Compare commits
No commits in common. "f55dcef6e776d6492cf888d2f50d21c324863ce3" and "74f530e85b28f6ad601661272267fcc860ddf2ca" have entirely different histories.
f55dcef6e7
...
74f530e85b
|
|
@ -19,19 +19,13 @@
|
||||||
</div>
|
</div>
|
||||||
</picker-view-column>
|
</picker-view-column>
|
||||||
<picker-view-column
|
<picker-view-column
|
||||||
v-if="
|
v-if="cityList.length && ['city', 'county'].includes(this.area)"
|
||||||
cityList &&
|
|
||||||
cityList.length &&
|
|
||||||
['city', 'county'].includes(this.area)
|
|
||||||
"
|
|
||||||
>
|
>
|
||||||
<div v-for="c in cityList" :key="c.id" class="picker-item">
|
<div v-for="c in cityList" :key="c.id" class="picker-item">
|
||||||
{{ c.name }}
|
{{ c.name }}
|
||||||
</div>
|
</div>
|
||||||
</picker-view-column>
|
</picker-view-column>
|
||||||
<picker-view-column
|
<picker-view-column v-if="countyList.length && this.area == 'county'">
|
||||||
v-if="countyList && countyList.length && this.area == 'county'"
|
|
||||||
>
|
|
||||||
<div v-for="d in countyList" :key="d.id" class="picker-item">
|
<div v-for="d in countyList" :key="d.id" class="picker-item">
|
||||||
{{ d.name }}
|
{{ d.name }}
|
||||||
</div>
|
</div>
|
||||||
|
|
@ -125,7 +119,6 @@ export default {
|
||||||
.filter(key => res.data[key])
|
.filter(key => res.data[key])
|
||||||
.filter(key => !res.data?.data?.[`${key}Data`])
|
.filter(key => !res.data?.data?.[`${key}Data`])
|
||||||
.reverse()
|
.reverse()
|
||||||
console.log(needSelected, 'needSelected')
|
|
||||||
if (
|
if (
|
||||||
needSelected?.length &&
|
needSelected?.length &&
|
||||||
Object.keys(res.data?.data || {}).length < needSelected?.length
|
Object.keys(res.data?.data || {}).length < needSelected?.length
|
||||||
|
|
@ -187,7 +180,6 @@ export default {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
this.cityList.forEach(item => {
|
this.cityList.forEach(item => {
|
||||||
const province = this.provinceList.find(
|
const province = this.provinceList.find(
|
||||||
province => province.pkId === item.parent
|
province => province.pkId === item.parent
|
||||||
|
|
@ -200,8 +192,6 @@ 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.cityList = this.provinceList[this.pickerValue[0]].children
|
||||||
this.countyList = this.cityList[this.pickerValue[1]].children
|
this.countyList = this.cityList[this.pickerValue[1]].children
|
||||||
},
|
},
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue