|
@@ -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(){
|