From 50549b806470efa562747d0e6c6c42f23dbcbac4 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 24 Nov 2025 20:08:09 +0800
Subject: [PATCH] =?UTF-8?q?!166=20=E2=9C=A8=20feat(order):=20=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E9=80=9A=E8=BF=87=E6=94=AF=E4=BB=98=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E5=8F=B7=E6=9F=A5=E8=AF=A2=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/detail.vue | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index b3b6358e..bd40c71d 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -277,8 +277,6 @@
 
   const state = reactive({
     orderInfo: {},
-    merchantTradeNo: '', // 商户订单号
-    comeinType: '', // 进入订单详情的来源类型
   });
 
   // ========== 门店自提（核销） ==========
@@ -429,12 +427,8 @@
   }
 
   onShow(async () => {
-    //onShow中获取订单列表,保证跳转后页面为最新状态
-
-    //options.payOrderNo传值的情况下,onLoad 会去查询支付订单
-    //此时state.orderInfo.id没有值，onShow await getOrderDetail会出现异常
-    //改用watch监听state.orderInfo.id 方式 await getOrderDetail
-    //await getOrderDetail(state.orderInfo.id);
+    // onShow中获取订单列表,保证跳转后页面为最新状态
+    await getOrderDetail(state.orderInfo.id);
   });
 
   onLoad(async (options) => {
@@ -442,30 +436,18 @@
     if (options.id) {
       id = options.id;
     }
-    if (options.payOrderNo) {
+    // 场景：例如说“微信小程序购物订单”
+    // https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order_center/order_center.html
+    // （小程序商品订单详情 path）配置参考：pages/order/detail?payOrderNo=${商品订单号} 。其中：${商品订单号} out_trade_no 为 payOrderNo
+    if (!id && options.payOrderNo) {
       // 查询支付订单：根据 payOrderNo 取 merchantOrderId ，merchantOrderId 即 tradeOrderId
-      // 例：小程序商品订单详情path
-      // -- https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/business-capabilities/order_center/order_center.html
-      // -- 配置参考：pages/order/detail?payOrderNo=${商品订单号}
-      // -- ${商品订单号} out_trade_no 为 payOrderNo，根据 payOrderNo 取 merchantOrderId ，merchantOrderId 即 tradeOrderId
-      const payOrder = await PayOrderApi.getOrder(undefined,undefined, options.payOrderNo);
+      const payOrder = await PayOrderApi.getOrder(undefined, undefined, options.payOrderNo);
       if (payOrder.code === 0) {
-        id = payOrder.data?.merchantOrderId || id;
+        id = payOrder.data?.merchantOrderId;
       }
     }
-    // TODO 芋艿：【微信物流】下面两个变量，后续接入
-    state.comeinType = options.comein_type;
-    if (state.comeinType === 'wechat') {
-      state.merchantTradeNo = options.merchant_trade_no;
-    }
     state.orderInfo.id = id;
   });
-
-  watch(() => state.orderInfo.id, async (newId) => {
-    if (newId) {
-      await getOrderDetail(newId);
-    }
-  });
 </script>
 
 <style lang="scss" scoped>