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

src/config/api.js

@@ -174,10 +174,14 @@ const apis = {
       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:{
@@ -303,5 +307,11 @@ const apis = {
       url: `${commPrefix}/extendContent`
     }
   },
+  message:{
+    list:{
+      method:'get',
+      url: `${commPrefix}/taCustomerMessage`
+    }
+  },
 }
 export default apis

src/store/index.js

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

src/store/modules/customer.js

@@ -95,8 +95,19 @@ export default {
           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/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/edit.vue

@@ -24,7 +24,7 @@
        <el-date-picker v-model="activityQuery.endDate" type="datetime" placeholder="选择日期"/>   
     </el-form-item>
     <el-form-item label="活动地点"  prop="address">
-      <el-input  v-model="activityQuery.address"></el-input>
+      <el-input v-model="activityQuery.address"></el-input>
     </el-form-item>
     <el-form-item label="活动人数" prop="personNum">
       <el-input v-model="activityQuery.personNum" type="number"></el-input>
@@ -90,7 +90,7 @@ export default {
       },
       rules: {
           buildingId: [
-            { required: true, message: '请选择活动区域', trigger: 'change' }
+            { required: true, message: '请选择活动区域', trigger: 'blur' }
           ],
           url: [
             { required: true, message: ' ', trigger: 'change' }
@@ -99,16 +99,16 @@ export default {
             { required: true, message: '请输入活动标题', trigger: 'blur' },
           ],
           startDate: [
-            { required: true, message: '请选择日期', trigger: 'change' }
+            { required: true, message: '请选择日期', trigger: 'blur' }
           ],
           endDate: [
             { type: 'date', required: true, message: '请选择时间', trigger: 'change' }
           ],
           address: [
-            {  required: true, message: '请输入活动地点', trigger: 'change' }
+            {  required: true, message: '请输入活动地点', trigger: 'blur' }
           ],
           personNum: [
-            { required: true, message: '请输入活动人数', trigger: 'change' }
+            { required: true, message: '请输入活动人数', trigger: 'blur' }
           ],
           desc: [
             { required: true, message: ' ', trigger: 'blur' }

src/views/activity/list.vue

@@ -65,11 +65,10 @@
       fixed="right"
       label="操作">
       <template slot-scope="scope">
-        <!-- <el-button type="text" @click="toDetail(scope.row)" size="small">{{scope.row.status == 1?'停用':'启用'}}</el-button> -->
-         <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1' || scope.row.isEnlist === '2'">报名记录</el-button>
-         <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '0'">编辑</el-button>
-        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1'">结束活动</el-button>
-        <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button>
+        <el-button type="text" @click="getSignList(scope.row.dynamicId)" size="small" v-if="scope.row.isEnlist == '1' || scope.row.isEnlist === '2'">报名记录</el-button>
+        <el-button type="text" @click="toDetail(scope.row.dynamicId)" size="small">编辑</el-button>
+        <el-button type="text" @click="finish(scope.row.dynamicId)" size="small">结束活动</el-button>
+        <!-- <el-button type="text" @click="top(scope.row.dynamicId)" size="small">置顶</el-button> -->
       </template>
     </el-table-column>
   </el-table>
@@ -163,14 +162,14 @@ export default {
         });
     },
     top(id){
-          this.filterData.dynamicId = id
-          this.filterData.top = 1
-          this.finishActivity(
-          JSON.stringify(this.filterData)
-        ).then((res) => {
-           this.getList();
-          this.getBuildList()   
-        })  
+        //   this.filterData.dynamicId = id
+        //   this.filterData.top = 1
+        //   this.finishActivity(
+        //   JSON.stringify(this.filterData)
+        // ).then((res) => {
+        //    this.getList();
+        //   this.getBuildList()   
+        // })
     },
     addDynamic() {
       this.$router.push({ name: "activity-add" });

src/views/carouselFigure/advertisementEdit.vue

@@ -13,6 +13,7 @@
       </el-form-item>
       <el-form-item label="主图：">
         <el-upload
+                class="avatar-uploader"
                 :headers="uploadHeaders"
                 :action="upFileUrl"
                 :show-file-list="false"
@@ -105,7 +106,7 @@
           content: '',
           status: 0,
           targetId: '',
-          showType: 'banner'
+          showType: 'screen'
         },
         imageUrl: '',
         buildingList: [], // 所属项目
@@ -417,14 +418,16 @@
           this.form = res
           this.imageUrl = res.image
           this.showPlace = res.targetName
-        }).catch(() => {
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
           console.log('carouselFigure/getByIdExtendContent err')
         })
       },
       getBuildList() {
         this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
           this.buildingList = res.records
-        }).catch(() => {
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
           console.log('building/getBuildings err')
         })
       },
