Procházet zdrojové kódy

feat(福利go) 购买成功后主动去请求支付是否成功

xing.li před 3 roky
rodič
revize
ac8418f23c

+ 8 - 0
api/welfareMall.js

@@ -120,6 +120,14 @@ class WelfareMall extends request {
     return this.postRequest(`${this.BASE_URL}open/welfare-mall/activity/detail`, params);
   }
 
+  static getPayStatus(orderSn) {
+    let params={
+      orderSn:orderSn
+    }
+    return this.postRequest(`${this.BASE_URL}open/call/getPayStatus`, params);
+  }
+
+
 
        /**
    * 创建订单

+ 21 - 7
pages/welfareMall/activityInfo/activityInfo.js

@@ -20,6 +20,7 @@ Page({
      hideWindowValue:false,
      preventDup:true,
      config: {},
+     orderSn:""
   },
 
   /**
@@ -229,22 +230,35 @@ Page({
           //支付成功,跳转领取成功页面
           _self.setData({
             hideWindowValue:true,
-            preventDup:true
+            preventDup:true,
+            orderSn:_self.data.orderInfo.orderSn
           })
          
         },
         fail: function (res) {
           _self.setData({
-            preventDup:true
+            preventDup:true,
+            orderSn:_self.data.orderInfo.orderSn
           })
-          _self.goToOrderList()
+          _self.goToOrderCancelInfo()
         }
       })
   },
-  goToOrderList(){
-       wx.redirectTo({
-            url: '/pages/welfareMall/historical/historical'
-        })
+
+  goToOrderCancelInfo(){
+    wx.redirectTo({
+      url: '/pages/welfareMall/order/orderCompletion?ordersn='+this.data.orderSn
+    })
+  },
+  //type 1  是未支付带过去的    2 是已支付带过去的
+   async goToOrderInfo(){
+   
+    let res = await WelfareMall.getPayStatus(this.data.orderSn);
+     console.log(res);
+    wx.redirectTo({
+      url: '/pages/welfareMall/order/orderCompletion?ordersn='+this.data.orderSn
+    })
+     
   },
 
 hideWindow(){

+ 1 - 1
pages/welfareMall/activityInfo/activityInfo.wxml

@@ -78,7 +78,7 @@
         <view class="w_name">{{detail.name}}</view>
         <view class="w_text">已发送至您的卡包</view>
         <view class="w_border"></view>
-        <view class="w_go_order" bindtap="goToOrderList">去看看</view>
+        <view class="w_go_order" bindtap="goToOrderInfo">去看看</view>
 
         </view>
       <image class="widow_del" src="/images/welfareMall/window_del.png"  bindtap="goToOrderList"></image>

+ 1 - 1
pages/welfareMall/order/orderCompletion.js

@@ -261,7 +261,7 @@ Page({
     //获取上一个页面的页面栈
     var lastPage = page[page.length-2];
     console.log(lastPage.data)
-    let oldOrderList = lastPage.data.orderList;
+    let oldOrderList = lastPage.data.orderList?lastPage.data.orderList:[];
     for(var i = 0;i<oldOrderList.length;i++){
        if(orderSn == oldOrderList[i].orderSn){
         oldOrderList[i].status.value = status