|
|
@@ -280,7 +280,13 @@ Page({ |
|
|
|
.then(res => { |
|
|
|
wx.hideLoading() |
|
|
|
console.log(res); |
|
|
|
if (!type) { |
|
|
|
if (!type&&type!='free') { |
|
|
|
wx.navigateTo({ |
|
|
|
url: `/pages/order/detail/index?orderId=${ |
|
|
|
orderId |
|
|
|
}` |
|
|
|
}); |
|
|
|
} else if (type == 'free'){ |
|
|
|
wx.navigateTo({ |
|
|
|
url: `/pages/order/detail/index?orderId=${ |
|
|
|
orderId |
|
|
@@ -490,16 +496,11 @@ Page({ |
|
|
|
}) |
|
|
|
} else { |
|
|
|
// 免费券 |
|
|
|
that.payOrderUpdate(orderId, "0", 1, '', 'fail'); |
|
|
|
that.payOrderUpdate(orderId, "0", 1, '', 'free'); |
|
|
|
wx.setStorage({ |
|
|
|
key: 'couponNum', |
|
|
|
data: "couponNum" |
|
|
|
}) |
|
|
|
wx.navigateTo({ |
|
|
|
url: `/pages/order/detail/index?orderId=${ |
|
|
|
that.data.orderId |
|
|
|
}` |
|
|
|
}); |
|
|
|
// setTimeout(function () { |
|
|
|
// }, 1000) |
|
|
|
// if (that.data.data.type == 5) { |
|
|
|