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

# Conflicts:
#	vue.config.js

src/config/api.js

@@ -140,6 +140,28 @@ const apis = {
       method: 'post',
       url: `${commPrefix}/customer/add`
     }
+  },
+  newsType: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/taNewsType`
+    },
+    add: {
+      method: 'post',
+      url: `${commPrefix}/taNewsType`
+    },
+    delete: {
+      method: 'delete',
+      url: `${commPrefix}/taNewsType/:id`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/taNewsType/:id`
+    },
+    getById: {
+      method: 'get',
+      url: `${commPrefix}/taNewsType/:id`
+    }
   }
 }
 

src/store/index.js

@@ -2,6 +2,7 @@ import Vue from 'vue'
 import Vuex from 'vuex'
 import system from './system'
 import apartment from './modules/apartment'
+import news from './modules/news'
 Vue.use(Vuex)
 
 const store = new Vuex.Store({
@@ -14,6 +15,7 @@ const store = new Vuex.Store({
     building: require('./modules/building').default,
     img: require('./modules/img').default,
     goods: require('./modules/goods').default,
+    news
   }
 })
 

src/store/modules/news.js

@@ -0,0 +1,76 @@
+import apis from '../../config/api'
+import request from '../../utils/request'
+
+export default {
+    namespaced: true,
+    state: {
+        list: [],
+        detail: []
+    },
+    mutations: {
+
+    },
+    actions: {
+        getTypeList({ commit }, payload) { // 查询所有资迅类型
+           return  new Promise((resolve, reject) => {
+               request({
+                   ...apis.newsType.list,
+                   params: payload,
+               }).then((data) => {
+                   resolve(data)
+               }).catch((err) => {
+                   reject(err)
+               })
+           })
+        },
+        getTypeById({ commit }, payload) { // 根据Id查询资迅类型
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.newsType.getById,
+                    urlData: { id: payload.newsTypeId },
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        addType({ commit }, payload) { // 添加类型
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.newsType.add,
+                    data: payload,
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        updateType({ commit }, payload) { // 修改类型
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.newsType.update,
+                    urlData:{ id: payload.newsTypeId },
+                    data:payload
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        },
+        deleteType({ commit }, payload) { // 删除类型
+            return  new Promise((resolve, reject) => {
+                request({
+                    ...apis.newsType.delete,
+                    urlData: { id: payload.newsTypeId },
+                }).then((data) => {
+                    resolve(data)
+                }).catch((err) => {
+                    reject(err)
+                })
+            })
+        }
+    }
+}

src/views/carouselFigure/advertisement.vue

@@ -0,0 +1,228 @@
+<template>
+  <div>
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
+        </div>
+      </div>
+      <div class="moreFilter"></div>
+    </div>
+    <el-table
+      :data="dynamics.list || []"
+      >
+      <el-table-column
+        type="index">
+        <template slot-scope="scope">
+          <span>{{ GetIndex(scope.$index) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="主图">
+        <template slot-scope="scope">
+          <div class="header">
+            <img :src="scope.row.imgUrl" alt="" />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        label="类型">
+      </el-table-column>
+      <el-table-column
+        prop="createDate"
+        label="发布时间">
+      </el-table-column>
+      <el-table-column
+        label="状态"
+        >
+        <template slot-scope="scope">
+          <span>{{scope.row.status == 1 ? '启用' : '停用'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        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>
+
+        </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"
+    >
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex';
+
+const {mapState: mapDynamicState, mapActions: mapDynamicActions} = createNamespacedHelpers('dynamic')
+const {mapState: mapBuildingState, mapActions: mapBuildingActions} = createNamespacedHelpers('building')
+
+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 ''
+      }
+    },
+    getList () {
+      this.getDynamics({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        name: this.name,
+        buildingId: this.buildingId
+      })
+    },
+    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
+        }).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
+        }).then(() => {
+          this.getList()
+        })
+      })
+    },
+    addDynamic () {
+      this.setDetailNull()
+      this.$router.push({name: 'advertisementEdit'})
+    }
+  },
+  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%;
+  }
+}
+
+.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;
+  display: -webkit-flex;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

src/views/carouselFigure/advertisementEdit.vue

