|
@@ -190,7 +190,7 @@
|
|
|
<text class="pf">¥</text>{{detail.shopProductSubsidy.subsidyAmount}}
|
|
|
</view>
|
|
|
<view class="flex align_center" v-else>
|
|
|
- <uni-icons size="18" type="checkbox" color="#999"></uni-icons>
|
|
|
+ <uni-icons size="18" type="circle-filled" color="#aaa"></uni-icons>
|
|
|
<text class="pf">¥</text>{{detail.shopProductSubsidy.subsidyAmount}}
|
|
|
</view>
|
|
|
</view>
|
|
@@ -199,7 +199,7 @@
|
|
|
<view style="font-weight: bold;"><text class="pf">¥</text>{{payAmount}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <payOptions v-model="payType" :hasBalancePay="showBalanceAuth" :hasPay="hasPay" @change="payTypeChange" :balance="storeAccount?storeAccount.rechargeBalance:0"></payOptions>
|
|
|
+ <payOptions v-model="payType" :hasBalancePay="showBalanceAuth" :disableCz="disCzOption" :hasPay="hasPay" @change="payTypeChange" :balance="storeAccount?storeAccount.rechargeBalance:0"></payOptions>
|
|
|
</view>
|
|
|
</view>
|
|
|
<view class="popu-content-btn">
|
|
@@ -320,6 +320,11 @@
|
|
|
type: '1'
|
|
|
}
|
|
|
},
|
|
|
+ watch: {
|
|
|
+ disCzOption(v){
|
|
|
+ this.payType = v ? (this.hasPay ? 1 : 2) : 0
|
|
|
+ }
|
|
|
+ },
|
|
|
computed: {
|
|
|
...mapState(['hasLogin']),
|
|
|
// 登录用户信息
|
|
@@ -330,7 +335,7 @@
|
|
|
shelfInfo(){
|
|
|
return this.$store.state.vuex_storeShelf
|
|
|
},
|
|
|
- //是否开启线上支付,支付方式不是线下支付
|
|
|
+ //是否开启线上支付,且支付方式不是线下支付
|
|
|
hasPay(){
|
|
|
const shelfInfo = this.shelfInfo
|
|
|
return shelfInfo&&shelfInfo.payOnlineFlag&&shelfInfo.payOnlineFlag=='1'&&this.payType!=2
|
|
@@ -348,9 +353,14 @@
|
|
|
hasBalancePay(){
|
|
|
return this.$store.state.vuex_showBalanceAuth&&this.storeAccount.giveBalance&&this.detail&&!this.detail.shopPromoProduct
|
|
|
},
|
|
|
+ // 门店账户信息
|
|
|
storeAccount(){
|
|
|
return this.$store.state.vuex_storeAccount
|
|
|
},
|
|
|
+ // 禁用的支付选项
|
|
|
+ disCzOption(){
|
|
|
+ return this.payAmount>this.storeAccount.rechargeBalance
|
|
|
+ },
|
|
|
// 禁用抵扣金额
|
|
|
disKdk(){
|
|
|
const kdk = this.detail&&this.detail.shopProductSubsidy&&this.storeAccount&&this.detail.shopProductSubsidy.subsidyAmount>0&&this.detail.shopProductSubsidy.subsidyAmount<=this.storeAccount.giveBalance
|
|
@@ -361,6 +371,7 @@
|
|
|
const shelfInfo = this.shelfInfo
|
|
|
return shelfInfo&&shelfInfo.contactMobile ? shelfInfo.contactMobile : ''
|
|
|
},
|
|
|
+ // 总数
|
|
|
totalNum(){
|
|
|
return this.hasLogin&&this.userInfo.sysUserFlag == '1' ? this.$store.state.vuex_cartTotal : 0
|
|
|
},
|