|
@@ -203,7 +203,9 @@ Page({
|
|
} else {
|
|
} else {
|
|
_self.setData({
|
|
_self.setData({
|
|
hideWindowValue:true,
|
|
hideWindowValue:true,
|
|
- preventDup:true
|
|
|
|
|
|
+ preventDup:true,
|
|
|
|
+ orderSn:_self.data.orderInfo.orderSn,
|
|
|
|
+ isPay:this.data.detail.isPay
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
@@ -265,10 +267,11 @@ Page({
|
|
//type 1 是未支付带过去的 2 是已支付带过去的
|
|
//type 1 是未支付带过去的 2 是已支付带过去的
|
|
async goToOrderInfo(){
|
|
async goToOrderInfo(){
|
|
|
|
|
|
- if(this.data.orderSn){
|
|
|
|
- let res = await WelfareMall.getPayStatus(this.data.orderSn);
|
|
|
|
- console.log(res);
|
|
|
|
|
|
+ //如果是支付的订单才去查询订单状态
|
|
|
|
+ if(this.data.isPay){
|
|
|
|
+ await WelfareMall.getPayStatus(this.data.orderSn);
|
|
}
|
|
}
|
|
|
|
+
|
|
wx.redirectTo({
|
|
wx.redirectTo({
|
|
url: '/pages/welfareMall/order/orderCompletion?ordersn='+this.data.orderSn
|
|
url: '/pages/welfareMall/order/orderCompletion?ordersn='+this.data.orderSn
|
|
})
|
|
})
|