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] =?UTF-8?q?=E3=80=90=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4=E5=94=AE=E5=90=8E=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=90=8E=E7=9B=B4=E6=8E=A5=E8=BF=94=E5=9B=9E=E5=88=B0=E8=AE=A2?=
 =?UTF-8?q?=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>