@@ -0,0 +1,454 @@
+<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>    
+</template>
+
+<script>
+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 { mapActions: mapApartmentActions } = createNamespacedHelpers(
+  "apartment"
+);
+
+const { mapActions: mapImgActions } = createNamespacedHelpers("img");
+
+export default {
+  data() {
+    var _self = this;
+    return {
+      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: "在售"
+        }
+      ]
+    };
+  },
+  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;
+    },
+
+    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
+      };
+      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 {
+          imgType: "aparment",
+          url: x.url,
+          orderNo: i + 1
+        };
+      });
+      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.$confirm("确认删除此数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        if (this.building.status === 1) {
+          this.$message.error("当前楼盘处于发布状态，不允许删除！");
+          return false;
+        }
+        this.deleteApartment({
+          id: row.apartmentId
+        }).then(() => {
+          this.getAparmentList();
+        });
+      });
+    }
+  },
+  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("");
+    }
+  }
+};
+</script>
+
+<style lang="scss">
+.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;
+  }
+  .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-select-dropdown {
+  z-index: 10003 !important;
+}
+
+.el-date-picker {
+  z-index: 10002 !important;
+}
+</style>

src/views/carouselFigure/edit.vue

@@ -40,7 +40,17 @@
           <div id="websiteEditorElem" style="height: 400px"></div>
         </el-form-item>
         <el-form-item label="发布内容：" class="publish">
-          <p>活动名称展示处 <span class="choose">请选择</span></p>
+          <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="请选择">
@@ -77,6 +87,22 @@ export default {
   data() {
     var _self = this;
     return {
+      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: "",
@@ -280,22 +306,28 @@ export default {
         this.aparments = data;
       });
     },
-    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;
-      });
+    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.$confirm("确认删除此数据?", "提示", {
         confirmButtonText: "确定",
@@ -399,16 +431,23 @@ export default {
   .el-input {
     max-width: 400px;
   }
-  .publish{
-    p{
+  .publish {
+    p {
       margin: 0;
       font-size: 15.4px;
-      .choose{
+      .choose {
         color: blue;
+        margin-left: 15px;
       }
     }
   }
 }
+.el-popover {
+  z-index: 10004 !important;
+  .el-table .cell{
+    text-align: center;
+  }
+}
 
 .el-select-dropdown {
   z-index: 10003 !important;

src/views/carouselFigure/list.vue

@@ -31,7 +31,7 @@
       </el-table-column>
       <el-table-column
         prop="desc"
-        label="发布位置2">
+        label="发布位置">
       </el-table-column>
       <el-table-column
         prop="createDate"

src/views/customer/editCustomer.vue

@@ -0,0 +1,235 @@
+<template>
+  <div>
+    <div class="form-wrapper">
+      <el-form label-width="200px" :model="detail">
+        <el-form-item label="意向项目：">
+          <el-input v-model="detail.name"></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>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+      </el-form-item>
+        <el-form-item label="客户姓名：">
+          <el-input v-model="detail.company"></el-input>
+        </el-form-item>
+        <el-form-item label="客户电话：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="客户性别：">
+          <el-radio-group v-model="detail.isMain">
+            <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-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-form-item>
+        <el-form-item label="物业类型：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="需求类型：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="价格区间：">
+          <el-input v-model="detail.department"></el-input>
+        </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>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm">保存</el-button>
+          <el-button @click="$router.go(-1)">返回</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+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") || "";
+      return {
+        Authorization: `Bearer ${token}`
+      };
+    }
+  },
+  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();
+    },
+    handleRemove(file, fileList) {
+      this.imgList = fileList;
+    },
+    submitForm() {
+      this.showLoadding("保存中...");
+      this.editConsultant(this.detail)
+        .then(res => {
+          if (res.personId) {
+            this.detail = res;
+          }
+
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+        })
+        .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();
+    }
+  },
+  mounted() {
+    const _that = this;
+
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100
+    }).then(() => {
+      if ((this.$route.query.id || "") !== "") {
+        this.getDetail({ id: this.$route.query.id }).then(data => {});
+      }
+    });
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.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;
+}
+</style>

src/views/customer/editRecommend.vue

