发货通知

pages/order/detail.vue

@@ -401,11 +401,14 @@
     // todo:
     // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
     // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
-    if (sheep.$platform.name === 'WechatMiniProgram' && !ignore) {
-      if (!isEmpty(state.orderInfo.wechat_extra_data) && tradeManaged.value === 1) {
-        mpConfirm(orderId);
-        return;
-      }
+    let isOpenBusinessView = true;
+    if (
+      sheep.$platform.name === 'WechatMiniProgram' &&
+      !isEmpty(state.orderInfo.wechat_extra_data) &&
+      isOpenBusinessView &&
+      !ignore
+    ) {
+      mpConfirm(orderId);
       return;
     }
 
@@ -426,8 +429,7 @@
     wx.openBusinessView({
       businessType: 'weappOrderConfirm',
       extraData: {
-        // merchant_id: '1481069012',
-        // merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
         transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
       },
       success(response) {