From 23a02352d7c7bfbbf770877c4b2f6f3b3faead32 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Wed, 20 Nov 2024 16:34:22 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A2621=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=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E2=80=94=E5=86=8D=E4=B9=B0=E4=B8=80=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E8=B4=A7=E5=9C=B0=E5=9D=80=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4=E6=A1=86=E5=BC=B9=E5=87=BA=E4=B9=8B=E5=89=8D=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=B7=B2=E4=BF=AE=E6=94=B9=EF=BC=8C=E7=82=B9=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E4=BF=AE=E6=94=B9=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue    |  2 +-
 pages/order/OrderSubmission/index.vue | 24 ++++++++++++++++++++----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index 4dd9aee..17a6ceb 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -590,7 +590,7 @@ export default {
         const ids = res.data.cartInfo.map(e => e.id)
         const addressInfo = res.data.addressInfo
         if (ids.length === 0) return
-        uni.navigateTo({
+        uni.redirectTo({
           url: '/pages/order/OrderSubmission/index?id=' + ids.join(',') + '&address=' + JSON.stringify(addressInfo)
         })
       })
diff --git a/pages/order/OrderSubmission/index.vue b/pages/order/OrderSubmission/index.vue
index 3ed599e..d98f44c 100644
--- a/pages/order/OrderSubmission/index.vue
+++ b/pages/order/OrderSubmission/index.vue
@@ -392,10 +392,26 @@ export default {
     let that = this;
     uni.$on('chooseAddress', (res) => {
       console.log('监听到选择收货地址:' + JSON.stringify(res));
-      that.addressInfo = res;
-      //地址切换也要重新计算一下
-      that.computedPrice('onLoad chooseAddress');
-    })
+      setTimeout(() => {
+        uni.showModal({
+          title:'确定修改地址吗?',
+          content: '',
+          showCancel: true,
+          cancelText: '取消',
+          confirmText: '确认',
+          success:(success)=>{
+            if(success.confirm) {
+              that.addressInfo = res;
+              //地址切换也要重新计算一下
+              that.computedPrice('onLoad chooseAddress');
+            }
+          },
+          complete:(complete)=>{
+            uni.hideLoading()
+          },
+        })
+      })
+    },1000)
     if (that.$yroute.query.pinkid !== undefined) {
       that.pinkId = that.$yroute.query.pinkid;
     }