@@ -0,0 +1,293 @@
+<template>
+  <div>
+    <div class="form-wrapper">
+      <el-form label-width="200px" :model="detail">
+        <el-form-item label="意向项目：">
+          <el-input v-model="detail.name"></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>
+          <el-dialog :visible.sync="dialogVisible">
+            <img width="100%" :src="dialogImageUrl" alt="">
+          </el-dialog>
+      </el-form-item>
+        <el-form-item label="客户姓名：">
+          <el-input v-model="detail.company"></el-input>
+        </el-form-item>
+        <el-form-item label="客户电话：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="客户性别：">
+          <el-radio-group v-model="detail.isMain">
+            <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-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-form-item>
+        <el-form-item label="物业类型：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="需求类型：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="价格区间：">
+          <el-input v-model="detail.department"></el-input>
+        </el-form-item>
+        <el-form-item label="报备日期：">
+          <el-input v-model="detail.department"></el-input>
+        </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>
+        </el-form-item>
+        <el-form-item label="归属置业顾问：">
+          <p style="margin:0">{{consultant}}<span @click="dialogTableVisible=true" class="choose">请选择</span></p>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="submitForm">修改并审核通过</el-button>
+          <el-button @click="$router.go(-1)">驳回</el-button>
+        </el-form-item>
+        <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-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-dialog>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+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: "",
+      dialogTableVisible: false, //选择置业顾问弹框
+      consultant:"",
+      gridData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎"
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎"
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎"
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎"
+        }
+      ]
+    };
+  },
+  created() {
+    this.init();
+  },
+  computed: {
+    ...mapBuildingState({
+      buildings: x => x.buildings
+    }),
+    uploadHeaders() {
+      const token = localStorage.getItem("x-token") || "";
+      return {
+        Authorization: `Bearer ${token}`
+      };
+    }
+  },
+  methods: {
+    ...mapBuildingActions(["getBuildings"]),
+    ...mapPersonActions(["getConsultant", "editConsultant"]),
+
+    init() {
+      if (this.$route.params.id) {
+        this.getConsultant({ id: this.$route.params.id }).then(data => {
+          this.detail = data;
+        });
+      }
+    },
+    handleDel(row) {
+      this.$confirm("确定选择此置业顾问?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.$message({
+            type: "success",
+            message: "选择成功!"
+          });
+          this.consultant = 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)"
+      });
+
+      return true;
+    },
+    handleAvatarSuccess(res) {
+      this.imgList = [
+        ...this.imgList,
+        {
+          url: res.data
+        }
+      ];
+      this.hideLoadding();
+    },
+    handleRemove(file, fileList) {
+      this.imgList = fileList;
+    },
+    submitForm() {
+      this.showLoadding("保存中...");
+      this.editConsultant(this.detail)
+        .then(res => {
+          if (res.personId) {
+            this.detail = res;
+          }
+
+          this.hideLoadding();
+          this.$notify.info("保存成功");
+        })
+        .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();
+    }
+  },
+  mounted() {
+    const _that = this;
+
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100
+    }).then(() => {
+      if ((this.$route.query.id || "") !== "") {
+        this.getDetail({ id: this.$route.query.id }).then(data => {});
+      }
+    });
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.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;
+}
+</style>

src/views/customer/integralRecord.vue

