Browse Source

feat(福利go) 修改详情页主动查询接口 和接口回调

xing.li 3 years ago
parent
commit
aea7ada282
2 changed files with 7 additions and 2 deletions
  1. 6 1
      pages/welfareMall/activityInfo/activityInfo.js
  2. 1 1
      utils/request.js

+ 6 - 1
pages/welfareMall/activityInfo/activityInfo.js

@@ -266,11 +266,16 @@ Page({
       url: '/pages/welfareMall/order/orderCompletion?ordersn='+this.data.orderSn
     })
   },
+    goToOrderList(){
+        wx.redirectTo({
+            url: '/pages/welfareMall/historical/historical'
+        })
+    },
   //type 1  是未支付带过去的    2 是已支付带过去的
    async goToOrderInfo(){
    
     //如果是支付的订单才去查询订单状态
-    if(this.data.isPay && this.data.orderSn){
+    if(this.data.detail.isPay && this.data.orderSn){
        await WelfareMall.getPayStatus(this.data.orderSn);
     }
 

+ 1 - 1
utils/request.js

@@ -115,7 +115,7 @@ class request {
                       let signStr = jsondata+"menu20220422";
                       let sign =  util.sha1(signStr).toString();
                      
-                      if(sign != res.data.sign){
+                      if(sign != res.data.sign && res.data.data != null && res.data.data!="SUCCESS"){
                         wx.showModal({
                             title: "提示",
                             content: "数据走丢了"