|
...
|
...
|
@@ -923,7 +923,7 @@ Page({ |
|
|
|
// 付款
|
|
|
|
confirmPayment: util.throttle(function () {
|
|
|
|
let that = this;
|
|
|
|
let actualPrice = this.data.actualPrice
|
|
|
|
let soothPrice = this.data.soothPrice
|
|
|
|
wx.showLoading({
|
|
|
|
title: '支付中',
|
|
|
|
})
|
|
...
|
...
|
@@ -931,7 +931,7 @@ Page({ |
|
|
|
console.log('核销所勾选的券传参', str);
|
|
|
|
let params = {
|
|
|
|
sellerid: this.data.seller.sid,
|
|
|
|
price: actualPrice,
|
|
|
|
price: soothPrice,
|
|
|
|
}
|
|
|
|
if (this.data.consumeDiscount) {
|
|
|
|
params.consume = this.data.consumeDiscount;
|
|
...
|
...
|
@@ -970,7 +970,7 @@ Page({ |
|
|
|
})
|
|
|
|
}
|
|
|
|
if (res.ret == '200') {
|
|
|
|
that.deductBalance(actualPrice, res.data.id)
|
|
|
|
that.deductBalance(soothPrice, res.data.id)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
return false
|
|
...
|
...
|
@@ -996,8 +996,8 @@ Page({ |
|
|
|
success(ress) {
|
|
|
|
wx.hideLoading()
|
|
|
|
if (ress.errMsg == 'requestPayment:ok') {
|
|
|
|
that.giftCouponsFun(actualPrice,res.data.orderid) //送券
|
|
|
|
that.giftConsumeFun(actualPrice, res.data.orderid) //送消费金
|
|
|
|
that.giftCouponsFun(soothPrice,res.data.orderid) //送券
|
|
|
|
that.giftConsumeFun(soothPrice, res.data.orderid) //送消费金
|
|
|
|
setTimeout(() => {
|
|
|
|
console.log('2送券金额----', that.data.totalPrice);
|
|
|
|
console.log('2送消费金----', that.data.totalConsumePrice);
|
|
...
|
...
|
@@ -1597,6 +1597,7 @@ Page({ |
|
|
|
* 生命周期函数--监听页面显示
|
|
|
|
*/
|
|
|
|
onShow() {
|
|
|
|
this.payFail()
|
|
|
|
this.getCheckUserHavePhone()
|
|
|
|
this.getFreeMealConfigFun()
|
|
|
|
},
|
...
|
...
|
|