@@ -0,0 +1,145 @@
+<template>
+  <div>
+    <h5>当前可用积分：200</h5>
+    <el-table
+      :data="dynamics.list || []"
+      >
+      <el-table-column
+        type="index">
+        <template slot-scope="scope">
+          <span>{{ GetIndex(scope.$index) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        label="积分类型">
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        label="积分变化">
+      </el-table-column>
+      <el-table-column
+        prop="createDate"
+        label="发生时间">
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      small
+      style="margin-top:10px;"
+      layout="prev, pager, next"
+      :current-page.sync="currentPage"
+      :pageSize="pageSize"
+      :total="dynamics.total || 0"
+      @current-change="getList"
+    >
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+
+const {
+  mapState: mapDynamicState,
+  mapActions: mapDynamicActions
+} = createNamespacedHelpers("dynamic");
+const {
+  mapState: mapBuildingState,
+  mapActions: mapBuildingActions
+} = createNamespacedHelpers("building");
+
+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 "";
+      }
+    },
+    getList() {
+      this.getDynamics({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        name: this.name,
+        buildingId: this.buildingId
+      });
+    },
+    getBuildingName(id) {
+      return (
+        ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {})
+          .buildingName || ""
+      );
+    },
+  
+  },
+  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%;
+  }
+}
+
+.el-dialog{
+  z-index: 9999!important;
+  .el-form-item__content{
+    p{
+      margin: 0;
+    }
+  }
+}
+
+
+.flex-h {
+  display: flex;
+  display: -webkit-flex;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

src/views/customer/list.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="list">
     <div class="system-table-search">
       <div class="flex-h">
         <ul>
@@ -22,10 +22,10 @@
         </ul>
         <el-button
           size="mini"
-          type="primary" @click="search">搜索</el-button>
+          type="primary" @click="search">查询</el-button>
       </div>
     </div>
-    <el-table style="width: 100%">
+    <el-table :data="dynamics.list || []" style="width: 100%">
       <el-table-column
         type="index"
         width="50">
@@ -37,12 +37,12 @@
         label="头像">
         <template slot-scope="scope">
           <div class="header">
-            <img :src="scope.row.picture" alt="" />
+            <img :src="scope.row.imgUrl" alt="" />
           </div>
         </template>
       </el-table-column>
       <el-table-column
-        prop="name"
+        prop="title"
         label="姓名">
       </el-table-column>
       <el-table-column
@@ -55,63 +55,44 @@
       </el-table-column>
       <el-table-column   label="置业顾问">
         <template slot-scope="scope">
-          <span>{{scope.row.name}}</span>
+          <span>{{scope.row.desc}}</span>
           <p>{{scope.row.tel}}</p>
         </template>
       </el-table-column>
-      <el-table-column fixed="right" label="操作">
+      <el-table-column fixed="right" width="300" label="操作">
         <template slot-scope="scope">
-          <el-button type="text"  @click="toDetail(scope.row)" size="small">编辑</el-button>
-          <el-button type="text" size="small">调整归属</el-button>
-          <el-button type="text" size="small">积分记录</el-button>
-          <el-button type="text" size="small">推荐客户</el-button>
+          <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>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        prop="describe"
-        label="描述">
-      </el-table-column>
-      <el-table-column
-        prop="appointmentTime"
-        label="预约时间">
-      </el-table-column>
-      <el-table-column
-        prop="visiteNum"
-        label="到访人数">
-      </el-table-column>
-      <el-table-column
-        prop="intention"
-        label="意向项目">
-      </el-table-column>
-      <el-table-column
-        prop="buildingId"
-        label="项目ID">
-      </el-table-column>
-      <el-table-column
-        prop="realtyManageType"
-        label="物业类型">
-      </el-table-column>
-      <el-table-column
-        prop="demandType"
-        label="需求类型">
-      </el-table-column>
-      <el-table-column
-        prop="priceRange"
-        label="价格区间">
-      </el-table-column>
-      <el-table-column
-        prop="reportDate"
-        label="报备日期">
-      </el-table-column>
-      <el-table-column
-        prop="status"
-        label="状态">
-      </el-table-column>
-      <el-table-column
-        prop="personId"
-        label="推荐人">
-      </el-table-column> -->
     </el-table>
+    <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-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-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-table>
+       <el-button type="primary" class="close-btn"  @click="dialogRecommendVisible=false" >关闭</el-button>
+    </el-dialog>
     <el-pagination
       small
       style="margin-top:10px;"
@@ -125,6 +106,10 @@
 </template>
 <script>
 import { createNamespacedHelpers } from "vuex";
+const {
+  mapState: mapDynamicState,
+  mapActions: mapDynamicActions
+} = createNamespacedHelpers("dynamic");
 const {
   mapState: mapCustomerState,
   mapActions: mapCustomerActions
@@ -148,40 +133,123 @@ export default {
       priceRange: "",
       reportDate: "",
       status: "",
-      personId: ""
+      personId: "",
+      dialogTableVisible: false, //调整归属弹框
+      dialogRecommendVisible: false, //推荐客户弹框
+      gridData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎"
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎"
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎"
+        },
+        {
+          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.getCustomers({
+      this.getDynamics({
         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
+        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;
+    },
+    handleDel(row) {
+      this.$confirm("确定选择此置业顾问?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .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;
       this.getList();
@@ -191,9 +259,6 @@ export default {
         name: "consultant.edit",
         params: { id: row.personId }
       });
-    },
-    created() {
-      this.getList();
     }
   }
 };
@@ -235,6 +300,12 @@ export default {
   display: flex;
   align-items: center;
 }
+.el-dialog__body{
+  text-align: center;
+  .close-btn{
+  margin:  20px auto 0 auto;
+}
+}
 
 .flex-item {
   flex: 1;

src/views/customer/recommendCustomer.vue

@@ -0,0 +1,274 @@
+<template>
+  <div class="list">
+    <div class="system-table-search">
+      <div class="flex-h">
+        <ul>
+          <li>
+            <span>姓名</span>
+            <el-input v-model="name" ></el-input>
+          </li>
+          <li>
+            <span>电话</span>
+            <el-input v-model="name" ></el-input>
+          </li>
+          <li>
+            <span>推荐人</span>
+            <el-input v-model="name" ></el-input>
+          </li>
+          <li>
+            <span>推荐人电话</span>
+            <el-input v-model="name" ></el-input>
+          </li>
+          <li>
+            <span>状态</span>
+            <el-select v-model="name" placeholder="请选择">
+              <el-option v-for="(item,i) in gridData || []" :key="i" :label="item.name" :value="item.id"></el-option>
+            </el-select>
+          </li>
+        </ul>
+        <el-button
+          size="mini"
+          type="primary" @click="search">查询</el-button>
+      </div>
+    </div>
+    <el-table :data="dynamics.list || []" style="width: 100%">
+      <el-table-column
+        type="index"
+        width="50">
+        <template slot-scope="scope">
+          <span>{{ GetIndex(scope.$index) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="头像">
+        <template slot-scope="scope">
+          <div class="header">
+            <img :src="scope.row.imgUrl" alt="" />
+          </div>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        label="姓名">
+      </el-table-column>
+      <el-table-column
+        prop="phone"
+        label="电话">
+      </el-table-column>
+      <el-table-column
+        prop="sex"
+        width="100"
+        label="性别">
+      </el-table-column>
+      <el-table-column
+        prop="sex"
+        label="意向项目">
+      </el-table-column>
+      <el-table-column  label="推荐人">
+        <template slot-scope="scope">
+          <span>{{scope.row.name}}</span>
+          <p>{{scope.row.tel}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="createDate"
+        label="推荐时间">
+      </el-table-column>
+      <el-table-column  label="状态">
+        <template slot-scope="scope">
+          <span>{{scope.row.status==1?'已通过':scope.row.status==0?'已驳回':'未审核'}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column fixed="right" width="100" label="操作">
+        <template slot-scope="scope">
+          <el-button type="text" @click="toEditRecommend(scope.row)" size="small">{{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"
+      @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: "",
+      gridData: [
+        {
+          date: "2016-05-02",
+          name: "王小虎",
+          id: "1"
+        },
+        {
+          date: "2016-05-04",
+          name: "王小虎",
+          id: "2"
+        },
+        {
+          date: "2016-05-01",
+          name: "王小虎",
+          id: "3"
+        },
+        {
+          date: "2016-05-03",
+          name: "王小虎",
+          id: "4"
+        }
+      ]
+    };
+  },
+  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
+      });
+    },
+
+    // 进入积分记录页
+    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();
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.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 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;
+}
+
+.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;
+}
+</style>
+
+

src/views/index.js

@@ -1,5 +1,5 @@
 
-const pages = [  
+const pages = [
   {
     path: 'dashboard',
     name: 'dashboard',
@@ -130,6 +130,42 @@ const pages = [
         meta: {
           menuShow: true,
           title: '客户列表',
+        }
+      },
+      {
+        path: 'recommendCustomer',
+        name: 'recommendCustomer',
+        component: () => import('./customer/recommendCustomer.vue'),
+        meta: {
+          menuShow: true,
+          title: '推荐客户',
+        }
+      },
+      {
+        path: 'editRecommend',
+        name: 'editRecommend',
+        component: () => import('./customer/editRecommend.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑',
+        },
+      },
+      {
+        path: 'integralRecord',
+        name: 'integralRecord',
+        component: () => import('./customer/integralRecord.vue'),
+        meta: {
+          menuShow: false,
+          title: '积分记录',
+        },
+      },
+      {
+        path: 'editCustomer',
+        name: 'editCustomer',
+        component: () => import('./customer/editCustomer.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑',
         },
       },
     ]
@@ -150,7 +186,7 @@ const pages = [
         meta: {
           menuShow: true,
           title: '轮播图列表',
-        },
+        }
       },
       {
         path: 'editCarousel',
@@ -160,7 +196,58 @@ const pages = [
           menuShow: false,
           title: '编辑轮播图',
         },
-      }
+      },
+      {
+        path: 'advertisement',
+        name: 'advertisement',
+        component: () => import('./carouselFigure/advertisement.vue'),
+        meta: {
+          menuShow: true,
+          title: '开屏广告',
+        }
+      },
+      {
+        path: 'advertisementEdit',
+        name: 'advertisementEdit',
+        component: () => import('./carouselFigure/advertisementEdit.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑开屏广告',
+        },
+
+
+      },
+
+    ]
+  },
+  {
+
+    path: 'systemManagement',
+    name: 'systemManagement',
+    component: () => import('./index.vue'),
+    meta: {
+      menuShow: true,
+      title: '系统管理',
+    },
+    children: [
+      {
+        path: 'pushMessage',
+        name: 'pushMessage',
+        component: () => import('./systemManagement/pushMessage.vue'),
+        meta: {
+          menuShow: true,
+          title: '推送消息',
+        },
+      },
+      {
+        path: 'keyWords',
+        name: 'keyWords',
+        component: () => import('./systemManagement/keyWords.vue'),
+        meta: {
+          menuShow: true,
+          title: '关键字维护',
+        },
+      },
     ]
   },
   {
@@ -169,16 +256,25 @@ const pages = [
     component: () => import('./index.vue'),
     meta: {
       menuShow: true,
-      title: '咨迅管理',
+      title: '资迅管理',
     },
     children: [
       {
         path: '/news/type/list',
         name: 'news-type-list',
-        component: () => import('./news/index.vue'),
+        component: () => import('./news/type/index.vue'),
         meta: {
           menuShow: true,
-          title: '咨迅类型',
+          title: '资迅类型',
+        },
+      },
+      {
+        path: '/news/type/edi',
+        name: 'news-type-edi',
+        component: () => import('./news/type/edi/index.vue'),
+        meta: {
+          menuShow: false,
+          title: '编辑资迅类型',
         },
       }
     ]
@@ -240,13 +336,14 @@ const pages = [
       },
     ]
   },
+
 ]
 
 const flatten = (rts, parents = []) => {
   return rts.reduce((acc, rt) => {
     const chs = rt.children && rt.children.length ?
       flatten(rt.children, parents.concat(rt)) : []
-    
+
     return [...acc, { ...rt, parents }, ...chs]
   }, [])
 }

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

@@ -0,0 +1,156 @@
+<template>
+    <div id="root">
+        <el-form ref="form" :model="form" label-width="80px" class="form">
+            <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="图片">
+<!--                class="avatar-uploader"-->
+                <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.newsTypeName"></el-input>
+            </el-form-item>
+            <el-form-item>
+                <el-button type="primary" @click="submitNewsType">保存</el-button>
+                <el-button @click="cancel">取消</el-button>
+            </el-form-item>
+        </el-form>
+    </div>
+</template>
+
+<script>
+    import apis from '../../../../config/api'
+    export default {
+        name: "index",
+        data() {
+            return {
+                upFileUrl: apis.file.upload.url,
+                buildingList: [],
+                imageUrl: '',
+                form: {
+                    newsTypeId: '',
+                    newsTypeImg: '',
+                    newsTypeName: '',
+                    buildingId: ''
+                },
+                buildingForm: {
+                    pageNum: 1,
+                    pageSize: 100
+                },
+            }
+        },
+        created() {
+            this.getBuildList()
+            this.form.newsTypeId = this.$route.query.id
+            if (this.form.newsTypeId !== undefined) {
+                this.getById()
+            }
+        },
+        computed: {
+            uploadHeaders () {
+                const token = localStorage.getItem('x-token') || ''
+                return {
+                    Authorization: `Bearer ${token}`
+                }
+            }
+        },
+        methods: {
+            handleAvatarSuccess(res, file) {
+                this.imageUrl = URL.createObjectURL(file.raw);
+                // console.log(res)
+                this.form.newsTypeImg = res.data
+            },
+            getBuildList() {
+                this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+                    this.buildingList = res.records
+                }).catch(() => {
+                    console.log('building/getBuildings err')
+                })
+            },
+            submitNewsType() {
+                console.log(this.form.newsTypeId)
+                if (this.form.newsTypeId === '' || this.form.newsTypeId === undefined) {
+                    console.log('添加')
+                    this.$store.dispatch('news/addType', this.form).then((res) => {
+                        this.$message.success('操作成功！')
+                        this.$router.go(-1)
+                        // console.log(res)
+                    }).catch(() => {
+                        console.log('news/addType err')
+                    })
+
+                    return;
+                }
+
+                // 修改
+                this.$store.dispatch('news/updateType', this.form).then((res) => {
+                    this.$message.success('操作成功！')
+                    this.$router.go(-1)
+                    // console.log(res)
+                }).catch(() => {
+                    console.log('news/updateType err')
+                })
+
+            },
+            cancel() {
+                this.$router.go(-1)
+            },
+            getById() {
+                this.$store.dispatch('news/getTypeById', this.form).then((res) => {
+                    this.form.newsTypeName = res.newsTypeName
+                    this.form.newsTypeImg = res.newsTypeImg
+                    this.imageUrl = res.newsTypeImg
+                    this.form.buildingId = res.buildingId
+                }).catch(() => {
+                    console.log('news/getTypeById err')
+                })
+            }
+        }
+    }
+</script>
+
+<style 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;
+    }
+    .form {
+        width: 300px;
+        margin-left: auto;
+        margin-right: auto;
+    }
+</style>

