From 2f5b17da92bc1ea0b0ad92f47e1143da72eb9bfe Mon Sep 17 00:00:00 2001
From: linxi <957440651@qq.com>
Date: Mon, 13 Apr 2026 15:29:52 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A5106=20=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E9=80=89=E6=8B=A9=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=9C=B0=E5=9D=80=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E9=A1=B9=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/MyOrder/index.vue                  |  6 ++++++
 pages/order/OrderDetails/index.vue             |  6 ++++++
 pages/user/address/AddressManagement/index.vue | 18 ++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/pages/order/MyOrder/index.vue b/pages/order/MyOrder/index.vue
index af74604..0d39f72 100644
--- a/pages/order/MyOrder/index.vue
+++ b/pages/order/MyOrder/index.vue
@@ -975,6 +975,12 @@ export default {
     },
     addressTap(order) {
       this._orderId = order.orderId
+      uni.setStorageSync('updateOrderSourceAddress', {
+        id: order.addressId || order.userAddressId || '',
+        realName: order.realName || '',
+        phone: order.userPhone || '',
+        userAddress: order.userAddress || ''
+      })
       this.$yrouter.push({
         path: "/pages/user/address/AddressManagement/index",
         query: {
diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index d01b2dc..1487b6b 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -801,6 +801,12 @@ export default {
     },
     goAddress() {
       this.addressEditOrderId = this.orderInfo.orderId
+      uni.setStorageSync('updateOrderSourceAddress', {
+        id: this.orderInfo.addressId || this.orderInfo.userAddressId || '',
+        realName: this.orderInfo.realName || this.orderInfo.oldRealName || '',
+        phone: this.orderInfo.userPhone || this.orderInfo.oldUserPhone || '',
+        userAddress: this.orderInfo.userAddress || this.orderInfo.oldUserAddress || ''
+      })
       this.$yrouter.push({
         path:'/pages/user/address/AddressManagement/index',
         query: {
diff --git a/pages/user/address/AddressManagement/index.vue b/pages/user/address/AddressManagement/index.vue
index 22eddaa..c921e6c 100644
--- a/pages/user/address/AddressManagement/index.vue
+++ b/pages/user/address/AddressManagement/index.vue
@@ -190,6 +190,24 @@ export default {
         if (this.choosMode === 3) {
           this.currentId =  uni.getStorageSync('giftChooseAddress') ?  uni.getStorageSync('giftChooseAddress').id : this.addressList.find(e => e.isDefault === 1) ? this.addressList.find(e => e.isDefault === 1).id : null
         }
+        // 来源修改订单地址
+        if (this.choosMode === 4) {
+          const sourceAddress = uni.getStorageSync('updateOrderSourceAddress') || {}
+          let currentId = sourceAddress.id || null
+          if (!currentId && sourceAddress.userAddress) {
+            const sourceAddressText = String(sourceAddress.userAddress).replace(/\s+/g, '')
+            const sourceRealName = String(sourceAddress.realName || '').trim()
+            const sourcePhone = String(sourceAddress.phone || '').trim()
+            const matched = this.addressList.find(e => {
+              const addressText = `${e.province || ''}${e.city || ''}${e.district || ''}${e.detail || ''}`.replace(/\s+/g, '')
+              const sameAddress = sourceAddressText && addressText === sourceAddressText
+              const samePerson = sourceRealName && sourcePhone && String(e.realName || '').trim() === sourceRealName && String(e.phone || '').trim() === sourcePhone
+              return sameAddress || samePerson
+            })
+            currentId = matched ? matched.id : null
+          }
+          this.currentId = currentId || (this.addressList.find(e => e.isDefault === 1) ? this.addressList.find(e => e.isDefault === 1).id : null)
+        }
       })
     },
     /**