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

src/config/api.js

@@ -173,7 +173,15 @@ const apis = {
     recommendCustomerList: {
       method:'get',
       url: `${commPrefix}/customer/recommend/:id`
-    }
+    },
+    getCustomerDetail: {
+      method: `get`,
+      url: `${commPrefix}/customer/recommend/get/:id`
+    },
+    taPointsRecords: { // 积分列表
+      method: `get`,
+      url: `${commPrefix}/taPointsRecords/:id`
+    },
   },
   goods:{
     list:{
@@ -271,6 +279,38 @@ const apis = {
     change: {
       method: 'put',
       url: `${commPrefix}/taPointsExchange/change`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/taPointsExchange/:id`
+    }
+  },
+  carouselFigure:{ // 轮播图列表查询
+    list:{
+      method:'get',
+      url: `${commPrefix}/extendContent`
+    },
+    handle:{
+      method:'get',
+      url: `${commPrefix}/extendContent/:id`
+    },
+    update: {
+      method:'put',
+      url: `${commPrefix}/extendContent/:id`
+    },
+    getById: {
+      method:'get',
+      url: `${commPrefix}/extendContent/:id`
+    },
+    add: {
+      method:'post',
+      url: `${commPrefix}/extendContent`
+    }
+  },
+  message:{
+    list:{
+      method:'get',
+      url: `${commPrefix}/taCustomerMessage`
     }
   },
 }

src/store/index.js

@@ -18,6 +18,8 @@ const store = new Vuex.Store({
     goods: require('./modules/goods').default,
     points: require('./modules/points').default,
     exchange: require('./modules/exchange').default,
+    carouselFigure: require('./modules/carouselFigure').default,
+    message: require('./modules/message').default,
     news
 
   }

src/store/modules/activity.js

@@ -43,8 +43,6 @@ export default {
           ...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') {

src/store/modules/carouselFigure.js

@@ -0,0 +1,102 @@
+import request from '../../utils/request'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    carouselList: {},
+    // detail: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.carouselList = payload
+    },
+    // updateDetail (state, payload) {
+    //   state.detail = payload
+    // }
+  },
+  actions: {
+    // setDetailNull ({ commit }) {
+    //   commit('updateDetail', {})
+    // },
+    getExtendContent ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.list,
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    handleExtendContent ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.handle,
+          urlData: { id: payload.contentId },
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    updateExtendContent ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.update,
+          urlData: { id: payload.contentId },
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    getByIdExtendContent({ commit }, payload) { // 根据Id查询
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.getById,
+          urlData: { id: payload.contentId },
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    addExtendContent ({ commit }, payload) { // 添加
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.add,
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+  }
+}

src/store/modules/customer.js

@@ -57,7 +57,7 @@ export default {
         })
       })
     },
-    getRecommendCustomersUpdate ({ commit }, payload) { // 根据Id查询列表
+    getRecommendCustomersUpdate ({ commit }, payload) { // 修改
       return new Promise((resolve, reject) => {
         request({
           ...apis.recommendCustomer.update,
@@ -82,8 +82,32 @@ export default {
           reject(message)
         })
       })
-    }
-
+    },
+    taPointsRecords({ commit }, payload) { // 积分列表
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.recommendCustomer.taPointsRecords,
+          urlData: { id: payload.customerId},
+          params: payload
+        }).then((data) => {
+          resolve(data)
+        }).catch(({ message }) => {
+          reject(message)
+        })
+      })
+    },
+    getCustomerDetail({ commit }, payload) { // 查询客户详情
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.recommendCustomer.getCustomerDetail,
+          urlData: { id: payload.customerId}
+        }).then((data) => {
+          resolve(data)
+        }).catch(({ message }) => {
+          reject(message)
+        })
+    })
+}
     
   }
 }

src/store/modules/exchange.js

@@ -112,19 +112,15 @@ export default {
         })
       })
     },
-    cancelDynamic (_, payload) {
+    verifyById (_, payload) {
       return new Promise((resolve, reject) => {
         request({
-          ...apis.dynamic.cancel,
+          ...apis.exchange.update,
           urlData: payload,
         }).then((data) => {
           resolve(data)
         }).catch((err) => {
-          const message = err.message || err.msg
-
-          if (typeof message === 'string') {
-            reject(message)
-          }
+          reject(err)
         })
       })
     }

src/store/modules/message.js

@@ -0,0 +1,128 @@
+import request from '../../utils/request'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    dynamics: {},
+    detail: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.dynamics = payload
+    },
+    updateDetail (state, payload) {
+      state.detail = payload
+    }
+  },
+  actions: {
+    setDetailNull ({ commit }) {
+      commit('updateDetail', {})
+    },
+    getMessage ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.message.list,
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          resolve(err)
+        })
+      })
+    },
+    getGoodsDetail ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.detail,
+          urlData: payload,
+        }).then((data) => {
+          commit('updateDetail', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    addGoods (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.add, 
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    editGoods (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.edit,
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    deleteDynamics (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.delete,
+          ...payload
+        }).then(() => {
+          resolve()
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
+    changeGoodsStatus (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.goods.change,
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    cancelDynamic (_, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.dynamic.cancel,
+          urlData: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    }
+  }
+}

src/views/activity/add.vue

@@ -1,6 +1,6 @@
 <template>
-  <el-form ref="form" :model="dynamic" label-width="160px">
-    <el-form-item label="所属项目">
+  <el-form ref="activityQuery" :model="activityQuery" :rules="rules"  label-width="160px">
+    <el-form-item label="所属项目" prop="buildingId">
       <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>
@@ -22,24 +22,19 @@
             <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
     </el-form-item>
-    <el-form-item label="活动标题">
+    <el-form-item label="活动标题" prop="title">
       <el-input v-model="activityQuery.title"></el-input>
     </el-form-item>
-    <el-form-item label="活动时间">
-       <el-date-picker v-model="activityQuery.startDate"  type="datetime" placeholder="选择日期"/>
-       <!-- <el-date-picker
-                  v-model="detail.reportDate"
-                  type="datetime"
-                  placeholder="选择日期时间">
-          </el-date-picker> -->
+    <el-form-item label="活动时间" prop="startDate">
+       <el-date-picker v-model="activityQuery.startDate" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.endDate"  type="datetime" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
-    <el-form-item label="活动地点">
+    <el-form-item label="活动地点" prop="address">
       <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  label="活动人数" prop="personNum">
+      <el-input v-model="activityQuery.personNum" type="number"></el-input>
     </el-form-item>
     <!-- <el-form-item label="链接地址">
       <el-input v-model="dynamic.url"></el-input>
@@ -51,13 +46,13 @@
        <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="选择日期"/>
+    <el-form-item label="报名时间" v-if="activityQuery.isEnlist == '1'" prop="enlistStart">
+       <el-date-picker v-model="activityQuery.enlistStart" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.enlistEnd" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button type="primary" @click="onSubmit('activityQuery')">保存</el-button>
 
     </el-form-item>
   </el-form>
@@ -77,7 +72,6 @@ export default {
   data () {
     return {
       url:'',
-      buildingId:'',
       upFileUrl: apis.file.upload.url,
       radio:'1',
       imgList: [],
@@ -90,12 +84,40 @@ export default {
        buildingId:'',
        title:'',
        isEnlist:'1',
-       text:'',
+       desc:'',
        enlistStart:'',
        enlistEnd:'',
        personNum:'',
-      }
-      
+      },
+      rules: {
+          buildingId: [
+            { required: true, message: '请选择所属项目', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: ' ', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入标题', trigger: 'blur' },
+          ],
+          startDate: [
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ],
+          endDate: [
+            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+          ],
+          address: [
+            {  required: true, message: '请至少输入活动地点', trigger: 'change' }
+          ],
+          personNum: [
+            { required: true, message: '请输入活动人数', trigger: 'change' }
+          ],
+          desc: [
+            { required: true, message: ' ', trigger: 'blur' }
+          ],
+          enlistStart:[
+            { type: 'date', required: true, message: '请选报名日期', trigger: 'change' }
+          ]
+        }
     }
   },
   computed: {
@@ -164,11 +186,32 @@ export default {
       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]
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+      if (valid) {
+        // 主图不可为空
+        if(this.activityQuery.url ===''){
+          this.$message({ showClose: true, message: '请选择主图!',type: 'error'});
+        return false
+        }
+      console.log('this.activityQuery.desc',this.activityQuery.desc)
+      const endDate=this.activityQuery.endDate
+      const startDate=this.activityQuery.startDate
+      if( endDate <= startDate){
+        this.$message({ showClose: true, message: '活动结束时间不能小于活动开始时间',type: 'error'});
+        return false
+      }
+      if( this.activityQuery.desc === '' || this.activityQuery.desc === null){
+        this.$message({ showClose: true, message: '活动详情不能为空',type: 'error'});
+        return false
+      }
+
+      const enlistStart= this.activityQuery.enlistStart
+      const enlistEnd= this.activityQuery.enlistEnd
+      if(this.activityQuery.isEnlist ==='1' && enlistEnd<= enlistStart ){
+        this.$message({ showClose: true, message: '报名结束时间不能小于报名开始时间',type: 'error'});
+        return false
+      }
         this.addActivity(
           JSON.stringify(this.activityQuery)
         ).then(() => {
@@ -176,26 +219,23 @@ export default {
           
         })
         this.$router.push({ name: "activity-list" });
-      // } else {
-      //   // 修改
-      //   this.editDynamics({
-      //     detail: JSON.stringify(this.detail)
-      //   }).then(() => {
-      //     this.onCancel()
-      //   })
-      // }
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        })
     },
     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
+      _that.activityQuery = {..._that.activityQuery, desc: html}
+       console.log('that.dynamic.url',_that.activityQuery.desc)
     }
     // phoneEditor.customConfig.uploadImgServer = this.upFileUrl
     // phoneEditor.customConfig.uploadFileName = 'uploadFiles'

src/views/activity/edit.vue

@@ -1,11 +1,11 @@
 <template>
-  <el-form ref="form" label-width="160px">
-    <el-form-item label="所属项目">
-      <el-select v-model="activityQuery.buildingId" placeholder="请选择">
+  <el-form ref="activityQuery" label-width="160px" :rules="rules" :model="activityQuery">
+    <el-form-item label="所属项目" prop="buildingId">
+      <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-form-item label="主图：" prop="buildingId">
           <el-upload
                 :headers="uploadHeaders"
                 :action="upFileUrl"
@@ -15,37 +15,39 @@
               <i v-else class="el-icon-plus avatar-uploader-icon"></i>
           </el-upload>
     </el-form-item>
-    <el-form-item label="活动标题">
+    <el-form-item label="活动标题" prop="title">
       <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="选择日期"/>
+    <el-form-item label="活动时间" prop="startDate">
+       <el-date-picker v-model="activityQuery.startDate" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.endDate" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
-    <el-form-item label="活动地点">
+    <el-form-item label="活动地点"  prop="address">
       <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 label="活动人数" prop="personNum">
+      <el-input v-model="activityQuery.personNum" type="number"></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>
+      <div id="desc">
+        <rich-editor v-model="activityQuery.desc" 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="选择日期"/>
+    <el-form-item label="报名时间" v-if="activityQuery.isEnlist == '1'"  prop="enlistStart">
+       <el-date-picker v-model="activityQuery.enlistStart" type="datetime" placeholder="选择日期"/>
         <span>-</span>
-       <el-date-picker v-model="activityQuery.enlistEnd" type="date" placeholder="选择日期"/>   
+       <el-date-picker v-model="activityQuery.enlistEnd" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item>
-      <el-button type="primary" @click="onSubmit">保存</el-button>
+      <el-button type="primary" @click="onSubmit('activityQuery')">保存</el-button>
       <el-button @click="onCancel">取消</el-button>
     </el-form-item>
   </el-form>
@@ -55,7 +57,7 @@
 import { createNamespacedHelpers } from 'vuex'
 import apis from '../../config/api'
 import E from 'wangeditor'
-
+import dayjs from 'dayjs'
 const { mapState: mapDynamicState, mapActions: mapDynamicActions, mapMutations: mapDynamicMutations } = createNamespacedHelpers('building')
 const { mapState: mapActivityState, mapActions: mapActivityActions } = createNamespacedHelpers('activity')
 const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
@@ -74,19 +76,50 @@ export default {
       dialogImageUrl: "",
       activityQuery: {
        dynamicId:'',
-       buildingId:'',
        url:'',
        startDate:'',
        endDate:'',
        buildingId:'',
        title:'',
        isEnlist:'',
-       text:'',
+       desc:'',
        enlistStart:'',
        enlistEnd:'',
        address:'',
        personNum:''
-      }
+      },
+      rules: {
+          buildingId: [
+            { required: true, message: '请选择活动区域', trigger: 'change' }
+          ],
+          url: [
+            { required: true, message: ' ', trigger: 'change' }
+          ],
+          title: [
+            { required: true, message: '请输入活动标题', trigger: 'blur' },
+          ],
+          startDate: [
+            { required: true, message: '请选择日期', trigger: 'change' }
+          ],
+          endDate: [
+            { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
+          ],
+          address: [
+            {  required: true, message: '请输入活动地点', trigger: 'change' }
+          ],
+          personNum: [
+            { required: true, message: '请输入活动人数', trigger: 'change' }
+          ],
+          desc: [
+            { required: true, message: ' ', trigger: 'blur' }
+          ],
+          // img: [
+          //   { required: true, message: ' '}
+          // ],
+          enlistStart:[
+            { type: 'date', required: true, message: '请选择日期', trigger: 'change' }
+          ]
+        }
       
     }
   },
@@ -154,83 +187,72 @@ export default {
     },
 
     handleAvatarSuccess (res) {
-      this.activityQuery.url = res.data
-      this.updateDetail({...this.dynamic, imgUrl: res.data})
-      this.loading.close()
+      this.imageUrl = res.data
     },
-    onSubmit () {
-        // 新增
-        console.log('this.imgList[0]',this.imgList[0])
-        // this.activityQuery.url = this.imgList[0]
-        this.updateActivity(
+    onSubmit (formName) {
+      this.$refs[formName].validate((valid) => {
+      if (valid) {
+        // 活动时间校验
+      const endDate = this.formateDate(this.activityQuery.endDate); 
+      const startDate = this.formateDate(this.activityQuery.startDate);           
+      if( endDate <= startDate){
+        this.$message({ showClose: true, message: '活动结束时间不能小于活动开始时间',type: 'error'});
+        return 
+      }
+      // 富文本校验
+      if( this.activityQuery.desc === '' || this.activityQuery.desc === null|| this.activityQuery.desc ==='<p><br></p>'){
+        this.$message({ showClose: true, message: '活动详情不能为空',type: 'error'});
+        return 
+      }
+      // 报名时间校验
+      const enlistStart = this.formateDate(this.activityQuery.enlistStart); 
+      const enlistEnd = this.formateDate(this.activityQuery.enlistEnd);           
+      if(this.activityQuery.isEnlist ==='1' && enlistEnd<= enlistStart ){
+        this.$message({ showClose: true, message: '报名结束时间不能小于报名开始时间',type: 'error'});
+        return 
+      }
+      this.activityQuery.url = this.imageUrl 
+        this.updateActivity(    
            JSON.stringify(this.activityQuery)
-        ).then(() => {
-          this.onCancel()
-          
+        ).then((res) => {
+      this.$router.push({ name: "activity-list" });
+        })
+     
+        } else {
+            console.log('error submit!!');
+            return false;
+          }
         })
-        this.$router.push({ name: "activity-list" });
     },
     onCancel () {
-      this.$router.push({name: 'dynamiclist'})
+      this.$router.push({name: 'activity-list'})
     },
     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.startDate = data.startDate 
         this.activityQuery.endDate = data.endDate
         this.activityQuery.address = data.address
         this.activityQuery.personNum = data.personNum
         this.imageUrl = data.url
         this.activityQuery.isEnlist = data.isEnlist
+        this.activityQuery.desc = data.desc
         
        
         })
-    }
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
   },
   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()
+    // const editor = new E('#desc')
+    // editor.customConfig.zIndex = 1
+    // editor.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>

src/views/activity/list.vue

@@ -28,9 +28,10 @@
     </el-table-column>
     <el-table-column
       prop="tel"
-      label="活动时间">
+      label="活动时间"
+      width="340">
      <template slot-scope="scope">
-        <span>{{ formateDate(scope.row.startDate)}} ~ {{ formateDate(scope.row.startDate)}}</span>
+        <span>{{ formateDate(scope.row.startDate)}}——{{ formateDate(scope.row.endDate)}}</span>
       </template>
     </el-table-column>
     <el-table-column
@@ -142,14 +143,24 @@ export default {
     },
     // 结束活动
     finish(id){
-      this.filterData.dynamicId = id
+        this.$confirm('结束以后将无法编辑, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+           this.filterData.dynamicId = id
           this.finishActivity(
           JSON.stringify(this.filterData)
         ).then((res) => {
            this.getList();
           this.getBuildList()   
-        })
-       
+        })    
+          this.$message({
+            type: 'success',
+            message: '成功!'
+          });
+        }).catch(() => {       
+        });
     },
     top(id){
           this.filterData.dynamicId = id

src/views/carouselFigure/advertisement.vue

@@ -5,224 +5,235 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
         </div>
+        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
+          <el-option
+                  v-for="item in buildingList"
+                  :key="item.buildingId"
+                  :label="item.buildingName"
+                  :value="item.buildingId">
+          </el-option>
+        </el-select>
       </div>
       <div class="moreFilter"></div>
     </div>
-    <el-table
-      :data="dynamics.list || []"
-      >
+    <el-table :data="carouselList.records || []">
       <el-table-column
-        type="index">
+              type="index">
         <template slot-scope="scope">
           <span>{{ GetIndex(scope.$index) }}</span>
         </template>
       </el-table-column>
       <el-table-column
-        label="主图">
+              label="主图">
         <template slot-scope="scope">
           <div class="header">
-            <img :src="scope.row.imgUrl" alt="" />
+            <img :src="scope.row.image" alt="" />
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="title"
-        label="类型">
+              prop="showType"
+              label="类型">
+        <template slot-scope="scope">{{ scope.row.showType === 'banner' ? '轮播图' : scope.row.showType === 'screen' ? '开屏' : '' }}</template>
       </el-table-column>
       <el-table-column
-        prop="createDate"
-        label="发布时间">
+              label="发布时间"
+              width="180">
+        <template slot-scope="scope">
+          <span>{{FormatDate(scope.row.createDate)}}</span>
+        </template>
       </el-table-column>
       <el-table-column
-        label="状态"
-        >
+              label="状态">
         <template slot-scope="scope">
           <span>{{scope.row.status == 1 ? '启用' : '停用'}}</span>
         </template>
       </el-table-column>
       <el-table-column
-        fixed="right"
-        label="操作"
-        width="180">
+              fixed="right"
+              label="操作"
+              width="180">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)" v-if="scope.row.status === 0" size="small">编辑</el-button>
-          <el-button type="text" @click="handlePulic(scope.row)" size="small" v-if="scope.row.status === 0">启用</el-button>
-          <el-button type="text" @click="handleUnPulic(scope.row)" size="small" v-if="scope.row.status === 1">禁用</el-button>
-
+          <el-button type="text" @click="handlePulic(scope.row.contentId, 1)" size="small" v-if="scope.row.status === 0">启用</el-button>
+          <el-button type="text" @click="Prohibit(scope.row.contentId, 0)" size="small" v-if="scope.row.status === 1">禁用</el-button>
         </template>
       </el-table-column>
     </el-table>
     <el-pagination
-      small
-      style="margin-top:10px;"
-      layout="prev, pager, next"
-      :current-page.sync="currentPage"
-      :pageSize="pageSize"
-      :total="dynamics.total || 0"
-      @current-change="getList"
+            small
+            style="margin-top:10px;"
+            layout="prev, pager, next"
+            :current-page.sync="currentPage"
+            :pageSize="pageSize"
+            :total="carouselList.total || 0"
+            @current-change="getList"
     >
     </el-pagination>
   </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex';
+  import { createNamespacedHelpers } from "vuex";
+  import dayjs from 'dayjs'
 
-const {mapState: mapDynamicState, mapActions: mapDynamicActions} = createNamespacedHelpers('dynamic')
-const {mapState: mapBuildingState, mapActions: mapBuildingActions} = createNamespacedHelpers('building')
+  const {
+    mapState: mapCarouselFigureState,
+    mapActions: mapCarouselFigureActions
+  } = createNamespacedHelpers("carouselFigure");
 
-export default {
-  data() {
-    return {
-      pageSize: 20,
-      currentPage: 1,
-      name: '',
-      buildingId: '',
-    }
-  },
-  computed: {
-    ...mapDynamicState({
-      dynamics: x => x.dynamics
-    }),
-    ...mapBuildingState({
-      buildings: x => x.buildings
-    })
-  },
-  methods: {
-    ...mapDynamicActions([
-      'getDynamics',
-      'setDetailNull',
-      'deleteDynamics',
-      'publicDynamic',
-      'cancelDynamic'
-    ]),
-    ...mapBuildingActions([
-      'getBuildings',
-    ]),
-    GetIndex (inx) {
-      return (this.currentPage - 1) * this.pageSize + inx + 1
-    },
-    FormatDate (date) {
-      if (date) {
-        return dayjs(date).formate('yyyy-MM-DD HH:mm:ss')
-      } else {
-        return ''
-      }
+  const {
+    mapState: mapBuildingState,
+    mapActions: mapBuildingActions
+  } = createNamespacedHelpers("building");
+
+  export default {
+    data() {
+      return {
+        pageSize: 20,
+        currentPage: 1,
+        name: "",
+        buildingId: "",
+        buildingList: [], // 所属项目
+        buildingForm: { // 所属项目条件
+          pageNum: 1,
+          pageSize: 100
+        },
+      };
     },
-    getList () {
-      this.getDynamics({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        name: this.name,
-        buildingId: this.buildingId
+    computed: {
+      ...mapCarouselFigureState({
+        carouselList: x => x.carouselList
+      }),
+      ...mapBuildingState({
+        buildings: x => x.buildings
       })
     },
-    getBuildingName (id) {
-      return ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {}).buildingName || ''
-    },
-    search () {
-      this.currentPage = 1
-      this.getList()
-    },
-    handleEdit (row) {
-      this.setDetailNull()
-      this.$router.push({name: 'advertisementEdit', query: {id: row.dynamicId}})
-    },
-    handlePulic (row) {
-      this.$confirm('确认发布此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.publicDynamic({
-          id: row.dynamicId
+    methods: {
+      ...mapCarouselFigureActions(["getExtendContent","handleExtendContent"]),
+      ...mapBuildingActions(["getBuildings"]),
+      GetIndex(inx) {
+        return (this.currentPage - 1) * this.pageSize + inx + 1;
+      },
+      FormatDate(date) {
+        if (!date || date.indexOf('0001-') > -1) return ''
+
+        return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
+      },
+
+      getList() {
+        this.getExtendContent({
+          pageNum: this.currentPage,
+          pageSize: this.pageSize,
+          buildingId: this.buildingId,
+          showType: 'screen'
+        });
+      },
+      getBuildingName(id) {
+        return (
+                ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {})
+                        .buildingName || ""
+        );
+      },
+      search() {
+        this.currentPage = 1;
+        this.getList();
+      },
+      handleEdit(row) {
+        this.$router.push({ name: "advertisementEdit", query: { id: row.contentId } });
+      },
+      handlePulic(contentId, status) {
+        this.$confirm("确认发布此数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         }).then(() => {
-          this.getList()
-        })
-      })
-    },
-    handleUnPulic (row) {
-      this.$confirm('确认取消发布此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        this.cancelDynamic({
-          id: row.dynamicId}).then(() => {
-          this.getList()
-        })
-      })
-    },
-    handleDel (row) {
-      this.$confirm('确认删除此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        if (row.status === 1) {
-          this.$message.error('当前活动处于发布状态，不允许删除！')
-          return false
-        }
-        this.deleteDynamics({
-          id: row.dynamicId
+          this.updateExtendContent(contentId, status)
+        });
+      },
+      Prohibit(contentId, status) {
+        this.$confirm("确认停用此轮播图?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.updateExtendContent(contentId, status)
+        });
+      },
+      handleDel(contentId, status) {
+        this.$confirm("确认删除此数据?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         }).then(() => {
-          this.getList()
+          if (row.status === 1) {
+            this.$message.error("当前活动处于发布状态，不允许删除！");
+            return false;
+          }
+        });
+      },
+      updateExtendContent(contentId, status) { // 修改轮播状态
+        this.$store.dispatch('carouselFigure/updateExtendContent', { contentId: contentId, status: status }).then((res) => {
+          this.getList();
+        }).catch(() =>{
+          console.log('carouselFigure/updateExtendContent err')
         })
-      })
+      },
+      addDynamic() {
+        this.$router.push({ name: "advertisementEdit" });
+      },
+      getBuildList() {
+        this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+          this.buildingList = res.records
+        }).catch(() => {
+          console.log('building/getBuildings err')
+        })
+      },
     },
-    addDynamic () {
-      this.setDetailNull()
-      this.$router.push({name: 'advertisementEdit'})
+    created() {
+      this.getBuildList()
+      this.getList();
     }
-  },
-  created () {
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100,
-    }).then(() => {
-      this.getList()
-    })
-  }
-}
+  };
 </script>
 
 <style lang="scss" scoped>
-.header{
-  width: 50px;
-  height: 50px;
-  img{
-    width: 100%;
-    height: 100%;
+  .header {
+    width: 50px;
+    height: 50px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
   }
-}
 
-.system-table-search{
-  width: calc(100% - 40px);
-  margin: 20px auto 0;
-}
+  .system-table-search {
+    width: calc(100% - 40px);
+    margin: 20px auto 0;
+  }
 
-.system-table-search li{
-  margin-right: 20px;
-}
+  .system-table-search li {
+    margin-right: 20px;
+  }
 
-.system-table-search ul{
-  font-size: 0;
-  white-space: nowrap;
-}
+  .system-table-search ul {
+    font-size: 0;
+    white-space: nowrap;
+  }
 
-.system-table-search ul>li{
-  display: inline-block;
-}
+  .system-table-search ul > li {
+    display: inline-block;
+  }
 
-.flex-h {
-  display: flex;
-  display: -webkit-flex;
-}
+  .flex-h {
+    display: flex;
+    display: -webkit-flex;
+  }
 
-.flex-item {
-  flex: 1;
-  -webkit-flex: 1;
-  position: relative;
-  overflow: hidden;
-}
+  .flex-item {
+    flex: 1;
+    -webkit-flex: 1;
+    position: relative;
+    overflow: hidden;
+  }
 </style>

src/views/carouselFigure/advertisementEdit.vue

@@ -1,454 +1,546 @@
 <template>
-    <div class="edit-carousel">
-      <el-form ref="form" :model="building" label-width="180px">
-        <el-form-item label="所属项目：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></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="building.tel"></el-input>
-        </el-form-item>
-        <el-form-item label="类型：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="发布内容：">
-          <div id="websiteEditorElem" style="height: 400px"></div>
-        </el-form-item>
-        <el-form-item label="发布内容：" class="publish">
-          <p>活动名称展示处<span class="choose" v-popover:popover4>{{showPlace?showPlace:'请选择'}}</span></p>
-          <el-popover ref="popover4"  placement="right"  width="560" v-model="popover4"  trigger="click">
-            <el-table :data="gridData">
-            <el-table-column width="360" property="name" label="标题"></el-table-column>
-            <el-table-column width="200" label="操作">
-              <template slot-scope="scope">
-                <el-button type="text" @click="handleEdit(scope.row)" size="small">选择</el-button>
-        </template>
-            </el-table-column>
-            </el-table>
-          </el-popover>
-        </el-form-item>
-        <el-form-item label="状态：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
-          </el-select>
-        </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>
-    </div>    
+  <div class="edit-carousel">
+    <el-form ref="form" :model="form" label-width="180px">
+      <el-form-item label="所属项目：">
+        <el-select v-model="form.buildingId" placeholder="请选择">
+          <el-option
+                  v-for="item in buildingList"
+                  :key="item.buildingId"
+                  :label="item.buildingName"
+                  :value="item.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="form.title"></el-input>
+      </el-form-item>
+      <el-form-item label="发布位置：">
+        <el-select v-model="form.showPosition" placeholder="请选择">
+          <el-option v-for="(item,i) in showPositionList" :key="i" :label="item.name" :value="item.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类型：">
+        <el-select v-model="form.contentType" placeholder="请选择">
+          <el-option v-for="(t,i) in contentTypeList" :key="i" :label="t.name" :value="t.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="发布内容：" v-if=" form.contentType === 'other'">
+        <rich-editor v-model="form.content" style="height: 400px; width: 1000px;" />
+      </el-form-item>
+      <el-form-item label="发布活动：" class="publish" v-if=" form.contentType === 'activity'">
+        <p>{{ showPlace }}<span class="choose" @click="showDial">请选择</span></p>
+      </el-form-item>
+      <el-form-item label="状态：">
+        <el-select v-model="form.status" placeholder="请选择">
+          <el-option v-for="(t,i) in extendContentStatus" :key="i" :label="t.name" :value="t.value"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="submitAddOrUpdate">保存</el-button>
+        <el-button @click="onCancel">取消</el-button>
+      </el-form-item>
+
+
+      <el-dialog title="选择活动" :visible.sync="dialogTableVisible">
+        <el-table :data="activityList">
+          <el-table-column property="title" label="活动名称"></el-table-column>
+          <el-table-column fixed="right" label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" @click="handleDel(scope.row)" size="small">选择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <el-pagination
+                @size-change="dialogHandleSizeChange"
+                @current-change="dialogHandleCurrentChange"
+                :current-page.sync="activityForm.pageNum"
+                :page-size="activityForm.pageSize"
+                layout="total, prev, pager, next"
+                :total="activityTotal">
+        </el-pagination>
+      </el-dialog>
+    </el-form>
+  </div>
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex";
-import apis from "../../config/api";
-import { mapState } from "vuex";
-import E from "wangeditor";
+  import { createNamespacedHelpers } from "vuex";
+  import apis from "../../config/api";
+  import { mapState } from "vuex";
+  import E from "wangeditor";
 
-const {
-  mapState: mapBuildingState,
-  mapActions: mapBuildingActions,
-  mapMutations: mapBuildingMutations
-} = createNamespacedHelpers("building");
+  const {
+    mapState: mapBuildingState,
+    mapActions: mapBuildingActions,
+    mapMutations: mapBuildingMutations
+  } = createNamespacedHelpers("building");
 
-const { mapActions: mapApartmentActions } = createNamespacedHelpers(
-  "apartment"
-);
+  const { mapActions: mapApartmentActions } = createNamespacedHelpers(
+          "apartment"
+  );
 
-const { mapActions: mapImgActions } = createNamespacedHelpers("img");
+  const { mapActions: mapImgActions } = createNamespacedHelpers("img");
 
-export default {
-  data() {
-    var _self = this;
-    return {
-      popover4:false,//弹框
-      showPlace:'',//活动名称展示处
-      gridData: [
-        {
-          date: "2016-05-02",
-          name: "高奢生活，在遇到它之前你想象不到"
+  export default {
+    data() {
+      var _self = this;
+      return {
+        form: {
+          contentId: '',
+          buildingId: '',
+          image: '',
+          title: '',
+          showPosition: '',
+          contentType: '',
+          content: '',
+          status: 0,
+          targetId: '',
+          showType: 'screen'
         },
-        {
-          date: "2016-05-04",
-          name: "欢乐套圈圈，福利大放送"
+        imageUrl: '',
+        buildingList: [], // 所属项目
+        buildingForm: { // 所属项目条件
+          pageNum: 1,
+          pageSize: 100
         },
-        {
-          date: "2016-05-01",
-          name: "上海市普陀区金沙江路 1518 弄"
-        }
-      ],
-      upFileUrl: apis.file.upload.url,
-      commPrefix: "",
-      imgurl: "",
-      loadingZm: false,
-      activeName: "detail",
-      dialogImageUrl: "",
-      dialogVisible: false,
-      dialogApartImageUrl: "",
-      dialogApartVisible: false,
-      showHx: false,
-      imgList: [],
-      tags: [],
-      buildingProperty: [],
-      aparments: [],
-      aparmentInfo: {},
-      aparmentImg: [],
-      saleType: [
-        {
-          id: 1,
-          name: "待定"
+        showPositionList: [
+          {
+            name: '首页',
+            value: 'index'
+          },
+          {
+            name: '商城',
+            value: 'mall'
+          }
+        ],
+        contentTypeList: [
+          {
+            name: '活动',
+            value: 'activity'
+          },
+          {
+            name: '项目',
+            value: 'project'
+          },
+          {
+            name: '资讯',
+            value: 'news'
+          },
+          {
+            name: '其他',
+            value: 'other'
+          }
+        ],
+        extendContentStatus: [ // 状态
+          {
+            name: "启用",
+            value: 1
+          },
+          {
+            name: "停用",
+            value: 0
+          },
+        ],
+        activityForm: { // 活动查询条件
+          pageNum: 1,
+          pageSize: 10
         },
-        {
-          id: 2,
-          name: "售罄"
-        },
-        {
-          id: 3,
-          name: "在售"
-        }
-      ]
-    };
-  },
-  computed: {
-    ...mapBuildingState({
-      detail: x => x.detail
-    }),
-    ...mapState({
-      dicts: x => x.dicts
-    }),
-    building: {
-      get() {
-        return this.detail;
-      },
-      set(val) {
-        return this.updateDetail(val);
-      }
-    },
-    propertyType() {
-      return (this.dicts || []).filter(x => x.type === "propertyType");
-    },
-    uploadHeaders() {
-      const token = localStorage.getItem("x-token") || "";
-      return {
-        Authorization: `Bearer ${token}`
-      };
-    }
-  },
-  methods: {
-    ...mapBuildingMutations(["updateDetail"]),
-    ...mapBuildingActions(["getDetail", "addBuilding", "editBuilding"]),
-    ...mapApartmentActions([
-      "getApartments",
-      "getApartmentDetail",
-      "addApartment",
-      "editApartment",
-      "deleteApartment"
-    ]),
-    ...mapImgActions(["uploadImg"]),
-    getSaleTypeName(id) {
-      return (this.saleType.filter(x => x.id == id)[0] || {}).name;
-    },
-    onCancel() {
-      this.$router.push({ name: "buildinglist" });
-    },
-    handleRemove(file, fileList) {
-      this.imgList = fileList;
-    },
-    handleAparmentRemove(file, fileList) {
-      this.aparmentImg = fileList;
-    },
+        activityTotal: 0, // 活动总数
+        dialogTableVisible: false, //选择活动弹框
+        activityList: [], // 活动列表
 
-    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;
-    },
-    handleAvatarSuccess(res) {
-      this.imgList = [
-        ...this.imgList,
-        {
-          url: res.data
-        }
-      ];
-      this.loading.close();
-    },
-    handleMapImgSuccess(res) {
-      this.building = { ...this.building, mapImg: res.data };
-      this.loading.close();
-    },
-    handlePosterSuccess(res) {
-      this.building = { ...this.building, poster: res.data };
-      this.loading.close();
-    },
-    handleAparmentSuccess(res) {
-      this.aparmentImg = [
-        ...this.aparmentImg,
-        {
-          url: res.data
-        }
-      ];
-      this.loading.close();
-    },
-    onSubmit() {
-      const imgs = this.imgList.map((x, i) => {
-        return {
-          imgType: "banner",
-          url: x.url,
-          orderNo: i + 1
-        };
-      });
-      const tag = this.tags.map(x => {
-        return {
-          tagName: x
-        };
-      });
-      const building = {
-        ...this.building,
-        img: imgs,
-        propertyType: this.buildingProperty.join(","),
-        tag
+
+
+
+
+        // 下面的不敢删除
+        popover4:false,//弹框
+        showPlace:'',//活动名称展示处
+        gridData: [
+          {
+            date: "2016-05-02",
+            name: "高奢生活，在遇到它之前你想象不到"
+          },
+          {
+            date: "2016-05-04",
+            name: "欢乐套圈圈，福利大放送"
+          },
+          {
+            date: "2016-05-01",
+            name: "上海市普陀区金沙江路 1518 弄"
+          }
+        ],
+        upFileUrl: apis.file.upload.url,
+        commPrefix: "",
+        imgurl: "",
+        loadingZm: false,
+        activeName: "detail",
+        dialogImageUrl: "",
+        dialogVisible: false,
+        dialogApartImageUrl: "",
+        dialogApartVisible: false,
+        showHx: false,
+        imgList: [],
+        tags: [],
+        buildingProperty: [],
+        aparments: [],
+        aparmentInfo: {},
+        aparmentImg: [],
+        saleType: [
+          {
+            id: 1,
+            name: "待定"
+          },
+          {
+            id: 2,
+            name: "售罄"
+          },
+          {
+            id: 3,
+            name: "在售"
+          }
+        ]
       };
-      if (!building.buildingId) {
-        // 新增
-        this.addBuilding({
-          onSuccess: this.onCancel,
-          detail: JSON.stringify(building)
-        });
-      } else {
-        // 修改
-        this.editBuilding({
-          onSuccess: this.onCancel,
-          detail: JSON.stringify(building)
-        });
-      }
     },
-    FormatDate(date) {
-      return (date || "").split("T")[0] === "0001-01-01"
-        ? ""
-        : (date || "").split("T")[0];
-    },
-    saveAparment() {
-      const imgs = this.aparmentImg.map((x, i) => {
+    computed: {
+      ...mapBuildingState({
+        detail: x => x.detail
+      }),
+      ...mapState({
+        dicts: x => x.dicts
+      }),
+      building: {
+        get() {
+          return this.detail;
+        },
+        set(val) {
+          return this.updateDetail(val);
+        }
+      },
+      propertyType() {
+        return (this.dicts || []).filter(x => x.type === "propertyType");
+      },
+      uploadHeaders() {
+        const token = localStorage.getItem("x-token") || "";
         return {
-          imgType: "aparment",
-          url: x.url,
-          orderNo: i + 1
+          Authorization: `Bearer ${token}`
         };
-      });
-      if (!this.aparmentInfo.apartmentId) {
-        this.addApartment(
-          JSON.stringify({
-            ...this.aparmentInfo,
-            img: imgs
-          })
-        ).then(() => {
-          this.getAparmentList();
-          this.showHx = false;
-        });
-      } else {
-        this.editApartment(
-          JSON.stringify({
-            ...this.aparmentInfo,
-            img: imgs
-          })
-        ).then(() => {
-          this.getAparmentList();
-          this.showHx = false;
-        });
       }
     },
-    addHx() {
-      this.aparmentImg = [];
-      this.aparmentInfo = { buildingId: this.building.buildingId };
-      this.showHx = true;
-    },
-    getAparmentList() {
-      this.getApartments({ buildingId: this.$route.query.id }).then(data => {
-        this.aparments = data;
-      });
-    },
-    handleEdit(row){
-      this.showPlace = row.name
-      this.popover4 = false
-
+    methods: {
+      ...mapBuildingMutations(["updateDetail"]),
+      ...mapBuildingActions(["getDetail", "addBuilding", "editBuilding"]),
+      ...mapApartmentActions([
+        "getApartments",
+        "getApartmentDetail",
+        "addApartment",
+        "editApartment",
+        "deleteApartment"
+      ]),
+      ...mapImgActions(["uploadImg"]),
+      getSaleTypeName(id) {
+        return (this.saleType.filter(x => x.id == id)[0] || {}).name;
+      },
+      onCancel() {
+        this.$router.push({ name: "buildinglist" });
+      },
+      handleRemove(file, fileList) {
+        this.imgList = fileList;
+      },
+      handleAparmentRemove(file, fileList) {
+        this.aparmentImg = fileList;
+      },
 
-    },
-    // handleEdit(row) {
-    //   this.aparmentImg = [];
-    //   this.getApartmentDetail({
-    //     id: row.apartmentId
-    //   }).then(data => {
-    //     console.log("...", data);
-    //     this.aparmentImg = data.buildingImgList.map(x => {
-    //       return {
-    //         name: x.imgId,
-    //         url: x.url
-    //       };
-    //     });
-    //     this.aparmentInfo = data;
-    //     this.showHx = true;
-    //   });
-    // },
-    handleDel(row) {
-      this.$confirm("确认删除此数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        if (this.building.status === 1) {
-          this.$message.error("当前楼盘处于发布状态，不允许删除！");
+      beforeImgUpload(file) {
+        if (file.type !== "image/jpeg" && file.type !== "image/png") {
+          this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
           return false;
         }
-        this.deleteApartment({
-          id: row.apartmentId
-        }).then(() => {
-          this.getAparmentList();
+        // 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)"
         });
-      });
-    }
-  },
-  mounted() {
-    const _that = this;
-    const phoneEditor = new E("#websiteEditorElem");
-    phoneEditor.customConfig.onchange = function(html) {
-      _that.building = { ..._that.building, remark: html };
-    };
-    phoneEditor.customConfig.customUploadImg = function(files, insert) {
-      _that.uploadImg(files[0]).then(data => {
-        insert(data[0]);
-      });
-    };
-    phoneEditor.customConfig.menus = [
-      "head", // 标题
-      "bold", // 粗体
-      "fontSize", // 字号
-      "fontName", // 字体
-      "italic", // 斜体
-      "underline", // 下划线
-      "strikeThrough", // 删除线
-      "foreColor", // 文字颜色
-      "backColor", // 背景颜色
-      "justify", // 对齐方式
-      "image" // 插入图片
-    ];
-    phoneEditor.create();
-    if ((this.$route.query.id || "") !== "") {
-      this.getAparmentList();
-      window.console.log(this.getDetail);
-      this.getDetail({ id: this.$route.query.id }).then(data => {
-        this.buildingProperty = data.propertyType.split(",");
-        phoneEditor.txt.html(data.remark);
-        this.imgList = data.buildingImg.map(x => {
+
+        return true;
+      },
+      handleAvatarSuccess(res) {
+        this.imageUrl = res.data
+        this.form.image = res.data
+      },
+      handleMapImgSuccess(res) {
+        this.building = { ...this.building, mapImg: res.data };
+        this.loading.close();
+      },
+      handlePosterSuccess(res) {
+        this.building = { ...this.building, poster: res.data };
+        this.loading.close();
+      },
+      handleAparmentSuccess(res) {
+        this.aparmentImg = [
+          ...this.aparmentImg,
+          {
+            url: res.data
+          }
+        ];
+        this.loading.close();
+      },
+      onSubmit() {
+        const imgs = this.imgList.map((x, i) => {
+          return {
+            imgType: "banner",
+            url: x.url,
+            orderNo: i + 1
+          };
+        });
+        const tag = this.tags.map(x => {
+          return {
+            tagName: x
+          };
+        });
+        const building = {
+          ...this.building,
+          img: imgs,
+          propertyType: this.buildingProperty.join(","),
+          tag
+        };
+        if (!building.buildingId) {
+          // 新增
+          this.addBuilding({
+            onSuccess: this.onCancel,
+            detail: JSON.stringify(building)
+          });
+        } else {
+          // 修改
+          this.editBuilding({
+            onSuccess: this.onCancel,
+            detail: JSON.stringify(building)
+          });
+        }
+      },
+      FormatDate(date) {
+        return (date || "").split("T")[0] === "0001-01-01"
+                ? ""
+                : (date || "").split("T")[0];
+      },
+      saveAparment() {
+        const imgs = this.aparmentImg.map((x, i) => {
           return {
-            name: x.imgId,
-            url: x.url
+            imgType: "aparment",
+            url: x.url,
+            orderNo: i + 1
           };
         });
-        this.tags = data.buildingTag.map(x => x.tagName);
-      });
-    } else {
-      phoneEditor.txt.html("");
+        if (!this.aparmentInfo.apartmentId) {
+          this.addApartment(
+                  JSON.stringify({
+                    ...this.aparmentInfo,
+                    img: imgs
+                  })
+          ).then(() => {
+            this.getAparmentList();
+            this.showHx = false;
+          });
+        } else {
+          this.editApartment(
+                  JSON.stringify({
+                    ...this.aparmentInfo,
+                    img: imgs
+                  })
+          ).then(() => {
+            this.getAparmentList();
+            this.showHx = false;
+          });
+        }
+      },
+      addHx() {
+        this.aparmentImg = [];
+        this.aparmentInfo = { buildingId: this.building.buildingId };
+        this.showHx = true;
+      },
+      getAparmentList() {
+        this.getApartments({ buildingId: this.$route.query.id }).then(data => {
+          this.aparments = data;
+        });
+      },
+      handleEdit(row){
+        this.showPlace = row.name
+        this.popover4 = false
+
+
+      },
+      // handleEdit(row) {
+      //   this.aparmentImg = [];
+      //   this.getApartmentDetail({
+      //     id: row.apartmentId
+      //   }).then(data => {
+      //     console.log("...", data);
+      //     this.aparmentImg = data.buildingImgList.map(x => {
+      //       return {
+      //         name: x.imgId,
+      //         url: x.url
+      //       };
+      //     });
+      //     this.aparmentInfo = data;
+      //     this.showHx = true;
+      //   });
+      // },
+      handleDel(row) { // 选择
+        this.form.targetId = row.dynamicId
+        this.showPlace = row.title
+        this.dialogTableVisible = false
+      },
+
+      showDial() { // 显示活动弹窗
+        this.dialogTableVisible = true
+        this.getActivityList()
+      },
+      getExtendContentById() {
+        this.$store.dispatch('carouselFigure/getByIdExtendContent', this.form).then((res) => {
+          console.log('carouselFigure/getByIdExtendContent', res)
+          this.form = res
+          this.imageUrl = res.image
+          this.showPlace = res.targetName
+        }).catch(() => {
+          console.log('carouselFigure/getByIdExtendContent err')
+        })
+      },
+      getBuildList() {
+        this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+          this.buildingList = res.records
+        }).catch(() => {
+          console.log('building/getBuildings err')
+        })
+      },
+      getActivityList() { // 活动列表
+        this.$store.dispatch('activity/getActivityList',this.activityForm).then(res => {
+          this.activityList = res.list;
+          this.activityForm.pageSize = res.pageSize
+          this.activityForm.pageNum = res.pageNum
+          this.activityTotal = res.total
+        }).catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+      },
+      dialogHandleSizeChange(value) {
+        this.activityForm.pageSize = value
+        this.getActivityList()
+      },
+      dialogHandleCurrentChange(value) {
+        this.activityForm.pageNum = value
+        this.getActivityList()
+      },
+      submitAddOrUpdate() { // 添加或者修改
+
+        // 添加
+        if (this.form.contentId === undefined || this.form.contentId === '') {
+          this.$store.dispatch('carouselFigure/addExtendContent', this.form).then((res) => {
+            this.$message.success('操作成功')
+            this.$router.go(-1)
+          }).catch(() => {
+
+          })
+          return
+        }
+
+        // 修改
+        this.$store.dispatch('carouselFigure/updateExtendContent', this.form).then((res) => {
+          this.$message.success('操作成功')
+          this.$router.go(-1)
+        }).catch(() => {
+          console.log('carouselFigure/updateExtendContent err')
+        })
+      },
+
+    },
+    created() {
+      this.form.contentId = this.$route.query.id
+      if (this.$route.query.id !== undefined) {
+        this.getExtendContentById()
+      }
+      this.getBuildList()
     }
-  }
-};
+  };
 </script>
 
 <style lang="scss">
-.header {
-  width: 50px;
-  height: 50px;
-  img {
-    width: 100%;
-    height: 100%;
+  .header {
+    width: 50px;
+    height: 50px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
   }
-}
-.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;
-}
-.edit-carousel {
-  .el-select {
-    max-width: 300px !important;
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
   }
-  .el-input {
-    max-width: 400px;
+  .avatar-uploader .el-upload:hover {
+    border-color: #409eff;
   }
-  .publish {
-    p {
-      margin: 0;
-      font-size: 15.4px;
-      .choose {
-        color: blue;
-        margin-left: 15px;
+  .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;
+  }
+  .edit-carousel {
+    .el-select {
+      max-width: 300px !important;
+    }
+    .el-input {
+      max-width: 400px;
+    }
+    .publish {
+      p {
+        margin: 0;
+        font-size: 15.4px;
+        .choose {
+          color: blue;
+          margin-left: 15px;
+        }
       }
     }
   }
-}
-.el-popover {
-  z-index: 10004 !important;
-  .el-table .cell{
-    text-align: center;
+  .el-popover {
+    z-index: 10004 !important;
+    .el-table .cell{
+      text-align: center;
+    }
   }
-}
 
-.el-select-dropdown {
-  z-index: 10003 !important;
-}
+  .el-select-dropdown {
+    z-index: 10003 !important;
+  }
 
-.el-date-picker {
-  z-index: 10002 !important;
-}
+  .el-date-picker {
+    z-index: 10002 !important;
+  }
 </style>

src/views/carouselFigure/edit.vue

@@ -1,66 +1,74 @@
 <template>
     <div class="edit-carousel">
-      <el-form ref="form" :model="building" label-width="180px">
+      <el-form ref="form" :model="form" label-width="180px">
         <el-form-item label="所属项目：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
+          <el-select v-model="form.buildingId" placeholder="请选择">
+            <el-option
+                    v-for="item in buildingList"
+                    :key="item.buildingId"
+                    :label="item.buildingName"
+                    :value="item.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>
+                  :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-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-          </el-dialog>
         </el-form-item>
         <el-form-item label="标题：">
-          <el-input v-model="building.tel"></el-input>
+          <el-input v-model="form.title"></el-input>
         </el-form-item>
         <el-form-item label="发布位置：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
+          <el-select v-model="form.showPosition" placeholder="请选择">
+            <el-option v-for="(item,i) in showPositionList" :key="i" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="类型：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
+          <el-select v-model="form.contentType" placeholder="请选择">
+            <el-option v-for="(t,i) in contentTypeList" :key="i" :label="t.name" :value="t.value"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="发布内容：">
-          <div id="websiteEditorElem" style="height: 400px"></div>
+        <el-form-item label="发布内容：" v-if=" form.contentType === 'other'">
+          <rich-editor v-model="form.content" style="height: 400px; width: 1000px;" />
         </el-form-item>
-        <el-form-item label="发布内容：" class="publish">
-          <p>活动名称展示处<span class="choose" v-popover:popover4>{{showPlace?showPlace:'请选择'}}</span></p>
-          <el-popover ref="popover4"  placement="right"  width="560" v-model="popover4"  trigger="click">
-            <el-table :data="gridData">
-            <el-table-column width="360" property="name" label="标题"></el-table-column>
-            <el-table-column width="200" label="操作">
-              <template slot-scope="scope">
-                <el-button type="text" @click="handleEdit(scope.row)" size="small">选择</el-button>
-        </template>
-            </el-table-column>
-            </el-table>
-          </el-popover>
+        <el-form-item label="发布活动：" class="publish" v-if=" form.contentType === 'activity'">
+          <p>{{ showPlace }}<span class="choose" @click="showDial">请选择</span></p>
         </el-form-item>
         <el-form-item label="状态：">
-          <el-select v-model="buildingProperty" multiple placeholder="请选择">
-            <el-option v-for="(t,i) in propertyType" :key="i" :label="t.name" :value="t.id"></el-option>
+          <el-select v-model="form.status" placeholder="请选择">
+            <el-option v-for="(t,i) in extendContentStatus" :key="i" :label="t.name" :value="t.value"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" @click="onSubmit">保存</el-button>
+          <el-button type="primary" @click="submitAddOrUpdate">保存</el-button>
           <el-button @click="onCancel">取消</el-button>
         </el-form-item>
+
+
+        <el-dialog title="选择活动" :visible.sync="dialogTableVisible">
+          <el-table :data="activityList">
+            <el-table-column property="title" label="活动名称"></el-table-column>
+            <el-table-column fixed="right" label="操作">
+              <template slot-scope="scope">
+                <el-button type="text" @click="handleDel(scope.row)" size="small">选择</el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-pagination
+                  @size-change="dialogHandleSizeChange"
+                  @current-change="dialogHandleCurrentChange"
+                  :current-page.sync="activityForm.pageNum"
+                  :page-size="activityForm.pageSize"
+                  layout="total, prev, pager, next"
+                  :total="activityTotal">
+          </el-pagination>
+        </el-dialog>
       </el-form>
     </div>    
 </template>
@@ -87,6 +95,76 @@ export default {
   data() {
     var _self = this;
     return {
+      form: {
+        contentId: '',
+        buildingId: '',
+        image: '',
+        title: '',
+        showPosition: '',
+        contentType: '',
+        content: '',
+        status: 0,
+        targetId: '',
+        showType: 'banner'
+      },
+      imageUrl: '',
+      buildingList: [], // 所属项目
+      buildingForm: { // 所属项目条件
+        pageNum: 1,
+        pageSize: 100
+      },
+      showPositionList: [
+        {
+          name: '首页',
+          value: 'index'
+        },
+        {
+          name: '商城',
+          value: 'mall'
+        }
+      ],
+      contentTypeList: [
+        {
+          name: '活动',
+          value: 'activity'
+        },
+        {
+          name: '项目',
+          value: 'project'
+        },
+        {
+          name: '资讯',
+          value: 'news'
+        },
+        {
+          name: '其他',
+          value: 'other'
+        }
+      ],
+      extendContentStatus: [ // 状态
+        {
+          name: "启用",
+          value: 1
+        },
+        {
+          name: "停用",
+          value: 0
+        },
+      ],
+      activityForm: { // 活动查询条件
+        pageNum: 1,
+        pageSize: 10
+      },
+      activityTotal: 0, // 活动总数
+      dialogTableVisible: false, //选择活动弹框
+      activityList: [], // 活动列表
+
+
+
+
+
+
+      // 下面的不敢删除
       popover4:false,//弹框
       showPlace:'',//活动名称展示处
       gridData: [
@@ -203,13 +281,8 @@ export default {
       return true;
     },
     handleAvatarSuccess(res) {
-      this.imgList = [
-        ...this.imgList,
-        {
-          url: res.data
-        }
-      ];
-      this.loading.close();
+      this.imageUrl = res.data
+      this.form.image = res.data
     },
     handleMapImgSuccess(res) {
       this.building = { ...this.building, mapImg: res.data };
@@ -328,66 +401,80 @@ export default {
     //     this.showHx = true;
     //   });
     // },
-    handleDel(row) {
-      this.$confirm("确认删除此数据?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      }).then(() => {
-        if (this.building.status === 1) {
-          this.$message.error("当前楼盘处于发布状态，不允许删除！");
-          return false;
-        }
-        this.deleteApartment({
-          id: row.apartmentId
-        }).then(() => {
-          this.getAparmentList();
-        });
+    handleDel(row) { // 选择
+      this.form.targetId = row.dynamicId
+      this.showPlace = row.title
+      this.dialogTableVisible = false
+    },
+
+    showDial() { // 显示活动弹窗
+      this.dialogTableVisible = true
+      this.getActivityList()
+    },
+    getExtendContentById() {
+      this.$store.dispatch('carouselFigure/getByIdExtendContent', this.form).then((res) => {
+        console.log('carouselFigure/getByIdExtendContent', res)
+        this.form = res
+        this.imageUrl = res.image
+        this.showPlace = res.targetName
+      }).catch(() => {
+        console.log('carouselFigure/getByIdExtendContent err')
+      })
+    },
+    getBuildList() {
+      this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+        this.buildingList = res.records
+      }).catch(() => {
+        console.log('building/getBuildings err')
+      })
+    },
+    getActivityList() { // 活动列表
+      this.$store.dispatch('activity/getActivityList',this.activityForm).then(res => {
+        this.activityList = res.list;
+        this.activityForm.pageSize = res.pageSize
+        this.activityForm.pageNum = res.pageNum
+        this.activityTotal = res.total
+      }).catch(err => {
+        this.$notify.error(err.msg || err.message);
       });
-    }
+    },
+    dialogHandleSizeChange(value) {
+      this.activityForm.pageSize = value
+      this.getActivityList()
+    },
+    dialogHandleCurrentChange(value) {
+      this.activityForm.pageNum = value
+      this.getActivityList()
+    },
+    submitAddOrUpdate() { // 添加或者修改
+
+      // 添加
+      if (this.form.contentId === undefined || this.form.contentId === '') {
+        this.$store.dispatch('carouselFigure/addExtendContent', this.form).then((res) => {
+          this.$message.success('操作成功')
+          this.$router.go(-1)
+        }).catch(() => {
+
+        })
+        return
+      }
+
+      // 修改
+      this.$store.dispatch('carouselFigure/updateExtendContent', this.form).then((res) => {
+        this.$message.success('操作成功')
+        this.$router.go(-1)
+      }).catch(() => {
+        console.log('carouselFigure/updateExtendContent err')
+      })
+    },
+
   },
-  mounted() {
-    const _that = this;
-    const phoneEditor = new E("#websiteEditorElem");
-    phoneEditor.customConfig.onchange = function(html) {
-      _that.building = { ..._that.building, remark: html };
-    };
-    phoneEditor.customConfig.customUploadImg = function(files, insert) {
-      _that.uploadImg(files[0]).then(data => {
-        insert(data[0]);
-      });
-    };
-    phoneEditor.customConfig.menus = [
-      "head", // 标题
-      "bold", // 粗体
-      "fontSize", // 字号
-      "fontName", // 字体
-      "italic", // 斜体
-      "underline", // 下划线
-      "strikeThrough", // 删除线
-      "foreColor", // 文字颜色
-      "backColor", // 背景颜色
-      "justify", // 对齐方式
-      "image" // 插入图片
-    ];
-    phoneEditor.create();
-    if ((this.$route.query.id || "") !== "") {
-      this.getAparmentList();
-      window.console.log(this.getDetail);
-      this.getDetail({ id: this.$route.query.id }).then(data => {
-        this.buildingProperty = data.propertyType.split(",");
-        phoneEditor.txt.html(data.remark);
-        this.imgList = data.buildingImg.map(x => {
-          return {
-            name: x.imgId,
-            url: x.url
-          };
-        });
-        this.tags = data.buildingTag.map(x => x.tagName);
-      });
-    } else {
-      phoneEditor.txt.html("");
+  created() {
+    this.form.contentId = this.$route.query.id
+    if (this.$route.query.id !== undefined) {
+      this.getExtendContentById()
     }
+    this.getBuildList()
   }
 };
 </script>

src/views/carouselFigure/list.vue

@@ -5,12 +5,18 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
         </div>
+        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
+          <el-option
+                  v-for="item in buildingList"
+                  :key="item.buildingId"
+                  :label="item.buildingName"
+                  :value="item.buildingId">
+          </el-option>
+        </el-select>
       </div>
       <div class="moreFilter"></div>
     </div>
-    <el-table
-      :data="dynamics.list || []"
-      >
+    <el-table :data="carouselList.records || []">
       <el-table-column
         type="index">
         <template slot-scope="scope">
@@ -21,21 +27,26 @@
         label="主图">
         <template slot-scope="scope">
           <div class="header">
-            <img :src="scope.row.imgUrl" alt="" />
+            <img :src="scope.row.image" alt="" />
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="title"
+        prop="showType"
         label="类型">
+        <template slot-scope="scope">{{ scope.row.showType === 'banner' ? '轮播图' : scope.row.showType === 'screen' ? '开屏' : '' }}</template>
       </el-table-column>
       <el-table-column
-        prop="desc"
+        prop="showPosition"
         label="发布位置">
+        <template slot-scope="scope">{{ scope.row.showPosition === 'index' ? '首页' : scope.row.showPosition === 'mall' ? '商城' : '' }}</template>
       </el-table-column>
       <el-table-column
-        prop="createDate"
-        label="发布时间">
+        label="发布时间"
+        width="180">
+        <template slot-scope="scope">
+          <span>{{FormatDate(scope.row.createDate)}}</span>
+        </template>
       </el-table-column>
       <el-table-column
         label="状态"
@@ -50,9 +61,8 @@
         width="180">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)" v-if="scope.row.status === 0" size="small">编辑</el-button>
-          <el-button type="text" @click="handlePulic(scope.row)" size="small" v-if="scope.row.status === 0">启用</el-button>
-          <el-button type="text" @click="handleUnPulic(scope.row)" size="small" v-if="scope.row.status === 1">禁用</el-button>
-
+          <el-button type="text" @click="handlePulic(scope.row.contentId, 1)" size="small" v-if="scope.row.status === 0">启用</el-button>
+          <el-button type="text" @click="Prohibit(scope.row.contentId, 0)" size="small" v-if="scope.row.status === 1">禁用</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -62,7 +72,7 @@
       layout="prev, pager, next"
       :current-page.sync="currentPage"
       :pageSize="pageSize"
-      :total="dynamics.total || 0"
+      :total="carouselList.total || 0"
       @current-change="getList"
     >
     </el-pagination>
@@ -70,151 +80,154 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from 'vuex';
+import { createNamespacedHelpers } from "vuex";
+import dayjs from 'dayjs'
 
-const {mapState: mapDynamicState, mapActions: mapDynamicActions} = createNamespacedHelpers('dynamic')
-const {mapState: mapBuildingState, mapActions: mapBuildingActions} = createNamespacedHelpers('building')
+const {
+  mapState: mapCarouselFigureState,
+  mapActions: mapCarouselFigureActions
+} = createNamespacedHelpers("carouselFigure");
+
+const {
+  mapState: mapBuildingState,
+  mapActions: mapBuildingActions
+} = createNamespacedHelpers("building");
 
 export default {
   data() {
     return {
       pageSize: 20,
       currentPage: 1,
-      name: '',
-      buildingId: '',
-    }
+      name: "",
+      buildingId: "",
+      buildingList: [], // 所属项目
+      buildingForm: { // 所属项目条件
+        pageNum: 1,
+        pageSize: 100
+      },
+    };
   },
   computed: {
-    ...mapDynamicState({
-      dynamics: x => x.dynamics
+    ...mapCarouselFigureState({
+      carouselList: x => x.carouselList
     }),
     ...mapBuildingState({
       buildings: x => x.buildings
     })
   },
   methods: {
-    ...mapDynamicActions([
-      'getDynamics',
-      'setDetailNull',
-      'deleteDynamics',
-      'publicDynamic',
-      'cancelDynamic'
-    ]),
-    ...mapBuildingActions([
-      'getBuildings',
-    ]),
-    GetIndex (inx) {
-      return (this.currentPage - 1) * this.pageSize + inx + 1
+    ...mapCarouselFigureActions(["getExtendContent","handleExtendContent"]),
+    ...mapBuildingActions(["getBuildings"]),
+    GetIndex(inx) {
+      return (this.currentPage - 1) * this.pageSize + inx + 1;
     },
-    FormatDate (date) {
-      if (date) {
-        return dayjs(date).formate('yyyy-MM-DD HH:mm:ss')
-      } else {
-        return ''
-      }
+    FormatDate(date) {
+      if (!date || date.indexOf('0001-') > -1) return ''
+
+      return dayjs(date).format('YYYY-MM-DD HH:mm:ss')
     },
-    getList () {
-      this.getDynamics({
+
+    getList() {
+      this.getExtendContent({
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        name: this.name,
-        buildingId: this.buildingId
-      })
+        buildingId: this.buildingId,
+        showType: 'banner'
+      });
     },
-    getBuildingName (id) {
-      return ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {}).buildingName || ''
+    getBuildingName(id) {
+      return (
+        ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {})
+          .buildingName || ""
+      );
     },
-    search () {
-      this.currentPage = 1
-      this.getList()
+    search() {
+      this.currentPage = 1;
+      this.getList();
     },
-    handleEdit (row) {
-      this.setDetailNull()
-      this.$router.push({name: 'editCarousel', query: {id: row.dynamicId}})
+    handleEdit(row) {
+      this.$router.push({ name: "editCarousel", query: { id: row.contentId } });
     },
-    handlePulic (row) {
-      this.$confirm('确认发布此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    handlePulic(contentId, status) {
+      this.$confirm("确认发布此数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       }).then(() => {
-        this.publicDynamic({
-          id: row.dynamicId
-        }).then(() => {
-          this.getList()
-        })
-      })
+        this.updateExtendContent(contentId, status)
+      });
     },
-    handleUnPulic (row) {
-      this.$confirm('确认取消发布此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    Prohibit(contentId, status) {
+      this.$confirm("确认停用此轮播图?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       }).then(() => {
-        this.cancelDynamic({
-          id: row.dynamicId}).then(() => {
-          this.getList()
-        })
-      })
+        this.updateExtendContent(contentId, status)
+      });
     },
-    handleDel (row) {
-      this.$confirm('确认删除此数据?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
+    handleDel(contentId, status) {
+      this.$confirm("确认删除此数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
       }).then(() => {
         if (row.status === 1) {
-          this.$message.error('当前活动处于发布状态，不允许删除！')
-          return false
+          this.$message.error("当前活动处于发布状态，不允许删除！");
+          return false;
         }
-        this.deleteDynamics({
-          id: row.dynamicId
-        }).then(() => {
-          this.getList()
-        })
+      });
+    },
+    updateExtendContent(contentId, status) { // 修改轮播状态
+      this.$store.dispatch('carouselFigure/updateExtendContent', { contentId: contentId, status: status }).then((res) => {
+        this.getList();
+      }).catch(() =>{
+        console.log('carouselFigure/updateExtendContent err')
+      })
+    },
+    addDynamic() {
+      this.$router.push({ name: "editCarousel" });
+    },
+    getBuildList() {
+      this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+        this.buildingList = res.records
+      }).catch(() => {
+        console.log('building/getBuildings err')
       })
     },
-    addDynamic () {
-      this.setDetailNull()
-      this.$router.push({name: 'editCarousel'})
-    }
   },
-  created () {
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100,
-    }).then(() => {
-      this.getList()
-    })
+  created() {
+    this.getBuildList()
+    this.getList();
   }
-}
+};
 </script>
 
 <style lang="scss" scoped>
-.header{
+.header {
   width: 50px;
   height: 50px;
-  img{
+  img {
     width: 100%;
     height: 100%;
   }
 }
 
-.system-table-search{
+.system-table-search {
   width: calc(100% - 40px);
   margin: 20px auto 0;
 }
 
-.system-table-search li{
+.system-table-search li {
   margin-right: 20px;
 }
 
-.system-table-search ul{
+.system-table-search ul {
   font-size: 0;
   white-space: nowrap;
 }
 
-.system-table-search ul>li{
+.system-table-search ul > li {
   display: inline-block;
 }
 

src/views/consultant/list.vue

@@ -108,7 +108,7 @@ export default {
         });
     },
     addDynamic() {
-      this.$router.push({ name: "consultant.list" });
+      this.$router.push({ name: "consultant.edit" });
     },
     toDetail(row) {
       this.$router.push({

src/views/customer/customerDetails.vue

@@ -0,0 +1,223 @@
+<template>
+  <div class="detail-box">
+    <el-row :gutter="24">
+      <el-col :span="9">
+        <div class="grid-content">
+          <p class="title">置业顾问信息</p>
+          <img class="touxiang" src="http://img1.imgtn.bdimg.com/it/u=1022041283,4133755956&fm=26&gp=0.jpg" alt="">
+          <p class="name">{{  customerDetail.consultant === null ? '' :  customerDetail.consultant.name }}</p>
+          <p class="phone">{{ customerDetail.consultant === null ? '' :  customerDetail.consultant.phone }}</p>
+          <div class="info">
+            <p>部门：{{ customerDetail.consultant === null ? '' :  customerDetail.consultant.department }}</p>
+            <p>岗位：{{ customerDetail.consultant === null ? '' :  customerDetail.consultant.post }}</p>
+            <p>公司：{{ customerDetail.consultant === null ? '' :  customerDetail.consultant.company }}</p>
+          </div>
+          <p class="project">所属项目：
+            <span v-if="customerDetail.consultant === null"></span>
+            <span v-else v-for="(item, index) in customerDetail.consultant.projects" :key="index">{{ item }}</span>
+          </p>
+        </div>
+      </el-col>
+      <el-col :span="15">
+        <div class="grid-content">
+          <p class="title">客户信息</p>
+          <div style="display:flex">
+            <img class="touxiang" src="http://img1.imgtn.bdimg.com/it/u=1022041283,4133755956&fm=26&gp=0.jpg" alt="">
+            <div style="width:100%">
+              <p class="info-box">用户名称：<span>{{ customerDetail.name }}</span></p>
+              <p class="info-box">国家：<span>{{ customerDetail.country }}</span></p>
+              <p class="info-box">手机号：<span>{{ customerDetail.phone }}</span></p>
+              <p class="info-box">省份：<span>{{ customerDetail.province }}</span></p>
+            </div>       
+          </div>
+          <div class="other-info">
+              <p class="info-box">访问时长：<span>{{ customerDetail.duration / 60 }} 分钟</span></p>
+              <p class="info-box">城市：<span>{{ customerDetail.city }}</span></p>
+              <p class="info-box">访问次数：<span>{{ customerDetail.visitTimes }}</span></p>
+              <p class="info-box">来访渠道：<span>活动分享</span></p>
+              <p class="info-box">首次访问时间：<span>{{ formateDate(customerDetail.visitTime) }}</span></p>
+          </div>
+          <p style="line-height:1.8">详细信息：</p>
+          <div class="flex-box" style="display:flex;justify-content: space-between;">
+            <p>意向项目：<span>{{ customerDetail.intention }}</span></p>
+            <p>需求类型：<span>{{ customerDetail.demandType }}</span></p>
+            <p>物业类型：<span>{{ customerDetail.realtyManageType }}</span></p>
+          </div>
+          <div class="flex-box" style="display:flex;justify-content: space-between;">
+            <p>价格区间：<span>{{ customerDetail.priceRange }}</span></p>
+            <p>预约到访时间：<span>{{ formateDate(customerDetail.appointmentTime) }}</span></p>
+            <p>预约人数：<span>{{ customerDetail.visiteNum }}</span></p>
+          </div>
+          <p class="flex-box">客户说明：<span>{{ customerDetail.verifyRemark }}</span></p>
+          <p class="flex-box">客户描述：<span>{{ customerDetail.describe }}</span></p>
+          
+        </div>
+      </el-col>
+    </el-row>
+    <div class="access-records">
+      <p class="title">访问记录</p>
+      <el-table
+      :data="customerDetail.visitRecords || []"
+      class="table-box"
+      style="width: 100%;">
+      <el-table-column
+        prop="event"
+        label="访问事件">
+      </el-table-column>
+      <el-table-column
+        prop="visitTime"
+        label="访问时间">
+        <template slot-scope="scope">{{ formateDate(scope.row.visitTime) }}</template>
+      </el-table-column>
+      <el-table-column
+        prop="visitDuration"
+        label="停留时间">
+        <template slot-scope="scope">{{ scope.row.visitDuration / 60 }}分钟</template>
+      </el-table-column>
+    </el-table>
+    </div>
+  
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex"
+import dayjs from 'dayjs'
+
+export default {
+  data() {
+    return {
+      customerId: '',
+      customerDetail: '',
+      tableData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          time: "10分30秒"
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          time: "17分43秒"
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          time: "05分26秒"
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          time: "1时24分27秒"
+        }
+      ]
+    };
+  },
+  computed: {},
+  methods: {
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
+    getCustomerDetail() {
+      let data = { customerId: this.customerId }
+      this.$store.dispatch('customer/getCustomerDetail',data).then((res) => {
+        this.customerDetail = res
+        console.log('customer/getCustomerDetail: ', this.customerDetail)
+      }).catch(() => {
+        console.log('customer/getCustomerDetail err')
+      })
+    }
+  },
+  created() {
+    this.customerId = this.$route.query.id
+    this.getCustomerDetail()
+  }
+};
+</script>
+<style lang="scss">
+.detail-box {
+  .el-table th.is-leaf,
+  .el-table td {
+    border-bottom: 0px !important;
+    text-align: center;
+  }
+  .el-table::before {
+    background-color: #fff;
+  }
+}
+</style>
+
+
+<style lang="scss" scoped>
+.detail-box {
+  .access-records{
+    border: 1px solid #dcdcdc;
+    border-radius: 5px;
+    padding: 12px 15px;
+    margin-bottom: 26px;
+  }
+  .grid-content {
+    border: 1px solid #dcdcdc;
+    border-radius: 5px;
+    height: 400px;
+    overflow: hidden;
+    padding: 12px 15px;
+    position: relative;
+    margin-bottom: 26px;
+    p {
+      margin: 0;
+      font-size: 15px;
+    }
+    .title {
+      font-size: 18px;
+      font-weight: 600;
+      margin-bottom: 30px;
+    }
+    .touxiang {
+      width: 90px;
+      height: 80px;
+      display: inline-block;
+      margin-right: 26px;
+    }
+    .name {
+      position: absolute;
+      top: 80px;
+      left: 130px;
+      font-weight: 600;
+    }
+    .phone {
+      position: absolute;
+      top: 116px;
+      left: 130px;
+    }
+    .info {
+      margin: 20px 0;
+      p {
+        color: #666;
+        line-height: 1.8;
+      }
+    }
+    .info-box {
+      display: inline-block;
+      width: 50%;
+      line-height: 2.4;
+      span {
+        color: #555;
+      }
+    }
+    .other-info {
+      margin-left: 96px;
+      width: 100%;
+      span {
+        color: #555;
+      }
+    }
+    .flex-box {
+      line-height: 2.2;
+      span {
+        color: #555;
+      }
+    }
+  }
+}
+</style>

src/views/customer/editCustomer.vue

@@ -3,63 +3,67 @@
     <div class="form-wrapper">
       <el-form label-width="200px" :model="detail">
         <el-form-item label="意向项目：">
-          <el-input v-model="detail.name"></el-input>
+          <el-input v-model="detail.intention"></el-input>
         </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
+                  :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-dialog :visible.sync="dialogVisible">
-            <img width="100%" :src="dialogImageUrl" alt="">
-          </el-dialog>
-      </el-form-item>
+        </el-form-item>
         <el-form-item label="客户姓名：">
-          <el-input v-model="detail.company"></el-input>
+          <el-input v-model="detail.name"></el-input>
         </el-form-item>
         <el-form-item label="客户电话：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.phone"></el-input>
         </el-form-item>
         <el-form-item label="客户性别：">
-          <el-radio-group v-model="detail.isMain">
+          <el-radio-group v-model="detail.sex">
             <el-radio :label="1">男</el-radio>
             <el-radio :label="0">女</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="预约到访时间：">
-          <el-input v-model="detail.department"></el-input>
+          <el-date-picker
+                  v-model="detail.appointmentTime"
+                  type="datetime"
+                  placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="到访人数：">
-          <el-input v-model="detail.department"></el-input>
-        </el-form-item>
-        <el-form-item label="客户描述：">
-            <el-input type="textarea" :rows="5"  v-model="detail.introduction"></el-input>
+          <el-input v-model="detail.visiteNum"></el-input>
         </el-form-item>
         <el-form-item label="物业类型：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.realtyManageType"></el-input>
         </el-form-item>
         <el-form-item label="需求类型：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.demandType"></el-input>
         </el-form-item>
         <el-form-item label="价格区间：">
-          <el-input v-model="detail.department"></el-input>
+          <el-input v-model="detail.priceRange"></el-input>
+        </el-form-item>
+        <el-form-item label="报备日期：">
+          <el-date-picker
+                  v-model="detail.reportDate"
+                  type="datetime"
+                  placeholder="选择日期时间">
+          </el-date-picker>
         </el-form-item>
         <el-form-item label="状态：">
-          <el-select v-model="detail.buildings" placeholder="请选择">
-            <el-option v-for="(build,i) in buildings.list || []" :key="i" :label="build.buildingName" :value="build.buildingId"></el-option>
+          <el-select v-model="detail.status" placeholder="请选择">
+            <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="客户描述：">
+          <el-input type="textarea" :rows="5"  v-model="detail.describe"></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="submitForm">保存</el-button>
-          <el-button @click="$router.go(-1)">返回</el-button>
+          <el-button @click="$router.go(-1)">驳回</el-button>
         </el-form-item>
       </el-form>
     </div>
@@ -67,169 +71,224 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex";
-import apis from "../../config/api";
-import E from "wangeditor";
+  import { createNamespacedHelpers } from "vuex";
+  import apis from "../../config/api";
+  import E from "wangeditor";
 
-const { mapActions: mapPersonActions } = createNamespacedHelpers("persons");
-const {
-  mapState: mapBuildingState,
-  mapActions: mapBuildingActions
-} = createNamespacedHelpers("building");
-export default {
-  name: "consultantEdit",
-  data() {
-    return {
-      upFileUrl: apis.file.upload.url,
-      detail: {
-        name: undefined,
-        company: undefined,
-        department: undefined,
-        post: undefined,
-        tel: undefined,
-        photo: undefined,
-        status: 1,
-        buildings: []
-      },
-      imgList: [],
-      dialogVisible: false,
-      dialogImageUrl: "",
-      
-    };
-  },
-  created() {
-    this.init();
-  },
-  computed: {
-    ...mapBuildingState({
-      buildings: x => x.buildings
-    }),
-    uploadHeaders() {
-      const token = localStorage.getItem("x-token") || "";
+  const { mapActions: mapPersonActions } = createNamespacedHelpers("persons");
+  const {
+    mapState: mapBuildingState,
+    mapActions: mapBuildingActions
+  } = createNamespacedHelpers("building");
+  export default {
+    name: "consultantEdit",
+    data() {
       return {
-        Authorization: `Bearer ${token}`
+        upFileUrl: apis.file.upload.url,
+        detail: {
+          customerId: '',
+          consultantName: '',
+          name: undefined,
+          company: undefined,
+          department: undefined,
+          post: undefined,
+          tel: undefined,
+          photo: undefined,
+          status: '1',
+          buildings: [],
+        },
+        dialogForm: {
+          pageNumber: 1,
+          pageSize: 100
+        },
+        dialogTotal: 0,
+        consultantList: [],
+        imageUrl: '',
+        dialogVisible: false,
+        dialogImageUrl: "",
+        dialogTableVisible: false, //选择置业顾问弹框
+        consultant:"",
+        gridData: [
+          {
+            name: "报备",
+            value: '1'
+          },
+          {
+            name: "到访",
+            value: '2'
+          },
+          {
+            name: "认购",
+            value: '3'
+          },
+          {
+            name: "签约",
+            value: '4'
+          }
+        ]
       };
-    }
-  },
-  methods: {
-    ...mapBuildingActions(["getBuildings"]),
-    ...mapPersonActions(["getConsultant", "editConsultant"]),
-
-    init() {
-      if (this.$route.params.id) {
-        this.getConsultant({ id: this.$route.params.id }).then(data => {
-          this.detail = data;
-        });
-      }
-    },
-
-    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;
     },
-    handleAvatarSuccess(res) {
-      this.imgList = [
-        ...this.imgList,
-        {
-          url: res.data
-        }
-      ];
-      this.hideLoadding();
+    created() {
+      this.init();
+      this.getConsultantsList()
     },
-    handleRemove(file, fileList) {
-      this.imgList = fileList;
+    computed: {
+      ...mapBuildingState({
+        buildings: x => x.buildings
+      }),
+      uploadHeaders() {
+        const token = localStorage.getItem("x-token") || "";
+        return {
+          Authorization: `Bearer ${token}`
+        };
+      }
     },
-    submitForm() {
-      this.showLoadding("保存中...");
-      this.editConsultant(this.detail)
-        .then(res => {
-          if (res.personId) {
-            this.detail = res;
-          }
+    methods: {
+      ...mapBuildingActions(["getBuildings"]),
+      ...mapPersonActions(["getConsultant", "editConsultant"]),
 
-          this.hideLoadding();
-          this.$notify.info("保存成功");
+      init() {
+        this.detail.customerId = this.$route.query.id
+        if (this.detail.customerId !== undefined) {
+          this.$store.dispatch('customer/getRecommendCustomersGetById',this.detail).then(data => {
+            this.detail = data;
+            this.dialogImageUrl = data.picture
+            this.imageUrl = data.picture
+          });
+        }
+      },
+      handleDel(row) {
+        this.$confirm("确定选择此置业顾问?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
         })
-        .catch(err => {
-          this.hideLoadding();
-          this.$notify.error(err.message);
+                .then(() => {
+                  this.$message({
+                    type: "success",
+                    message: "选择成功!"
+                  });
+                  this.detail.realtyConsultant = row.personId
+                  this.detail.consultantName = row.name
+                  this.dialogTableVisible = false;
+                })
+                .catch(() => {
+                  this.$message({
+                    type: "info",
+                    message: "已取消选择"
+                  });
+                });
+      },
+      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)"
         });
-    },
 
-    showLoadding(text) {
-      this.loading = this.$loading({
-        text,
-        lock: true,
-        spinner: "el-icon-loading",
-        background: "rgba(255, 255, 255, 0.7)"
-      });
-    },
+        return true;
+      },
+      handleAvatarSuccess(res) {
+        this.imageUrl = res.data
+        this.detail.picture = res.data
+        this.hideLoadding();
+      },
+      handleRemove(file, fileList) {
+        this.imgList = fileList;
+      },
+      submitForm() {
+        this.showLoadding("保存中...");
+        this.$store.dispatch('customer/getRecommendCustomersUpdate',this.detail)
+                .then(res => {
+                  if (res.personId) {
+                    this.detail = res;
+                  }
 
-    hideLoadding() {
-      if (this.loading) this.loading.close();
-    }
-  },
-  mounted() {
-    const _that = this;
+                  this.hideLoadding();
+                  this.$notify.success("保存成功");
+                  this.$router.go(-1)
+                })
+                .catch(err => {
+                  this.hideLoadding();
+                  this.$notify.error(err.message);
+                });
+      },
 
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100
-    }).then(() => {
-      if ((this.$route.query.id || "") !== "") {
-        this.getDetail({ id: this.$route.query.id }).then(data => {});
+      showLoadding(text) {
+        this.loading = this.$loading({
+          text,
+          lock: true,
+          spinner: "el-icon-loading",
+          background: "rgba(255, 255, 255, 0.7)"
+        });
+      },
+
+      hideLoadding() {
+        if (this.loading) this.loading.close();
+      },
+      getConsultantsList() {
+        this.$store.dispatch('persons/getConsultants', this.dialogForm).then((res) => {
+          this.consultantList = res.records
+          this.dialogForm.pageNumber = res.current
+          this.dialogForm.pageSize = res.size
+          this.dialogTotal = res.total
+        }).catch(()=> {
+          console.log('persons/getConsultants err')
+        })
+      },
+      dialogHandleSizeChange(value) {
+        this.dialogForm.pageSize = value
+        this.getConsultantsList()
+      },
+      dialogHandleCurrentChange(value) {
+        this.dialogForm.pageNumber = value
+        this.getConsultantsList()
       }
-    });
-  }
-};
+    },
+  };
 </script>
 
 <style lang="scss" scoped>
-.form-wrapper {
-  width: 60%;
-}
+  .form-wrapper {
+    width: 60%;
+  }
 </style>
 
 <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;
-}
-.choose {
-  color: blue;
-  margin-left: 15px;
-}
+  .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;
+  }
+  .choose {
+    color: blue;
+    margin-left: 15px;
+  }
 </style>

src/views/customer/editRecommend.vue

@@ -57,7 +57,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="状态：">
-          <el-select v-model="detail.status" placeholder="请选择">
+          <el-select v-model="detail.verifyStatus" placeholder="请选择">
             <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>
           </el-select>
         </el-form-item>
@@ -118,7 +118,7 @@ export default {
         post: undefined,
         tel: undefined,
         photo: undefined,
-        status: '1',
+        verifyStatus: '0',
         buildings: [],
         realtyConsultant: ''
       },
@@ -135,20 +135,16 @@ export default {
       consultant:"",
       gridData: [
         {
-          name: "报备",
-          value: '1'
-        },
-        {
-          name: "到访",
-          value: '2'
+          name: "未通过",
+          value: '0'
         },
         {
-          name: "认购",
-          value: '3'
+          name: "已通过",
+          value: '1'
         },
         {
-          name: "签约",
-          value: '4'
+          name: "已驳回",
+          value: '2'
         }
       ]
     };
@@ -275,8 +271,7 @@ export default {
       this.getConsultantsList()
     },
     dialogHandleCurrentChange(value) {
-      this.dialogForm.pageNumber = 1
-      this.dialogForm.pageSize = value
+      this.dialogForm.pageNumber = value
       this.getConsultantsList()
     }
   },

src/views/customer/integralRecord.vue

@@ -1,35 +1,41 @@
 <template>
   <div>
-    <h5>当前可用积分：200</h5>
+    <h5>当前可用积分：{{ totalPoints || 0 }}</h5>
     <el-table
-      :data="dynamics.list || []"
+       border
+      :data="list || []"
       >
       <el-table-column
+        label="序号"
+        width="50"
         type="index">
-        <template slot-scope="scope">
-          <span>{{ GetIndex(scope.$index) }}</span>
-        </template>
       </el-table-column>
       <el-table-column
-        prop="title"
+        prop="changeType"
         label="积分类型">
+        <template slot-scope="scope">{{ showChangeType(scope.row.changeType) }}</template>
       </el-table-column>
       <el-table-column
-        prop="title"
+        prop="pointsAmount"
         label="积分变化">
+        <template slot-scope="scope">
+          <span v-if="subPoints(scope.row.pointsAmount)" style="color: red;">{{ scope.row.pointsAmount }}</span>
+          <span v-else>{{ scope.row.pointsAmount }}</span>
+        </template>
       </el-table-column>
       <el-table-column
         prop="createDate"
         label="发生时间">
+        <template slot-scope="scope">{{ formateDate(scope.row.createDate) }}</template>
       </el-table-column>
     </el-table>
     <el-pagination
       small
       style="margin-top:10px;"
       layout="prev, pager, next"
-      :current-page.sync="currentPage"
-      :pageSize="pageSize"
-      :total="dynamics.total || 0"
+      :current-page.sync="form.pageNum"
+      :pageSize="form.pageSize"
+      :total="total || 0"
       @current-change="getList"
     >
     </el-pagination>
@@ -38,7 +44,7 @@
 
 <script>
 import { createNamespacedHelpers } from "vuex";
-
+import dayjs from 'dayjs'
 const {
   mapState: mapDynamicState,
   mapActions: mapDynamicActions
@@ -51,10 +57,14 @@ const {
 export default {
   data() {
     return {
-      pageSize: 20,
-      currentPage: 1,
-      name: "",
-      buildingId: "",
+      form: {
+        customerId: '',
+        pageSize: 20,
+        pageNum: 1,
+      },
+      totalPoints: '', // 当前可用积分
+      total: '',
+      list: []
     };
   },
   computed: {
@@ -85,12 +95,17 @@ export default {
       }
     },
     getList() {
-      this.getDynamics({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        name: this.name,
-        buildingId: this.buildingId
-      });
+      this.$store.dispatch('customer/taPointsRecords', this.form).then((res) => {
+        console.log('customer/taPointsRecords: ', res)
+        this.total = res.result.total
+        this.form.pageNum = res.result.current
+        this.form.pageSize = res.result.size
+        this.list = res.result.records
+        this.totalPoints = res.totalPoints
+
+      }).catch(() => {
+        console.log('customer/taPointsRecords err')
+      })
     },
     getBuildingName(id) {
       return (
@@ -98,15 +113,35 @@ export default {
           .buildingName || ""
       );
     },
-  
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
+    showChangeType(str) { // 积分类型
+      switch (str) {
+        case 'goods':
+          return '兑换商品'
+        case 'checkin':
+          return '签到'
+        case 'share':
+          return '分享'
+        case 'authorize':
+          return '授权'
+        default:
+          return '未知类型'
+      }
+    },
+    subPoints(points) { // 判断是否是 - 开头
+      let subStr = points.toString().substring(0, 1)
+      if (subStr === '-') {
+        return true
+      }
+
+      return false
+    }
   },
   created() {
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100
-    }).then(() => {
-      this.getList();
-    });
+    this.form.customerId = this.$route.query.id
+    this.getList()
   }
 };
 </script>

src/views/customer/list.vue

@@ -5,314 +5,403 @@
         <ul>
           <li>
             <span>姓名</span>
-            <el-input v-model="name" ></el-input>
+            <el-input v-model="form.name" ></el-input>
           </li>
           <li>
             <span>电话</span>
-            <el-input v-model="name" ></el-input>
+            <el-input v-model="form.tel" ></el-input>
           </li>
           <li>
-            <span>置业顾问</span>
-            <el-input v-model="name" ></el-input>
+            <span>推荐人</span>
+            <el-input v-model="form.consultName" ></el-input>
           </li>
           <li>
-            <span>置业顾问电话</span>
-            <el-input v-model="name" ></el-input>
+            <span>推荐人电话</span>
+            <el-input v-model="form.consultTel" ></el-input>
           </li>
         </ul>
         <el-button
-          size="mini"
-          type="primary" @click="search">查询</el-button>
+                size="mini"
+                type="primary" @click="search">查询</el-button>
       </div>
     </div>
-    <el-table :data="dynamics.list || []" style="width: 100%">
+    <el-table :data="list || []"
+              border
+              style="width: 100%">
       <el-table-column
-        type="index"
-        width="50">
-        <template slot-scope="scope">
-          <span>{{ GetIndex(scope.$index) }}</span>
-        </template>
+              type="index"
+              width="50">
       </el-table-column>
       <el-table-column
-        label="头像">
+              label="头像">
         <template slot-scope="scope">
           <div class="header">
-            <img :src="scope.row.imgUrl" alt="" />
+            <img :src="scope.row.picture" alt="" />
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="title"
-        label="姓名">
+              prop="name"
+              label="姓名">
       </el-table-column>
       <el-table-column
-        prop="phone"
-        label="电话">
+              prop="phone"
+              label="电话">
       </el-table-column>
       <el-table-column
-        prop="sex"
-        label="性别">
+              prop="sex"
+              label="性别">
+        <template slot-scope="scope">{{ scope.row.sex === 1 ? '男' : '女' }}</template>
       </el-table-column>
-      <el-table-column   label="置业顾问">
+      <el-table-column  label="置业顾问">
         <template slot-scope="scope">
-          <span>{{scope.row.desc}}</span>
-          <p>{{scope.row.tel}}</p>
+          <span>{{scope.row.name}}</span>
+          <p>{{scope.row.phone}}</p>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" width="300" label="操作">
+      <el-table-column fixed="right"  width="200" label="操作">
         <template slot-scope="scope">
-          <el-button type="text" @click="toEditCustomer(scope.row)"   size="small">编辑</el-button>
-          <el-button type="text" @click="adjustment(scope.row)" size="small">调整归属</el-button>
-          <el-button type="text" @click="toIntegralRecord(scope.row)" size="small">积分记录</el-button>
-          <el-button type="text" @click="recommend(scope.row)" size="small">推荐客户</el-button>
-          <el-button type="text" size="small" @click="toDetail(scope.row)">查看详情</el-button>
+          <router-link :to="{ name:'editCustomer', query: { id: scope.row.customerId } }" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">编辑</router-link>
+          &nbsp;
+          <a href="javascript: void(0);" @click="showDialogConsultants(scope.row)" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">调整归属</a>
+          &nbsp;
+          <router-link :to="{ name:'integralRecord', query: { id: scope.row.customerId } }" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">积分记录</router-link>
+          &nbsp;
+          <a href="javascript: void(0);" @click="showRecommendCustomerList(scope.row)" v-if="scope.row.phone !== '' && scope.row.phone !== undefined && scope.row.phone !== null">推荐客户</a>
+          &nbsp;
+          <router-link :to="{ name:'customerDetails', query: { id: scope.row.customerId } }">查看详情</router-link>
         </template>
       </el-table-column>
     </el-table>
+    <el-pagination
+            small
+            style="margin-top:10px;"
+            layout="prev, pager, next"
+            :current-page.sync="form.pageNumber"
+            :pageSize="form.pageSize"
+            @current-change="getList"
+    >
+    </el-pagination>
+
+
     <el-dialog title="选择置业顾问" :visible.sync="dialogTableVisible">
-      <el-table :data="gridData">
-        <el-table-column property="date" label="姓名"></el-table-column>
-        <el-table-column property="name" label="电话"></el-table-column>
-        <el-table-column property="name" label="部门"></el-table-column>
-        <el-table-column property="name" label="岗位"></el-table-column>
+      <el-table :data="consultantList">
+        <el-table-column property="name" label="姓名"></el-table-column>
+        <el-table-column property="phone" label="电话"></el-table-column>
+        <el-table-column property="department" label="部门"></el-table-column>
+        <el-table-column property="post" label="岗位"></el-table-column>
         <el-table-column fixed="right" label="操作">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleDel(scope.row)" size="small">选择</el-button>
+            <!--            <el-button type="text" @click="handleDel(scope.row)" size="small">选择</el-button>-->
+            <el-radio v-model="dialogConsultantForm.realtyConsultant" :label="scope.row.personId"></el-radio>
           </template>
         </el-table-column>
       </el-table>
+      <el-pagination
+              @size-change="dialogHandleSizeChange"
+              @current-change="dialogHandleCurrentChange"
+              :current-page.sync="dialogForm.pageNumber"
+              :page-size="dialogForm.pageSize"
+              layout="total, prev, pager, next"
+              :total="dialogTotal">
+      </el-pagination>
+      <el-button type="primary" @click="handleDel" size="small">确定</el-button>
     </el-dialog>
-    <el-dialog title="推荐客户" :visible.sync="dialogRecommendVisible">
-      <el-table :data="gridData">
-        <el-table-column property="date" label="姓名"></el-table-column>
-        <el-table-column property="name" label="电话"></el-table-column>
-        <el-table-column property="name" label="性别"></el-table-column>
-        <el-table-column property="name" label="意向项目"></el-table-column>
-        <el-table-column property="name" label="推荐时间"></el-table-column>
-        <el-table-column property="name" label="状态"></el-table-column>
+
+
+    <el-dialog title="推荐客户" :visible.sync="dialogRecommendedTableVisible">
+      <el-table :data="recommendedConsultantList">
+        <el-table-column property="name" label="姓名"></el-table-column>
+        <el-table-column property="phone" label="电话"></el-table-column>
+        <el-table-column property="sex" label="性别">
+          <template slot-scope="scope"> {{ scope.row.sex === 1 ? '男' : '女' }}</template>
+        </el-table-column>
+        <el-table-column property="intention" label="意向项目"></el-table-column>
+        <el-table-column property="post" label="推荐时间"></el-table-column>
+        <el-table-column fixed="right" label="状态">
+          <template slot-scope="scope">
+            {{ scope.row.status == 1 ? '报备': scope.row.status == 2 ? '到访' : scope.row.status == 3 ? '认购' : scope.row.status == 4 ? '签约' : '无效' }}
+          </template>
+        </el-table-column>
       </el-table>
-       <el-button type="primary" class="close-btn"  @click="dialogRecommendVisible=false" >关闭</el-button>
+      <el-pagination
+              @size-change="recommendedDialogHandleSizeChange"
+              @current-change="recommendedDialogHandleCurrentChange"
+              :current-page.sync="recommendedDialogConsultantForm.pageNumber"
+              :page-size="recommendedDialogConsultantForm.pageSize"
+              layout="total, prev, pager, next"
+              :total="recommendedDialogTotal">
+      </el-pagination>
     </el-dialog>
-    <el-pagination
-      small
-      style="margin-top:10px;"
-      layout="prev, pager, next"
-      :current-page.sync="currentPage"
-      :pageSize="pageSize"
-      @current-change="getList"
-    >
-    </el-pagination>
   </div>
 </template>
 <script>
-import { createNamespacedHelpers } from "vuex";
-const {
-  mapState: mapDynamicState,
-  mapActions: mapDynamicActions
-} = createNamespacedHelpers("dynamic");
-const {
-  mapState: mapCustomerState,
-  mapActions: mapCustomerActions
-} = createNamespacedHelpers("customer");
-export default {
-  data() {
-    return {
-      pageSize: 20,
-      currentPage: 1,
-      name: "",
-      sex: "",
-      phone: "",
-      picture: "",
-      describe: "",
-      appointmentTime: "",
-      visiteNum: "",
-      intention: "",
-      buildingId: "",
-      realtyManageType: "",
-      demandType: "",
-      priceRange: "",
-      reportDate: "",
-      status: "",
-      personId: "",
-      dialogTableVisible: false, //调整归属弹框
-      dialogRecommendVisible: false, //推荐客户弹框
-      gridData: [
-        {
-          date: "2016-05-02",
-          name: "王小虎"
+  import { createNamespacedHelpers } from "vuex";
+  import dayjs from 'dayjs'
+  const {
+    mapState: mapDynamicState,
+    mapActions: mapDynamicActions
+  } = createNamespacedHelpers("dynamic");
+  const {
+    mapState: mapCustomerState,
+    mapActions: mapCustomerActions
+  } = createNamespacedHelpers("customer");
+  export default {
+    data() {
+      return {
+        form: {
+          pageSize: 10,
+          pageNumber: 1,
+          name: "",
+          consultName: '',
+          consultTel: '',
+          verifyStatus: '1' // 0未通过 1已通过 2已驳
         },
-        {
-          date: "2016-05-04",
-          name: "王小虎"
+        list: [],
+        total: 0,
+        sex: "",
+        phone: "",
+        picture: "",
+        describe: "",
+        appointmentTime: "",
+        visiteNum: "",
+        intention: "",
+        buildingId: "",
+        realtyManageType: "",
+        demandType: "",
+        priceRange: "",
+        reportDate: "",
+        status: "",
+        personId: "",
+        gridData: [
+          {
+            name: "报备",
+            value: 1
+          },
+          {
+            name: "到访",
+            value: 2
+          },
+          {
+            name: "认购",
+            value: 3
+          },
+          {
+            name: "签约",
+            value: 4
+          }
+        ],
+        dialogTableVisible: false, //选择置业顾问弹框
+        consultantList: [],
+        dialogForm: {
+          pageNumber: 1,
+          pageSize: 10
         },
-        {
-          date: "2016-05-01",
-          name: "王小虎"
+        dialogTotal: 0,
+        dialogConsultantForm: {
+          customerId: '', // 客户Id
+          realtyConsultant: '' // 置业顾问
         },
-        {
-          date: "2016-05-03",
-          name: "王小虎"
-        }
-      ]
-    };
-  },
-  computed: {
-    ...mapCustomerState({
-      customers: x => x.customers
-    }),
-    ...mapDynamicState({
-      dynamics: x => x.dynamics
-    })
-  },
-  created() {
-    this.getList();
-  },
-  methods: {
-    ...mapCustomerActions(["getCustomers", "getDetail"]),
-    ...mapDynamicActions([
-      "getDynamics",
-      "setDetailNull",
-      "deleteDynamics",
-      "publicDynamic",
-      "cancelDynamic"
-    ]),
-    GetIndex(inx) {
-      return (this.currentPage - 1) * this.pageSize + inx + 1;
-    },
-    getList() {
-      this.getDynamics({
-        pageNum: this.currentPage,
-        pageSize: this.pageSize,
-        name: this.name,
-        buildingId: this.buildingId
-      });
-    },
-    // 进入编辑页
-    toEditCustomer(row) {
-      this.$router.push({
-        name: "editCustomer",
-        params: { id: row.personId }
-      });
-    },
-    // 进入积分记录页
-    toIntegralRecord(row) {
-      this.$router.push({
-        name: "integralRecord",
-        params: { id: row.personId }
-      });
-    },
-    // 调整归属
-    adjustment(row) {
-      this.dialogTableVisible = true;
-    },
-    // 推荐客户
-    recommend(row) {
-      this.dialogRecommendVisible = true;
+        // 推荐客户
+        dialogRecommendedTableVisible: false,
+        recommendedConsultantList: [],
+        recommendedDialogTotal: 0,
+        recommendedDialogConsultantForm: {
+          customerId: '', // 客户Id
+          pageNumber: 1,
+          pageSize: 10
+        },
+      };
     },
-    handleDel(row) {
-      this.$confirm("确定选择此置业顾问?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
+    computed: {
+      ...mapCustomerState({
+        customers: x => x.customers
+      }),
+      ...mapDynamicState({
+        dynamics: x => x.dynamics
       })
-        .then(() => {
-          this.$message({
-            type: "success",
-            message: "选择成功!"
-          });
-          this.dialogTableVisible = false;
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消选择"
-          });
-        });
     },
-    // getList() {
-    // this.getCustomers({
-    // pageNum: this.currentPage,
-    // pageSize: this.pageSize,
-    // name: this.name,
-    // sex: this.sex,
-    // phone: this.phone,
-    // picture: this.picture,
-    // describe: this.describe,
-    // appointmentTime: this.appointmentTime,
-    // visiteNum: this.visiteNum,
-    // intention: this.intention,
-    // buildingId: this.buildingId,
-    // realtyManageType: this.realtyManageType,
-    // demandType: this.demandType,
-    // priceRange: this.priceRange,
-    // reportDate: this.reportDate,
-    // status: this.status,
-    // personId: this.personId
-    // });
-    // },
-    search() {
-      this.currentPage = 1;
+    created() {
       this.getList();
     },
-    toDetail(row) {
-      this.$router.push({
-        name: "consultant.edit",
-        params: { id: row.personId }
-      });
+    methods: {
+      ...mapCustomerActions(["getCustomers", "getDetail", "getRecommendCustomers"]),
+      ...mapDynamicActions([
+        "getDynamics",
+        "setDetailNull",
+        "deleteDynamics",
+        "publicDynamic",
+        "cancelDynamic"
+      ]),
+      GetIndex(inx) {
+        return (this.currentPage - 1) * this.pageSize + inx + 1;
+      },
+      formateDate(dt) {
+        return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+      },
+      getList() {
+        this.getRecommendCustomers(this.form).then((res) => {
+          this.list = res.records
+          this.form.pageSize = res.size
+          this.form.pageNumber = res.current
+          this.total = res.total
+        }).catch(() => {
+          console.log('getRecommendCustomers err')
+        });
+      },
+
+      // 进入积分记录页
+      toEditRecommend(row) {
+        this.$router.push({
+          name: "editRecommend",
+          params: { id: row.personId }
+        });
+      },
+
+      // getList() {
+      // this.getCustomers({
+      // pageNum: this.currentPage,
+      // pageSize: this.pageSize,
+      // name: this.name,
+      // sex: this.sex,
+      // phone: this.phone,
+      // picture: this.picture,
+      // describe: this.describe,
+      // appointmentTime: this.appointmentTime,
+      // visiteNum: this.visiteNum,
+      // intention: this.intention,
+      // buildingId: this.buildingId,
+      // realtyManageType: this.realtyManageType,
+      // demandType: this.demandType,
+      // priceRange: this.priceRange,
+      // reportDate: this.reportDate,
+      // status: this.status,
+      // personId: this.personId
+      // });
+      // },
+      search() {
+        this.currentPage = 1;
+        this.getList();
+      },
+      handleDel() {
+        this.dialogSubmitForm(this.dialogConsultantForm.customerId, this.dialogConsultantForm.realtyConsultant)
+        this.dialogTableVisible = false
+      },
+      dialogHandleSizeChange(value) {
+        this.dialogForm.pageSize = value
+        this.getConsultantsList()
+      },
+      dialogHandleCurrentChange(value) {
+        this.dialogForm.pageNumber = value
+        this.getConsultantsList()
+      },
+      getConsultantsList() {
+        this.$store.dispatch('persons/getConsultants', this.dialogForm).then((res) => {
+          this.consultantList = res.records
+          this.dialogForm.pageNumber = res.current
+          this.dialogForm.pageSize = res.size
+          this.dialogTotal = res.total
+        }).catch(()=> {
+          console.log('persons/getConsultants err')
+        })
+      },
+      dialogSubmitForm(customerId, realtyConsultant) {
+        console.log('提交', this.dialogConsultantForm)
+        this.$store.dispatch('customer/getRecommendCustomersUpdate',{customerId:  customerId, realtyConsultant:  realtyConsultant})
+                .then(res => {
+                  if (res.personId) {
+                    this.detail = res;
+                  }
+
+                  this.$notify.info("保存成功");
+                })
+                .catch(err => {
+                  this.$notify.error(err.message);
+                });
+      },
+      showDialogConsultants(row) {
+        this.dialogTableVisible = true
+        this.dialogConsultantForm.customerId = row.customerId
+        this.dialogConsultantForm.realtyConsultant = row.realtyConsultant
+        this.getConsultantsList()
+      },
+      getRecommendCustomerList() {
+        this.$store.dispatch('customer/recommendCustomerList', this.recommendedDialogConsultantForm).then((res) => {
+          this.recommendedConsultantList = res.records
+          this.recommendedDialogConsultantForm.pageNumber = res.current
+          this.recommendedDialogConsultantForm.pageSize = res.size
+          this.recommendedDialogTotal = res.total
+        }).catch(()=> {
+          console.log('persons/getConsultants err')
+        })
+      },
+      showRecommendCustomerList(row) {
+        this.dialogRecommendedTableVisible = true
+        this.recommendedDialogConsultantForm.customerId = row.customerId
+        this.getRecommendCustomerList()
+      },
+      recommendedDialogHandleSizeChange(value) {
+        this.recommendedDialogConsultantForm.pageSize = value
+        this.getRecommendCustomerList()
+      },
+      recommendedDialogHandleCurrentChange(value) {
+        this.recommendedDialogConsultantForm.pageNumber = value
+        this.getConsultantsList()
+      },
     }
-  }
-};
+  };
 </script>
 <style lang="scss" scoped>
-.list {
-  .header {
-    width: 50px;
-    height: 50px;
-    img {
-      width: 100%;
-      height: 100%;
+  .list {
+    .header {
+      width: 50px;
+      height: 50px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
     }
   }
-}
 
-.system-table-search {
-  width: calc(100% - 40px);
-  margin: 16px auto 0;
-}
+  .system-table-search {
+    width: calc(100% - 40px);
+    margin: 16px auto 0;
+  }
 
-.system-table-search ul > li {
-  margin-right: 20px;
-  display: flex;
-  float: left;
-  align-items: center;
-  span {
-    margin-right: 10px;
+  .system-table-search ul > li {
+    margin-right: 20px;
+    display: flex;
+    float: left;
+    align-items: center;
+    margin-bottom: 10px;
+    span {
+      margin-right: 10px;
+    }
   }
-}
 
-.system-table-search ul {
-  font-size: 15px;
-  white-space: nowrap;
-  padding: 0;
-}
+  .system-table-search ul {
+    font-size: 15px;
+    white-space: nowrap;
+    padding: 0;
+  }
 
-.flex-h {
-  display: flex;
-  align-items: center;
-}
-.el-dialog__body{
-  text-align: center;
-  .close-btn{
-  margin:  20px auto 0 auto;
-}
-}
+  .flex-h {
+    display: flex;
+    align-items: center;
+  }
+  .el-dialog__body {
+    text-align: center;
+    .close-btn {
+      margin: 20px auto 0 auto;
+    }
+  }
 
-.flex-item {
-  flex: 1;
-  -webkit-flex: 1;
-  position: relative;
-  overflow: hidden;
-}
+  .flex-item {
+    flex: 1;
+    -webkit-flex: 1;
+    position: relative;
+    overflow: hidden;
+  }
 </style>
 
 

src/views/customer/recommendCustomer.vue

@@ -19,12 +19,12 @@
             <span>推荐人电话</span>
             <el-input v-model="form.consultTel" ></el-input>
           </li>
-<!--          <li>-->
-<!--            <span>状态</span>-->
-<!--            <el-select v-model="form.status" placeholder="请选择">-->
-<!--              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>-->
-<!--            </el-select>-->
-<!--          </li>-->
+          <li>
+            <span>状态</span>
+            <el-select v-model="form.verifyStatus" placeholder="请选择">
+              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.value"></el-option>
+            </el-select>
+          </li>
         </ul>
         <el-button
           size="mini"
@@ -77,20 +77,12 @@
       </el-table-column>
       <el-table-column  label="状态">
         <template slot-scope="scope">
-          <span>{{scope.row.status == 1 ? '报备': scope.row.status == 2 ? '到访' : scope.row.status == 3 ? '认购' : '签约' }}</span>
+          <span>{{scope.row.verifyStatus == '0' ? '未通过': scope.row.verifyStatus == '1' ? '已通过' : scope.row.verifyStatus == '2' ? '已驳回' : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column fixed="right" width="200" label="操作">
         <template slot-scope="scope">
-          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">编辑</router-link>
-          &nbsp;
-          <a href="javascript: void(0);" @click="showDialogConsultants(scope.row)">调整归属</a>
-          &nbsp;
-          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">积分记录</router-link>
-          &nbsp;
-          <a href="javascript: void(0);" @click="showRecommendCustomerList(scope.row)">推荐客户</a>
-          &nbsp;
-          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">查看详情</router-link>
+          <router-link :to="{ name:'editRecommend', query: { id: scope.row.customerId } }">审核</router-link>
         </template>
       </el-table-column>
     </el-table>
@@ -176,7 +168,8 @@ export default {
         name: "",
         consultName: '',
         consultTel: '',
-        status: ''
+        verifyStatus: '', // 0未通过 1已通过 2已驳
+        entryType: 'input'
       },
       list: [],
       total: 0,
@@ -196,20 +189,16 @@ export default {
       personId: "",
       gridData: [
         {
-          name: "报备",
-          value: 1
-        },
-        {
-          name: "到访",
-          value: 2
+          name: "未通过",
+          value: '0'
         },
         {
-          name: "认购",
-          value: 3
+          name: "已通过",
+          value: '1'
         },
         {
-          name: "签约",
-          value: 4
+          name: "已驳回",
+          value: '2'
         }
       ],
       dialogTableVisible: false, //选择置业顾问弹框

src/views/exchange/verify.vue

@@ -27,8 +27,14 @@
         </div>
       </el-col>
     </el-row>
-    <el-button type="danger" style="margin:20px auto 0 auto;display:block" round>立即核销</el-button>
-    
+    <el-button type="danger" @click="showVerifyDialog = true" style="margin:20px auto 0 auto;display:block" round>立即核销</el-button>
+    <el-dialog title="核销数据" :visible.sync="showVerifyDialog">
+      <el-form>
+        <el-form-item label="扫描二维码数据">
+          <el-input v-model="verifyId" @keyup.enter.native="verifyEnter" placeholder="请用扫码枪扫描二维码"></el-input>
+        </el-form-item>
+      </el-form>
+    </el-dialog>
   </el-tab-pane>
   <el-tab-pane label="手机号核销">
     <el-row>
@@ -81,6 +87,8 @@ export default {
         status: ""
       },
       verifyPhone: "",
+      verifyId: "",
+      showVerifyDialog: false,
       list: [],
       pageNavi: {
         current: 1,
@@ -91,7 +99,7 @@ export default {
   },
   computed: {},
   methods: {
-    ...mapExchangeActions(["getExchanges"]),
+    ...mapExchangeActions(["getExchanges", "verifyById"]),
     getList() {
       const pageNumber = this.pageNavi.current || 1;
       const pageSize = this.pageNavi.size;
@@ -114,7 +122,23 @@ export default {
     addGoods() {
       this.$router.push({ name: "goods.edit" });
     },
+    verifyEnter() {
+      this.verifyById({
+        id: this.verifyId
+      })
+        .then(res => {
+         this.$notify.info("核销成功");
+         this.showVerifyDialog = false;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
     verifyTel() {
+      if(this.verifyPhone === ""){
+        this.$notify.error("请输入手机号");
+        return;
+      }
       this.$router.push({
         name: "verify.list",
         params: { tel: this.verifyPhone }

src/views/index.js

@@ -33,7 +33,7 @@ const pages = [
         name: 'consultant.edit',
         component: () => import('./consultant/edit.vue'),
         meta: {
-          menuShow: true,
+          menuShow: false,
           title: '置业管理',
         },
       },
@@ -173,7 +173,7 @@ const pages = [
       {
         path: 'customerlist',
         name: 'customerlist',
-        component: () => import('./customer/recommendCustomer.vue'),
+        component: () => import('./customer/list.vue'),
         meta: {
           menuShow: true,
           title: '客户列表',
@@ -194,7 +194,16 @@ const pages = [
         component: () => import('./customer/editRecommend.vue'),
         meta: {
           menuShow: false,
-          title: '编辑',
+          title: '审核',
+        },
+      },
+      {
+        path: 'customerDetails',
+        name: 'customerDetails',
+        component: () => import('./customer/customerDetails.vue'),
+        meta: {
+          menuShow: false,
+          title: '客户详情',
         },
       },
       {
@@ -212,7 +221,7 @@ const pages = [
         component: () => import('./customer/editCustomer.vue'),
         meta: {
           menuShow: false,
-          title: '编辑',
+          title: '编辑客户',
         },
       },
     ]
@@ -295,6 +304,15 @@ const pages = [
           title: '关键字维护',
         },
       },
+      {
+        path: 'message',
+        name: 'message',
+        component: () => import('./systemManagement/message.vue'),
+        meta: {
+          menuShow: true,
+          title: '客户留言',
+        },
+      },
     ]
   },
   {

src/views/news/type/index.vue

@@ -90,13 +90,13 @@
             },
             handleSizeChange(val) {
                 console.log(`每页 ${val} 条`);
-                this.form.pageSize = val
-                this.form.pageNum = 1
+                this.pageSize = val
+                this.pageNum = 1
                 this.getList()
             },
             handleCurrentChange(val) {
                 console.log(`当前页: ${val}`);
-                this.form.pageNum = val
+                this.pageNum = val
                 this.getList()
             },
             getList() {

src/views/systemManagement/message.vue

@@ -0,0 +1,187 @@
+<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='addGoods'>新增</el-button>
+        </div>
+        <ul>
+          <li>
+            <el-input v-model="filterData.goodsName" placeholder="商品名称"></el-input>
+          </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="phone"
+      label="电话号码">
+    </el-table-column>
+    <el-table-column
+      prop="message"
+      label="留言内容">
+    </el-table-column>
+    <el-table-column
+      label="创建时间">
+      <template slot-scope="scope">
+          <span>{{formateDate(scope.row.createDate)}}</span>
+      </template>
+    </el-table-column>
+  </el-table>
+  <el-pagination
+    small
+    style="margin-top:10px;"
+    layout="prev, pager, next"
+    :current-page.sync="pageNavi.current"
+    :pageSize="pageNavi.size"
+    :total="pageNavi.total || 0"
+    @current-change="getList"
+  >
+  </el-pagination>
+</div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+import dayjs from 'dayjs'
+
+const { mapActions: mapMessageActions } = createNamespacedHelpers("message");
+
+export default {
+  name: "goods-list",
+  data() {
+    return {
+      filterData: {
+        goodsName: ""
+      },
+      list: [],
+      pageNavi: {
+        current: 1,
+        size: 20,
+        total: 0
+      }
+    };
+  },
+  computed: {},
+  methods: {
+    ...mapMessageActions(["getMessage"]),
+    getList() {
+      const pageNumber = this.pageNavi.current || 1;
+      const pageSize = this.pageNavi.size;
+
+      this.getMessage({
+        ...this.filterData,
+        pageNumber,
+        pageSize
+      })
+        .then(res => {
+          const { records, ...pageNavi } = res;
+
+          this.list = records;
+          this.pageNavi = pageNavi;
+        })
+        .catch(err => {
+          this.$notify.error(err.msg || err.message);
+        });
+    },
+    addGoods() {
+      this.$router.push({ name: "goods.edit" });
+    },
+    toDetail(row) {
+      this.$router.push({
+        name: "goods.edit",
+        params: { id: row.goodsId }
+      });
+    },
+    changeStatus(row) {
+      this.showLoadding("保存中...");
+      this.changeGoodsStatus(row)
+        .then(res => {
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+          this.search();
+        })
+        .catch(err => {
+          this.hideLoadding();
+          this.$notify.error(err.message);
+        });
+    },
+    showLoadding(text) {
+      this.loading = this.$loading({
+        text,
+        lock: true,
+        spinner: "el-icon-loading",
+        background: "rgba(255, 255, 255, 0.7)"
+      });
+    },
+    hideLoadding() {
+      if (this.loading) this.loading.close();
+    },
+    search() {
+      this.pageNavi.current = 1;
+      this.getList();
+    },
+    newPage(page) {
+      this.$router.replace({ name: "goods.list", query: { page } });
+    },
+    formateDate(dt) {
+      return !dt ? '' : dayjs(dt).format('YYYY-MM-DD HH:mm')
+    },
+  },
+  created() {
+    this.pageNavi.current = this.$route.query.page || 1;
+
+    this.getList();
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.list {
+  .header {
+    width: 50px;
+    height: 50px;
+    border-radius: 50%;
+  }
+  img {
+      width: 100%;
+      height: 100%;
+    }
+}
+.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>

vue.config.js

@@ -4,7 +4,8 @@ module.exports = {
     port: 8080,
     proxy: {
       '/api': {
-        target: 'http://192.168.0.11:8080',
+        // target: 'http://192.168.0.11:8080',
+        target: 'http://localhost:8080',
         changeOrigin: true,
         // pathRewrite: {
         //   '^/api': '/'