@@ -453,8 +456,8 @@
           this.$store.dispatch('carouselFigure/addExtendContent', this.form).then((res) => {
             this.$message.success('操作成功')
             this.$router.go(-1)
-          }).catch(() => {
-
+          }).catch((err) => {
+            this.$notify.error(err.msg || err.message);
           })
           return
         }
@@ -463,7 +466,8 @@
         this.$store.dispatch('carouselFigure/updateExtendContent', this.form).then((res) => {
           this.$message.success('操作成功')
           this.$router.go(-1)
-        }).catch(() => {
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
           console.log('carouselFigure/updateExtendContent err')
         })
       },
@@ -479,15 +483,7 @@
   };
 </script>
 
-<style lang="scss">
-  .header {
-    width: 50px;
-    height: 50px;
-    img {
-      width: 100%;
-      height: 100%;
-    }
-  }
+<style scoped>
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;
@@ -496,7 +492,7 @@
     overflow: hidden;
   }
   .avatar-uploader .el-upload:hover {
-    border-color: #409eff;
+    border-color: #409EFF;
   }
   .avatar-uploader-icon {
     font-size: 28px;
@@ -511,6 +507,18 @@
     height: 178px;
     display: block;
   }
+
+</style>
+
+<style lang="scss">
+  .header {
+    width: 50px;
+    height: 50px;
+    img {
+      width: 100%;
+      height: 100%;
+    }
+  }
   .edit-carousel {
     .el-select {
       max-width: 300px !important;

src/views/carouselFigure/edit.vue

@@ -13,6 +13,7 @@
         </el-form-item>
         <el-form-item label="主图：">
           <el-upload
+                  class="avatar-uploader"
                   :headers="uploadHeaders"
                   :action="upFileUrl"
                   :show-file-list="false"
@@ -417,14 +418,16 @@ export default {
         this.form = res
         this.imageUrl = res.image
         this.showPlace = res.targetName
-      }).catch(() => {
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message);
         console.log('carouselFigure/getByIdExtendContent err')
       })
     },
     getBuildList() {
       this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
         this.buildingList = res.records
-      }).catch(() => {
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message);
         console.log('building/getBuildings err')
       })
     },
@@ -453,8 +456,8 @@ export default {
         this.$store.dispatch('carouselFigure/addExtendContent', this.form).then((res) => {
           this.$message.success('操作成功')
           this.$router.go(-1)
-        }).catch(() => {
-
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
         })
         return
       }
@@ -463,7 +466,8 @@ export default {
       this.$store.dispatch('carouselFigure/updateExtendContent', this.form).then((res) => {
         this.$message.success('操作成功')
         this.$router.go(-1)
-      }).catch(() => {
+      }).catch((err) => {
+        this.$notify.error(err.msg || err.message);
         console.log('carouselFigure/updateExtendContent err')
       })
     },
