t

src/views/house/components/searchForm/Price.vue

@@ -41,12 +41,24 @@ export default {
     },
     getDef (str) {
       let params = { ...this.$refs.ruleForm.baseForm }
+      const query = this.$route.query
+      let estateName = query.name || ''
+      params.estate_id = query.id ? Number(query.id) : ''
       this.searchData = [
+        { label: '选择楼盘', key: 'estate_id', type: 'selectRemote', changeHandle: this.estateChange,
+          remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
+          remoteOptions: [{ keyRO: estateName, valRO: params.estate_id }]
+        },
         { label: '签约中介', key: 'company' },
         { label: '签约日期', label2: '开始时间', label3: '结束时间', key: 'startEndTime', type: 'datePicker', rules: 1},
       ]
       this.setDefaultValue(params, 'searchData')
     },
+    estateChange (val, options, curItem) {
+      this.$router.push(`/house/price?id=${val}&name=${curItem.estate_name}`)
+      // this.$router.go(0)
+      this.searchHandle()
+    },
     searchHandle() {
       const oldform = this.$refs.ruleForm.baseForm
       const newForm = { ...oldform }
@@ -55,7 +67,7 @@ export default {
         newForm.end_at = newForm.startEndTime[1]
         delete newForm.startEndTime
       }
-      newForm.estate_id = this.parentData.searchForm.estate_id
+      // newForm.estate_id = this.parentData.searchForm.estate_id
       this.$emit('change', newForm)
     }
   }

src/views/map/dtl.vue

@@ -512,15 +512,21 @@ export default {
 
 
         let areaList = res.area_total || []
-        areaList.map(item => {
+        let newAreaList = []
+        areaList.forEach(item => {
           // let lnglatArr = arrToObj(this.dictData.map_area_lnglat)[item.area_type].split(',')
           // item.position = [lnglatArr[0], lnglatArr[1]]
           // item.areaName = arrToObj(this.dictData.area_type)[item.area_type]
           const areaIndex = arrToObj(arr)[item.area_type]
-          item.position = [arr[areaIndex].longitude, arr[areaIndex].latitude]
-          item.areaName = arr[areaIndex].areaName
+          if (arr[areaIndex] && arr[areaIndex].longitude) {
+            newAreaList.push({
+              ...item,
+              position: [arr[areaIndex].longitude, arr[areaIndex].latitude],
+              areaName: arr[areaIndex].areaName
+            })
+          }
         })
-        this.areaList = [...areaList]
+        this.areaList = [...newAreaList]
       })
     })
   },