list

src/config/api.js

@@ -273,5 +273,15 @@ const apis = {
       url: `${commPrefix}/taPointsExchange/change`
     }
   },
+  carouselFigure:{ // 轮播图列表查询
+    list:{
+      method:'get',
+      url: `${commPrefix}/extendContent`
+    },
+    handle:{
+      method:'get',
+      url: `${commPrefix}/extendContent/:id `
+    },
+  },
 }
 export default apis

src/store/index.js

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

src/store/modules/carouselFigure.js

@@ -0,0 +1,73 @@
+import request from '../../utils/request'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    carouselList: {},
+    // detail: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.carouselList = payload
+    },
+    // updateDetail (state, payload) {
+    //   state.detail = payload
+    // }
+  },
+  actions: {
+    // setDetailNull ({ commit }) {
+    //   commit('updateDetail', {})
+    // },
+    getExtendContent ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.list,
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    handleExtendContent ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.carouselFigure.handle,
+          urlData: { id: payload.contentId },
+          params: payload,
+        }).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch((err) => {
+          const message = err.message || err.msg
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    // 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)
+    //       }
+    //     })
+    //   })
+    // },
+  }
+}

src/views/carouselFigure/list.vue

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

src/views/consultant/list.vue

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

src/views/index.js

@@ -33,7 +33,7 @@ const pages = [
         name: 'consultant.edit',
         component: () => import('./consultant/edit.vue'),
         meta: {
-          menuShow: true,
+          menuShow: false,
           title: '置业管理',
         },
       },

src/views/news/type/index.vue

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

vue.config.js

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