@@ -479,7 +483,34 @@ export default {
 };
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
+  .avatar-uploader .el-upload {
+    border: 1px dashed #d9d9d9;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+  .avatar-uploader .el-upload:hover {
+    border-color: #409EFF;
+  }
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+
+</style>
+
+<style lang="scss" scoped>
 .header {
   width: 50px;
   height: 50px;
@@ -488,29 +519,6 @@ export default {
     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;

src/views/consultant/edit.vue

@@ -18,7 +18,7 @@
           <el-input v-model="detail.tel"></el-input>
         </el-form-item>
         <el-form-item label="标签：">
-          <el-input v-model="detail.tag"></el-input>
+          <editabel-tag v-model="detail.personTags"></editabel-tag>
         </el-form-item>
         <el-form-item label="地址：">
           <el-input v-model="detail.address"></el-input>
@@ -64,6 +64,9 @@ const {
 } = createNamespacedHelpers("building");
 export default {
   name: "consultantEdit",
+  components: {
+    EditabelTag: () => import('@/components/EditableTag.vue')
+  },
   data() {
     return {
       upFileUrl: apis.file.upload.url,
@@ -75,7 +78,7 @@ export default {
         tel: undefined,
         photo: undefined,
         status: 1,
-        buildings: []
+        buildings: undefined,
       }
     };
   },
@@ -93,7 +96,10 @@ export default {
     init() {
       if (this.$route.params.id) {
         this.getConsultant({ id: this.$route.params.id }).then(data => {
-          this.detail = data;
+          this.detail = {
+            ...data,
+            buildings: Array.isArray(data.projects) ? data.projects[0] : '',
+          };
         });
       }
     },

src/views/customer/customerDetails.vue

@@ -5,14 +5,17 @@
         <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">曹玉文</p>
-          <p class="phone">13706842514</p>
+          <p class="name">{{  customerDetail.consultant === null ? '' :  customerDetail.consultant.name }}</p>
+          <p class="phone">{{ customerDetail.consultant === null ? '' :  customerDetail.consultant.phone }}</p>
           <div class="info">
-            <p>部门：营销部</p>
-            <p>岗位：置业经理</p>
-            <p>公司：南京知与行网络科技有限公司</p>
+            <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">所属项目：香颂.蔚澜半岛</p>
+          <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">
@@ -21,32 +24,32 @@
           <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>曹建芳</span></p>
-              <p class="info-box">国家：<span>中国</span></p>
-              <p class="info-box">手机号：<span>184521462130</span></p>
-              <p class="info-box">省份：<span>江苏</span></p>
+              <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>20分30秒 在线</span></p>
-              <p class="info-box">城市：<span>苏州</span></p>
-              <p class="info-box">访问次数：<span>20次</span></p>
+              <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>2019-07-23 12:23:49</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>香颂.蔚澜半岛、碧桂园</span></p>
-            <p>需求类型：<span>高层</span></p>
-            <p>物业类型：<span>物业</span></p>
+            <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>100-200万</span></p>
-            <p>预约到访时间：<span>2019-07-23 12:59:14</span></p>
-            <p>预约人数：<span>2</span></p>
+            <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>客户说明展示处</span></p>
-          <p class="flex-box">客户描述：<span>客户描述展示处</span></p>
+          <p class="flex-box">客户说明：<span>{{ customerDetail.verifyRemark }}</span></p>
+          <p class="flex-box">客户描述：<span>{{ customerDetail.describe }}</span></p>
           
         </div>
       </el-col>
@@ -54,20 +57,22 @@
     <div class="access-records">
       <p class="title">访问记录</p>
       <el-table
-      :data="tableData"
+      :data="customerDetail.visitRecords || []"
       class="table-box"
       style="width: 100%;">
       <el-table-column
-        prop="name"
+        prop="event"
         label="访问事件">
       </el-table-column>
       <el-table-column
-        prop="date"
+        prop="visitTime"
         label="访问时间">
+        <template slot-scope="scope">{{ formateDate(scope.row.visitTime) }}</template>
       </el-table-column>
       <el-table-column
-        prop="time"
+        prop="visitDuration"
         label="停留时间">
+        <template slot-scope="scope">{{ scope.row.visitDuration / 60 }}分钟</template>
       </el-table-column>
     </el-table>
     </div>
@@ -76,11 +81,14 @@
 </template>
 
 <script>
-import { createNamespacedHelpers } from "vuex";
+import { createNamespacedHelpers } from "vuex"
+import dayjs from 'dayjs'
 
 export default {
   data() {
     return {
+      customerId: '',
+      customerDetail: '',
       tableData: [
         {
           date: "2016-05-02",
@@ -106,7 +114,24 @@ export default {
     };
   },
   computed: {},
-  created() {}
+  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">

src/views/customer/editCustomer.vue

@@ -7,6 +7,7 @@
         </el-form-item>
         <el-form-item label="客户照片：">
           <el-upload
+                  class="avatar-uploader"
                   :headers="uploadHeaders"
                   :action="upFileUrl"
                   :show-file-list="false"
@@ -154,6 +155,8 @@
             this.detail = data;
             this.dialogImageUrl = data.picture
             this.imageUrl = data.picture
+          }).catch((err) => {
+            this.$notify.error(err.msg || err.message);
           });
         }
       },
@@ -219,7 +222,7 @@
                 })
                 .catch(err => {
                   this.hideLoadding();
-                  this.$notify.error(err.message);
+                  this.$notify.error(err.msg || err.message);
                 });
       },
 
@@ -241,7 +244,8 @@
           this.dialogForm.pageNumber = res.current
           this.dialogForm.pageSize = res.size
           this.dialogTotal = res.total
-        }).catch(()=> {
+        }).catch((err)=> {
+          this.$notify.error(err.msg || err.message);
           console.log('persons/getConsultants err')
         })
       },
