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

+ 3 - 3
pagesB/procureOrder/creatOrder.vue

@@ -185,7 +185,7 @@
 			},
 			// 禁用抵扣金额,选择线上支付时,禁用抵扣金额
 			disKdk(){
-				const kdk = this.storeAccount&&this.subsidyAmount>0&&this.subsidyAmount<=this.storeAccount.giveBalance
+				const kdk = this.storeAccount&&this.subsidyAmount>0&&this.subsidyAmount<=this.storeAccount.giveBalance&&this.showBalanceAuth
 				return !kdk||this.payType==2
 			},
 			// 禁用的充值支付选项,合计金额大于充值余额禁用
@@ -255,7 +255,6 @@
 							promoSn: item.promoSn,
 							promoProductSn: item.shopProductSubsidy&&item.shopProductSubsidy.productSubsidySn,
 							resultValue: item.shopProductSubsidy&&item.shopProductSubsidy.subsidyAmount,
-							useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0'
 						 })
 						 cartSn.push({
 							 cartSn: item.cartSn,
@@ -263,6 +262,7 @@
 						 })
 					})
 				})
+				console.log(this.hasKdk,this.disKdk)
 				this.loading = true
 				// 校验并提示信息
 				purchaseCheck({
@@ -340,7 +340,7 @@
 				this.loading = true
 				purchaseSave({
 					detailList: detailList,
-					useSubsidyFlag: this.hasKdk? '1' : '0',
+					useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
 					payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : ''
 				}).then(res => {
 					uni.hideLoading()

+ 1 - 1
pagesB/shopiing/productDetail.vue

@@ -370,7 +370,7 @@
 			},
 			// 是否禁用抵扣金额
 			disKdk(){
-				const kdk = this.detail&&this.detail.shopProductSubsidy&&this.storeAccount&&this.subsidyAmount>0&&this.subsidyAmount<=this.storeAccount.giveBalance
+				const kdk = this.detail&&this.detail.shopProductSubsidy&&this.storeAccount&&this.subsidyAmount>0&&this.subsidyAmount<=this.storeAccount.giveBalance&&this.showBalanceAuth
 				return !kdk||this.payType==2
 			},
 			// 总金额