src/views/news/type/index.vue

@@ -1,8 +1,9 @@
 <template>
     <div id="root">
         <div class="operation-class">
-           <el-button type="primary">新增</el-button>
-            <el-select v-model="buildingId" placeholder="项目" style="margin-left: 20px;">
+           <el-button type="primary" @click="ediNewsType">新增</el-button>
+            &nbsp;
+            <el-select v-model="form.buildingId" placeholder="项目" @change="getList">
                 <el-option
                         v-for="item in buildingList"
                         :key="item.buildingId"
@@ -11,21 +12,130 @@
                 </el-option>
             </el-select>
         </div>
+        <div class="body">
+            <el-table
+                    :data="list"
+                    border
+                    style="width: 100%">
+                <el-table-column
+                        prop="date"
+                        label="类型图"
+                        align="center">
+                    <template slot-scope="scope">
+                        <img :src="scope.row.newsTypeImg" width="50" height="50"/>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                        prop="newsTypeName"
+                        label="名称"
+                        align="center">
+                </el-table-column>
+                <el-table-column
+                        prop="newsTypeId"
+                        align="center"
+                        label="操作">
+                    <template slot-scope="scope">
+                        <router-link :to="{ name:'news-type-edi', query: { id: scope.row.newsTypeId } }">编辑</router-link>
+                        <a href="javascript:void(0);" @click="deleteNews(scope.row.newsTypeId)" class="delClass">删除</a>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <div class="block">
+            <el-pagination
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="form.pageNum"
+                    :page-sizes="[1, 10, 20, 30, 40]"
+                    :page-size="form.pageSize"
+                    layout="total, sizes, prev, pager, next, jumper"
+                    :total="total">
+            </el-pagination>
+        </div>
     </div>
 </template>
 
 <script>
     export default {
-        name: "newsTypeIndex",
+        name: "newsIndex",
         data() {
             return {
                 buildingList: [],
-                buildingId: ''
+                form: {
+                    buildingId: '',
+                    pageNum: 1,
+                    pageSize: 10
+                },
+                buildingForm: {
+                    pageNum: 1,
+                    pageSize: 100
+                },
+                total: 0,
+                list: []
+            }
+        },
+        created() {
+          this.getList()
+          this.getBuildList()
+        },
+        methods: {
+            deleteNews(id) {
+                // 删除操作
+                const data = { newsTypeId: id }
+                this.$store.dispatch('news/deleteType', data).then((res) => {
+                    this.getList()
+                }).catch(() => {
+                    console.log('news/deleteType err');
+                })
+            },
+            handleSizeChange(val) {
+                console.log(`每页 ${val} 条`);
+                this.form.pageSize = val
+                this.form.pageNum = 1
+                this.getList()
+            },
+            handleCurrentChange(val) {
+                console.log(`当前页: ${val}`);
+                this.form.pageNum = val
+                this.getList()
+            },
+            getList() {
+              this.$store.dispatch('news/getTypeList', this.form).then((res) => {
+                this.list = res.records
+                this.form.pageNum = res.current
+                this.form.pageSize = res.size
+                this.total = res.total
+              }).catch(() => {
+                  console.log('news/getTypeList err')
+              })
+            },
+            getBuildList() {
+                this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+                    this.buildingList = res.records
+                }).catch(() => {
+                    console.log('building/getBuildings err')
+                })
+            },
+            ediNewsType() {
+                this.$router.push({ name: 'news-type-edi' })
             }
         }
     }
 </script>
 
 <style scoped>
