From 088c1be6f98d02849e6e963e6af30f0da06e5b58 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Fri, 20 Sep 2024 15:53:51 +0800
Subject: [PATCH] =?UTF-8?q?Fix=EF=BC=9A=E3=80=90=E5=95=86=E5=9F=8E?=
 =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E3=80=91=E5=BE=85=E4=BB=98=E6=AC=BE?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85=E9=A1=B5=E8=A1=A5=E4=B8=8A?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=B0=E5=9D=80=E7=9A=84=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/OrderDetails/index.vue | 52 +++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 4 deletions(-)

diff --git a/pages/order/OrderDetails/index.vue b/pages/order/OrderDetails/index.vue
index e0a3a8e..021d0f4 100644
--- a/pages/order/OrderDetails/index.vue
+++ b/pages/order/OrderDetails/index.vue
@@ -21,7 +21,7 @@
         </div>
         <div class="v12-font-28 v12-secondary-dark-text v12-justify-between">
           <text class=" more-t" style="flex: 2;">{{ orderInfo.userAddress }}</text>
-          <!-- <view @click="goAddress" class="v12-btn cancel v12-dark-text v12-dark-border v12-radius-40" v-if="status.type == -2 || status.type == -3">修改地址</view> -->
+          <view v-if="getStatus(orderInfo) === '待付款'" @click="goAddress" class="v12-btn cancel v12-dark-text v12-dark-border v12-radius-40" >修改地址</view>
         </div>
       </view>
     </view>
@@ -421,7 +421,7 @@
 <script>
 import passkeyborad from '@/components/yzc-paykeyboard/yzc-paykeyboard'
 import OrderGoods from "@/components/OrderGoods";
-import {orderDetail, orderDelay, aginConfirm, express} from "@/api/order";
+import {orderDetail, orderDelay, aginConfirm, express, editAddress} from "@/api/order";
 import Payment from "@/components/Payment";
 import DataFormat from "@/components/DataFormat";
 import {copyClipboard} from "@/utils";
@@ -455,6 +455,7 @@ export default {
   mixins: [pageListenMixins],
   data: function () {
     return {
+      addressId: null,
       showExtend: false,
       delayId: '',
       showMore: false,
@@ -489,6 +490,46 @@ export default {
   onShow() {
     this.id = this.$yroute.query.id;
     this.getDetail();
+    uni.$on('chooseAddress', (res) => {
+      this.addressId = res.id
+    })
+  },
+  watch: {
+    addressId(val) {
+      if(val) {
+        const params = {
+          addressId: this.addressId,
+          orderId: this.orderInfo.orderId
+        }
+        setTimeout(() => {
+          uni.showModal({
+            title:'确定修改地址吗?',
+            content: '',
+            showCancel: true,
+            cancelText: '取消',
+            confirmText: '确认',
+            success:(success)=>{
+              if(success.confirm) {
+                uni.showLoading()
+                editAddress(params).then(res => {
+                  uni.showToast({
+                    icon: 'success',
+                    title: '修改成功！'
+                  })
+                  this.getDetail();
+                }).finally(() => {
+                  uni.hideLoading()
+                })
+              }
+            },
+            complete:(complete)=>{
+              uni.hideLoading()
+              this.addressId = ''
+            },
+          })
+        }, 1000)
+      }
+    }
   },
   // inject: ["app"],
   mounted: function () {
@@ -541,8 +582,11 @@ export default {
       })
     },
     goAddress() {
-      uni.navigateTo({
-        url:'/pages/user/address/AddressManagement/index'
+      this.$yrouter.push({
+        path:'/pages/user/address/AddressManagement/index',
+        query: {
+          choosMode: 1
+        }
       })
     },
     toDelay(id) {