Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/pc-admin

src/config/api.js

@@ -127,6 +127,35 @@ const apis = {
       url: `${commPrefix}/customer/add`
     }
   },
+  activity:{
+    list:{
+      method:'get',
+      url: `${commPrefix}/iBuildingDynamicList`
+    },
+    buildingAll:{
+      method:'get',
+      url: `${commPrefix}/buildingAll`
+    },
+    activityAdd:{
+      method:'post',
+      url: `${commPrefix}/buildingDynamic/add`
+    },
+    activityDetails:{
+      method:'get',
+      url: `${commPrefix}/buildingDynamic/Details`
+    },
+    updateActivity:{
+      method:'PUT',
+      url: `${commPrefix}/buildingDynamic/update`
+    },
+    getSignList:{
+      method:'get',
+      url: `${commPrefix}/SignList`
+    },
+    finishActivity:{
+      method:'put',
+      url: `${commPrefix}/buildingDynamic/finish`
+  },
   recommendCustomer:{
     list:{
       method:'get',
@@ -188,6 +217,7 @@ const apis = {
       method: 'get',
       url: `${commPrefix}/taNewsType/:id`
     }
+  }
   },
   points:{
     list:{
@@ -244,5 +274,4 @@ const apis = {
     }
   },
 }
-
 export default apis

src/store/index.js

@@ -14,10 +14,12 @@ const store = new Vuex.Store({
     customer: require('./modules/customer').default,
     building: require('./modules/building').default,
     img: require('./modules/img').default,
+    activity: require('./modules/activity').default,
     goods: require('./modules/goods').default,
     points: require('./modules/points').default,
     exchange: require('./modules/exchange').default,
     news
+
   }
 })
 

src/store/modules/activity.js

