From 7744c81745dc0d4c5dff0eafac7c7461e20afb29 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Mon, 29 Apr 2024 11:18:29 +0800
Subject: [PATCH] uu

---
 common/enum.js         |  8 ++++++++
 common/util.js         |  2 +-
 pages/address/edit.vue | 21 ++++++++++++++++-----
 pages/address/model.js |  8 +++++++-
 4 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/common/enum.js b/common/enum.js
index d024250..fe80448 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -170,8 +170,16 @@ const pageEventNames = {
 	chooseAddress: "chooseAddress", // 地址选择
 }
 
+const addressNameCodeMap = [
+	{ nameKey: 'countryName', codeKey: 'country' },
+	{ nameKey: 'provinceName', codeKey: 'province' },
+	{ nameKey: 'cityName', codeKey: 'city' },
+	{ nameKey: 'countyName', codeKey: 'county' },
+	{ nameKey: 'townName', codeKey: 'town' }
+]
 
 export {
+	addressNameCodeMap,
 	ordStaEnum,
 	ordStatusList,
 	payTypeEnum,
diff --git a/common/util.js b/common/util.js
index f664acd..3b4ae14 100644
--- a/common/util.js
+++ b/common/util.js
@@ -97,7 +97,7 @@ const numberToChinese = (num)=> {
 
 // - 获取地址详情
 const getAddressDetail = (item= {})=> {
-	return `${item.countryName||''}${item.provinceName||''}${item.cityName||''}${item.countyName||''}${item.address||''}`
+	return `${item.countryName||''}${item.provinceName||''}${item.cityName||''}${item.countyName||''}${item.townName||''}${item.address||''}`
 }
 
 // - 转换list的key val
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index 4a9a00c..698bae6 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -26,7 +26,7 @@
 						</view>
 						
 						<view class="mt-40 pos-rlt">
-							<tpx-input v-model:value="_area" placeholder="所在地区"></tpx-input>
+							<tpx-input :value="getAddressDetail(submitParam)" placeholder="所在地区"></tpx-input>
 							<view @click="handleDialogClick(addressModal)" class="pos-abt-all"></view>
 						</view>
 						
@@ -82,6 +82,8 @@
 <script>
 	import { getAddressModels } from "./model"
 	import * as apiService from "@/common/api"
+	import { addressNameCodeMap } from "@/common/enum"
+	import { getAddressDetail } from "@/common/util"
 	
 	export default {
 		props: {
@@ -120,6 +122,7 @@
 
 		},
 		methods: {
+			getAddressDetail,
 			async initData() {
 				if(this.queryOption.id) {
 					let res = await apiService.getAddressById({ id: this.queryOption.id, _loading: true })
@@ -127,16 +130,24 @@
 						res.data.blDefaultFlag = [true]
 					}
 					this.submitParam = res.data
+					// 回显 国家-省市区组件数据
+					addressNameCodeMap.map((t, index)=> {
+						let name = res.data[t.nameKey]
+						let code = res.data[t.codeKey]
+						name && (this.addressModal.values.regIds[index] = name);
+						code && (this.addressModal.values.regNames[index] = code);
+					})
 				}
 			},
 			handleAnsText(){
 				
 			},
 			handleAddressChoose(data) {
-				this.submitParam.country = data.regIds[0]
-				this.submitParam.province = data.regIds[1]
-				this.submitParam.city = data.regIds[2]
-				this.submitParam.county = data.regIds[3]
+				data.regIds.map((regId, index)=> {
+					let nameCodeMap = addressNameCodeMap[index]
+					this.submitParam[nameCodeMap.codeKey] = regId
+					this.submitParam[nameCodeMap.nameKey] = data.regNames[index]
+				})
 			},
 			handleReset(){
 				this.submitParam = getAddressModels()
diff --git a/pages/address/model.js b/pages/address/model.js
index f38127c..fbce568 100644
--- a/pages/address/model.js
+++ b/pages/address/model.js
@@ -4,9 +4,15 @@ export const getAddressModels = () => {
 		"name": "", // 姓名
 		"phone": "", // 手机号
 		"country": "", // 国家代码
+		"countryName": "", // 国家名称
 		"province": "", // 省份code
+		"provinceName": "", // 省份名称
 		"city": "", // 城市code
-		"county": "", // 区 code
+		"cityName": "", // 城市名称
+		"county": "", // 城镇 code
+		"countyName": "", // 城镇名称
+		"town": "", // 街道编号
+		"townName": "", // 街道名称
 		"address": "", // 详细地址
 		"postCode": "", // 邮编
 		"email": null,