轮播图

src/config/api.js

@@ -284,8 +284,20 @@ const apis = {
     },
     handle:{
       method:'get',
-      url: `${commPrefix}/extendContent/:id `
+      url: `${commPrefix}/extendContent/:id`
     },
+    update: {
+      method:'put',
+      url: `${commPrefix}/extendContent/:id`
+    },
+    getById: {
+      method:'get',
+      url: `${commPrefix}/extendContent/:id`
+    },
+    add: {
+      method:'post',
+      url: `${commPrefix}/extendContent`
+    }
   },
 }
 export default apis

src/store/modules/carouselFigure.js

@@ -52,22 +52,51 @@ export default {
         })
       })
     },
-    // 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)
-    //       }
-    //     })
-    //   })
-    // },
+    updateExtendContent ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.update,
+          urlData: { id: payload.contentId },
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    getByIdExtendContent({ commit }, payload) { // 根据Id查询
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.getById,
+          urlData: { id: payload.contentId },
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    addExtendContent ({ commit }, payload) { // 添加
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.add,
+          data: payload,
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
   }
 }

src/store/modules/customer.js

@@ -57,7 +57,7 @@ export default {
         })
       })
     },
-    getRecommendCustomersUpdate ({ commit }, payload) { // 根据Id查询列表
+    getRecommendCustomersUpdate ({ commit }, payload) { // 修改
       return new Promise((resolve, reject) => {
         request({
           ...apis.recommendCustomer.update,

src/views/carouselFigure/edit.vue

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

src/views/carouselFigure/list.vue

@@ -5,6 +5,14 @@
         <div class="flex-item flex-h">
           <el-button size="mini" type="success" @click='addDynamic'>新增</el-button>
         </div>
+        <el-select v-model="buildingId" placeholder="请选择" @change="getList">
+          <el-option
+                  v-for="item in buildingList"
+                  :key="item.buildingId"
+                  :label="item.buildingName"
+                  :value="item.buildingId">
+          </el-option>
+        </el-select>
       </div>
       <div class="moreFilter"></div>
     </div>
@@ -26,10 +34,12 @@
       <el-table-column
         prop="showType"
         label="类型">
+        <template slot-scope="scope">{{ scope.row.showType === 'banner' ? '轮播图' : '' }}</template>
       </el-table-column>
       <el-table-column
         prop="showPosition"
         label="发布位置">
+        <template slot-scope="scope">{{ scope.row.showPosition === 'index' ? '首页' : scope.row.showPosition === 'mall' ? '商城' : '' }}</template>
       </el-table-column>
       <el-table-column
         label="发布时间"
@@ -51,8 +61,8 @@
         width="180">
         <template slot-scope="scope">
           <el-button type="text" @click="handleEdit(scope.row)" v-if="scope.row.status === 0" size="small">编辑</el-button>
-          <el-button type="text" @click="handlePulic(scope.row)" size="small" v-if="scope.row.status === 0">启用</el-button>
-          <el-button type="text" @click="Prohibit(scope.row)" size="small" v-if="scope.row.status === 1">禁用</el-button>
+          <el-button type="text" @click="handlePulic(scope.row.contentId, 1)" size="small" v-if="scope.row.status === 0">启用</el-button>
+          <el-button type="text" @click="Prohibit(scope.row.contentId, 0)" size="small" v-if="scope.row.status === 1">禁用</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -89,7 +99,12 @@ export default {
       pageSize: 20,
       currentPage: 1,
       name: "",
-      buildingId: ""
+      buildingId: "",
+      buildingList: [], // 所属项目
+      buildingForm: { // 所属项目条件
+        pageNum: 1,
+        pageSize: 100
+      },
     };
   },
   computed: {
@@ -115,7 +130,8 @@ export default {
     getList() {
       this.getExtendContent({
         pageNum: this.currentPage,
-        pageSize: this.pageSize
+        pageSize: this.pageSize,
+        buildingId: this.buildingId
       });
     },
     getBuildingName(id) {
@@ -129,32 +145,27 @@ export default {
       this.getList();
     },
     handleEdit(row) {
-      this.$router.push({ name: "editCarousel", query: { id: row.dynamicId } });
+      this.$router.push({ name: "editCarousel", query: { id: row.contentId } });
     },
-    handlePulic(row) {
+    handlePulic(contentId, status) {
       this.$confirm("确认发布此数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(() => {});
+      }).then(() => {
+        this.updateExtendContent(contentId, status)
+      });
     },
-    Prohibit(row) {
+    Prohibit(contentId, status) {
       this.$confirm("确认停用此轮播图?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
-        this.handleExtendContent(row.contentId)
-        .then(res => {
-          
-        
-        })
-        .catch(err => {
-         
-        });
+        this.updateExtendContent(contentId, status)
       });
     },
-    handleDel(row) {
+    handleDel(contentId, status) {
       this.$confirm("确认删除此数据?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -166,17 +177,27 @@ export default {
         }
       });
     },
+    updateExtendContent(contentId, status) { // 修改轮播状态
+      this.$store.dispatch('carouselFigure/updateExtendContent', { contentId: contentId, status: status }).then((res) => {
+        this.getList();
+      }).catch(() =>{
+        console.log('carouselFigure/updateExtendContent err')
+      })
+    },
     addDynamic() {
       this.$router.push({ name: "editCarousel" });
-    }
+    },
+    getBuildList() {
+      this.$store.dispatch('building/getBuildings', this.buildingForm).then((res) => {
+        this.buildingList = res.records
+      }).catch(() => {
+        console.log('building/getBuildings err')
+      })
+    },
   },
   created() {
-    this.getBuildings({
-      pageNum: 1,
-      pageSize: 100
-    }).then(() => {
-      this.getList();
-    });
+    this.getBuildList()
+    this.getList();
   }
 };
 </script>

src/views/customer/editCustomer.vue

@@ -250,8 +250,7 @@
         this.getConsultantsList()
       },
       dialogHandleCurrentChange(value) {
-        this.dialogForm.pageNumber = 1
-        this.dialogForm.pageSize = value
+        this.dialogForm.pageNumber = value
         this.getConsultantsList()
       }
     },

src/views/customer/editRecommend.vue

@@ -271,8 +271,7 @@ export default {
       this.getConsultantsList()
     },
     dialogHandleCurrentChange(value) {
-      this.dialogForm.pageNumber = 1
-      this.dialogForm.pageSize = value
+      this.dialogForm.pageNumber = value
       this.getConsultantsList()
     }
   },

src/views/customer/list.vue

@@ -298,8 +298,7 @@
         this.getConsultantsList()
       },
       dialogHandleCurrentChange(value) {
-        this.dialogForm.pageNumber = 1
-        this.dialogForm.pageSize = value
+        this.dialogForm.pageNumber = value
         this.getConsultantsList()
       },
       getConsultantsList() {
@@ -352,8 +351,7 @@
         this.getRecommendCustomerList()
       },
       recommendedDialogHandleCurrentChange(value) {
-        this.recommendedDialogConsultantForm.pageNumber = 1
-        this.recommendedDialogConsultantForm.pageSize = value
+        this.recommendedDialogConsultantForm.pageNumber = value
         this.getConsultantsList()
       },
     }