@@ -263,7 +267,7 @@
   }
 </style>
 
-<style lang="scss">
+<style lang="scss" >
   .avatar-uploader .el-upload {
     border: 1px dashed #d9d9d9;
     border-radius: 6px;

src/views/customer/editRecommend.vue

@@ -7,6 +7,7 @@
         </el-form-item>
         <el-form-item label="客户照片：">
           <el-upload
+                  class="avatar-uploader"
                   :headers="uploadHeaders"
                   :action="upFileUrl"
                   :show-file-list="false"
@@ -175,6 +176,8 @@ export default {
           this.detail = data;
           this.dialogImageUrl = data.picture
           this.imageUrl = data.picture
+        }).catch((err) => {
+          this.$notify.error(err.msg || err.message);
         });
       }
     },
@@ -240,7 +243,7 @@ export default {
         })
         .catch(err => {
           this.hideLoadding();
-          this.$notify.error(err.message);
+          this.$notify.error(err.msg || err.message);
         });
     },
 
@@ -262,7 +265,8 @@ export default {
         this.dialogForm.pageNumber = res.current
         this.dialogForm.pageSize = res.size
         this.dialogTotal = res.total
-      }).catch(()=> {
+      }).catch((err)=> {
+        this.$notify.error(err.msg || err.message);
         console.log('persons/getConsultants err')
       })
     },
@@ -282,6 +286,10 @@ export default {
 .form-wrapper {
   width: 60%;
 }
+.choose {
+  color: blue;
+  margin-left: 15px;
+}
 </style>
 
 <style lang="scss">
@@ -308,8 +316,4 @@ export default {
   height: 178px;
   display: block;
 }
-.choose {
-  color: blue;
-  margin-left: 15px;
-}
 </style>

src/views/index.js

@@ -39,35 +39,6 @@ const pages = [
       },
     ]
   },
-  {
-    path: 'project',
-    name: 'project',
-    component: () => import('./index.vue'),
-    meta: {
-      menuShow: true,
-      title: '项目管理',
-    },
-    children: [
-      {
-        path: 'project',
-        name: 'project.list',
-        component: () => import('./project/list.vue'),
-        meta: {
-          menuShow: true,
-          title: '项目列表',
-        },
-      },
-      {
-        path: 'project/edit',
-        name: 'projectedit',
-        component: () => import('./project/edit.vue'),
-        meta: {
-          menuShow: false,
-          title: '项目编辑',
-        },
-      },
-    ]
-  },
   {
     path: 'activity',
     name: 'activity',
@@ -124,24 +95,6 @@ const pages = [
       title: '楼盘设置',
     },
     children: [
-      {
-        path: 'dynamic',
-        name: 'dynamiclist',
-        component: () => import('./dynamic/list.vue'),
-        meta: {
-          menuShow: true,
-          title: '项目动态列表',
-        },
-      },
-      {
-        path: 'dynamic/edit',
-        name: 'dynamicedit',
-        component: () => import('./dynamic/edit.vue'),
-        meta: {
-          menuShow: false,
-          title: '项目动态编辑',
-        },
-      },
       {
         path: 'buildinglist',
         name: 'buildinglist',
@@ -304,6 +257,15 @@ const pages = [
           title: '关键字维护',
         },
       },
+      {
+        path: 'message',
+        name: 'message',
+        component: () => import('./systemManagement/message.vue'),
+        meta: {
+          menuShow: true,
+          title: '客户留言',
+        },
+      },
     ]
   },
   {
@@ -312,7 +274,7 @@ const pages = [
     component: () => import('./index.vue'),
     meta: {
       menuShow: true,
-      title: '资迅管理',
+      title: '资讯管理',
     },
     children: [
       {
@@ -321,7 +283,7 @@ const pages = [
         component: () => import('./news/type/index.vue'),
         meta: {
           menuShow: true,
-          title: '资迅类型',
+          title: '资讯类型',
         },
       },
       {
@@ -330,7 +292,7 @@ const pages = [
         component: () => import('./news/type/edi/index.vue'),
         meta: {
           menuShow: false,
-          title: '编辑资迅类型',
+          title: '编辑资讯类型',
         },
       },
       {
@@ -339,7 +301,7 @@ const pages = [
         component: () => import('./news/index.vue'),
         meta: {
           menuShow: true,
-          title: '资迅列表',
+          title: '资讯列表',
         },
       },
       {
@@ -348,7 +310,7 @@ const pages = [
         component: () => import('./news/edi/index.vue'),
         meta: {
           menuShow: false,
-          title: '编辑资迅',
+          title: '编辑资讯',
         },
       },
     ]

src/views/news/edi/index.vue

@@ -12,8 +12,8 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="资讯图片">
-<!--                class="avatar-uploader"-->
                 <el-upload
+                        class="avatar-uploader"
                         :headers="uploadHeaders"
                         :action="upFileUrl"
                         :show-file-list="false"
@@ -36,7 +36,7 @@
                 </el-select>
             </el-form-item>
             <el-form-item label="资讯详情">
-                <my-wangeditor :content="form.newsDetail" @get-content="getEdiCentent"></my-wangeditor>
+                <rich-editor v-model="form.newsDetail" style="height: 400px; width: 1000px;" />
             </el-form-item>
             <el-form-item label="状态">
                 <el-select v-model="form.newsStatus" placeholder="请选择">
@@ -134,14 +134,16 @@
             getTypeList() {
                 this.$store.dispatch('news/getTypeList', this.typeForm).then((res) => {
                     this.typeList = res.records
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('news/getTypeList err')
                 })
             },
             getBuildList() {
                 this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
                     this.buildingList = res.records
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('building/getBuildings err')
                 })
             },
@@ -151,7 +153,8 @@
                         this.$message.success('操作成功！')
                         this.$router.go(-1)
                         // console.log(res)
-                    }).catch(() => {
+                    }).catch((err) => {
+                        this.$notify.error(err.msg || err.message);
                         console.log('news/add err')
                     })
 
@@ -163,7 +166,8 @@
                     this.$message.success('操作成功！')
                     this.$router.go(-1)
                     // console.log(res)
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('news/update err')
                 })
 
