update

src/config/api.js

@@ -202,6 +202,28 @@ const apis = {
       method: 'put',
       url: `${commPrefix}/buildingDynamic/cancel/:id`
     }
+  },
+  propaganda: {
+    list: {
+      method: 'get',
+      url: `${commPrefix}/propagandaList`
+    },
+    detail: {
+      method: 'get',
+      url: `${commPrefix}/propaganda/:id`
+    },
+    add: {
+      method: 'post',
+      url: `${commPrefix}/propaganda/add`
+    },
+    update: {
+      method: 'put',
+      url: `${commPrefix}/propaganda/update`
+    },
+    delete: {
+      method: 'delete',
+      url: `${commPrefix}/propaganda/delete/:id`
+    }
   }
 }
 

src/store/index.js

@@ -10,6 +10,7 @@ import apartment from './modules/apartment'
 import comment from './modules/comment'
 import banner from './modules/banner'
 import dynamic from './modules/dynamic'
+import propaganda from './modules/propaganda'
 
 Vue.use(Vuex)
 
@@ -24,7 +25,8 @@ const store = new Vuex.Store({
     apartment,
     comment,
     banner,
-    dynamic
+    dynamic,
+    propaganda
   }
 })
 

src/store/modules/propaganda.js

@@ -0,0 +1,84 @@
+import lodash from 'lodash'
+import { interact, replaceApiParams } from '../../utils'
+import apis from '../../config/api'
+
+export default {
+  namespaced: true,
+  state: {
+    propagandas: {},
+    detail: {}
+  },
+  mutations: {
+    updateList (state, payload) {
+      state.propagandas = payload
+    },
+    updateDetail (state, payload) {
+      state.detail = payload
+    }
+  },
+  actions: {
+    setDetailNull ({ commit }) {
+      commit('updateDetail', {})
+    },
+    getPropagandas ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'propaganda.list')
+        interact(api, payload).then((data) => {
+          commit('updateList', data)
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    getDetail ({ commit }, payload) {
+      return new Promise((resolve, reject) => {
+        const api = replaceApiParams(lodash.get(apis, 'propaganda.detail'), payload)
+        interact(api).then((data) => {
+          commit('updateDetail', data)
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    addPropaganda (_, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'propaganda.add')
+        interact(api, payload).then((data) => {
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    editPropaganda (_, payload) {
+      return new Promise((resolve, reject) => {
+        const api = lodash.get(apis, 'propaganda.update')
+        interact(api, payload).then((data) => {
+          resolve(data)
+        }).catch(({ message }) => {
+          if (typeof message === 'string') {
+            reject(message)
+          }
+        })
+      })
+    },
+    deletePropaganda (_, payload) {
+      return new Promise((resolve, reject) => {
+        const api = replaceApiParams(lodash.get(apis, 'propaganda.delete'), payload)
+        interact(api).then(() => {
+          resolve()
+        }).catch(() => {
+          reject()
+        })
+      })
+    }
+  }
+}

src/views/building/edit.vue

@@ -32,6 +32,19 @@
             <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-input v-model="building.marketStatus"></el-input>
+        </el-form-item>
+        <el-form-item label="标签">
+          <el-select
+            v-model="tags"
+            multiple
+            filterable
+            allow-create
+            default-first-option
+            placeholder="请输入标签">
+          </el-select>
+        </el-form-item>
         <el-form-item label="项目主图">
           <el-upload
             :action="upFileUrl"
@@ -48,6 +61,18 @@
             <img width="100%" :src="dialogImageUrl" alt="">
           </el-dialog>
         </el-form-item>
+        <el-form-item label="排序">
+          <el-input v-model="building.orderNo"></el-input>
+        </el-form-item>
+        <el-form-item label="优惠信息">
+          <el-input v-model="building.discount"></el-input>
+        </el-form-item>
+        <el-form-item label="首页推荐">
+          <el-radio-group v-model="building.isMain">
+            <el-radio :label="1">是</el-radio>
+            <el-radio :label="0">否</el-radio>
+          </el-radio-group>
+        </el-form-item>
         <el-form-item label="项目备注">
           <div id="websiteEditorElem" style="height: 400px"></div>
         </el-form-item>
@@ -198,6 +223,7 @@ export default {
       showHx: false,
       markers: [],
       imgList: [],
+      tags: [],
       buildingProperty: [],
       aparments: [],
       aparmentInfo: {},
@@ -322,7 +348,12 @@ export default {
           orderNo: (i + 1)
         }
       })
-      const building = {...this.building, img: imgs, propertyType: this.buildingProperty.join(',')}
+      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({
@@ -448,6 +479,7 @@ export default {
             url: x.url
           }
         })
+        this.tags = data.buildingTag.map(x => x.tagName)
       })
     } else {
       phoneEditor.txt.html('')

src/views/cms/propagandaEdit.vue

@@ -0,0 +1,185 @@
+<template>
+  <el-form ref="form" :model="propaganda" label-width="160px">
+    <el-form-item label="主图">
+      <el-upload
+        class="avatar-uploader"
+        :action="upFileUrl"
+        name='uploadFiles'
+        :show-file-list="false"
+        :before-upload="beforeImgUpload"
+        :on-success="handleAvatarSuccess">
+        <img v-if="propaganda.imgUrl" :src="propaganda.imgUrl" class="avatar">
+        <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+      </el-upload>
+    </el-form-item>
+    <el-form-item label="跳转类型">
+      <el-select v-model="propaganda.skipType" @change="skipTypeChange" placeholder="请选择">
+        <el-option label="楼盘" value="building"></el-option>
+        <el-option label="活动" value="activity"></el-option>
+      </el-select>
+    </el-form-item>
+    <el-form-item label="选择跳转主体">
+      <el-select v-model="propaganda.skipId" placeholder="请选择">
+        <el-option v-for="(item,i) in skipList" :key="i" :label="item.name" :value="item.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>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex'
+import apis from '../../config/api'
+
+const { mapState: mapPropagandaState, mapActions: mapPropagandaActions, mapMutations: mapPropagandaMutations } = createNamespacedHelpers('propaganda')
+const { mapState: mapBuildingState, mapActions: mapBuildingActions } = createNamespacedHelpers('building')
+const { mapState: mapActivityState, mapActions: mapActivityActions } = createNamespacedHelpers('activity')
+const { mapActions: mapImgActions } = createNamespacedHelpers('img')
+
+export default {
+  data () {
+    return {
+      upFileUrl: apis.file.upload.url,
+    }
+  },
+  computed: {
+    ...mapPropagandaState({
+      detail: x => x.detail,
+    }),
+    propaganda: {
+      get () {
+        return this.detail
+      },
+      set (val) {
+        return this.updateDetail(val)
+      }
+    },
+    ...mapBuildingState({
+      buildings: x => x.buildings
+    }),
+    ...mapActivityState({
+      activitys: x => x.activitys
+    }),
+    skipList() {
+      if (!this.propaganda.skipType || this.propaganda.skipType == ''){
+        return []
+      }
+      return this.propaganda.skipType === 'building' ? (this.buildings.list || []).map(x => {
+        return {
+          id: x.buildingId,
+          name: x.buildingName
+        }
+      }) : (this.activitys.records || []).map(x => {
+        return {
+          id: x.activityId,
+          name: x.title
+        }
+      })
+    }
+  },
+  methods: {
+    ...mapBuildingActions([
+      'getBuildings'
+    ]),
+    ...mapActivityActions([
+      'getActivitys',
+    ]),
+    ...mapPropagandaMutations([
+      'updateDetail'
+    ]),
+    ...mapPropagandaActions([
+      'getDetail',
+      'addPropaganda',
+      'editPropaganda'
+    ]),
+    ...mapImgActions([
+      'uploadImg'
+    ]),
+    skipTypeChange () {
+      this.propaganda = {...this.propaganda, skipId: ''}
+    },
+    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.updateDetail({...this.propaganda, imgUrl: res.data[0]})
+      this.loading.close()
+    },
+    onSubmit () {
+      if (!this.detail.propagandaId) {
+        // 新增
+        this.addPropaganda(JSON.stringify(this.detail)).then(() => {
+          this.onCancel()
+        })
+      } else {
+        // 修改
+        this.editPropaganda(JSON.stringify(this.detail)).then(() => {
+          this.onCancel()
+        })
+      }
+    },
+    onCancel () {
+      this.$router.push({name: 'propagandaList'})
+    }
+  },
+  mounted () {
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100,
+    }).then(() => {
+      this.getActivitys({
+        pageNum: 1,
+        pageSize: 100,
+      }).then(() => {
+        if ((this.$route.query.id || '') !== '') {
+          this.getDetail({id: this.$route.query.id})
+        }
+      })
+    })
+  }
+}
+</script>
+
+<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;
+  }
+</style>

src/views/cms/propagandaList.vue

@@ -0,0 +1,226 @@
+<template>
+  <div>
+    <div class="system-table-search">
+      <div class="flex-h">
+        <div class="flex-item flex-h">
+          <el-button size="mini" type="success" @click='addPropaganda'>新增宣传</el-button>
+        </div>
+      </div>
+    </div>
+    <el-table
+      :data="propagandas.records || []"
+      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="skipType"
+        label="跳转类型">
+        <template slot-scope="scope">
+          <span>
+            {{getSkipType(scope.row.skipType)}}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="跳转内容名称">
+        <template slot-scope="scope">
+          <span>{{getSkipName(scope.row.skipType,scope.row.skipId)}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="创建时间"
+        width="200"
+        prop="createDate"
+      >
+      </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>
+          <el-button @click="handleDel(scope.row)" type="text" 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="propagandas.total || 0"
+      @current-change="getList"
+    >
+    </el-pagination>
+  </div>
+</template>
+
+<script>
+import { createNamespacedHelpers } from 'vuex';
+
+const {mapState: mapPropagandaState, mapActions: mapPropagandaActions} = createNamespacedHelpers('propaganda')
+
+const {mapState: mapBuildingState, mapActions: mapBuildingActions} = createNamespacedHelpers('building')
+
+const {mapState: mapActivityState, mapActions: mapActivityActions} = createNamespacedHelpers('activity')
+
+export default {
+  data() {
+    return {
+      pageSize: 20,
+      currentPage: 1,
+    }
+  },
+  computed: {
+    ...mapPropagandaState({
+      propagandas: x => x.propagandas
+    }),
+    ...mapBuildingState({
+      buildings: x => x.buildings
+    }),
+    ...mapActivityState({
+      activitys: x => x.activitys
+    })
+  },
+  methods: {
+    ...mapPropagandaActions([
+      'getPropagandas',
+      'setDetailNull',
+      'deletePropaganda'
+    ]),
+    ...mapBuildingActions([
+      'getBuildings',
+    ]),
+    ...mapActivityActions([
+      'getActivitys',
+    ]),
+    GetIndex (inx) {
+      return (this.currentPage - 1) * this.pageSize + inx + 1
+    },
+    FormatDate (date) {
+      if (date) {
+        return date.split('T')[0] === '0001-01-01' ? '' : date.split('T')[0] + '  ' + date.split('T')[1]
+      } else {
+        return ''
+      }
+    },
+    getList () {
+      this.getPropagandas({
+        pageNum: this.currentPage,
+        pageSize: this.pageSize
+      })
+    },
+    getSkipType (type) {
+      if (type==='building') {
+        return '楼盘'
+      }
+      if (type==='activity') {
+        return '活动'
+      }
+      return ''
+    },
+    getSkipName (type,id) {
+      if (type === 'building') {
+        return this.getBuildingName(id)
+      } else {
+        return this.getActivityName(id)
+      }
+    },
+    getBuildingName (id) {
+      return ((this.buildings.list || []).filter(x => x.buildingId === id)[0] || {}).buildingName || ''
+    },
+    getActivityName (id) {
+      return ((this.activitys.records || []).filter(x => x.activityId === id)[0] || {}).title || ''
+    },
+    handleEdit (row) {
+      this.setDetailNull()
+      this.$router.push({name: 'propagandaEdit', query: {id: row.propagandaId}})
+    },
+    handleDel (row) {
+      this.$confirm('确认删除此数据?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.deletePropagandas({
+          id: row.propagandaId
+        }).then(() => {
+          this.getList()
+        })
+      })
+    },
+    addPropaganda () {
+      this.setDetailNull()
+      this.$router.push({name: 'propagandaEdit'})
+    }
+  },
+  created () {
+    this.getBuildings({
+      pageNum: 1,
+      pageSize: 100,
+    }).then(() => {
+      this.getActivitys({
+        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/index.js

@@ -18,6 +18,24 @@ const pages = [
       title: 'CMS管理',
     },
     children: [
+      {
+        path: 'propagandaList',
+        name: 'propagandaList',
+        component: () => import('./cms/propagandaList.vue'),
+        meta: {
+          menuShow: true,
+          title: '宣传设置',
+        },
+      },
+      {
+        path: 'propagandaEdit',
+        name: 'propagandaEdit',
+        component: () => import('./cms/propagandaEdit.vue'),
+        meta: {
+          menuShow: false,
+          title: '宣传设置',
+        },
+      },
       {
         path: 'pageBannerList',
         name: 'pageBannerList',