From 9e8fd63b5efc69c280942711ea55e4771806b29d Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Mon, 21 Apr 2025 23:33:09 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E4=BF=A1=E6=81=AF=E5=A4=84=E7=90=86=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在订单列表中移除伴宠师备注并添加查看详情提示
- 重构地址信息处理逻辑，使用正则表达式提取省市区信息
- 统一地址信息字段名，提升代码可读性和维护性
---
 pages/newOrder/address.vue           | 16 +++++++++++-----
 pages/personalCenter/addressInfo.vue | 35 +++++++++++++++++++++++++++++------
 pages_order/order/orderList.vue      |  4 +---
 3 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/pages/newOrder/address.vue b/pages/newOrder/address.vue
index c2d04c0..a0b805d 100644
--- a/pages/newOrder/address.vue
+++ b/pages/newOrder/address.vue
@@ -131,16 +131,22 @@
 					success: res => {
 						this.addressInfo.latitude = res.latitude
 						this.addressInfo.longitude = res.longitude
-						this.addressInfo.district = ''
-						this.addressInfo.province = ''
+                        
+						var reg = /.+?(省|市|自治区|自治州|县|区)/g;
+						
+						let arr = res.address.match(reg)
+                        
+						this.addressInfo.province = arr[0]
+						this.addressInfo.city = arr[1]
+						this.addressInfo.district = arr[2]
 						
 						if (!res.address && res.name) { //用户直接选择城市的逻辑
-							return this.addressInfo.city = res.name
+							return this.addressInfo.selectAddress = res.name
 						}
 						if (res.address || res.name) {
-							return this.addressInfo.city = res.address + res.name
+							return this.addressInfo.selectAddress = res.address + res.name
 						}
-						this.addressInfo.city = '' //用户啥都没选就点击勾选
+						this.addressInfo.selectAddress = '' //用户啥都没选就点击勾选
 					},
 					fail(e) {
 						console.log("获取位置信息失败!", e)
diff --git a/pages/personalCenter/addressInfo.vue b/pages/personalCenter/addressInfo.vue
index d52fdda..9acd9b7 100644
--- a/pages/personalCenter/addressInfo.vue
+++ b/pages/personalCenter/addressInfo.vue
@@ -27,7 +27,7 @@
 				
 				<u-form-item label="所在地区" prop="addressInfo.city" labelWidth="120" borderBottom>
 					<view style="display: flex;justify-content: space-between;" @click="selectAddress">
-						<u--input :value="addressInfo.city" 
+						<u--input :value="addressInfo.selectAddress"
 							disabled disabledColor="#ffffff" placeholder="请选择所在地区"  
 							placeholderStyle="text-align:right;color:#AAA" border="none"  inputAlign="right">
 						</u--input>
@@ -127,18 +127,41 @@
 			selectAddress(){
 				uni.chooseLocation({
 					success: res => {
+						
+						console.log(res);
+						
 						this.addressInfo.latitude = res.latitude
 						this.addressInfo.longitude = res.longitude
-						this.addressInfo.district = ''
-						this.addressInfo.province = ''
+						// this.addressInfo.district = ''
+						// this.addressInfo.province = ''
+						
+						var reg = /.+?(省|市|自治区|自治州|县|区)/g;
+						
+						let arr = res.address.match(reg)
+						
+						// var add1 = '四川省成都市都江堰市天马镇34号';
+						// var add2 = '北京市北京市东城区前门大街1号'
+						// var add3 = '新疆维吾尔自治区乌鲁木齐市天山区中山路479号';
+						// var add4 = '四川省成都市双流县幸福社区23号';
+						// var add5 = '香港特别行政区中西区尖沙嘴路';
+						// console.log(add1 + ': ', add1.match(reg));
+						// console.log(add2 + ': ', add2.match(reg));
+						// console.log(add3 + ': ', add3.match(reg));
+						// console.log(add4 + ': ', add4.match(reg));
+						// console.log(add5 + ': ', add5.match(reg));
+
+						
+						this.addressInfo.province = arr[0]
+						this.addressInfo.city = arr[1]
+						this.addressInfo.district = arr[2]
 						
 						if (!res.address && res.name) { //用户直接选择城市的逻辑
-							return this.addressInfo.city = res.name
+							return this.addressInfo.selectAddress = res.name
 						}
 						if (res.address || res.name) {
-							return this.addressInfo.city = res.address + res.name
+							return this.addressInfo.selectAddress = res.address + res.name
 						}
-						this.addressInfo.city = '' //用户啥都没选就点击勾选
+						this.addressInfo.selectAddress = '' //用户啥都没选就点击勾选
 					},
 					fail(e) {
 						console.log("获取位置信息失败!", e)
diff --git a/pages_order/order/orderList.vue b/pages_order/order/orderList.vue
index 94cbd38..719ea80 100644
--- a/pages_order/order/orderList.vue
+++ b/pages_order/order/orderList.vue
@@ -52,8 +52,7 @@
 					<view class="order-info">
 						<text class="order-time">下单时间: {{order.createTime}}</text>
 						<view class="companion-info">
-							<text>伴宠师: {{order.companionName}}</text>
-							<text v-if="order.companionNote">({{order.companionNote}})</text>
+							<text>伴宠师: {{order.companionName}}</text> <text>（点击查看伴宠师详情）</text>
 						</view>
 					</view>
 
@@ -280,7 +279,6 @@
 					resolve();
 				}).catch(err => {
 					this.loading = false;
-					reject(err);
 				});
 			},