fix: 修改余额抵用券抵扣
This commit is contained in:
parent
387c73f9ac
commit
ff7aa74ab1
|
|
@ -28,7 +28,7 @@
|
||||||
</view>
|
</view>
|
||||||
<!-- 积分 -->
|
<!-- 积分 -->
|
||||||
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
|
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
|
||||||
<text class="yang">积分:</text>
|
<text class="yang">预估积分:</text>
|
||||||
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
|
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
|
||||||
<text class="price">{{item['integral']}}</text>
|
<text class="price">{{item['integral']}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -78,7 +78,7 @@
|
||||||
</view>
|
</view>
|
||||||
<!-- 积分 -->
|
<!-- 积分 -->
|
||||||
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
|
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
|
||||||
<text class="yang">积分:</text>
|
<text class="yang">预估积分:</text>
|
||||||
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
|
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
|
||||||
<text class="price">{{item['integral']}}</text>
|
<text class="price">{{item['integral']}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -114,7 +114,7 @@
|
||||||
</view>
|
</view>
|
||||||
<!-- 积分 -->
|
<!-- 积分 -->
|
||||||
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
|
<view class="shop_home-commodity-infor-price shop_home-commodity-infor-bottom">
|
||||||
<text class="yang">积分:</text>
|
<text class="yang">预估积分:</text>
|
||||||
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
|
<!-- <text class="price">{{RetainDecimalPoint(item['pay_price'] - item['max_deduction'])}}</text> -->
|
||||||
<text class="price">{{item['integral']}}</text>
|
<text class="price">{{item['integral']}}</text>
|
||||||
</view>
|
</view>
|
||||||
|
|
|
||||||
|
|
@ -385,12 +385,10 @@
|
||||||
// 是否使用券
|
// 是否使用券
|
||||||
isCoin() {
|
isCoin() {
|
||||||
this.use_coin = !this.use_coin;
|
this.use_coin = !this.use_coin;
|
||||||
this.getCart()
|
|
||||||
},
|
},
|
||||||
|
|
||||||
isBroker() {
|
isBroker() {
|
||||||
this.use_broker = !this.use_broker;
|
this.use_broker = !this.use_broker;
|
||||||
this.getCart()
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -468,7 +466,6 @@
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// let redirect_url = '/pages/restaurant/order/order-details/details';
|
// let redirect_url = '/pages/restaurant/order/order-details/details';
|
||||||
// uni.hideLoading();
|
// uni.hideLoading();
|
||||||
// // 调起支付
|
// // 调起支付
|
||||||
|
|
|
||||||
|
|
@ -65,13 +65,17 @@ class Payment {
|
||||||
.map(([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`)
|
.map(([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`)
|
||||||
.join('&');
|
.join('&');
|
||||||
|
|
||||||
|
|
||||||
wx.miniProgram.navigateTo({
|
wx.miniProgram.navigateTo({
|
||||||
url: `/pages/extension/shop/wxPay/wxPay?${queryString}`
|
url: `/pages/extension/shop/wxPay/wxPay?${queryString}`
|
||||||
});
|
});
|
||||||
|
|
||||||
// 延迟两秒后H5内部跳转
|
|
||||||
setTimeout(()=>{
|
setTimeout(()=>{
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
|
|
||||||
|
// 支付完成返回点餐首页
|
||||||
|
window.history.back();
|
||||||
|
|
||||||
// if(return_url){
|
// if(return_url){
|
||||||
// // 是否需要关闭调起支付的页面
|
// // 是否需要关闭调起支付的页面
|
||||||
// if(redirect){
|
// if(redirect){
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue