Browse Source

判断小程序是否有发货信息管理功能

kele 1 year ago
parent
commit
a2a7bb2121
2 changed files with 11 additions and 10 deletions
  1. 9 10
      pages/order/detail.vue
  2. 2 0
      sheep/store/app.js

+ 9 - 10
pages/order/detail.vue

@@ -317,6 +317,8 @@
 
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
   const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
   const headerBg = sheep.$url.css('/static/img/shop/order/order_bg.png');
+  const tradeManaged = computed(() => sheep.$store('app').has_wechat_trade_managed);
+
   const state = reactive({
   const state = reactive({
     orderInfo: {},
     orderInfo: {},
     merchantTradeNo: '', // 商户订单号
     merchantTradeNo: '', // 商户订单号
@@ -399,14 +401,11 @@
     // todo:
     // todo:
     // 1.怎么检测是否开启了发货组件功能?如果没有开启的话就不能在这里return出去
     // 1.怎么检测是否开启了发货组件功能?如果没有开启的话就不能在这里return出去
     // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
     // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
-    let isOpenBusinessView = true;
-    if (
-      sheep.$platform.name === 'WechatMiniProgram' &&
-      !isEmpty(state.orderInfo.wechat_extra_data) &&
-      isOpenBusinessView &&
-      !ignore
-    ) {
-      mpConfirm(orderId);
+    if (sheep.$platform.name === 'WechatMiniProgram' && !ignore) {
+      if (!isEmpty(state.orderInfo.wechat_extra_data) && tradeManaged.value === 1) {
+        mpConfirm(orderId);
+        return;
+      }
       return;
       return;
     }
     }
 
 
@@ -427,8 +426,8 @@
     wx.openBusinessView({
     wx.openBusinessView({
       businessType: 'weappOrderConfirm',
       businessType: 'weappOrderConfirm',
       extraData: {
       extraData: {
-        merchant_id: '1481069012',
-        merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
+        // merchant_id: '1481069012',
+        // merchant_trade_no: state.orderInfo.wechat_extra_data.merchant_trade_no,
         transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
         transaction_id: state.orderInfo.wechat_extra_data.transaction_id,
       },
       },
       success(response) {
       success(response) {

+ 2 - 0
sheep/store/app.js

@@ -49,6 +49,7 @@ const app = defineStore({
       },
       },
     },
     },
     shareInfo: {}, // 全局分享信息
     shareInfo: {}, // 全局分享信息
+    has_wechat_trade_managed: 0 // 小程序发货信息管理  0 没有 || 1 有
   }),
   }),
   actions: {
   actions: {
     // 获取Shopro应用配置和模板
     // 获取Shopro应用配置和模板
@@ -64,6 +65,7 @@ const app = defineStore({
         this.info = res.data.app;
         this.info = res.data.app;
         this.platform = res.data.platform;
         this.platform = res.data.platform;
         this.template = res.data.template;
         this.template = res.data.template;
+        this.has_wechat_trade_managed = res.data.has_wechat_trade_managed;
         if (!res.data.template) {
         if (!res.data.template) {
           $router.error('TemplateError');
           $router.error('TemplateError');
         }
         }