Merge branch 'bd-dev' of 47.94.45.65:angelo/web-base-h5 into bd-test
This commit is contained in:
commit
f55dcef6e7
|
@ -19,13 +19,19 @@
|
|||
</div>
|
||||
</picker-view-column>
|
||||
<picker-view-column
|
||||
v-if="cityList.length && ['city', 'county'].includes(this.area)"
|
||||
v-if="
|
||||
cityList &&
|
||||
cityList.length &&
|
||||
['city', 'county'].includes(this.area)
|
||||
"
|
||||
>
|
||||
<div v-for="c in cityList" :key="c.id" class="picker-item">
|
||||
{{ c.name }}
|
||||
</div>
|
||||
</picker-view-column>
|
||||
<picker-view-column v-if="countyList.length && this.area == 'county'">
|
||||
<picker-view-column
|
||||
v-if="countyList && countyList.length && this.area == 'county'"
|
||||
>
|
||||
<div v-for="d in countyList" :key="d.id" class="picker-item">
|
||||
{{ d.name }}
|
||||
</div>
|
||||
|
@ -119,6 +125,7 @@ export default {
|
|||
.filter(key => res.data[key])
|
||||
.filter(key => !res.data?.data?.[`${key}Data`])
|
||||
.reverse()
|
||||
console.log(needSelected, 'needSelected')
|
||||
if (
|
||||
needSelected?.length &&
|
||||
Object.keys(res.data?.data || {}).length < needSelected?.length
|
||||
|
@ -180,6 +187,7 @@ export default {
|
|||
}
|
||||
}
|
||||
})
|
||||
|
||||
this.cityList.forEach(item => {
|
||||
const province = this.provinceList.find(
|
||||
province => province.pkId === item.parent
|
||||
|
@ -192,6 +200,8 @@ export default {
|
|||
}
|
||||
}
|
||||
})
|
||||
this.provinceList = this.provinceList.filter(item => item.children)
|
||||
this.cityList = this.cityList.filter(item => item.children)
|
||||
this.cityList = this.provinceList[this.pickerValue[0]].children
|
||||
this.countyList = this.cityList[this.pickerValue[1]].children
|
||||
},
|
||||
|
|
Loading…
Reference in New Issue