-
+.operation-class {
+    margin-left: 20px;
+}
+.body {
+    margin-top: 10px;
+}
+.block {
+    display: flex;
+    justify-content: flex-end;
+}
+.delClass {
+    padding-left: 10px;
+    padding-right: 10px;
+}
 </style>

src/views/systemManagement/keyWords.vue

@@ -0,0 +1,237 @@
+<template>
+  <div>
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
+        </div>
+      </div>
+    </div>
+    <el-table :data="dynamics.list || []" >
+      <el-table-column
+        type="index">
+        <template slot-scope="scope">
+          <span>{{ GetIndex(scope.$index) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        label="关键字">
+      </el-table-column>
+      <el-table-column
+        prop="createDate"
+        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-dialog title="新增" :modal-append-to-body='false' :visible.sync="dialogFormVisible">
+          <el-form :model="form"  >
+              <el-form-item label="所属项目：" :label-width="formLabelWidth">
+                <el-select v-model="form.region" placeholder="请选择所属项目">
+                  <el-option label="区域一" value="shanghai"></el-option>
+                  <el-option label="区域二" value="beijing"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="关键字：" :label-width="formLabelWidth">
+                <el-input v-model="form.name" auto-complete="off"></el-input>
+              </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="dialogFormVisible = false">保 存</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+          </div>
+      </el-dialog>
+    <el-pagination
+      small
+      style="margin-top:10px;"
+      layout="prev, pager, next"
+      :current-page.sync="currentPage"
+      :pageSize="pageSize"
+      :total="dynamics.total || 0"
+      @current-change="getList"
+    >
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+
+const {
+  mapState: mapDynamicState,
+  mapActions: mapDynamicActions
+} = createNamespacedHelpers("dynamic");
+const {
+  mapState: mapBuildingState,
+  mapActions: mapBuildingActions
+} = createNamespacedHelpers("building");
+
+export default {
+  data() {
+    return {
+      dialogFormVisible: false, //新增弹框
+      pageSize: 20,
+      currentPage: 1,
+      name: "",
+      buildingId: "",
+      form: {
+        name: "",
+        region: ""
+      },
+      formLabelWidth: "150px"
+    };
+  },
+  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 "";
+      }
+    },
+    getList() {
+      this.getDynamics({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        name: this.name,
+        buildingId: this.buildingId
+      });
+    },
+    getBuildingName(id) {
+      return (
+        ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {})
+          .buildingName || ""
+      );
+    },
+    search() {
+      this.currentPage = 1;
+      this.getList();
+    },
+    handleDel(row) {
+      this.setDetailNull();
+       this.$confirm('此操作将永久删除该文件, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          this.$message({
+            type: 'success',
+            message: '删除成功!'
+          });
+        }).catch(() => {
+          this.$message({
+            type: 'info',
+            message: '已取消删除'
+          });          
+        });
+    },
+    handlePulic(row) {
+      this.$confirm("确认发布此数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.publicDynamic({
+          id: row.dynamicId
+        }).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
+    //     }).then(() => {
+    //       this.getList();
+    //     });
+    //   });
+    // },
+    addDynamic() {
+      this.dialogFormVisible = true;
+    }
+  },
+  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%;
+  }
+}
+
+.system-table-search {
+  width: calc(100% - 40px);
+  margin: 20px auto 0;
+}
+
+.flex-h {
+  display: flex;
+  display: -webkit-flex;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

src/views/systemManagement/pushMessage.vue

@@ -0,0 +1,224 @@
+<template>
+  <div>
+    <el-table
+      :data="dynamics.list || []"
+      >
+      <el-table-column
+        type="index">
+        <template slot-scope="scope">
+          <span>{{ GetIndex(scope.$index) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="title"
+        label="标题">
+      </el-table-column>
+      <el-table-column
+        prop="createDate"
+        label="提示内容">
+      </el-table-column>
+      <el-table-column
+        fixed="right"
+        label="操作"
+        width="180">
+        <template slot-scope="scope">
+          <el-button type="text" @click="handleEdit(scope.row)" size="small">编辑</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"
+    >
+    </el-pagination>
+    <el-dialog title="编辑" :modal-append-to-body='false' :visible.sync="dialogFormVisible">
+          <el-form :model="form"  >
+              <el-form-item label="所属项目：" :label-width="formLabelWidth">
+                <el-select v-model="form.region" placeholder="请选择所属项目">
+                  <el-option label="区域一" value="shanghai"></el-option>
+                  <el-option label="区域二" value="beijing"></el-option>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="标题：" :label-width="formLabelWidth">
+                <p>用户来访提醒</p>
+              </el-form-item>
+            <el-form-item label="提示内容：" :label-width="formLabelWidth">
+                <el-input v-model="form.name" auto-complete="off"></el-input>
+              </el-form-item>
+          </el-form>
+          <div slot="footer" class="dialog-footer">
+            <el-button type="primary" @click="dialogFormVisible = false">保 存</el-button>
+            <el-button @click="dialogFormVisible = false">取 消</el-button>
+          </div>
+      </el-dialog>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from "vuex";
+
+const {
+  mapState: mapDynamicState,
+  mapActions: mapDynamicActions
+} = createNamespacedHelpers("dynamic");
+const {
+  mapState: mapBuildingState,
+  mapActions: mapBuildingActions
+} = createNamespacedHelpers("building");
+
+export default {
+  data() {
+    return {
+      pageSize: 20,
+      currentPage: 1,
+      name: "",
+      buildingId: "",
+      dialogFormVisible:false,//编辑弹框
+      form: {
+          name: '',
+          region: ''
+        },
+        formLabelWidth: '150px'
+    };
+  },
+  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 "";
+      }
+    },
+    getList() {
+      this.getDynamics({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        name: this.name,
+        buildingId: this.buildingId
+      });
+    },
+    getBuildingName(id) {
+      return (
+        ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {})
+          .buildingName || ""
+      );
+    },
+    search() {
+      this.currentPage = 1;
+      this.getList();
+    },
+    handleEdit(row) {
+      this.setDetailNull();
+      this.dialogFormVisible = true;
+    },
+    handlePulic(row) {
+      this.$confirm("确认发布此数据?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.publicDynamic({
+          id: row.dynamicId
+        }).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
+        }).then(() => {
+          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%;
+  }
+}
+
+.el-dialog{
+  z-index: 9999!important;
+  .el-form-item__content{
+    p{
+      margin: 0;
+    }
+  }
+}
+
+
+.flex-h {
+  display: flex;
+  display: -webkit-flex;
+}
+
+.flex-item {
+  flex: 1;
+  -webkit-flex: 1;
+  position: relative;
+  overflow: hidden;
+}
+</style>

vue.config.js

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