t

dist/static/css/chunk-7464df60.37bc9771.css

@@ -1 +0,0 @@
-.lib-edit[data-v-4b465e6e]{padding-top:50px;padding-left:20px;width:600px;display:-webkit-box;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap}.lib-edit.t2[data-v-4b465e6e],.lib-edit[data-v-4b465e6e] .el-form-item__error{padding-top:0}.lib-edit.t2[data-v-4b465e6e] .el-form-item{margin-bottom:10px}.lib-edit.t2[data-v-4b465e6e] .el-form-item__error{padding-top:0}.lib-edit[data-v-4b465e6e] .el-form-item{width:100%}.lib-edit[data-v-4b465e6e] .el-form-item.c-2{width:50%}.lib-edit[data-v-4b465e6e] .el-form-item.c-3{width:33.33%}.lib-edit[data-v-4b465e6e] .el-form-item.c-3s{width:66.66%}.lib-edit[data-v-4b465e6e] .el-form-item.is-error .el-input-group--append{border-color:#f56c6c}.lib-edit[data-v-4b465e6e] .el-input-group--append{border:1px solid #dcdcdc;position:relative}.lib-edit[data-v-4b465e6e] .el-input-group--append .el-input-group__append{min-width:40px;text-align:right;padding-right:5px}.lib-edit[data-v-4b465e6e] .el-input-group--append .el-input__inner{border:none;padding-right:10px}.lib-edit[data-v-4b465e6e] .el-input-group--append .el-select{margin:0;position:absolute;right:0;top:0}.lib-edit[data-v-4b465e6e] .el-input-group--append .el-select .el-input__inner{text-align:right;color:#333}.lib-edit[data-v-4b465e6e] .el-input-group--prepend{border:1px solid #dcdcdc;position:relative}.lib-edit[data-v-4b465e6e] .el-input-group--prepend .el-input-group__prepend{text-align:left;padding-right:5px;background-color:#fff;border:0;padding:0 8px}.lib-edit[data-v-4b465e6e] .el-input-group--prepend .el-input__inner{border:none;padding-right:10px;padding-left:0}.lib-edit[data-v-4b465e6e] .el-input-group--prepend .el-select{margin:0;position:absolute;right:0;top:0}.lib-edit[data-v-4b465e6e] .el-input-group--prepend .el-select .el-input__inner{text-align:left;color:#333}.lib-edit[data-v-4b465e6e]{padding-top:0}.lib-edit[data-v-4b465e6e] .el-form-item{margin-bottom:10px}.lib-edit[data-v-4b465e6e] .el-date-editor.el-input{width:100%}

dist/static/js/chunk-2d0ccfc9.5ae54dc1.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ccfc9","chunk-2d0ccfc9"],{"4fef":function(t,a,e){"use strict";e.r(a);var i=e("ade3"),c=e("5530");e("1276"),e("ac1f"),e("a9e3"),a["default"]={data:function(){return{listLoading:!1,tableData:[],currentPage:1,pageSize:10,totalRecords:1,listConfig:{},operations:[]}},created:function(){var t=this;this.$nextTick((function(){t.noCreated||t.fetchData()}))},methods:{searchHandle:function(t){this.currentPage=1,this.searchForm=t,this.fetchData()},sizeChange:function(t){this.pageSize=t,this.currentPage=1,this.fetchData()},pageHandle:function(t){this.currentPage=t,this.fetchData()},sortChange:function(t){this.currentPage=1;var a=Object(c["a"])({},this.searchForm);"ascending"===t.order?a.sort=JSON.stringify(Object(i["a"])({},t.prop,"asc")):a.sort=JSON.stringify(Object(i["a"])({},t.prop,"desc")),this.fetchData(a)},fetchData:function(t){var a=this;if(this.apiStr){var e={page:this.currentPage,page_size:this.pageSize};t?e=Object(c["a"])(Object(c["a"])({},e),t):this.searchForm&&(e=Object(c["a"])(Object(c["a"])({},e),this.searchForm)),this.getDataBefore&&this.getDataBefore(e),this.listLoading=!0;var i=this.apiStr.split(".");this.$api[i[0]][i[1]](e).then((function(t){return 1===a.currentPage&&(a.pageSize=t.page_size||1),a.totalRecords=t.total?Number(t.total):0,a.tableData=t.list||[],a.listLoading=!1,a.getMoreData&&a.getMoreData(t,e),t})).catch((function(t){a.listLoading=!1}))}}}}}}]);

dist/static/js/chunk-2d0ccfc9.6dc97524.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ccfc9"],{"4fef":function(t,a,e){"use strict";e.r(a);var i=e("ade3"),r=e("5530");e("1276"),e("ac1f"),e("a9e3");a["default"]={data:function(){return{listLoading:!1,tableData:[],currentPage:1,pageSize:10,totalRecords:1,listConfig:{},operations:[]}},created:function(){var t=this;this.$nextTick((function(){t.noCreated||t.fetchData()}))},methods:{searchHandle:function(t){this.currentPage=1,this.searchForm=t,this.fetchData()},sizeChange:function(t){this.pageSize=t,this.currentPage=1,this.fetchData()},pageHandle:function(t){this.currentPage=t,this.fetchData()},sortChange:function(t){this.currentPage=1;var a=Object(r["a"])({},this.searchForm);"ascending"===t.order?a.sort=JSON.stringify(Object(i["a"])({},t.prop,"asc")):a.sort=JSON.stringify(Object(i["a"])({},t.prop,"desc")),this.fetchData(a)},fetchData:function(t){var a=this;if(this.apiStr){var e={page:this.currentPage,page_size:this.pageSize};t?e=Object(r["a"])(Object(r["a"])({},e),t):this.searchForm&&(e=Object(r["a"])(Object(r["a"])({},e),this.searchForm)),this.getDataBefore&&this.getDataBefore(e),this.listLoading=!0;var i=this.apiStr.split(".");this.$api[i[0]][i[1]](e).then((function(t){return 1===a.currentPage&&(a.pageSize=t.page_size||1),a.totalRecords=t.total?Number(t.total):0,a.tableData=t.list||[],a.listLoading=!1,a.getMoreData&&a.getMoreData(t,e),t})).catch((function(t){a.listLoading=!1}))}}}}}}]);

src/api/base.js

@@ -38,9 +38,12 @@ export default {
   admdicttree: params => { // 字典数据接口
     return getRequestNoSort('/adm/dict/tree', params, 'loading')
   },
-  admuploadpicture: params => { // 楼盘主图上传接口
+  admuploadpicture: params => { // 上传图片 有水印
     return getRequestNoSort('/adm/upload/picture', params, 'loading')
   },
+  admuploadcloudpub: params => { // 上传图片 无水印
+    return getRequestNoSort('/adm/upload/cloudpub', params, 'loading')
+  },
   admpermissionsadd: params => { // 菜单 - 添加
     return getRequestNoSort('/adm/permissions/add', params, 'loading')
   },

src/api/house.js

@@ -130,4 +130,10 @@ export default {
   admpricedel: params => { // 历史成交价 - 删除
     return getRequestNoSort('/adm/estate/price/del', params, 'loading')
   },
+  admestatelotterydetail: params => { // 摇号 - 摇号公示详情
+    return getRequestNoSort('/adm/estate/lottery/detail', params, 'loading')
+  },
+  admestatelotterychange: params => { // 摇号 - 摇号公示变更
+    return getRequestNoSort('/adm/estate/lottery/change', params, 'loading')
+  },
 }

src/views/base/components/popup/DictDtlEdit.vue

@@ -41,6 +41,7 @@ export default {
         this.formData = [
           { label: '值', key: 'dict_value', disabled, rules: 1 },
           { label: '名称', key: 'dict_label', rules: 1 },
+          { label: '排序', key: 'dict_sort' },
           { label: '自定义值1', key: 'option1' },
           { label: '自定义值2', key: 'option2' },
           { label: '说明', key: 'remark' },

src/views/house/components/popup/LotteryEdit.vue

@@ -0,0 +1,280 @@
+<template>
+  <div>
+    <el-dialog
+      v-loading="loading"
+      :show-close="false"
+      :close-on-click-modal="false"
+      :visible.sync="isShow"
+      :title="curObj.estate_id ? '编辑摇号信息' : '新增摇号信息'"
+      :fullscreen="false"
+      width="700px"
+      custom-class="xl-dialog"
+      center
+    >
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[0, 1]">
+        <div slot="OI0" class="scoped-other-form">
+          <div class="scoped-img-area">
+            <div class="sia-title">项目图</div>
+            <div class="sia-op" v-for="(imgsrc,index) in infoImg" :key="index">
+              <img class="img" :src="imgsrc" alt="img">
+              <span class="close" @click="infoImgDel(index)"></span>
+            </div>
+            <el-upload
+              class="sia-img"
+              :action="`${domainUrl}/adm/upload/cloudpub`"
+              :data="{logic_type: 'estate', token}"
+              name="upload"
+              :show-file-list="false"
+              :on-success="infoImgSuccess"
+              :before-upload="imgUploadBefore"
+              >
+              <i class="el-icon-plus icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div slot="OI1" class="scoped-other-form">
+          <div class="scoped-img-area">
+            <div class="sia-title">一房一价图</div>
+            <div class="sia-op" v-for="(imgsrc,index) in houseImg" :key="index">
+              <img class="img" :src="imgsrc" alt="img">
+              <span class="close" @click="houseImgDel(index)"></span>
+            </div>
+            <el-upload
+              class="sia-img"
+              :action="`${domainUrl}/adm/upload/cloudpub`"
+              :data="{logic_type: 'estate', token}"
+              name="upload"
+              :show-file-list="false"
+              :on-success="houseImgSuccess"
+              :before-upload="imgUploadBefore"
+              >
+              <i class="el-icon-plus icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div slot="otherItem" class="scoped-other-form">
+          <div class="scoped-img-area">
+            <div class="sia-title">摇号结果图</div>
+            <div class="sia-op" v-for="(imgsrc,index) in lotteryImg" :key="index">
+              <img class="img" :src="imgsrc" alt="img">
+              <span class="close" @click="lotteryImgDel(index)"></span>
+            </div>
+            <el-upload
+              class="sia-img"
+              :action="`${domainUrl}/adm/upload/cloudpub`"
+              :data="{logic_type: 'estate', token}"
+              name="upload"
+              :show-file-list="false"
+              :on-success="lotteryImgSuccess"
+              :before-upload="imgUploadBefore"
+              >
+              <i class="el-icon-plus icon" />
+            </el-upload>
+          </div>
+        </div>
+        <div slot="footer" style="padding-top: 20px;">
+          <el-button class="xl-form-btn t2" @click="close">关 闭</el-button>
+          <el-button class="xl-form-btn t1" @click="close('confirm')">确定</el-button>
+        </div>
+      </base-form>
+    </el-dialog>
+  </div>
+</template>
+<script>
+export default {
+  components: { },
+  mixins,
+  props: {
+    isShow: Boolean,
+    curObj: Object
+  },
+  inject: ['parentData'],
+  data() {
+    let domainUrl = process.env.VUE_APP_BASE_API
+    const token = window.sessionStorage.getItem('fp_token')
+    return {
+      domainUrl,
+      token,
+      formData: [],
+      loading: true,
+      cObj: {},
+      infoImg: [],
+      houseImg: [],
+      lotteryImg: [],
+    }
+  },
+  watch: {
+    isShow: function(val) {
+      if (val) {
+        this.infoImg = []
+        this.houseImg = []
+        this.lotteryImg = []
+        this.$api.house.admestatelotterydetail({estate_id: this.curObj.estate_id}).then(res => {
+          this.cObj = res || {}
+          if (res.info_img) this.infoImg = res.info_img.split(',')
+          if (res.house_img) this.houseImg = res.house_img.split(',')
+          if (res.lottery_img) this.lotteryImg = res.lottery_img.split(',')
+          this.getDef()
+        })
+      }
+    },
+  },
+  methods: {
+    comImgDel (str, index) {
+      let cImg = this[str]
+      cImg.splice(index, 1)
+      this[str] = [...cImg]
+    },
+    comImgSuccess(str, res) {
+      const data = res.data || {}
+      let cImg = [...this[str]]
+      cImg.push(`${data.url}`)
+      this[str] = [...cImg]
+    },
+    lotteryImgDel (index) {
+      this.comImgDel('lotteryImg', index)
+    },
+    lotteryImgSuccess(res, file) {
+      this.comImgSuccess('lotteryImg', res)
+    },
+    houseImgDel (index) {
+      this.houseImg.splice(index, 1)
+      this.houseImg = [...this.houseImg]
+    },
+    houseImgSuccess(res, file) {
+      this.comImgSuccess('houseImg', res)
+    },
+    infoImgDel (index) {
+      this.infoImg.splice(index, 1)
+      this.infoImg = [...this.infoImg]
+    },
+    infoImgSuccess(res, file) {
+      this.comImgSuccess('infoImg', res)
+    },
+    imgUploadBefore(file) {
+      const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
+      const isLt2M = file.size / 1024 / 1024 < 5
+      if (!isJPGPNG) {
+        this.$message.error('上传图片只能是 JPG PNG 格式!')
+      }
+      if (!isLt2M) {
+        this.$message.error('上传图片大小不能超过 5M!')
+      }
+      return isJPGPNG && isLt2M
+    },
+    getDef() {
+      const params = { ...this.cObj }
+      this.formData = [
+        { label: '摇号中标题', key: 'under_way' },
+        { label: '摇号结果标题', key: 'result' },
+      ]
+      this.setDefaultValue(params)
+    },
+    close(str) {
+      if (str === 'confirm') {
+        this.$refs['ruleForm'].$refs['baseForm'].validate((valid) => {
+          if (valid) {
+            const oldform = this.$refs.ruleForm.baseForm
+            const newForm = { ...oldform }
+            if (this.curObj.estate_id) {
+              newForm.estate_id = this.curObj.estate_id
+            }
+            if (this.infoImg && this.infoImg.length > 0) {
+              newForm.info_img = this.infoImg.join(',')
+            }
+            if (this.houseImg && this.houseImg.length > 0) {
+              newForm.house_img = this.houseImg.join(',')
+            }
+            if (this.lotteryImg && this.lotteryImg.length > 0) {
+              newForm.lottery_img = this.lotteryImg.join(',')
+            }
+            let apiStr = 'admestatelotterychange'
+            this.$api.house[apiStr](newForm).then(data => {
+              this.$msgs(newForm.id ? '编辑成功' : '新增成功')
+              this.$emit('close', newForm)
+            })
+          }
+        })
+      } else {
+        this.$emit('close')
+        this.setDefaultValue()
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+@import '../../../../styles/libEdit.scss';
+.lib-edit {
+  padding-top: 0;
+  ::v-deep .el-form-item {
+    margin-bottom: 10px;
+  }
+  ::v-deep .el-date-editor.el-input {
+    width: 100%;
+  }
+}
+
+.scoped-img-area {
+  padding-left: 20px;
+  margin-bottom: 20px;
+  .sia-title {
+    font-size: 12px;
+    padding-bottom: 10px;
+    color: #666;
+    font-weight: bold;
+  }
+  .sia-op {
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 10px;
+    margin-bottom: 10px;
+    border: 1px solid #f2f2f2;
+    width: 80px;
+    height: 80px;
+    position: relative;
+    &:hover {
+      .img-big {
+        display: block;
+      }
+    }
+    .img {
+      width: 80px;
+      height: 80px;
+    }
+    .close {
+      position: absolute;
+      width: 20px;
+      height: 20px;
+      top: -10px;
+      right: -10px;
+      background: url(../../../../assets/icon_g_close.png) no-repeat;
+      background-size: 20px;
+      cursor: pointer;
+    }
+    .img-big {
+      position: absolute;
+      bottom: 0;
+      left: 0;
+      width: 400px;
+      height: auto;
+      display: none;
+      box-shadow: 10px 10px 10px #ccc;
+      z-index: 99;
+    }
+  }
+  .sia-img {
+    display: inline-block;
+    vertical-align: middle;
+    width: 80px;
+    height: 80px;
+    overflow: hidden;
+    border: 1px dashed #999;
+    margin-bottom: 10px;
+    .el-icon-plus {
+      color: #999;
+      padding: 30px;
+    }
+  }
+}
+</style>

src/views/house/theme.vue

@@ -17,24 +17,32 @@
       @currentChange="pageHandle"
       :isAdd="true"
       @add="openPopup"
+      :operationsDefaultLength="5"
     />
     <popup-edit
       :isShow="isDtlShow"
       :curObj="curObj"
       @close="closePopup"
     />
+    <lottery-edit
+      :isShow="isLEShow"
+      :curObj="curObj"
+      @close="closeLEPopup"
+    />
   </div>
 </template>
 <script>
 import { arrToObj } from '@/utils'
 import SearchForm from './components/searchForm/Theme'
 import PopupEdit from './components/popup/ThemeEdit'
+import LotteryEdit from './components/popup/LotteryEdit'
 import baseTable from '_m/baseTable.js'
 export default {
   name: 'old',
   components: {
     SearchForm,
     PopupEdit,
+    LotteryEdit,
   },
   provide() {
     return {
@@ -44,7 +52,7 @@ export default {
   mixins: [baseTable],
   data() {
     const mtArr = this.$dictData.module_type || []
-    const curNavVal = mtArr.length > 0 ? mtArr[0].val : ''
+    const curNavVal = mtArr.length > 0 ? mtArr[1].val : ''
     return {
       apiStr: 'house.admestatemodulelist',
       searchForm: {},
@@ -53,6 +61,7 @@ export default {
       curObj: {},
       mtArr,
       curNavVal,
+      isLEShow: false,
     }
   },
   computed: {
@@ -69,24 +78,47 @@ export default {
     }
   },
   mounted() {
-    this.listConfig = {
-      rows: [
-        { label: '楼盘名称', prop: 'estate_name' },
-        { label: '模块主题', prop: 'module_type', type: 'flag', flags: arrToObj(this.$dictData.module_type) },
-        { label: '排序', prop: 'sort' },
-        { label: '更新人', prop: 'update_by' },
-        { label: '更新时间', prop: 'update_at' },
-        { label: '操作', width: 120, type: 'handle2', operations:
-          [
-            { label: '编辑', func: this.openPopup, btnType: 'primary' },
-            { label: '删除', func: this.delHandle, btnType: 'danger' },
-          ]
-        }
-      ]
-    }
+    this.getConfig()
   },
   methods: {
+    getConfig () {
+      if (this.curNavVal === 'yhjg' || this.curNavVal === 'zzyh') {
+        this.listConfig = {
+          rows: [
+            { label: '楼盘名称', prop: 'estate_name' },
+            { label: '模块主题', prop: 'module_type', type: 'flag', flags: arrToObj(this.$dictData.module_type) },
+            { label: '排序', prop: 'sort' },
+            { label: '更新人', prop: 'update_by' },
+            { label: '更新时间', prop: 'update_at' },
+            { label: '操作', width: 220, type: 'handle2', operations:
+              [
+                { label: '更新摇号信息', func: this.openLEPopup, btnType: 'success' },
+                { label: '编辑', func: this.openPopup, btnType: 'primary' },
+                { label: '删除', func: this.delHandle, btnType: 'danger' },
+              ]
+            }
+          ]
+        }
+      } else {
+        this.listConfig = {
+          rows: [
+            { label: '楼盘名称', prop: 'estate_name' },
+            { label: '模块主题', prop: 'module_type', type: 'flag', flags: arrToObj(this.$dictData.module_type) },
+            { label: '排序', prop: 'sort' },
+            { label: '更新人', prop: 'update_by' },
+            { label: '更新时间', prop: 'update_at' },
+            { label: '操作', width: 120, type: 'handle2', operations:
+              [
+                { label: '编辑', func: this.openPopup, btnType: 'primary' },
+                { label: '删除', func: this.delHandle, btnType: 'danger' },
+              ]
+            }
+          ]
+        }
+      }
+    },
     navHandle () {
+      this.getConfig()
       this.searchForm.module_type = this.curNavVal
       this.fetchData()
     },
@@ -113,6 +145,20 @@ export default {
       if (obj) {
         this.fetchData()
       }
+    },
+    openLEPopup(row) {
+      if (row && row.id) {
+        this.curObj = row
+      } else {
+        this.curObj = {}
+      }
+      this.isLEShow = true
+    },
+    closeLEPopup(obj) {
+      this.isLEShow = false
+      if (obj) {
+        this.fetchData()
+      }
     }
   }
 }