t

src/api/house.js

@@ -19,247 +19,4 @@ export default {
   admestatedel: params => { // 楼盘删除
     return getRequestNoSort('/adm/estate/del', params, 'loading')
   },
-  admestaterecyclelist: params => { // 楼房回收站
-    return getRequest('/adm/estate/recycle/list', params)
-  },
-  admestaterecyclepurge: params => { // 楼房回收站 删除
-    return getRequest('/adm/estate/recycle/purge', params)
-  },
-  admestaterecyclerollback: params => { // 楼房回收站 恢复
-    return getRequest('/adm/estate/recycle/rollback', params)
-  },
-  admestatemoduleid: params => { // 资讯列表
-    return getRequestNoSort('/adm/estate/module/id', params, 'loading')
-  },
-  admestatephotolist: params => { // 楼盘相册接口
-    return getRequestNoSort('/adm/estate/photo/list', params, 'loading')
-  },
-  admestatephotoedit: params => { // 楼盘相册编辑接口
-    return getRequestNoSort('/adm/estate/photo/edit', params, 'loading')
-  },
-  admestatenewslist: params => { // 楼盘动态列表接口
-    return getRequest('/adm/estate/news/list', params)
-  },
-  admestatenewsadd: params => { // 楼盘动态添加接口
-    return getRequestNoSort('/adm/estate/news/add', params, 'loading')
-  },
-  admestatenewsedit: params => { // 楼盘动态编辑接口
-    return getRequestNoSort('/adm/estate/news/edit', params, 'loading')
-  },
-  admestatenewsdel: params => { // 楼盘动态删除接口
-    return getRequestNoSort('/adm/estate/news/del', params, 'loading')
-  },
-  admestatesalelist: params => { // 置业顾问 -  列表接口
-    return getRequest('/adm/estate/sale/list', params)
-  },
-  admestatesaleadd: params => { // 置业顾问 -  添加接口
-    return getRequestNoSort('/adm/estate/sale/add', params, 'loading')
-  },
-  admestatesaleedit: params => { // 置业顾问 -  编辑接口
-    return getRequestNoSort('/adm/estate/sale/edit', params, 'loading')
-  },
-  admestatesaledel: params => { // 置业顾问 -  删除接口
-    return getRequestNoSort('/adm/estate/sale/del', params, 'loading')
-  },
-  admoldhouselist: params => { // 二手房列表接口
-    return getRequest('/adm/oldhouse/list', params)
-  },
-  admoldhouseadd: params => { // 二手房添加
-    return getRequestNoSort('/adm/oldhouse/add', params, 'loading')
-  },
-  admoldhouseedit: params => { // 二手房编辑
-    return getRequestNoSort('/adm/oldhouse/edit', params, 'loading')
-  },
-  admoldhousedetail: params => { // 二手房详情
-    return getRequestNoSort('/adm/oldhouse/detail', params, 'loading')
-  },
-  admoldhousesortedit: params => { // 二手房 排序
-    return getRequestNoSort('/adm/oldhouse/sort/edit', params, 'loading')
-  },
-  admoldhousedel: params => { // 二手房删除
-    return getRequestNoSort('/adm/oldhouse/del', params, 'loading')
-  },
-  admestatemodulelist: params => { // 模块主题列表接口
-    return getRequest('/adm/estate/module/list', params)
-  },
-  admestatemoduleadd: params => { // 模块主题添加
-    return getRequestNoSort('/adm/estate/module/add', params, 'loading')
-  },
-  admestatemoduleedit: params => { // 模块主题编辑
-    return getRequestNoSort('/adm/estate/module/edit', params, 'loading')
-  },
-  admestatemoduledetail: params => { // 模块主题详情
-    return getRequestNoSort('/adm/estate/module/detail', params, 'loading')
-  },
-  admestatemoduledel: params => { // 模块主题删除
-    return getRequestNoSort('/adm/estate/module/del', params, 'loading')
-  },
-  admestatesortedit: params => { // 楼盘排序接口
-    return getRequestNoSort('/adm/estate/sort/edit', params, 'loading')
-  },
-  admncplanlist: params => { // 洪楼文章列表接口
-    return getRequest('/adm/nc/plan/list', params)
-  },
-  admncplanadd: params => { // 洪楼文章添加
-    return getRequestNoSort('/adm/nc/plan/add', params, 'loading')
-  },
-  admncplanedit: params => { // 洪楼文章编辑
-    return getRequestNoSort('/adm/nc/plan/edit', params, 'loading')
-  },
-  admncplandetail: params => { // 洪楼文章详情
-    return getRequestNoSort('/adm/nc/plan/detail', params, 'loading')
-  },
-  admncplandel: params => { // 洪楼文章删除
-    return getRequestNoSort('/adm/nc/plan/del', params, 'loading')
-  },
-  adminformationlist: params => { // 洪楼文章列表接口
-    return getRequest('/adm/information/list', params)
-  },
-  adminformationrefinedadd: params => { // 推荐文章 - 添加
-    return getRequestNoSort('/adm/information/refined/add', params, 'loading')
-  },
-  adminformationrefineddel: params => { // 推荐文章 - 删除
-    return getRequestNoSort('/adm/information/refined/del', params, 'loading')
-  },
-  adminformationadd: params => { // 洪楼文章添加
-    return getRequestNoSort('/adm/information/add', params, 'loading')
-  },
-  adminformationedit: params => { // 洪楼文章编辑
-    return getRequestNoSort('/adm/information/edit', params, 'loading')
-  },
-  adminformationdetail: params => { // 洪楼文章详情
-    return getRequestNoSort('/adm/information/detail', params, 'loading')
-  },
-  adminformationdel: params => { // 洪楼文章删除
-    return getRequestNoSort('/adm/information/del', params, 'loading')
-  },
-  adminformationcountcache: params => { // 洪楼文章 统计更新
-    return getRequestNoSort('/adm/information/count/cache', params, 'loading')
-  },
-  admlandlist: params => { // 土拍 - 列表接口
-    return getRequest('/adm/land/list', params)
-  },
-  admlandadd: params => { // 土拍 - 添加
-    return getRequestNoSort('/adm/land/add', params, 'loading')
-  },
-  admlandedit: params => { // 土拍 - 编辑
-    return getRequestNoSort('/adm/land/edit', params, 'loading')
-  },
-  admlanddetail: params => { // 土拍 - 详情
-    return getRequestNoSort('/adm/land/detail', params, 'loading')
-  },
-  admlanddel: params => { // 土拍 - 删除
-    return getRequestNoSort('/adm/land/del', params, 'loading')
-  },
-  admpricelist: params => { // 历史成交价 - 列表接口
-    return getRequest('/adm/estate/price/list', params)
-  },
-  admpriceadd: params => { // 历史成交价 - 添加
-    return getRequestNoSort('/adm/estate/price/add', params, 'loading')
-  },
-  admpriceedit: params => { // 历史成交价 - 编辑
-    return getRequestNoSort('/adm/estate/price/edit', params, 'loading')
-  },
-  admpricedetail: params => { // 历史成交价 - 详情
-    return getRequestNoSort('/adm/estate/price/detail', params, 'loading')
-  },
-  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')
-  },
-  admestatelottery2detail: params => { // 摇号期数 - 详情
-    return getRequestNoSort('/adm/estate/lottery2/detail', params, 'loading')
-  },
-  admestatelottery2add: params => { // 摇号期数 - 添加
-    return getRequestNoSort('/adm/estate/lottery2/add', params, 'loading')
-  },
-  admestatelottery2del: params => { // 摇号期数 - 删除
-    return getRequestNoSort('/adm/estate/lottery2/del', params, 'loading')
-  },
-  admestatelottery2edit: params => { // 摇号期数 - 编辑
-    return getRequestNoSort('/adm/estate/lottery2/edit', params, 'loading')
-  },
-  admestatelottery2list: params => { // 摇号期数 -列表
-    return getRequest('/adm/estate/lottery2/list', params)
-  },
-  admestatehousearealist: params => { // 摇号期数 - 楼盘户型图列表
-    return getRequest('/adm/estate/house/area/list', params, 'loading')
-  },
-  admestatelotterypriceedit: params => { // 一房一价 - 编辑
-    return getRequestNoSort('/adm/estate/lottery/price/edit', params, 'loading')
-  },
-  admestatelotterypriceadd: params => { // 一房一价 - 添加
-    return getRequestNoSort('/adm/estate/lottery/price/add', params, 'loading')
-  },
-  admestatelotterypricedel: params => { // 一房一价 - 删除
-    return getRequestNoSort('/adm/estate/lottery/price/del', params, 'loading')
-  },
-  admestatelotterypricelist: params => { // 一房一价 - 列表
-    return getRequest('/adm/estate/lottery/price/list', params, 'loading')
-  },
-  admestatecompetelist: params => { // 竞品列表 - 列表
-    return getRequest('/adm/estate/compete/list', params, 'loading')
-  },
-  admestatecompeteedit: params => { // 竞品列表 - 编辑
-    return getRequestNoSort('/adm/estate/compete/edit', params, 'loading')
-  },
-  admestatecompeteadd: params => { // 竞品列表 - 添加
-    return getRequestNoSort('/adm/estate/compete/add', params, 'loading')
-  },
-  admestatecompetedetail: params => { // 竞品列表 - 详情
-    return getRequestNoSort('/adm/estate/compete/detail', params, 'loading')
-  },
-  admestatecompetedel: params => { // 竞品列表 - 删除
-    return getRequestNoSort('/adm/estate/compete/del', params, 'loading')
-  },
-  admcontactclicklist: params => { // 房源 - 联系点击列表
-    return getRequestNoSort('/adm/contact/click/list', params)
-  },
-  admestatebargainlist: params => { // 特价楼盘 - 列表
-    return getRequest('/adm/estate/bargain/list', params)
-  },
-  admestatebargainedit: params => { // 特价楼盘 - 编辑
-    return getRequestNoSort('/adm/estate/bargain/edit', params, 'loading')
-  },
-  admestatebargainadd: params => { // 特价楼盘 - 添加
-    return getRequestNoSort('/adm/estate/bargain/add', params, 'loading')
-  },
-  admestatebargaindetail: params => { // 特价楼盘 - 详情
-    return getRequestNoSort('/adm/estate/bargain/detail', params, 'loading')
-  },
-  admestatebargaindel: params => { // 特价楼盘 - 删除
-    return getRequestNoSort('/adm/estate/bargain/del', params, 'loading')
-  },
-  admestatebargaindetail: params => { // 特价楼盘 - 详情
-    return getRequestNoSort('/adm/estate/bargain/detail', params, 'loading')
-  },
-  admestatecooperatelist: params => { // 合作楼盘 - 列表
-    return getRequest('/adm/estate/cooperate/list', params)
-  },
-  admestatecooperateedit: params => { // 合作楼盘 - 编辑
-    return getRequestNoSort('/adm/estate/cooperate/edit', params, 'loading')
-  },
-  admestatecooperateadd: params => { // 合作楼盘 - 添加
-    return getRequestNoSort('/adm/estate/cooperate/add', params, 'loading')
-  },
-  admestatecooperatedetail: params => { // 合作楼盘 - 详情
-    return getRequestNoSort('/adm/estate/cooperate/detail', params, 'loading')
-  },
-  admestatecooperatedel: params => { // 合作楼盘 - 删除
-    return getRequestNoSort('/adm/estate/cooperate/del', params, 'loading')
-  },
-  admestatevredit: params => { // 楼盘航拍 - 编辑
-    return getRequestNoSort('/adm/estate/vr/edit', params, 'loading')
-  },
-  admestatevrdetail: params => { // 楼盘航拍 - 详情
-    return getRequestNoSort('/adm/estate/vr/detail', params, 'loading')
-  },
-  admestateupdateprice: params => { // 楼盘自动更新均价 开关
-    return getRequestNoSort('/adm/estate/update/price', params, 'loading')
-  },
 }

