feats

src/api/activity.js

@@ -31,3 +31,26 @@ export function saveActivity(data) {
     data
   }))
 }
+
+export function getEnrollList(params) {
+  return pureResponseData(request({
+    url: `/api/admin/activityEnroll`,
+    method: 'get',
+    params
+  }))
+}
+
+export function getVoteItems(activityId) {
+  return pureResponseData(request({
+    url: `/api/admin/activity/${activityId}/voteitem`,
+    method: 'get'
+  }))
+}
+
+export function saveVoteItems(activityId, data) {
+  return pureResponseData(request({
+    url: `/api/admin/activity/${activityId}/voteitem`,
+    method: 'post',
+    data
+  }))
+}

src/components/FloatAction/index.vue

@@ -0,0 +1,62 @@
+<template>
+  <div class="floatting-action" :style="style">
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props: {
+    left: {
+      type: Number,
+      default: undefined
+    },
+    right: {
+      type: Number,
+      default: undefined
+    },
+    top: {
+      type: Number,
+      default: undefined
+    },
+    bottom: {
+      type: Number,
+      default: undefined
+    }
+  },
+
+  computed: {
+    style() {
+      const ds = []
+
+      if (this.left !== undefined && this.left !== null) {
+        ds.push(`left: ${this.left}px`)
+      }
+      if (this.right !== undefined && this.right !== null) {
+        ds.push(`right: ${this.right}px`)
+      }
+      if (this.top !== undefined && this.top !== null) {
+        ds.push(`top: ${this.top}px`)
+      }
+      if (this.bottom !== undefined && this.bottom !== null) {
+        ds.push(`bottom: ${this.bottom}px`)
+      }
+
+      return ds.join(';')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.floatting-action {
+  position: fixed;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  z-index: 5;
+  right: 100px;
+  bottom: 150px;
+}
+</style>

src/components/PAInput/index.vue

@@ -0,0 +1,37 @@
+<template>
+  <el-input placeholder="请输入内容" v-model="val">
+    <template slot="prepend">{{prefix}}</template>
+    <el-button slot="append" :icon="icon" @click="handleBtnClick"></el-button>
+  </el-input>
+</template>
+
+<script>
+export default {
+  props: {
+    value: String,
+    prefix: String,
+    icon: String
+  },
+
+  data() {
+    return {}
+  },
+
+  computed: {
+    val: {
+      get() {
+        return this.value
+      },
+      set(v) {
+        this.$emit('input', v)
+      }
+    }
+  },
+
+  methods: {
+    handleBtnClick() {
+      this.$emit('click')
+    }
+  }
+}
+</script>

src/router/index.js

@@ -65,34 +65,55 @@ export const constantRoutes = [
       {
         path: 'warm',
         name: 'warm',
-        component: () => import('@/views/life/Warm'),
+        component: () => import('@/views/life/warm'),
         meta: { title: '暖场活动', icon: 'el-icon-position' }
       },
       {
         path: 'warm/detail',
         name: 'warm.detail',
-        hidden: true,
-        component: () => import('@/views/life/Warm/Detail'),
-        meta: { title: '活动详情' }
+        component: () => import('@/views/life/warm/Detail'),
+        meta: { title: '暖场活动详情' },
+        hidden: true
       },
       {
         path: 'travel',
         name: 'travel',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/life/travel'),
         meta: { title: '美好出游季', icon: 'el-icon-bicycle' }
       },
+      {
+        path: 'travel/detail',
+        name: 'travel.detail',
+        component: () => import('@/views/life/travel/Detail'),
+        meta: { title: '美好出游季详情' },
+        hidden: true
+      },
       {
         path: 'school',
         name: 'school',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/life/school'),
         meta: { title: '六点半学堂', icon: 'el-icon-school' }
       },
+      {
+        path: 'school/detail',
+        name: 'school.detail',
+        component: () => import('@/views/life/school/Detail'),
+        meta: { title: '六点半学堂详情' },
+        hidden: true
+      },
       {
         path: 'sport',
         name: 'sport',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/life/sport'),
         meta: { title: '夜跑行动', icon: 'el-icon-moon' }
       },
+      {
+        path: 'sport/detail',
+        name: 'sport.detail',
+        component: () => import('@/views/life/sport/Detail'),
+        meta: { title: '夜跑行动详情' },
+        hidden: true
+      },
       {
         path: 'warm-history',
         name: 'warm-history',
@@ -134,14 +155,28 @@ export const constantRoutes = [
       {
         path: 'clothes',
         name: 'clothes',
-        component: () => import('@/views/table/index'),
+        component: () => import('@/views/love/clothes'),
         meta: { title: '旧衣飞行', icon: 'el-icon-aim' }
       },
+      {
+        path: 'clothes/detail',
+        name: 'clothes.detail',
+        component: () => import('@/views/love/clothes/Detail'),
+        meta: { title: '旧衣飞行详情' },
+        hidden: true
+      },
       {
         path: 'help',
         name: 'help',
-        component: () => import('@/views/tree/index'),
+        component: () => import('@/views/love/help'),
         meta: { title: '丽园助农', icon: 'el-icon-bangzhu' }
+      },
+      {
+        path: 'help/detail',
+        name: 'help.detail',
+        component: () => import('@/views/love/help/Detail'),
+        meta: { title: '丽园助农详情' },
+        hidden: true
       }
     ]
   },

src/views/activity/Detail.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="app-container">
+    <el-tabs v-model="currentTab" type="card">
+      <el-tab-pane label="活动详情" name="detail">
+        <div style="max-width: 60vw">
+          <activity :type-id="typeId" :dataset="detail" @submit="handleSubmit" @cancel="handleCancel" />
+        </div>
+      </el-tab-pane>
+      <el-tab-pane v-if="detail && detail.isEnroll" label="报名详情" name="enroll">
+        <enroll-list :activity-id="detail.activityId" />
+      </el-tab-pane>
+      <el-tab-pane label="投票设置" name="vote">
+        <voteedit :activity-id="detail.activityId" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getActivity, updateActivity, saveActivity } from '@/api/activity'
+
+export default {
+  components: {
+    activity: () => import('./components/Detail'),
+    enrollList: () => import('./components/EnrollList'),
+    voteedit: () => import('./components/VoteEdit')
+  },
+
+  props: {
+    typeId: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+    return {
+      id: null,
+      detail: null,
+      currentTab: 'detail'
+    }
+  },
+
+  created() {
+    const { id } = this.$route.query
+    if (id) {
+      this.id = id
+      // eslint-disable-next-line no-return-assign
+      getActivity(id).then(res => this.detail = res)
+    }
+  },
+
+  methods: {
+    handleSubmit(data) {
+      if (this.id) {
+        updateActivity(data).then(() => {
+          this.$message({ type: 'success', message: '更新成功' })
+        })
+      } else {
+        saveActivity(data).then(res => {
+          this.$router.replace({ name: this.$route.name, params: { typeId: this.typeId }, query: { id: res.activityId }})
+        })
+      }
+    },
+
+    handleCancel() {
+      this.$router.go(-1)
+    }
+  }
+}
+</script>

src/views/activity/List.vue

@@ -0,0 +1,185 @@
+<template>
+  <div class="app-container">
+    <div class="activity-header">
+      <FilterForm @search="handleSearch" @reset="handleSearch" />
+      <el-tooltip content="新增活动" placement="top">
+        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" />
+      </el-tooltip>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column align="center" label="ID" width="100" prop="activityId" />
+      <el-table-column label="活动时间">
+        <template slot-scope="scope">
+          {{ scope.row.startDate | toDayMini }} - {{ scope.row.endDate | toDayMini }}
+        </template>
+      </el-table-column>
+      <el-table-column label="活动名称" prop="name" />
+      <el-table-column label="活动状态" align="center" width="200">
+        <template slot-scope="scope">
+          <el-tag
+            :type="scope.row.status | statusTagFormat"
+            disable-transitions
+          >{{ scope.row.status | statusFormat }}</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button size="mini" type="primary" plain @click="handleEdit(scope.row)">编辑</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { getActivityList } from '@/api/activity'
+
+export default {
+  components: {
+    FilterForm: () => import('./components/FilterForm')
+  },
+
+  filters: {
+    statusFormat(status) {
+      if (status === null || status === undefined) {
+        return undefined
+      }
+
+      const statusMap = [
+        '未发布',
+        '已发布',
+        '已过期'
+      ]
+      return statusMap[status]
+    },
+
+    statusTagFormat(status) {
+      if (status === null || status === undefined) {
+        return undefined
+      }
+
+      const statusMap = [
+        'warning',
+        'success',
+        'info'
+      ]
+      return statusMap[status]
+    }
+  },
+
+  props: {
+    typeId: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      detailRouter: null,
+      pagination: {
+        total: 0,
+        size: 10,
+        current: 1
+      },
+      filters: {
+        pageNum: 1,
+        pageSize: 10
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+    this.detailRouter = `${this.$route.name}.detail`
+  },
+  methods: {
+    fetchData() {
+      this.listLoading = true
+      getActivityList({
+        ...this.filters,
+        typeId: this.typeId,
+        pageNum: this.pagination.current,
+        pageSize: this.pagination.size
+      }).then(res => {
+        this.list = res.records
+        this.pagination = {
+          total: res.total,
+          size: res.size,
+          current: res.current
+        }
+        this.listLoading = false
+      })
+    },
+
+    handleAdd() {
+      this.$router.push({
+        name: this.detailRouter,
+        params: { typeId: this.typeId }
+      })
+    },
+
+    handleEdit(row) {
+      this.$router.push({
+        name: this.detailRouter,
+        params: { typeId: this.typeId },
+        query: { id: row.activityId }
+      })
+    },
+
+    handleSizeChange(size) {
+      this.pagination.size = size
+    },
+
+    handleCurrentChange(current) {
+      this.pagination.current = current
+      this.fetchData()
+    },
+
+    handleSearch(searchParams) {
+      this.filters = {
+        ...this.filters,
+        ...searchParams,
+        pageNum: 1
+      }
+
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.activity-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+
+.pagination {
+  padding: 16px;
+  & > div {
+    float: right;
+  }
+}
+</style>

src/views/components/Activity/index.vue → src/views/activity/components/Detail.vue

@@ -3,7 +3,7 @@
     <el-form-item label="活动名称" prop="name">
       <el-input v-model="form.name" />
     </el-form-item>
-    <el-form-item label="活动时间" required="">
+    <el-form-item label="活动时间" required>
       <el-date-picker
         v-model="dtRange1"
         type="daterange"
@@ -26,8 +26,11 @@
     <el-form-item label="活动地点" prop="address">
       <el-input v-model="form.address" />
     </el-form-item>
-    <template v-if="enroll">
-      <el-form-item label="报名时间">
+    <template v-if="!isWarm">
+      <el-form-item label="允许报名" prop="isEnroll">
+        <el-switch v-model="form.isEnroll" />
+      </el-form-item>
+      <el-form-item label="报名时间" v-if="form.isEnroll">
         <el-date-picker
           v-model="dtRange2"
           type="daterange"
@@ -35,24 +38,28 @@
           end-placeholder="结束日期"
           style="width: 100%;" />
       </el-form-item>
+      <el-form-item label="当前报名" v-if="form.isEnroll">
+        <el-input v-model="form.enrollNum">
+          <template slot="append">人</template>
+        </el-input>
+      </el-form-item>
     </template>
-    <template v-if="type == 2">
-      <el-form-item label="是否投票" prop="is_vote">
-        <el-switch v-model="form.is_vote" />
+    <el-form-item label="活动详情" prop="detail">
+      <markdown v-model="form.detail" />
+    </el-form-item>
+    <template v-if="isWarm">
+      <el-form-item label="参与投票" prop="isVote">
+        <el-switch v-model="form.isVote" />
       </el-form-item>
-      <el-form-item label="投票时间">
+      <el-form-item label="投票时间" v-if="form.isVote">
         <el-date-picker
           v-model="dtRange3"
-          :disabled="!form.is_vote"
           type="daterange"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
           style="width: 100%;" />
       </el-form-item>
     </template>
-    <el-form-item label="活动详情" prop="detail">
-      <markdown v-model="form.detail" />
-    </el-form-item>
     <el-form-item label="活动状态" prop="status">
       <el-select v-model="form.status" placeholder="请选择">
         <el-option label="未发布" :value="0" />
@@ -94,16 +101,14 @@ export default {
   },
 
   props: {
-    type: {
-      type: String,
-      required: true
+    typeId: {
+      type: Number,
+      default: 0
     },
     dataset: {
       type: Object,
       default: undefined
-    },
-    enroll: Boolean,
-    vote: Boolean
+    }
   },
 
   data() {
@@ -134,6 +139,7 @@ export default {
         isWarm: false,
         isVote: false,
         voteNum: null,
+        isEnroll: false,
         enrollNum: null,
         shareImg: null,
         shareTitle: null,
@@ -151,6 +157,10 @@ export default {
   },
 
   computed: {
+    isWarm() {
+      return this.type === 1
+    },
+
     dtRange1: {
       get() {
         return [this.form.startDate, this.form.endDate]
@@ -196,7 +206,7 @@ export default {
     },
 
     dataset(val) {
-      if (val && !this.formDataInited) {
+      if (val && val.activityId && !this.formDataInited) {
         this.form = val
         this.formDataInited = true
       }
@@ -204,7 +214,7 @@ export default {
   },
 
   mounted() {
-    if (this.dataset) {
+    if (this.dataset && this.dataset.activityId) {
       this.form = this.dataset
       this.formDataInited = true
     }
@@ -216,12 +226,8 @@ export default {
         if (valid) {
           const data = {
             ...this.form,
-            typeId: this.type
-          }
-
-          // eslint-disable-next-line
-          if (this.type == 2) {
-            data.isWarm = true
+            typeId: this.typeId,
+            isWarm: this.isWarm
           }
 
           const [dt1, dt2] = transferBeginEndDay(data.startDate, data.endDate)

src/views/activity/components/EnrollList.vue

@@ -0,0 +1,106 @@
+<template>
+  <div>
+    <el-table
+      v-loading="listLoading"
+      :data="list"
+      element-loading-text="Loading"
+      border
+      fit
+      highlight-current-row
+      stripe
+    >
+      <el-table-column
+        type="index"
+        width="50">
+      </el-table-column>
+      <el-table-column label="报名时间">
+        <template slot-scope="scope">
+          {{ scope.row.createDate | toDayMini }}
+        </template>
+      </el-table-column>
+      <el-table-column label="头像">
+        <template slot-scope="scope">
+          <img :src="scope.row.personAvatar" width="64" alt="">
+        </template>
+      </el-table-column>
+      <el-table-column label="报名人" prop="personName" />
+      <el-table-column label="昵称" prop="personNickname" />
+      <el-table-column label="电话" prop="phone" />
+    </el-table>
+    <div class="pagination">
+      <el-pagination
+        :current-page="pagination.current"
+        :page-size="pagination.size"
+        :total="pagination.total"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+import { getEnrollList } from '@/api/activity'
+
+export default {
+  props: {
+    activityId: Number
+  },
+  data() {
+    return {
+      list: null,
+      listLoading: true,
+      pagination: {
+        total: 0,
+        size: 10,
+        current: 1
+      }
+    }
+  },
+  created() {
+    this.fetchData()
+  },
+  methods: {
+    fetchData() {
+      if (!this.activityId) {
+        return
+      }
+
+      this.listLoading = true
+      getEnrollList({
+        activityId: this.activityId,
+        pageNum: this.pagination.current,
+        pageSize: this.pagination.size
+      }).then(res => {
+        this.list = res.records
+        this.pagination = {
+          total: res.total,
+          size: res.size,
+          current: res.current
+        }
+        this.listLoading = false
+      })
+    },
+
+    handleSizeChange(size) {
+      this.pagination.size = size
+    },
+
+    handleCurrentChange(current) {
+      this.pagination.current = current
+      this.fetchData()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.pagination {
+  padding: 16px;
+  & > div {
+    float: right;
+  }
+}
+</style>

src/views/activity/components/VoteEdit.vue

@@ -0,0 +1,131 @@
+<template>
+  <div>
+    <floataction>
+      <el-tooltip content="新增投票项目" placement="top-start">
+        <el-button type="danger" icon="el-icon-plus" @click="addItem" circle></el-button>
+      </el-tooltip>
+    </floataction>
+    <ul class="vote-list" v-loading="loading">
+      <li v-for="(item, index) in voteItems" :key="index">
+        <painput :prefix="`${index + 1}.`" icon="el-icon-close" v-model="list[index].name" @click="deleteItem(item, index)" />
+      </li>
+    </ul>
+
+    <div>
+      <el-button type="primary" icon="" @click="saveItems">保 存</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getVoteItems, saveVoteItems } from '@/api/activity'
+
+const VOTE_ITEM = {
+  name: undefined,
+  sortNo: 0
+}
+
+export default {
+  components: {
+    floataction: () => import('@/components/FloatAction'),
+    painput: () => import('@/components/PAInput')
+  },
+
+  props: {
+    activityId: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+    return {
+      loading: false,
+      list: null
+    }
+  },
+
+  computed: {
+    voteItems() {
+      return this.list || []
+    }
+  },
+
+  created() {
+    this.getItems()
+  },
+
+  watch: {
+    activityId(nw, od) {
+      if (nw && !od) {
+        this.getItems(nw)
+      }
+    }
+  },
+
+  methods: {
+    getItems(id) {
+      if (id || this.activityId) {
+        this.loading = true
+        getVoteItems(id || this.activityId).then(res => {
+          this.loading = false
+          this.list = res
+        })
+      }
+    },
+
+    addItem() {
+      if (this.hasEmpty()) {
+        return
+      }
+
+      const list = this.list || []
+      this.list = list.concat({
+        ...VOTE_ITEM,
+        sortNo: list.length + 1
+      })
+    },
+
+    deleteItem(row, index) {
+      this.removeListItem(index)
+    },
+
+    removeListItem(index) {
+      this.list = this.list.slice(0, index).concat(this.list.slice(index + 1))
+    },
+
+    saveItems() {
+      if (this.hasEmpty()) {
+        this.$message({ type: 'error', message: '请删除空白内容' })
+        return
+      }
+
+      if (this.activityId && this.list) {
+        this.loading = true
+        const list = this.list.filter(x => x.name)
+        saveVoteItems(this.activityId, list).then(res => {
+          this.loading = false
+          this.list = res
+        })
+      }
+    },
+
+    hasEmpty() {
+      return (this.list || []).filter(x => !x.name).length > 0
+    }
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.vote-list {
+  list-style: none;
+
+  li {
+    & + li {
+      margin-top: 12px;
+    }
+  }
+}
+</style>

src/views/life/Warm/Detail.vue

@@ -1,51 +1,11 @@
 <template>
-  <div class="app-container">
-    <div style="max-width: 60vw">
-      <activity type="2" :dataset="detail" @submit="handleSubmit" @cancel="handleCancel" />
-    </div>
-  </div>
+  <detail :type-id="1" />
 </template>
 
 <script>
-import { getActivity, updateActivity, saveActivity } from '@/api/activity'
-
 export default {
   components: {
-    activity: () => import('@/views/components/Activity')
-  },
-
-  data() {
-    return {
-      id: null,
-      detail: null
-    }
-  },
-
-  mounted() {
-    const { id } = this.$route.query
-    if (id) {
-      this.id = id
-      // eslint-disable-next-line no-return-assign
-      getActivity(id).then(res => this.detail = res)
-    }
-  },
-
-  methods: {
-    handleSubmit(data) {
-      if (this.id) {
-        updateActivity(data).then(() => {
-          this.$message({ type: 'success', message: '更新成功' })
-        })
-      } else {
-        saveActivity(data).then(res => {
-          this.$router.push({ name: 'warm.detail', query: { id: res.activityId }})
-        })
-      }
-    },
-
-    handleCancel() {
-      this.$router.go(-1)
-    }
+    detail: () => import('@/views/activity/Detail')
   }
 }
 </script>

src/views/life/Warm/index.vue

@@ -1,168 +1,11 @@
 <template>
-  <div class="app-container">
-    <div class="activity-header">
-      <FilterForm @search="handleSearch" @reset="handleSearch" />
-      <el-tooltip content="新增活动" placement="top">
-        <el-button type="primary" icon="el-icon-plus" @click="handleAdd" />
-      </el-tooltip>
-    </div>
-    <el-table
-      v-loading="listLoading"
-      :data="list"
-      element-loading-text="Loading"
-      border
-      fit
-      highlight-current-row
-      stripe
-    >
-      <el-table-column align="center" label="ID" width="100" prop="activityId" />
-      <el-table-column label="活动时间">
-        <template slot-scope="scope">
-          {{ scope.row.startDate | toDayMini }} - {{ scope.row.endDate | toDayMini }}
-        </template>
-      </el-table-column>
-      <el-table-column label="活动名称" prop="name" />
-      <el-table-column label="活动状态" align="center" width="200">
-        <template slot-scope="scope">
-          <el-tag
-            :type="scope.row.status | statusTagFormat"
-            disable-transitions
-          >{{ scope.row.status | statusFormat }}</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" width="200">
-        <template slot-scope="scope">
-          <el-button size="mini" type="primary" plain @click="handleEdit(scope.row)">编辑</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="pagination">
-      <el-pagination
-        :current-page="pagination.current"
-        :page-size="pagination.size"
-        :total="pagination.total"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
-    </div>
-  </div>
+  <list :type-id="1" />
 </template>
 
 <script>
-import { getActivityList } from '@/api/activity'
-
 export default {
   components: {
-    FilterForm: () => import('../../components/Activity/FilterForm')
-  },
-
-  filters: {
-    statusFormat(status) {
-      if (status === null || status === undefined) {
-        return undefined
-      }
-
-      const statusMap = [
-        '未发布',
-        '已发布',
-        '已过期'
-      ]
-      return statusMap[status]
-    },
-
-    statusTagFormat(status) {
-      if (status === null || status === undefined) {
-        return undefined
-      }
-
-      const statusMap = [
-        'warning',
-        'success',
-        'info'
-      ]
-      return statusMap[status]
-    }
-  },
-  data() {
-    return {
-      list: null,
-      listLoading: true,
-      pagination: {
-        total: 0,
-        size: 10,
-        current: 1
-      },
-      filters: {
-        pageNum: 1,
-        pageSize: 10,
-        typeId: 2
-      }
-    }
-  },
-  created() {
-    this.fetchData()
-  },
-  methods: {
-    fetchData() {
-      this.listLoading = true
-      getActivityList({
-        ...this.filters,
-        pageNum: this.pagination.current,
-        pageSize: this.pagination.size
-      }).then(res => {
-        this.list = res.records
-        this.pagination = {
-          total: res.total,
-          size: res.size,
-          current: res.current
-        }
-        this.listLoading = false
-      })
-    },
-
-    handleAdd() {
-      this.$router.push({ name: 'warm.detail' })
-    },
-
-    handleEdit(row) {
-      this.$router.push({ name: 'warm.detail', query: { id: row.activityId }})
-    },
-
-    handleSizeChange(size) {
-      this.pagination.size = size
-    },
-
-    handleCurrentChange(current) {
-      this.pagination.current = current
-      this.fetchData()
-    },
-
-    handleSearch(searchParams) {
-      this.filters = {
-        ...this.filters,
-        ...searchParams,
-        pageNum: 1
-      }
-
-      this.fetchData()
-    }
+    list: () => import('@/views/activity/List')
   }
 }
 </script>
-
-<style lang="scss" scoped>
-.activity-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.pagination {
-  padding: 16px;
-  & > div {
-    float: right;
-  }
-}
-</style>

src/views/life/school/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="2" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/activity/Detail')
+  }
+}
+</script>

src/views/life/school/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="2" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/activity/List')
+  }
+}
+</script>

src/views/life/sport/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="3" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/activity/Detail')
+  }
+}
+</script>

src/views/life/sport/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="3" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/activity/List')
+  }
+}
+</script>

src/views/life/travel/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="4" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/activity/Detail')
+  }
+}
+</script>

src/views/life/travel/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="4" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/activity/List')
+  }
+}
+</script>

src/views/love/clothes/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="5" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/activity/Detail')
+  }
+}
+</script>

src/views/love/clothes/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="5" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/activity/List')
+  }
+}
+</script>

src/views/love/help/Detail.vue

@@ -0,0 +1,11 @@
+<template>
+  <detail :type-id="6" />
+</template>
+
+<script>
+export default {
+  components: {
+    detail: () => import('@/views/activity/Detail')
+  }
+}
+</script>

src/views/love/help/index.vue

@@ -0,0 +1,11 @@
+<template>
+  <list :type-id="6" />
+</template>
+
+<script>
+export default {
+  components: {
+    list: () => import('@/views/activity/List')
+  }
+}
+</script>