hookehuyr

fix(collectionSettings): 修复地址显示异常并优化地址数据处理逻辑

修复地址显示中可能出现的'NaN'问题,并优化地址数据的拼接和处理逻辑,确保地址显示正确
<!--
* @Date: 2022-09-19 14:11:06
* @LastEditors: hookehuyr hookehuyr@gmail.com
* @LastEditTime: 2025-08-12 18:30:09
* @LastEditTime: 2025-08-13 09:50:04
* @FilePath: /jgdl/src/pages/collectionSettings/index.vue
* @Description: 收款设置
-->
......@@ -199,8 +199,8 @@
class="address-selector"
@click="showAddressSelector = true"
>
<text class="address-text" :class="{ 'address-selected': addressData.full_address }">
{{ addressData.full_address || '请选择省市县并填写详细地址' }}
<text class="address-text" :class="{ 'address-selected': addressData.full_address && addressData.full_address !== 'NaN' }">
{{ (addressData.full_address && addressData.full_address !== 'NaN' && addressData.full_address.trim()) || '请选择省市县并填写详细地址' }}
</text>
<RectRight color="#999" size="10" />
</view>
......@@ -691,15 +691,28 @@ const openIdentityModal = () => {
* 初始化地址选择器数据
*/
const initAddressData = () => {
const province = tempIdentityInfo.value.province || ''
const city = tempIdentityInfo.value.city || ''
const county = tempIdentityInfo.value.county || ''
const detailAddress = tempIdentityInfo.value.idcard_address || ''
// 安全地拼接完整地址,只有在有有效数据时才拼接
let fullAddress = ''
if (province || city || county || detailAddress) {
const addressParts = [province, city, county].filter(part => part && part.trim())
const areaText = addressParts.join('')
fullAddress = detailAddress ? `${areaText} ${detailAddress}`.trim() : areaText
}
addressData.value = {
province: tempIdentityInfo.value.province || '',
city: tempIdentityInfo.value.city || '',
county: tempIdentityInfo.value.county || '',
province,
city,
county,
province_code: tempIdentityInfo.value.idcard_province || '',
city_code: tempIdentityInfo.value.idcard_city || '',
county_code: tempIdentityInfo.value.idcard_district || '',
detail_address: tempIdentityInfo.value.idcard_address || '',
full_address: (tempIdentityInfo.value.province + tempIdentityInfo.value.city + tempIdentityInfo.value.county + tempIdentityInfo.value.idcard_address) || ''
detail_address: detailAddress,
full_address: fullAddress
}
};
......