|
@ -9,8 +9,6 @@ |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
</view> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<view class="content"> |
|
|
<view class="content"> |
|
|
<!-- 左侧一级地址列表 --> |
|
|
<!-- 左侧一级地址列表 --> |
|
|
<view class="left-panel"> |
|
|
<view class="left-panel"> |
|
@ -303,6 +301,9 @@ |
|
|
|
|
|
|
|
|
// 生成完整地址文本 |
|
|
// 生成完整地址文本 |
|
|
let fullAddress = '' |
|
|
let fullAddress = '' |
|
|
|
|
|
let selectedId = '' // 用于传给后端的ID |
|
|
|
|
|
let selectedIds = [] // 多选时的ID数组 |
|
|
|
|
|
|
|
|
if (this.selectedProvince) { |
|
|
if (this.selectedProvince) { |
|
|
fullAddress += this.selectedProvince.adress |
|
|
fullAddress += this.selectedProvince.adress |
|
|
} |
|
|
} |
|
@ -310,9 +311,12 @@ |
|
|
// 多选城市模式 |
|
|
// 多选城市模式 |
|
|
if (this.multiple && this.selectedCities.length > 0) { |
|
|
if (this.multiple && this.selectedCities.length > 0) { |
|
|
const cityNames = this.selectedCities.map(item => item.adress).join(',') |
|
|
const cityNames = this.selectedCities.map(item => item.adress).join(',') |
|
|
fullAddress += cityNames |
|
|
|
|
|
|
|
|
fullAddress = cityNames |
|
|
result.selectedAddress = this.selectedProvince // 多选城市时返回省份作为选中地址 |
|
|
result.selectedAddress = this.selectedProvince // 多选城市时返回省份作为选中地址 |
|
|
result.selectedCities = this.selectedCities |
|
|
result.selectedCities = this.selectedCities |
|
|
|
|
|
// 返回多选城市的ID数组 |
|
|
|
|
|
selectedIds = this.selectedCities.map(item => item.id) |
|
|
|
|
|
result.selectedIds = selectedIds |
|
|
} else if (this.selectedCity) { |
|
|
} else if (this.selectedCity) { |
|
|
fullAddress += this.selectedCity.adress |
|
|
fullAddress += this.selectedCity.adress |
|
|
|
|
|
|
|
@ -322,20 +326,28 @@ |
|
|
fullAddress += districtNames |
|
|
fullAddress += districtNames |
|
|
result.selectedAddress = this.selectedCity // 多选时返回城市作为选中地址 |
|
|
result.selectedAddress = this.selectedCity // 多选时返回城市作为选中地址 |
|
|
result.selectedDistricts = this.selectedDistricts |
|
|
result.selectedDistricts = this.selectedDistricts |
|
|
|
|
|
// 返回多选区县的ID数组 |
|
|
|
|
|
selectedIds = this.selectedDistricts.map(item => item.id) |
|
|
|
|
|
result.selectedIds = selectedIds |
|
|
} else if (this.selectedDistrict) { |
|
|
} else if (this.selectedDistrict) { |
|
|
// 单选区县模式 |
|
|
// 单选区县模式 |
|
|
fullAddress += this.selectedDistrict.adress |
|
|
fullAddress += this.selectedDistrict.adress |
|
|
result.selectedAddress = this.selectedDistrict |
|
|
result.selectedAddress = this.selectedDistrict |
|
|
|
|
|
selectedId = this.selectedDistrict.id |
|
|
} else { |
|
|
} else { |
|
|
// 选择整个城市 |
|
|
// 选择整个城市 |
|
|
result.selectedAddress = this.selectedCity |
|
|
result.selectedAddress = this.selectedCity |
|
|
|
|
|
selectedId = this.selectedCity.id |
|
|
} |
|
|
} |
|
|
} else { |
|
|
} else { |
|
|
// 选择整个省份 |
|
|
// 选择整个省份 |
|
|
result.selectedAddress = this.selectedProvince |
|
|
result.selectedAddress = this.selectedProvince |
|
|
|
|
|
selectedId = this.selectedProvince.id |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
result.fullAddress = fullAddress |
|
|
result.fullAddress = fullAddress |
|
|
|
|
|
result.selectedId = selectedId // 单选时的ID |
|
|
|
|
|
result.selectedIds = selectedIds // 多选时的ID数组 |
|
|
|
|
|
|
|
|
this.$emit('confirm', result) |
|
|
this.$emit('confirm', result) |
|
|
this.close() |
|
|
this.close() |
|
|