src/api/index.js

@@ -1,11 +1,11 @@
 import base from './base'
-// import house from './house'
+import house from './house'
 import user from './user'
 // import other from './other'
 import cust from './cust'
 export default {
   base,
-  // house,
+  house,
   user,
   // other,
   cust,

src/views/cust/index.vue

@@ -13,9 +13,31 @@
       :total-records="totalRecords"
       @currentChange="pageHandle"
       @sizeChange="sizeChange"
-      
       :operationsDefaultLength="6"
-    />
+      :insertSlotArr="[2]"
+    >
+      <div slot="OI2">
+        <el-table-column
+          width="140"
+          label="保护期止"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <div v-if="+new Date() > +new Date(scope.row.lock_at)">
+              <div style="color: #f00">{{scope.row.lock_at}}</div>
+              <el-tag type="danger" size="mini">已过期</el-tag>
+            </div>
+            <div v-else-if="(+new Date(scope.row.lock_at) - +new Date()) < 86400000">
+              <div style="color: #e6a23c">{{scope.row.lock_at}}</div>
+              <el-tag type="warning" size="mini">1天内过期</el-tag>
+            </div>
+            <div v-else>
+              <div>{{scope.row.lock_at}}</div>
+            </div>
+          </template>
+        </el-table-column>
+      </div>
+    </table-list>
     <!-- :isAdd="true"
       @add="openPopup" -->
     <popup-edit
@@ -73,7 +95,7 @@ export default {
     this.listConfig = {
       rows: [
         { label: '报备时间', prop: 'create_at' },
-        { label: '保护期止', prop: 'lock_at' },
+        // { label: '保护期止', prop: 'lock_at' },
         { label: '报备楼盘', prop: 'estate_name'},
         { label: '电话', prop: 'phone' },
         { label: '姓名', prop: 'name' },

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

@@ -1,116 +1,39 @@
 <template>
   <div>
-    <el-drawer
+    <el-dialog
       v-loading="loading"
       :show-close="false"
-      :title="curObj.id ? '编辑楼盘' : '新增楼盘'"
-      :wrapper-closable="false"
-      :close-on-press-escape="false"
+      :close-on-click-modal="false"
       :visible.sync="isShow"
-      size="960px"
-      custom-class="xl-drawer"
-      direction="rtl"
+      :title="curObj.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="[23,25]">
-        <div slot="OI23" class="scoped-product">
-          <div class="sp-item" v-for="(product, one) in productData" :key="one">
-            <div class="sp-title">{{product.product_type_name}}
-              <div class="scoped-sp-box" @click="openPtPopup(product, one)">
-                修改类型
-              </div>
-            </div>
-            <div class="sp-content">
-              <div class="sc-input">
-                <el-form-item label-width="80px" label="产品均价">
-                  <el-input v-model="product.average_price" placeholder="数字如:15000" onkeyup="value=value.replace(/[^\d]/g,'')"></el-input>
-                </el-form-item>
-                <el-form-item label-width="80px" label="梯户比">
-                  <el-input v-model="product.stairs_rate" placeholder="如:2梯4户"></el-input>
-                </el-form-item>
-                <!-- <el-form-item label-width="80px" label="装标">
-                  <el-input v-model="product.standard" placeholder="装修标准"></el-input>
-                </el-form-item> -->
-                <!-- <el-form-item label-width="80px" label="最低单价">
-                  <el-input v-model="product.price_min" placeholder="选填"></el-input>
-                </el-form-item>
-                <el-form-item label-width="80px" label="最高单价">
-                  <el-input v-model="product.price_max" placeholder="选填"></el-input>
-                </el-form-item> -->
-              </div>
-              <el-form-item label="户型">
-                <el-select v-model="product.house_type_list_val" placeholder="请选择" :multiple="true" @change="houseTypeChange(one)">
-                  <el-option
-                    v-for="item in $dictData.house_type"
-                    :key="item.val"
-                    :label="item.key"
-                    :value="item.val">
-                  </el-option>
-                </el-select>
-              </el-form-item>
-              <div class="room-box">
-                <div class="room-item" v-for="(room, two) in product.house_type_list" :key="two">
-                  <div class="ri-title">{{room.house_type_name}}
-                    <el-button type="small" icon="el-icon-plus" class="xl-form-btn xs t3" @click="roomAreaAdd(one, two)">添加</el-button>
-                  </div>
-                  <div class="ri-content">
-                    <div class="ri-op" v-for="(area, three) in room.area_list" :key="three">
-                      <el-upload
-                        class="ri-img"
-                        :action="`${domainUrl}/adm/upload/cloud`"
-                        :data="{logic_type: 'estate', token}"
-                        name="upload"
-                        :show-file-list="false"
-                        :on-success="roomAreaUploadSuccess"
-                        :on-error="roomAreaUploadError"
-                        :before-upload="roomAreaUploadBefore"
-                      >
-                        <img v-if="area.img_url" :src="area.img_url + '_adm0'" class="img" @click="roomAreaUploadImg(one, two, three)">
-                        <i v-else class="el-icon-plus icon" @click="roomAreaUploadImg(one, two, three)"/>
-                        <img :src="area.img_url + '_adm0'" class="ri-img-big">
-                      </el-upload>
-                      <div class="ri-deal">
-                        <input class="ri-input" v-model="area.area" type="text" placeholder="输面积">
-                        <input class="ri-input" v-model="area.vr_key" type="text" placeholder="VR地址">
-                        <span class="ri-del"  @click="roomAreaDel(one, two, three)">删除</span>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div slot="OI25" class="scoped-other-form">
+      <base-form ref="ruleForm" class="lib-edit" :data="formData" :is-inline="false" label-width="110px" :insertSlotArr="[4]">
+        <div slot="OI4" class="scoped-other-form">
           <el-form-item label="点位坐标" class="scoped-item-two item">
             纬度N<el-input v-model="cObj.latitude" disabled />
             经度E<el-input v-model="cObj.longitude" disabled />
             <el-button type="primary" class="map-btn" size="small" @click="openMap">点击从地图获取</el-button>
           </el-form-item>
         </div>
-      </base-form>
-      <div class="xl-form">
-        <div class="xl-form-footer fixed" style="width:960px;padding-top: 20px;border-top: 1px solid #dcdcdc;right:0;">
+        <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>
-      </div>
-    </el-drawer>
+      </base-form>
+    </el-dialog>
     <handle-map :is-show="isShowMap" @close="closeMap" />
-    <pt-edit
-      :isShow="isPtShow"
-      :curObj="ptObj"
-      @close="closePtPopup"
-     />
   </div>
 </template>
 <script>
 import { arrToObj } from '@/utils'
 import handleMap from '@/components/Common/Map'
-import PtEdit from './ProductTypeEdit'
 export default {
   components: {
     handleMap,
-    PtEdit,
   },
   mixins,
   props: {
@@ -128,40 +51,15 @@ export default {
       formData: [],
       cObj: {},
       isShowMap: false,
-      productData: [],
-      tempImgIndex: [0, 0, 0],
-      ptObj: {},
-      isPtShow: false,
     }
   },
   watch: {
     isShow: function(val) {
       if (val) {
         if (this.curObj.id) {
-          this.loading = true
           this.$api.house.admestatedetail({id: this.curObj.id}).then(res => {
-            let curData = res || {}
-            if (curData.house_type) curData.house_type = curData.house_type.split(',')
-            if (curData.product_type) curData.product_type = curData.product_type.split(',')
-            if (curData.hospital_type) curData.hospital_type = curData.hospital_type.split(',')
-            if (curData.high_street) curData.high_street = curData.high_street.split(',')
-            if (curData.park_type) curData.park_type = curData.park_type.split(',')
-            if (curData.metro_line) curData.metro_line = curData.metro_line.split(',')
-            if (curData.metro_type) curData.metro_type = curData.metro_type.split(',')
-            this.cObj = curData || {}
-            let productData = curData.area_data || []
-            productData.map((one, oneIndex) =>{
-              one.product_type_name = arrToObj(this.$dictData.product_type)[one.product_type_val]
-              let houseTypeList = one.house_type_list || []
-              one.house_type_list_val = []
-              houseTypeList.map(two => {
-                two.house_type_name = arrToObj(this.$dictData.house_type)[two.house_type_val]
-                one.house_type_list_val.push(String(two.house_type_val))
-              })
-            })
-            this.productData = [...productData]
+            this.cObj = res || {}
             this.getDef()
-            this.loading = false
           })
         } else {
           this.cObj = this.curObj
@@ -171,205 +69,22 @@ export default {
     },
   },
   methods: {
-    closePtPopup (bcData) {
-      this.isPtShow = false
-      if (bcData) {
-        let productData = [...this.productData]
-        let cObj = productData[bcData.index]
-        cObj.product_type_val = bcData.ptVal
-        cObj.product_type_name = bcData.ptName
-        productData[bcData.index] = cObj
-        this.productData = [...productData]
-        let params = {...this.$refs.ruleForm.baseForm}
-        let curPt = [...params.product_type]
-        curPt[bcData.index] = bcData.ptVal
-        params.product_type = curPt
-        this.setDefaultValue(params)
-      }
-    },
-    openPtPopup (row, index) {
-      this.isPtShow = true
-      this.ptObj = {
-        row,
-        index
-      }
-    },
-    houseTypeChange (one) {
-      let productData = [...this.productData]
-      let tempList = []
-      let houseTypeList = productData[one].house_type_list || []
-      const curVal = productData[one].house_type_list_val ||[]
-      curVal.forEach(v =>{
-        let cObj = {
-          house_type_name: arrToObj(this.$dictData.house_type)[v],
-          house_type_val: v,
-          area_list: [{img_url: '', area: '0', vr_key: ''}]
-        }
-        houseTypeList.forEach((h, hIndex) =>{
-          if (v === String(h.house_type_val)) {
-            cObj.area_list = houseTypeList[hIndex].area_list || []
-          }
-        })
-        tempList.push(cObj)
-      })
-      productData[one].house_type_list = tempList
-      this.productData = [...productData]
-    },
-    roomAreaDel (one, two, three) {
-      let productData = [...this.productData]
-      productData[one].house_type_list[two].area_list.splice(three, 1)
-      this.productData = [...productData]
-    },
-    roomAreaAdd (one, two) {
-      let productData = [...this.productData]
-      productData[one].house_type_list[two].area_list.push({img_url: '', area: '0', vr_key: ''})
-      this.productData = [...productData]
-    },
-    roomAreaUploadImg (one, two, three) {
-      this.tempImgIndex = [one, two, three]
-    },
-    roomAreaUploadSuccess(res, file) {
-      const data = res.data || {}
-      let productData = [...this.productData]
-      // productData[this.tempImgIndex[0]].house_type_list[this.tempImgIndex[1]].area_list[this.tempImgIndex[2]].img_url =  `${data.domain}${data.url}?url=${data.url}&id=${data.file_id}`
-      productData[this.tempImgIndex[0]].house_type_list[this.tempImgIndex[1]].area_list[this.tempImgIndex[2]].img_url =  `${data.url}`
-      this.productData = [...productData]
-    },
-    roomAreaUploadError(file) {
-      // this.changeHandle(file)
-    },
-    roomAreaUploadBefore(file) {
-      const isJPGPNG = file.type === 'image/jpeg' || file.type === 'image/png'
-      const isLt2M = file.size / 1024 / 1024 < 2
-      if (!isJPGPNG) {
-        this.$message.error('上传图片只能是 JPG PNG 格式!')
-      }
-      if (!isLt2M) {
-        this.$message.error('上传图片大小不能超过 2M!')
-      }
-      return isJPGPNG && isLt2M
-    },
-    metroLineChange (val) {
-      this.getDef('change', 'metro_line')
-    },
-    productTypeChange (val, op, item) {
-      const valArr = [...val]
-      const productData = [...this.productData]
-      let newArr = []
-      valArr.forEach(v => {
-        let vObj = {
-          product_type_name: arrToObj(this.$dictData.product_type)[v],
-          product_type_val: v,
-        }
-        productData.forEach(old =>{
-          if (v === String(old.product_type_val)) {
-            vObj = {...old}
-          }
-        })
-        newArr.push(vObj)
-      })
-      this.productData = [...newArr]
-    },
     getDef (str, strKey, strParams) {
-      let params = {}
-      if (str === 'change') {
-        params = {...this.cObj, ...this.$refs.ruleForm.baseForm}
-      } else {
-        params = { ...this.cObj }
-      }
-      let metroLine = params.metro_line || []
-      let metroTypeArr = []
-      if (str === 'change' && strKey === 'metro_line') params.metro_type = ''
-      const metroTypeAll = this.$dictData.metro_type || []
-      metroTypeAll.map(item => {
-        metroLine.map(mline => {
-          if (item.option1.indexOf(mline) > -1) {
-            metroTypeArr.push(item)
-          }
-        })
-      })
-      let disabled = false
-      if (params.id) disabled = true
-      let remoteOptionsDkSchoolList = []
-      if (params.school_list && params.school_list.duikou && params.school_list.duikou.length > 0) {
-        params.school_dk_list = params.school_list.duikou.map(item => {
-          remoteOptionsDkSchoolList.push({ keyRO: item.school_name, valRO: item.id })
-          return item.id
-        })
-      } else {
-        params.school_dk_list = []
-      }
-      let remoteOptionsGhSchoolList = []
-      if (params.school_list && params.school_list.guihua && params.school_list.guihua.length > 0) {
-        params.school_gh_list = params.school_list.guihua.map(item => {
-          remoteOptionsGhSchoolList.push({ keyRO: item.school_name, valRO: item.id })
-          return item.id
-        })
-      } else {
-        params.school_gh_list = []
-      }
+      let params = {...this.cObj}
       this.formData = [
-        { label: '楼盘名称', key: 'estate_name', rules: 1 },
-        { label: '所属区域', key: 'area_type', type: 'select', class: 'c-3', options: this.$dictData.area_type },
-        { label: '地铁线路', key: 'metro_line', type: 'select', class: 'c-3', options: this.$dictData.metro_line, changeHandle: this.metroLineChange, multiple: true },
-        { label: '地铁站名', key: 'metro_type', type: 'select', class: 'c-3', options: metroTypeArr, multiple: true},
-        // { label: '周边医院', key: 'hospital_type', type: 'select', class: 'c-3', options: this.$dictData.hospital_type, multiple: true },
-        // { label: '周边商圈', key: 'high_street', type: 'select', class: 'c-3', options: this.$dictData.high_street, multiple: true },
-        // { label: '周边公园', key: 'park_type', type: 'select', class: 'c-3', options: this.$dictData.park_type, multiple: true },
-        { label: '建设时间', key: 'build_time', class: 'c-3', type: 'datePicker', type2: 'month', valueFormat: 'yyyy-MM'},
-        { label: '竣工时间', key: 'complete_time', class: 'c-3', type: 'datePicker', type2: 'month', valueFormat: 'yyyy-MM'},
-        { label: '容积率', key: 'plot_ratio', class: 'c-3'},
-        { label: '占地面积', key: 'acreage', class: 'c-3', type: 'inputFont', appendFont: '㎡'},
-        { label: '建筑面积', key: 'built_up_area', class: 'c-3', type: 'inputFont', appendFont: '㎡'},
-        { label: '总户数', key: 'household', class: 'c-3', type: 'inputFont', appendFont: '户', rules: [
-          { validator: (rule, value, callback) => {
-            if (Number(value) < 0 || isNaN(Number(value))) {
-              callback(new Error('请输入数字'))
-            } else {
-              callback()
-            }
-          }, trigger: 'blur' },
-          // { type: 'number', message: '请输入数字', trigger: 'blur' }
-        ]},
-        { label: '物业公司', key: 'property_type', class: 'c-3'},
-        { label: '物业费', key: 'property_fee', class: 'c-3'},
-        { label: '车位数量', key: 'parking', class: 'c-3', type: 'inputFont', appendFont: '个'},
-        { label: '绿化率', key: 'green_rate', class: 'c-3', type: 'inputFont', appendFont: '%' },
-        { label: '楼盘标签', key: 'estate_tag', type: 'select', class: 'c-3', options: this.$dictData.estate_tag, rules: 1 },
-        { label: '自定义标签', key: 'custom_tag', class: 'c-3' },
-        { label: '开发商', key: 'developer', class: 'c-3' }, 
-        { label: '楼栋数', key: 'seat_sum', class: 'c-3', type: 'inputFont', appendFont: '栋' },
-        { label: '产权年限', key: 'ownership', class: 'c-3' },
-        { label: '初次交付时间', key: 'deliver_time', class: 'c-3', type: 'datePicker', type2: 'month', valueFormat: 'yyyy-MM'},
-        { label: '楼盘单价', key: 'price_range', class: 'c-3', type: 'inputFont', appendFont: '/㎡', rules: 1 },
-        { label: '户型面积区间', key: 'built_area', class: 'c-3', type: 'inputFont', appendFont: '㎡' },
-        { label: '产品类型', key: 'product_type', type: 'select', options: this.$dictData.product_type, multiple: true, changeHandle: this.productTypeChange},
-        // { label: '房型', key: 'house_type', type: 'select', options: this.$dictData.house_type, multiple: true},
-        // { label: '面积', label2: '多个面积英文逗号,分开(如:100,120)', key: 'house_area', type: 'inputFont', appendFont: '㎡'},
-        // { label: '均价范围1', key: 'price_min', class: 'c-3', type: 'inputFont', appendFont: '元(最小)'},
-        // { label: '均价范围2', key: 'price_max', class: 'c-3', type: 'inputFont', appendFont: '元(最大)'},
-        { label: '对口学校', key: 'school_dk_list', type: 'selectRemote', multiple: true,
-          remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
-          remoteOptions: remoteOptionsDkSchoolList
-        },
-        { label: '规划就读', key: 'school_gh_list', type: 'selectRemote', multiple: true,
-          remoteParams: { skey: 'school_name', api: `school.admschoollist`, opKey: 'school_name', opVal: 'id' },
-          remoteOptions: remoteOptionsGhSchoolList
-        },
+        { label: '楼盘名称', key: 'estate_name', class: 'c-2', rules: 1 },
+        { label: '所属区域', key: 'area_type', type: 'select', class: 'c-2', options: this.$dictData.area_type },
+        { label: '报备保护期', key: 'report_lock', type: 'inputFont', class: 'c-2', appendFont: '天' },
+        { label: '带看保护期', key: 'lead_lock', type: 'inputFont', class: 'c-2', appendFont: '天' },
         { label: '楼盘地址', key: 'address', rules: 1 },
-        // { label: '是否新房', key: 'is_new', type: 'select', class: 'c-3', options: this.$dictData.sys_yesno, rules: 1 },
-        // { label: '梯户比', label2: '如:2梯4户', key: 'stairs_rate', class: 'c-3' },
-        { label: '不利因素', key: 'minus_points' },
-        { label: '楼盘图', key: 'pri_image', class: 'c-3', type: 'cuImg',
+        { label: '楼盘图', key: 'pri_image', class: 'c-2', type: 'cuImg',
           options: {
             w: 375,
             h: 250,
-            SY: 1,
           }
         , rules: 1 },
-        { label: '简评', key: 'remarked', class: 'c-3s', type: 'textarea' },
+        { label: '备注', key: 'remark', type: 'textarea' },
       ]
-      params.pri_image = this.IMadd(params.pri_image)
       this.setDefaultValue(params)
     },
     close (str) {
@@ -378,66 +93,15 @@ export default {
           if (valid) {
             const oldform = this.$refs.ruleForm.baseForm
             const newForm = { ...oldform }
-            if (this.curObj.id) newForm.id = this.curObj.id
-            if (newForm.school_dk_list && newForm.school_dk_list.length > 0) {
-              newForm.school_dk_list = newForm.school_dk_list.join(',')
-            } else {
-              newForm.school_dk_list = ''
-            }
-            if (newForm.school_gh_list && newForm.school_gh_list.length > 0) {
-              newForm.school_gh_list = newForm.school_gh_list.join(',')
-            } else {
-              newForm.school_gh_list = ''
-            }
             newForm.longitude = this.cObj.longitude
             newForm.latitude = this.cObj.latitude
             if (!newForm.longitude) return this.$msgw('请选择经度！')
             else if (!newForm.latitude) return this.$msgw('请选择纬度！')
-            if (newForm.house_type) newForm.house_type = newForm.house_type.join(',')
-            if (newForm.product_type) newForm.product_type = newForm.product_type.join(',')
-            if (newForm.hospital_type) newForm.hospital_type = newForm.hospital_type.join(',')
-            if (newForm.high_street) newForm.high_street = newForm.high_street.join(',')
-            if (newForm.park_type) newForm.park_type = newForm.park_type.join(',')
-            if (newForm.metro_line) newForm.metro_line = newForm.metro_line.join(',')
-            if (newForm.metro_type) newForm.metro_type = newForm.metro_type.join(',')
-            let customTag = newForm.custom_tag.replace(/，|、|\/|\\/g, ',')
-            if (!newForm.standard) newForm.standard = ''
-            // newForm.stairs_rate = newForm.stairs_rate.replace('，', ',')
-            let productData = this.productData || []
-            let pFlag = false
-            let vrFlag = false
-            productData.forEach(pOne => {
-              let oneArr = pOne.house_type_list || []
-              oneArr.forEach(pTwo => {
-                let twoArr = pTwo.area_list || []
-                twoArr.forEach(pThree => {
-                  if (pThree.vr_key) vrFlag = true
-                })
-              })
-              if (!pOne.average_price || !pOne.house_type_list_val) {
-                pFlag = true
-              }
-              if (!pOne.stairs_rate) pOne.stairs_rate = ''
-            })
-            if (pFlag) {
-              this.$msg('请输入完整的产品均价、户型图！')
-              return
-            }
-            if (vrFlag && newForm.custom_tag.indexOf('户型VR') === -1) {
-              customTag = `户型VR,${newForm.custom_tag}`
-            }
-            if (this.curObj.vr_key && newForm.custom_tag.indexOf('航拍') === -1) {
-              customTag = `航拍,${newForm.custom_tag}`
-            } 
-            newForm.custom_tag = customTag
-            if (productData.length === 0) {
-              newForm.area_data = ''
-            } else {
-              newForm.area_data = JSON.stringify([...productData])
-            }
             let apiStr = 'admestateadd'
-            if (this.curObj.id) apiStr = 'admestateedit'
-            newForm.pri_image = this.IMdel(newForm.pri_image)
+            if (this.curObj.id) {
+              newForm.id = this.curObj.id
+              apiStr = 'admestateedit'
+            }
             this.$api.house[apiStr](newForm).then(data => {
               this.$msgs(newForm.id ? '编辑成功' : '新增成功')
               this.productData = []
@@ -475,7 +139,7 @@ export default {
 <style lang="scss" scoped>
 @import '../../../../styles/libEdit.scss';
 .lib-edit {
-  width: 900px;
+  width: 600px;
   padding-top: 0;
   padding-left: 0;
   padding-bottom: 40px;
@@ -490,7 +154,7 @@ export default {
   .scoped-item-two {
     .el-input {
       display: inline-block;
-      width: 140px;
+      width: 120px;
       margin: 0 10px;
     }
   }
@@ -502,124 +166,4 @@ export default {
   margin-bottom: 10px;
 }
 
-.scoped-product {
-  width: 100%;
-  .sp-item {
-    position: relative;
-    border: 1px solid #dcdcdc;
-    margin-bottom: 10px;
-    margin-left: 55px;
-    margin-right: 30px;
-    border-radius: 10px;
-  }
-  .sp-title {
-    background: #dcdcdc;
-    font-weight: bold;
-    padding: 10px;
-    border-top-left-radius: 10px;
-    border-top-right-radius: 10px;
-    font-size: 14px;
-    color: #666;
-  }
-  .sp-content {
-    padding: 10px 10px 0;
-  }
-  .sc-input {
-    display: flex;
-  }
-}
-
-.room-box {
-  margin: 0 20px 10px 80px;
-  .room-item {
-    background: #f7f7f7;
-    border-radius: 10px;
-    padding: 10px;
-    margin-bottom: 10px;
-  }
-  .ri-title {
-    color: #666;
-    margin-bottom: 10px;
-  }
-  .ri-op {
-    text-align: center;
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: 20px;
-    margin-bottom: 10px;
-  }
-  .ri-img {
-    display: inline-block;
-    vertical-align: middle;
-    width: 82px;
-    height: 82px;
-    border: 1px dashed #999;
-    position: relative;
-    box-sizing: border-box;
-    &:hover {
-      .ri-img-big {
-        display: block;
-      }
-    }
-    img {
-      width: 80px;
-      height: 80px;
-    }
-    .ri-img-big {
-      position: absolute;
-      top: 80px;
-      left: 0;
-      width: 400px;
-      height: auto;
-      display: none;
-      box-shadow: 0 0 20px #ccc;
-      z-index: 99;
-    }
-    .el-icon-plus {
-      color: #999;
-      padding: 30px;
-    }
-  }
-  .ri-deal {
-    display: inline-block;
-    vertical-align: middle;
-    width: 50px;
-  }
-  .ri-input {
-    width: 50px;
-    border: 1px solid #dcdcdc;
-    height: 30px;
-    text-align: center;
-    border-radius: 0;
-    outline: none;
-    color: #666;
-    font-size: 12px;
-  }
-  .ri-del {
-    font-size: 12px;
-    background: #e6a23c;
-    color: #fff;
-    width: 100%;
-    height: 26px;
-    line-height: 26px;
-    cursor: pointer;
-    display: inline-block;
-  }
-}
-
-
-.scoped-sp-box {
-  position: absolute;
-  top: -2px;
-  right: 0;
-  background: #fff;
-  ::v-deep {
-    .el-input__inner {
-      width: 80px;
-    }
-    .el-input-group__append {
-      background: #f2f2f2;
-    }
-  }
-}
 </style>

src/views/house/index.vue

@@ -16,47 +16,13 @@
       :isAdd="true"
       @add="openPopup"
       :operationsDefaultLength="3"
-      :insertSlotArr="[5]"
     >
-      <div slot="OI5">
-        <el-table-column
-          width="70"
-          label="自动更新楼盘均价"
-          align="center"
-        >
-          <template slot-scope="scope">
-            <el-switch
-              v-model="scope.row.update_price"
-              active-color="#13ce66"
-              inactive-color="#ff4949"
-              active-value="1"
-              inactive-value="2"
-              @change="updatePriceAutoChange(scope.row)">
-            </el-switch>
-          </template>
-        </el-table-column>
-      </div>
     </table-list>
     <popup-edit
       :isShow="isDtlShow"
       :curObj="curObj"
       @close="closePopup"
     />
-    <photo-edit
-      :isShow="isPhotoShow"
-      :curObj="curObj"
-      @close="closePhotoPopup"
-    />
-    <vr-edit
-      :isShow="isVrShow"
-      :curObj="curObj"
-      @close="closeVrPopup"
-    />
-    <theme-house-edit
-      :isShow="isTHEShow"
-      :curObj="curObj"
-      @close="closeTHEPopup"
-    />
     <help-rule
       :isShow="isHRShow"
       :curObj="curObj"
@@ -68,9 +34,6 @@
 import { arrToObj } from '@/utils'
 import SearchForm from './components/searchForm/Index'
 import PopupEdit from './components/popup/IndexEdit'
-import PhotoEdit from './components/popup/PhotoEdit'
-import VrEdit from './components/popup/VrEdit'
-import ThemeHouseEdit from './components/popup/ThemeHouseEdit'
 import HelpRule from './components/popup/HelpRule'
 import baseTable from '_m/baseTable.js'
 export default {
@@ -78,9 +41,6 @@ export default {
   components: {
     SearchForm,
     PopupEdit,
-    PhotoEdit,
-    VrEdit,
-    ThemeHouseEdit,
     HelpRule,
   },
   provide() {
@@ -94,11 +54,7 @@ export default {
       apiStr: 'house.admestatelist',
       searchForm: null,
       isDtlShow: false,
-      isPhotoShow: false,
-      isVrShow: false,
-      // noCreated: true,
       curObj: {},
-      isTHEShow: false,
       isHRShow: false,
     }
   },
@@ -106,22 +62,8 @@ export default {
     tableData2() {
       const arr = [...this.tableData]
       arr.map(item => {
-        item.pri_image = this.IMadd(item.pri_image)
-        const metro_type = item.metro_type ? item.metro_type.split(',') : []
-        const metroTypeName = metro_type.map(v => {
-          return arrToObj(this.$dictData.metro_type)[v]
-        })
-        item.metroTypeName = metroTypeName.join(',')
-        const product_type = item.product_type ? item.product_type.split(',') : []
-        const productTypeName = product_type.map(v => {
-          return arrToObj(this.$dictData.product_type)[v]
-        })
-        item.productTypeName = productTypeName.join(',')
-        const metro_line = item.metro_line ? item.metro_line.split(',') : []
-        const metroLineName = metro_line.map(v => {
-          return arrToObj(this.$dictData.metro_line)[v]
-        })
-        item.metroLineName = metroLineName.join(',')
+        item.report_lock = item.report_lock + '天'
+        item.lead_lock = item.lead_lock + '天'
       })
       return arr
     }
@@ -130,34 +72,17 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
-        { label: '排序', prop: 'sort', type: 'input', width: 80},
-        { label: '楼盘名称', prop: 'estate_name', minWidth: 150, align: 'left' },
+        // { label: '排序', prop: 'sort', type: 'input', width: 80},
         { label: '图片', prop: 'pri_image', type: 'img' },
+        { label: '楼盘名称', prop: 'estate_name' },
+        { label: '报备保护期', prop: 'report_lock' },
+        { label: '带看保护期', prop: 'lead_lock' },
         { label: '所属区域', prop: 'area_type', type: 'flag', flags: arrToObj(this.$dictData.area_type) },
-        { label: '浏览量', prop: 'view_count'}, 
-        // { label: '楼盘地址', prop: 'address', fullShow: true, minWidth: 200 },
-        // { label: '地铁线路', prop: 'metroLineName'},
-        // { label: '地铁站名', prop: 'metroTypeName'},
-        { label: '产品类型', prop: 'productTypeName'},
-        // { label: '周边医院', prop: 'hospital_type', type: 'flag', flags: arrToObj(this.$dictData.hospital_type)},
-        // { label: '周边商圈', prop: 'high_street', type: 'flag', flags: arrToObj(this.$dictData.high_street)},
-        // { label: '公园', prop: 'park_type', type: 'flag', flags: arrToObj(this.$dictData.park_type)},
-        // { label: '创建人', prop: 'create_by' },
-        // { label: '创建时间', prop: 'create_at' },
-        { label: '更新人', prop: 'update_by' },
         { label: '更新时间', prop: 'update_at' },
-        { label: '操作', width: 220, type: 'handle2', operations:
+        { label: '操作', width: 140, type: 'handle2', operations:
           [
-            { label: '保存排序', func: this.saveHandle, btnType: 'success' },
+            // { label: '保存排序', func: this.saveHandle, btnType: 'success' },
             { label: '编辑信息', func: this.openPopup, btnType: 'primary' },
-            { label: '编辑相册', func: this.openPhotoPopup, btnType: 'info' },
-            { label: '楼盘航拍', func: this.openVrPopup, btnType: 'primary' },
-            { label: '置业顾问', func: this.openSale, btnType: 'info' },
-            { label: '楼盘动态', func: this.openNews, btnType: 'info' },
-            { label: '历史成交价', func: this.openPrice, btnType: 'info' },
-            { label: '模块主题', func: this.openTHEPopup, btnType: 'info' },
-            { label: '竞品管理', func: this.openCompetePopup, btnType: 'info' },
-            { label: '助力规则', func: this.openHRPopup, btnType: 'warning' },
             { label: '删除', func: this.delHandle, btnType: 'danger' },
           ]
         }
@@ -165,24 +90,15 @@ export default {
     }
   },
   methods: {
-    updatePriceAutoChange (row) {
-      this.$api.house.admestateupdateprice({
-        id: row.id,
-        update_price: row.update_price,
-      }).then(res => {
-        this.$msgs('操作成功~')
-        this.fetchData()
-      })
-    },
-    saveHandle (row) {
-      this.$api.house.admestatesortedit({
-        id: row.id,
-        sort: row.sort,
-      }).then(data => {
-        this.$msgs(`已保存！`)
-        this.fetchData()
-      })
-    },
+    // saveHandle (row) {
+    //   this.$api.house.admestatesortedit({
+    //     id: row.id,
+    //     sort: row.sort,
+    //   }).then(data => {
+    //     this.$msgs(`已保存！`)
+    //     this.fetchData()
+    //   })
+    // },
     delHandle(row) {
       this.$msg(`您确定要删除该楼盘吗？`, 'confirm', () => {
         this.$api.house.admestatedel({
@@ -194,46 +110,6 @@ export default {
         })
       }, null, true)
     },
-    openCompetePopup (item) {
-      this.$router.push('/house/compete?id=' + item.id + '&name=' + item.estate_name)
-    },
-    openNews (item) {
-      this.$router.push('/house/news?id=' + item.id)
-    },
-    openPrice (item) {
-      this.$router.push('/house/price?id=' + item.id + '&name=' + item.estate_name)
-    },
-    openSale (item) {
-      this.$router.push('/house/sale?id=' + item.id + '&name=' + item.estate_name)
-    },
-    openVrPopup(row) {
-      if (row && row.id) {
-        this.curObj = row
-      } else {
-        this.curObj = {}
-      }
-      this.isVrShow = true
-    },
-    closeVrPopup(obj) {
-      this.isVrShow = false
-      if (obj) {
-        this.fetchData()
-      }
-    },
-    openPhotoPopup(row) {
-      if (row && row.id) {
-        this.curObj = row
-      } else {
-        this.curObj = {}
-      }
-      this.isPhotoShow = true
-    },
-    closePhotoPopup(obj) {
-      this.isPhotoShow = false
-      if (obj) {
-        this.fetchData()
-      }
-    },
     openPopup(row) {
       if (row && row.id) {
         this.curObj = row
@@ -248,20 +124,6 @@ export default {
         this.fetchData()
       }
     },
-    openTHEPopup(row) {
-      if (row && row.id) {
-        this.curObj = row
-      } else {
-        this.curObj = {}
-      }
-      this.isTHEShow = true
-    },
-    closeTHEPopup(obj) {
-      this.isTHEShow = false
-      if (obj) {
-        this.fetchData()
-      }
-    },
     openHRPopup(row) {
       if (row && row.id) {
         this.curObj = row