@@ -181,7 +185,8 @@
                     this.imageUrl = res.newsImg
                     this.form.buildingId = res.buildingId
                     this.form.newsDetail = res.newsDetail
-                }).catch(() => {
+                }).catch((err) => {
+                    this.$notify.error(err.msg || err.message);
                     console.log('news/getById err')
                 })
             }
@@ -189,7 +194,7 @@
     }
 </script>
 
-<style scoped>
+<style lang="scss">
     .avatar-uploader .el-upload {
         border: 1px dashed #d9d9d9;
         border-radius: 6px;
@@ -213,9 +218,4 @@
         height: 178px;
         display: block;
     }
-    .form {
-        width: 800px;
-        margin-left: auto;
-        margin-right: auto;
-    }
 </style>

src/views/news/type/edi/index.vue

@@ -14,6 +14,7 @@
             <el-form-item label="图片">
 <!--                class="avatar-uploader"-->
                 <el-upload
+                        class="avatar-uploader"
                         :headers="uploadHeaders"
                         :action="upFileUrl"
                         :show-file-list="false"
@@ -75,6 +76,15 @@
                 // console.log(res)
                 this.form.newsTypeImg = res.data
             },
+            beforeImgUpload(file) {
+                if (file.type !== "image/jpeg" && file.type !== "image/png") {
+                    this.$message.error("上传图片只能是 JPG 或 PNG 格式!");
+                    return false;
+                }
+
+                this.showLoadding("上传中...");
+                return true;
+            },
             getBuildList() {
                 this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
                     this.buildingList = res.records
@@ -88,7 +98,8 @@
                         this.$message.success('操作成功！')
                         this.$router.go(-1)
                         // console.log(res)
-                    }).catch(() => {
+                    }).catch((err) => {
+                        this.$notify.error(err.msg || err.message);
                         console.log('news/addType err')
                     })
 
@@ -117,11 +128,17 @@
                 }).catch(() => {
                     console.log('news/getTypeById err')
                 })
-            }
+            },
         }
     }
 </script>
-
+<style lang="scss" scoped>
+.form {
+    width: 300px;
+    margin-left: auto;
+    margin-right: auto;
+}
+</style>
 <style scoped>
     .avatar-uploader .el-upload {
         border: 1px dashed #d9d9d9;
@@ -146,9 +163,5 @@
         height: 178px;
         display: block;
     }
-    .form {
-        width: 300px;
-        margin-left: auto;
-        margin-right: auto;
-    }
+
 </style>

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

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