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

src/config/api.js

@@ -307,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/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/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/index.js

@@ -304,6 +304,15 @@ const pages = [
           title: '关键字维护',
         },
       },
+      {
+        path: 'message',
+        name: 'message',
+        component: () => import('./systemManagement/message.vue'),
+        meta: {
+          menuShow: true,
+          title: '客户留言',
+        },
+      },
     ]
   },
   {
@@ -312,7 +321,7 @@ const pages = [
     component: () => import('./index.vue'),
     meta: {
       menuShow: true,
-      title: '资迅管理',
+      title: '资讯管理',
     },
     children: [
       {
@@ -321,7 +330,7 @@ const pages = [
         component: () => import('./news/type/index.vue'),
         meta: {
           menuShow: true,
-          title: '资迅类型',
+          title: '资讯类型',
         },
       },
       {
@@ -330,7 +339,7 @@ const pages = [
         component: () => import('./news/type/edi/index.vue'),
         meta: {
           menuShow: false,
-          title: '编辑资迅类型',
+          title: '编辑资讯类型',
         },
       },
       {
@@ -339,7 +348,7 @@ const pages = [
         component: () => import('./news/index.vue'),
         meta: {
           menuShow: true,
-          title: '资迅列表',
+          title: '资讯列表',
         },
       },
       {
@@ -348,7 +357,7 @@ const pages = [
         component: () => import('./news/edi/index.vue'),
         meta: {
           menuShow: false,
-          title: '编辑资迅',
+          title: '编辑资讯',
         },
       },
     ]

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': '/'