@@ -0,0 +1,81 @@
+import apis from '../../config/api'
+import request from '../../utils/request'
+
+export default {
+  namespaced: true,
+  state: {
+    list: [],
+    detail: {},
+  },
+  mutations: {},
+  actions: {
+    getActivityList (context, payload) {
+      return request({
+        ...apis.activity.list,
+        params: payload,
+      })
+    },
+    addActivity({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.activity.activityAdd,
+          data: payload,
+        }).then((data) => {
+          window.console.log(data)
+          commit('updateList', { ...data, list: data.records})
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    activityDetails (context, payload) {
+      return request({
+        ...apis.activity.activityDetails,
+        params: payload,
+      })
+    },
+    updateActivity({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.activity.updateActivity,
+          data: payload,
+        }).then((data) => {
+          window.console.log(data)
+          commit('updateList', { ...data, list: data.records})
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    // 活动报名列表
+    getSignList (context, payload) {
+      return request({
+        ...apis.activity.getSignList,
+        params: payload,
+      })
+    },
+    // 结束报名
+    finishActivity({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.activity.finishActivity,
+          data: payload,
+        }).then((data) => {
+          window.console.log(data)
+          commit('updateList', { ...data, list: data.records})
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+  },
+}

src/views/activity/add.vue

@@ -0,0 +1,256 @@
+<template>
+  <el-form ref="form" :model="dynamic" label-width="160px">
+    <el-form-item label="所属项目">
+      <el-select v-model="activityQuery.buildingId" placeholder="请选择">
+        <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="主图：">
+          <el-upload
+            :action="upFileUrl"
+            name='file'
+            list-type="picture-card"
+            :headers="uploadHeaders"
+            :file-list="imgList"
+            :show-file-list="true"
+            :before-upload="beforeImgUpload"
+            :on-success="handleAvatarSuccess"
+            :on-remove="handleRemove">
+            <i class="el-icon-plus"></i>
+          </el-upload>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+    </el-form-item>
+    <el-form-item label="活动标题">
+      <el-input v-model="activityQuery.title"></el-input>
+    </el-form-item>
+    <el-form-item label="活动时间">
+       <el-date-picker v-model="activityQuery.startDate" type="date" placeholder="选择日期"/>
+        <span>-</span>
+       <el-date-picker v-model="activityQuery.endDate" type="date" placeholder="选择日期"/>   
+    </el-form-item>
+    <el-form-item label="活动地点">
+      <el-input  v-model="activityQuery.address"></el-input>
+    </el-form-item>
+    <el-form-item  label="活动人数">
+      <el-input v-model="activityQuery.personNum" ></el-input>
+    </el-form-item>
+    <!-- <el-form-item label="链接地址">
+      <el-input v-model="dynamic.url"></el-input>
+    </el-form-item> -->
+    <el-form-item label="活动详情">
+      <div id="websiteEditorElem" style="height: 400px"></div>
+    </el-form-item>
+    <el-form-item label="是否需要报名">
+       <el-radio v-model="activityQuery.isEnlist" label="1">是</el-radio>
+       <el-radio v-model="activityQuery.isEnlist" label="0">否</el-radio>
+    </el-form-item>
+    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'">
+       <el-date-picker v-model="activityQuery.enlistStart" type="date" placeholder="选择日期"/>
+        <span>-</span>
+       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="onSubmit">保存</el-button>
+
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+import apis from '../../config/api'
+import E from 'wangeditor'
+
+const { mapState: mapDynamicState, mapActions: mapDynamicActions, mapMutations: mapDynamicMutations } = createNamespacedHelpers('building')
+const { mapState: mapActivityState, mapActions: mapActivityActions } = createNamespacedHelpers('activity')
+const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
+const { mapActions: mapImgActions } = createNamespacedHelpers('img')
+
+export default {
+  data () {
+    return {
+      url:'',
+      buildingId:'',
+      upFileUrl: apis.file.upload.url,
+      radio:'1',
+      imgList: [],
+      dialogVisible: false,
+      dialogImageUrl: "",
+      activityQuery: {
+       url:'',
+       startDate:'',
+       endDate:'',
+       buildingId:'',
+       title:'',
+       isEnlist:'1',
+       text:'',
+       enlistStart:'',
+       enlistEnd:'',
+       personNum:'',
+      }
+      
+    }
+  },
+  computed: {
+    ...mapDynamicState({
+      detail: x => x.detail,
+    }),
+    dynamic: {
+      get () {
+        return this.detail
+      },
+      set (val) {
+        return this.updateDetail(val)
+      }
+    },
+    ...mapBuildingState({
+      buildings: x => x.buildings
+    }),
+    uploadHeaders () {
+                const token = localStorage.getItem('x-token') || ''
+                return {
+                    Authorization: `Bearer ${token}`
+                }
+            }
+  },
+  methods: {
+    ...mapBuildingActions([
+      'getBuildings'
+    ]),
+    ...mapDynamicMutations([
+      'updateDetail'
+    ]),
+    ...mapDynamicActions([
+      'getDetail',
+      'editDynamics'
+    ]),
+        ...mapActivityActions([
+      'addActivity',
+    ]),
+    ...mapImgActions([
+      'uploadImg'
+    ]),
+    beforeImgUpload (file) {
+      if (file.type !== 'image/jpeg' && file.type !== 'image/png') {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        return false
+      }
+      // if (file.size / 1024 > 300) {
+      //   this.$message.error('图片大小不允许超过300k!')
+      //   return false
+      // }
+      this.loading = this.$loading({
+        lock: true,
+        text: '上传中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      return true
+    },
+    handleRemove(file, fileList) {
+      this.imgList = fileList;
+    },
+
+    handleAvatarSuccess (res) {
+      this.activityQuery.url = res.data
+      this.updateDetail({...this.dynamic, imgUrl: res.data})
+      this.loading.close()
+    },
+    onSubmit () {
+      // if (!this.detail.dynamicId) {
+        // 新增
+        console.log('this.imgList[0]',this.imgList[0])
+        // this.activityQuery.url = this.imgList[0]
+        this.addActivity(
+          JSON.stringify(this.activityQuery)
+        ).then(() => {
+          this.onCancel()
+          
+        })
+        this.$router.push({ name: "activity-list" });
+      // } else {
+      //   // 修改
+      //   this.editDynamics({
+      //     detail: JSON.stringify(this.detail)
+      //   }).then(() => {
+      //     this.onCancel()
+      //   })
+      // }
+    },
+    onCancel () {
+      this.$router.push({name: 'dynamiclist'})
+    }
+  },
+  mounted () {
+    const _that = this
+    const phoneEditor = new E('#websiteEditorElem')
+    phoneEditor.customConfig.zIndex = 1
+    phoneEditor.customConfig.onchange = function (html) {
+      _that.dynamic = {..._that.dynamic, url: html}
+        _that.activityQuery.text =_that.dynamic.url
+    }
+    // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
+    // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
+
+    phoneEditor.customConfig.customUploadImg = function (files, insert) {
+      _that.uploadImg(files[0]).then(data => {
+        insert(data)
+      })
+    }
+    phoneEditor.customConfig.menus = [
+      'head',  // 标题
+      'bold',  // 粗体
+      'fontSize',  // 字号
+      'fontName',  // 字体
+      'italic',  // 斜体
+      'underline',  // 下划线
+      'strikeThrough',  // 删除线
+      'foreColor',  // 文字颜色
+      'backColor',  // 背景颜色
+      'justify',  // 对齐方式
+      'image',  // 插入图片
+    ]
+    phoneEditor.create()
+    
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100,
+    }).then(() => {
+      if ((this.$route.query.id || '') !== '') {
+        this.getDetail({id: this.$route.query.id}).then((data) => {
+          phoneEditor.txt.html(data.url)
+        })
+      }
+    })
+  }
+}
+</script>
+
+<style lang="scss">
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>

src/views/activity/edit.vue

@@ -0,0 +1,260 @@
+<template>
+  <el-form ref="form" label-width="160px">
+    <el-form-item label="所属项目">
+      <el-select v-model="activityQuery.buildingId" placeholder="请选择">
+        <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="主图：">
+          <el-upload
+                :headers="uploadHeaders"
+                :action="upFileUrl"
+                :show-file-list="false"
+                :on-success="handleAvatarSuccess">
+              <img v-if="imageUrl" :src="imageUrl" class="avatar">
+              <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+    </el-form-item>
+    <el-form-item label="活动标题">
+      <el-input v-model="activityQuery.title"></el-input>
+    </el-form-item>
+    <el-form-item label="活动时间">
+       <el-date-picker v-model="activityQuery.startDate" type="date" placeholder="选择日期"/>
+        <span>-</span>
+       <el-date-picker v-model="activityQuery.endDate" type="date" placeholder="选择日期"/>   
+    </el-form-item>
+    <el-form-item label="活动地点">
+      <el-input  v-model="activityQuery.address"></el-input>
+    </el-form-item>
+    <el-form-item label="活动人数">
+      <el-input v-model="activityQuery.personNum"></el-input>
+    </el-form-item>
+    <!-- <el-form-item label="链接地址">
+      <el-input v-model="dynamic.url"></el-input>
+    </el-form-item> -->
+    <el-form-item label="活动详情">
+      <div id="websiteEditorElem" style="height: 400px"></div>
+    </el-form-item>
+    <el-form-item label="是否需要报名">
+       <el-radio v-model="activityQuery.isEnlist" label="1">是</el-radio>
+       <el-radio v-model="activityQuery.isEnlist" label="0">否</el-radio>
+    </el-form-item>
+    <el-form-item label="活动时间" v-if="activityQuery.isEnlist == '1'">
+       <el-date-picker v-model="activityQuery.enlistStart" type="date" placeholder="选择日期"/>
+        <span>-</span>
+       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+    </el-form-item>
+    <el-form-item>
+      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button @click="onCancel">取消</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+import apis from '../../config/api'
+import E from 'wangeditor'
+
+const { mapState: mapDynamicState, mapActions: mapDynamicActions, mapMutations: mapDynamicMutations } = createNamespacedHelpers('building')
+const { mapState: mapActivityState, mapActions: mapActivityActions } = createNamespacedHelpers('activity')
+const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
+const { mapActions: mapImgActions } = createNamespacedHelpers('img')
+
+export default {
+  data () {
+    return {
+      url:'',
+      buildingId:'',
+      upFileUrl: apis.file.upload.url,
+      radio:'1',
+      imageUrl: '',
+      imgList: [],
+      dialogVisible: false,
+      dialogImageUrl: "",
+      activityQuery: {
+       dynamicId:'',
+       buildingId:'',
+       url:'',
+       startDate:'',
+       endDate:'',
+       buildingId:'',
+       title:'',
+       isEnlist:'1',
+       text:'',
+       enlistStart:'',
+       enlistEnd:'',
+       address:'',
+       personNum:''
+      }
+      
+    }
+  },
+  computed: {
+    ...mapDynamicState({
+      detail: x => x.detail,
+    }),
+    dynamic: {
+      get () {
+        return this.detail
+      },
+      set (val) {
+        return this.updateDetail(val)
+      }
+    },
+    ...mapBuildingState({
+      buildings: x => x.buildings
+    }),
+    uploadHeaders () {
+                const token = localStorage.getItem('x-token') || ''
+                return {
+                    Authorization: `Bearer ${token}`
+                }
+            }
+  },
+  methods: {
+    ...mapBuildingActions([
+      'getBuildings'
+    ]),
+    ...mapDynamicMutations([
+      'updateDetail'
+    ]),
+    ...mapDynamicActions([
+      'getDetail',
+      'editDynamics'
+    ]),
+        ...mapActivityActions([
+      'addActivity',
+      'activityDetails',
+      'updateActivity'
+    ]),
+    ...mapImgActions([
+      'uploadImg'
+    ]),
+    beforeImgUpload (file) {
+      if (file.type !== 'image/jpeg' && file.type !== 'image/png') {
+        this.$message.error('上传图片只能是 JPG 或 PNG 格式!')
+        return false
+      }
+      // if (file.size / 1024 > 300) {
+      //   this.$message.error('图片大小不允许超过300k!')
+      //   return false
+      // }
+      this.loading = this.$loading({
+        lock: true,
+        text: '上传中...',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+
+      return true
+    },
+    handleRemove(file, fileList) {
+      this.imgList = fileList;
+    },
+
+    handleAvatarSuccess (res) {
+      this.activityQuery.url = res.data
+      this.updateDetail({...this.dynamic, imgUrl: res.data})
+      this.loading.close()
+    },
+    onSubmit () {
+        // 新增
+        console.log('this.imgList[0]',this.imgList[0])
+        // this.activityQuery.url = this.imgList[0]
+        this.updateActivity(
+           JSON.stringify(this.activityQuery)
+        ).then(() => {
+          this.onCancel()
+          
+        })
+        this.$router.push({ name: "activity-list" });
+    },
+    onCancel () {
+      this.$router.push({name: 'dynamiclist'})
+    },
+    getDetails(){
+      this.activityQuery.dynamicId = this.$route.query.row
+        this.activityDetails(this.activityQuery).then((data) => {
+          console.log('55',data)
+        this.activityQuery.buildingId = data.buildingId
+        this.activityQuery.title = data.title
+        this.activityQuery.startDate = data.startDate
+        this.activityQuery.endDate = data.endDate
+        this.activityQuery.address = data.address
+        this.activityQuery.personNum = data.personNum
+        this.imageUrl = data.url
+       
+        })
+    }
+  },
+  mounted () {
+    const _that = this
+    const phoneEditor = new E('#websiteEditorElem')
+    phoneEditor.customConfig.zIndex = 1
+    phoneEditor.customConfig.onchange = function (html) {
+      _that.dynamic = {..._that.dynamic, url: html}
+        _that.activityQuery.text =_that.dynamic.url
+    }
+    // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
+    // phoneEditor.customConfig.uploadFileName = 'uploadFiles'
+
+    phoneEditor.customConfig.customUploadImg = function (files, insert) {
+      _that.uploadImg(files[0]).then(data => {
+        insert(data)
+      })
+    }
+    phoneEditor.customConfig.menus = [
+      'head',  // 标题
+      'bold',  // 粗体
+      'fontSize',  // 字号
+      'fontName',  // 字体
+      'italic',  // 斜体
+      'underline',  // 下划线
+      'strikeThrough',  // 删除线
+      'foreColor',  // 文字颜色
+      'backColor',  // 背景颜色
+      'justify',  // 对齐方式
+      'image',  // 插入图片
+    ]
+    phoneEditor.create()
+    this.getDetails()
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100,
+    }).then(() => {
+      if ((this.$route.query.id || '') !== '') {
+        this.getDetail({id: this.$route.query.id}).then((data) => {
+          phoneEditor.txt.html(data.url)
+        })
+      }
+    })
+  }
+}
+</script>
+
+<style lang="scss">
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>

src/views/activity/list.vue

@@ -0,0 +1,229 @@
+<template>
+<div class="list">
+        <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
+        </div>
+        <ul>
+          <li>
+           <el-select v-model="filterData.buildingId"  placeholder="请选择">
+              <el-option v-for="site in buildings" :label="site.buildingName" :value="site.buildingId" :key="site.buildingId"></el-option>
+           </el-select>
+          </li>
+
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">查询</el-button>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+  <el-table
+    :data="list || []"
+    style="width: 100%">
+    <el-table-column
+      prop="title"
+      label="活动标题">
+    </el-table-column>
+    <el-table-column
+      prop="tel"
+      label="活动时间">
+     <template slot-scope="scope">
+        <span>{{scope.row.startDate}} ~ {{scope.row.startDate}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop="count"
+      label="已参加人数">
+    </el-table-column>
+    <el-table-column
+      prop="pvNum"
+      label="阅读量">
+      </el-table-column>
+      <el-table-column
+      prop="shareNum"
+      label="转发数">
+    </el-table-column>
+    <el-table-column
+      prop="favorNum"
+      label="点赞数">
+    </el-table-column>
+    <el-table-column
+      prop="saveNum"
+      label="收藏数">
+    </el-table-column>
+    <el-table-column   label="状态">
+      <template slot-scope="scope">
+        <span :style="{color:(scope.row.status == 1?'':'red')}" >{{scope.row.status == 1 ? '启用' : '禁用'}}</span>
+      </template>
+    </el-table-column>
+    <el-table-column
+      fixed="right"
+      label="操作">
+      <template slot-scope="scope">
+        <!-- <el-button type="text" @click="toDetail(scope.row)" size="small">{{scope.row.status == 1?'停用':'启用'}}</el-button> -->
+         <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small">报名记录</el-button>
+        <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small">编辑</el-button>
+        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small">结束活动</el-button>
+        <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    small
+    style="margin-top:10px;"
+    layout="prev, pager, next"
+    :current-page.sync="filterData.pageNum"
+    :pageSize="filterData.pageSize"
+    :total="filterData.total || 0"
+    @current-change="getPageList"
+  >
+  </el-pagination>
+</div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
+const { mapActions: mapActivity } = createNamespacedHelpers("activity");
+
+export default {
+  name: "consultant-list",
+  data() {
+    return {
+      filterData: {
+        dynamicId:'',
+        name: "",
+        phone: "",
+        buildingId:'',
+        pageNum:1,
+        pageSize:10,
+        total:0,
+        top:''
+      },
+      
+      buildingForm: {
+        pageNum: 1,
+        pageSize: 100
+      },
+      list: [],
+      buildings:[],
+      pageNavi: {
+        current: 1,
+        pageSize: 10,
+        total: 0
+      },
+      searchName: ""
+    };
+  },
+  computed: {},
+  methods: {
+        ...mapBuildingActions([
+      'getBuildings'
+    ]),
+    ...mapActivity([
+      "getActivityList",
+      'finishActivity'
+      ]),
+    getList() {
+      this.getActivityList(this.filterData,this.filterData.pageSize,this.filterData.pageNum).then(res => {
+          this.list = res.list;
+          this.filterData.pageSize =res.pageSize 
+          this.filterData.pageNum =res.pageNum
+          this.filterData.total =res.total
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    // 结束活动
+    finish(id){
+      this.filterData.dynamicId = id
+          this.finishActivity(
+          JSON.stringify(this.filterData)
+        ) 
+          this.getList();
+          this.getBuildList()   
+    },
+    top(id){
+          this.filterData.dynamicId = id
+          this.filterData.top = 1
+          this.finishActivity(
+          JSON.stringify(this.filterData)
+        ) 
+          this.getList();
+          this.getBuildList()   
+    },
+    addDynamic() {
+      this.$router.push({ name: "activity-add" });
+      console.log('11111')
+    },
+    toDetail(row) {
+      this.$router.push({ name: "activity-edit",query: { row }});
+      console.log('row',row)
+    },
+    search() {
+      this.filterData.current = 1;
+      this.getList();
+    },
+     getBuildList() {
+        this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+            this.buildings = res.records  
+        }).catch(() => {
+             console.log('building/getBuildings err')
+        })
+    },
+    getPageList(){
+       this.getList();
+    },
+    getSignList(id){
+      this.$router.push({ name: "activity-signList",query: { id } }); 
+    }
+  },
+  created() {
+    this.pageNavi.current = this.$route.query.page || 1;
+    this.getList();
+    this.getBuildList()
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  .header {
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+  }
+}
+.system-table-search {
+  width: calc(100% - 40px);
+  margin: 20px auto 0;
+}
+
+.system-table-search li {
+  margin-right: 20px;
+}
+
+.system-table-search ul {
+  font-size: 0;
+  white-space: nowrap;
+}
+
+.system-table-search ul > li {
+  display: inline-block;
+}
+
+.flex-h {
+  display: flex;
+  align-items: center;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

src/views/activity/signList.vue

@@ -0,0 +1,126 @@
+<template>
+<div class="list">
+        <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='activityLiest'>返回</el-button>
+        </div>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+  <el-table
+    :data="list || []"
+    style="width: 100%">
+    <el-table-column
+      prop="name"
+      label="姓名">
+    </el-table-column>
+    <el-table-column
+      prop="phone"
+      label="手机号">
+    </el-table-column>
+    <el-table-column
+      prop="createDate"
+      label="报名时间">
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    small
+    style="margin-top:10px;"
+    layout="prev, pager, next"
+    :current-page.sync="filterData.pageNum"
+    :pageSize="filterData.pageSize"
+    :total="filterData.total || 0"
+    @current-change="getPageList" >
+  </el-pagination>
+</div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+const { mapActions: mapActivity } = createNamespacedHelpers("activity");
+
+export default {
+  name: "consultant-list",
+  data() {
+    return {
+      filterData: {
+        name: "",
+        phone: "",
+        buildingId:'',
+        pageNum:1,
+        pageSize:10,
+        total:0,
+        dynamicId:'',
+      },
+      list:[],
+    };
+  },
+  computed: {},
+  methods: {
+    ...mapActivity([
+        "getSignList"
+    ]),
+    getList() {
+      this.getSignList(this.filterData,this.filterData.pageSize,this.filterData.pageNum).then(res => {
+          this.list = res.list.data
+          this.filterData.pageSize =res.pageSize 
+          this.filterData.pageNum =res.pageNum
+          this.filterData.total =res.total
+        }).catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    // 活动列表
+    activityLiest(){
+     this.$router.push({ name: "activity-list" });
+    },
+    getPageList(){
+       this.getList();
+    }
+  },
+  created() {
+    this.filterData.dynamicId = this.$route.query.id
+    this.getList();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  .header {
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+  }
+}
+.system-table-search {
+  width: calc(100% - 40px);
+  margin: 20px auto 0;
+}
+
+.system-table-search li {
+  margin-right: 20px;
+}
+
+.system-table-search ul {
+  font-size: 0;
+  white-space: nowrap;
+}
+
+.system-table-search ul > li {
+  display: inline-block;
+}
+
+.flex-h {
+  display: flex;
+  align-items: center;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

src/views/goods/edit.vue

@@ -35,7 +35,7 @@
           <el-input v-model="detail.inventory"></el-input>
         </el-form-item>
         <el-form-item label="商品详情：">
-            <div id="websiteEditorElem" style="height: 400px"></div>
+            <rich-editor v-model="detail.goodsDescription" style="height: 400px" />
         </el-form-item>
         <el-form-item label="状态：">
           <el-select v-model="detail.status" clearable placeholder="请选择">
@@ -82,6 +82,7 @@ export default {
         totalNum: '',
         inventory: '',
         status: 0,
+        goodsDescription: '',
         address: '',
         goodsId: '',
       },
@@ -125,6 +126,7 @@ export default {
           this.detail.status = data.status
           this.detail.address = data.address
           this.detail.goodsId = data.goodsId
+          this.detail.goodsDescription = data.goodsDescription
         });
       }
     },

src/views/index.js

@@ -68,6 +68,53 @@ const pages = [
       },
     ]
   },
+  {
+    path: 'activity',
+    name: 'activity',
+    component: () => import('./index.vue'),
+    meta: {
+      menuShow: true,
+      title: '活动管理',
+    },
+    children: [
+      {
+        path: 'activity',
+        name: 'activity-list',
+        component: () => import('./activity/list.vue'),
+        meta: {
+          menuShow: true,
+          title: '活动列表',
+        },
+      },
+      {
+        path: 'activity/add',
+        name: 'activity-add',
+        component: () => import('./activity/add.vue'),
+        meta: {
+          menuShow: false,
+          title: '活动添加',
+        }
+      },
+      {
+        path: 'activity/edit',
+        name: 'activity-edit',
+        component: () => import('./activity/edit.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑活动',
+        }
+      },
+      {
+        path: 'activity/signList',
+        name: 'activity-signList',
+        component: () => import('./activity/signList.vue'),
+        meta: {
+          menuShow: false,
+          title: '报名记录',
+        },
+      }
+    ]
+  },
   {
     path: 'building',
     name: 'building',