From 518c8988821786e4733eb7dad709370822bb6f0b Mon Sep 17 00:00:00 2001
From: Lcp <2767378157@qq.com>
Date: Sun, 29 Sep 2024 15:52:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E6=8F=90=E4=BA=A4=E5=94=AE=E5=90=8E=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=90=8E=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E5=88=B0?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/aftersale/apply.vue | 2 +-
 pages/order/detail.vue          | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pages/order/aftersale/apply.vue b/pages/order/aftersale/apply.vue
index 805ea944..581ca576 100644
--- a/pages/order/aftersale/apply.vue
+++ b/pages/order/aftersale/apply.vue
@@ -171,7 +171,7 @@
       uni.showToast({
         title: '申请成功',
       });
-      sheep.$router.go('/pages/order/aftersale/list');
+      sheep.$router.redirect('/pages/order/aftersale/list');
     }
   }
 
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index ed0119fa..4e0514de 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -256,7 +256,7 @@
 
 <script setup>
   import sheep from '@/sheep';
-  import { onLoad } from '@dcloudio/uni-app';
+  import { onLoad, onShow } from '@dcloudio/uni-app';
   import { reactive, ref } from 'vue';
   import { isEmpty } from 'lodash-es';
   import {
@@ -416,6 +416,11 @@
     }
   }
 
+  onShow(async () => {
+    //onShow中获取订单列表,保证跳转后页面为最新状态
+    await getOrderDetail(state.orderInfo.id);
+  })
+
   onLoad(async (options) => {
     let id = 0;
     if (options.id) {
@@ -426,7 +431,7 @@
     if (state.comeinType === 'wechat') {
       state.merchantTradeNo = options.merchant_trade_no;
     }
-    await getOrderDetail(id);
+    state.orderInfo.id = id
   });
 </script>
 

From b476305e302d2b42868e84593a508cdfc84554d8 Mon Sep 17 00:00:00 2001
From: Lcp <2767378157@qq.com>
Date: Sun, 29 Sep 2024 16:37:43 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E3=80=91=E7=A1=AE=E8=AE=A4=E6=94=B6=E8=B4=A7=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=8F=90=E7=A4=BA=E7=A1=AE=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/detail.vue | 19 ++++++++++++++-----
 pages/order/list.vue   | 21 +++++++++++++++------
 2 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 4e0514de..0e716c48 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -341,11 +341,20 @@
       return;
     }
 
-    // 正常的确认收货流程
-    const { code } = await OrderApi.receiveOrder(orderId);
-    if (code === 0) {
-      await getOrderDetail(orderId);
-    }
+    uni.showModal({
+      title: '提示',
+      content: '确认收货吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        // 正常的确认收货流程
+        const { code } = await OrderApi.receiveOrder(orderId);
+        if (code === 0) {
+          await getOrderDetail(orderId);
+        }
+      },
+    });
   }
 
   // #ifdef MP-WEIXIN
diff --git a/pages/order/list.vue b/pages/order/list.vue
index 926ecfde..fc02fedc 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -223,12 +223,21 @@
       return;
     }
 
-    // 正常的确认收货流程
-    const { code } = await OrderApi.receiveOrder(order.id);
-    if (code === 0) {
-      resetPagination(state.pagination);
-      await getOrderList();
-    }
+    uni.showModal({
+      title: '提示',
+      content: '确认收货吗？',
+      success: async function (res) {
+        if (!res.confirm) {
+          return;
+        }
+        // 正常的确认收货流程
+        const { code } = await OrderApi.receiveOrder(order.id);
+        if (code === 0) {
+          resetPagination(state.pagination);
+          await getOrderList();
+        }
+      },
+    });
   }
 
   // #ifdef MP-WEIXIN