From ec0c003ff750b1436fc3ad2e3b65f07e63a0c1f3 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 6 May 2025 17:48:46 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A3256=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=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E9=A1=B5=E9=9D=A2=EF=BC=8C=E7=BB=99=E5=BD=93=E5=89=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E7=9A=84=E5=9C=B0=E5=9D=80=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=A0=87=E8=AF=86=EF=BC=8C=E6=94=BE=E5=9C=A8?=
 =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=8F=B3=E4=B8=8B=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderSubmission/index.vue | 50 +++++++++++++--------------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 8c28a1e..a0c8fbe 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -413,33 +413,11 @@ export default {
     _this.getCartInfo()
     //获取用户信息
     _this.$store.dispatch("getUser", true)
-    const chooseAddress = uni.getStorageSync('chooseAddress') || {}
-    // 监听到选择收货地址
-    if (chooseAddress.id) {
-      uni.showModal({
-        title:'确定修改地址吗?',
-        content: '',
-        showCancel: true,
-        cancelText: '取消',
-        confirmText: '确认',
-        success: (res) => {
-          if(res.confirm) {
-            _this.addressInfo = chooseAddress
-            // 地址切换也要重新计算一下
-            _this.computedPrice('onLoad chooseAddress')
-          }
-        },
-        complete: () => {
-          uni.hideLoading()
-          // uni.setStorageSync('chooseAddress', {})
-        }
-      })
-    }
+    
   },
   methods: {
     isNullOrEmpty,
     couponMax(e) {
-      console.log(e, 'dxdhkasjhdajks');
       this.couponTitle = e.couponTitle
       this.couponId = this.$yroute.query.couponId ||  uni.getStorageSync('couponId') || 0
     },
@@ -528,8 +506,30 @@ export default {
         } else {
           _this.addressInfo = uni.getStorageSync('chooseAddress') ? uni.getStorageSync('chooseAddress') : data.addressInfo || {}
         }
-        
-        
+        const chooseAddress = uni.getStorageSync('chooseAddress') || {}
+        const sourceAddress = uni.getStorageSync('sourceAddress') || data.addressInfo || uni.getStorageSync('chooseAddress') 
+        // 监听到选择收货地址
+        if (chooseAddress.id && (chooseAddress.id !== sourceAddress.id)) {
+          uni.showModal({
+            title:'确定修改地址吗?',
+            content: '',
+            showCancel: true,
+            cancelText: '取消',
+            confirmText: '确认',
+            success: (res) => {
+              if(res.confirm) {
+                _this.addressInfo = chooseAddress
+                // 地址切换也要重新计算一下
+                uni.setStorageSync('sourceAddress', _this.addressInfo || '')
+                _this.computedPrice('onLoad chooseAddress')
+              }
+            },
+            complete: () => {
+              uni.hideLoading()
+              // uni.setStorageSync('chooseAddress', {})
+            }
+          })
+        }
         _this.systemStore = data.systemStore || {}
         _this.storeSelfMention = data.storeSelfMention
         _this.computedPrice()