lilei 4 months ago
parent
commit
552c36ecf7
2 changed files with 4 additions and 3 deletions
  1. 2 1
      pagesB/procureOrder/creatOrder.vue
  2. 2 2
      pagesB/shopiing/productDetail.vue

+ 2 - 1
pagesB/procureOrder/creatOrder.vue

@@ -151,6 +151,7 @@
 		},
 		watch: {
 			hasBalancePay(v){
+				console.log(v,'0000')
 				this.payType = v ? 0 : (this.hasPay ? 1 : 2)
 			},
 			disKdk(v){
@@ -422,7 +423,7 @@
 					})
 				})
 				// 默认支付方式
-				this.payType = this.hasBalancePay ? 0 : (this.hasPay ? 1 : 2)
+				this.payType = this.showBalanceAuth ? 0 : (this.hasPay ? 1 : 2)
 				// 总可抵扣金额有余额支付权限,且总抵扣金额小于等于抵扣余额,且支付方式不是线下支付
 				this.hasKdk = this.subsidyAmount>0&&this.storeAccount&&this.subsidyAmount<=this.storeAccount.giveBalance&&this.showBalanceAuth&&this.payType!=2
 			},

+ 2 - 2
pagesB/shopiing/productDetail.vue

@@ -480,7 +480,7 @@
 							res.data.priceStr = Number(bprice).toFixed(2).toString().split('.')
 							res.data.price = bprice
 							// 可抵扣金额是否可用,有余额支付权限,且没有促销活动,且有抵扣金额,且抵扣金额小于等于抵扣余额
-							const kdk = res.data.shopProductSubsidy&&res.data.shopProductSubsidy.subsidyAmount>0&&this.storeAccount&&res.data.shopProductSubsidy.subsidyAmount<this.storeAccount.giveBalance
+							const kdk = res.data.shopProductSubsidy&&res.data.shopProductSubsidy.subsidyAmount>0&&this.storeAccount&&res.data.shopProductSubsidy.subsidyAmount<=this.storeAccount.giveBalance
 							this.hasKdk = kdk&&!this.detail.shopPromoProduct&&this.showBalanceAuth
 						}
 					}
@@ -565,7 +565,7 @@
 								// 没有充值余额权限
 								this.payType = this.showBalanceAuth ? this.payType : (this.hasPay? '1' : '2')
 								// 有余额支付权限,且没有促销活动,且有抵扣金额,且抵扣金额小于等于抵扣余额
-								this.hasKdk = this.detail.shopProductSubsidy&&this.subsidyAmount>0&&this.subsidyAmount<this.storeAccount.giveBalance&&!this.detail.shopPromoProduct&&this.showBalanceAuth
+								this.hasKdk = this.detail.shopProductSubsidy&&this.subsidyAmount>0&&this.subsidyAmount<=this.storeAccount.giveBalance&&!this.detail.shopPromoProduct&&this.showBalanceAuth
 							}else{
 								// 充值余额支付
 								if(this.payType == 0){