|
@@ -195,10 +195,10 @@
|
|
</view>
|
|
</view>
|
|
<view class="flex align_center justify_end" v-if="detail.shopProductSubsidy">
|
|
<view class="flex align_center justify_end" v-if="detail.shopProductSubsidy">
|
|
<view>合计:</view>
|
|
<view>合计:</view>
|
|
- <view><text class="pf">¥</text>{{payAmount}}</view>
|
|
|
|
|
|
+ <view style="font-weight: bold;"><text class="pf">¥</text>{{payAmount}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
- <payOptions v-model="payType" :hasBalancePay="showBalanceAuth" :hasPay="hasPay" @change="v=>hasKdk=v!=2" :balance="storeAccount?storeAccount.rechargeBalance:0"></payOptions>
|
|
|
|
|
|
+ <payOptions v-model="payType" :hasBalancePay="showBalanceAuth" :hasPay="hasPay" @change="payTypeChange" :balance="storeAccount?storeAccount.rechargeBalance:0"></payOptions>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="popu-content-btn">
|
|
<view class="popu-content-btn">
|
|
@@ -539,6 +539,7 @@
|
|
if(!this.showPopu){
|
|
if(!this.showPopu){
|
|
this.showPopu = true
|
|
this.showPopu = true
|
|
this.payType = this.showBalanceAuth ? 0 : (this.hasPay ? 1 : 2)
|
|
this.payType = this.showBalanceAuth ? 0 : (this.hasPay ? 1 : 2)
|
|
|
|
+
|
|
this.hasKdk = this.detail.shopProductSubsidy&&this.detail.shopProductSubsidy.subsidyAmount>0&&this.detail.shopProductSubsidy.subsidyAmount<this.storeAccount.giveBalance
|
|
this.hasKdk = this.detail.shopProductSubsidy&&this.detail.shopProductSubsidy.subsidyAmount>0&&this.detail.shopProductSubsidy.subsidyAmount<this.storeAccount.giveBalance
|
|
}else{
|
|
}else{
|
|
// 充值余额支付
|
|
// 充值余额支付
|
|
@@ -758,6 +759,19 @@
|
|
}
|
|
}
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ payTypeChange(v){
|
|
|
|
+ this.hasKdk=v!=2
|
|
|
|
+ // 充值余额支付,判断是否不足
|
|
|
|
+ if(v==0){
|
|
|
|
+ if(this.payAmount>this.storeAccount.rechargeBalance){
|
|
|
|
+ uni.showToast({
|
|
|
|
+ title: '充值余额不足',
|
|
|
|
+ icon: 'none'
|
|
|
|
+ })
|
|
|
|
+ this.payType = this.hasPay ? 1 : 2
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ },
|
|
// 确认付款
|
|
// 确认付款
|
|
confirmPay(){
|
|
confirmPay(){
|
|
const _this = this
|
|
const _this = this
|