lilei 4 months ago
parent
commit
f5d1702fcc
2 changed files with 10 additions and 7 deletions
  1. 6 2
      pagesB/procureOrder/creatOrder.vue
  2. 4 5
      pagesB/shopiing/productDetail.vue

+ 6 - 2
pagesB/procureOrder/creatOrder.vue

@@ -254,7 +254,7 @@
 							promoSn: item.promoSn,
 							promoProductSn: item.shopProductSubsidy&&item.shopProductSubsidy.productSubsidySn,
 							resultValue: item.shopProductSubsidy&&item.shopProductSubsidy.subsidyAmount,
-							useSubsidyFlag: this.hasKdk? '1' : '0'
+							useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0'
 						 })
 						 cartSn.push({
 							 cartSn: item.cartSn,
@@ -264,7 +264,11 @@
 				})
 				
 				// 校验并提示信息
-				purchaseCheck({detailList:detailList,useSubsidyFlag: this.hasKdk? '1' : '0'}).then(res => {
+				purchaseCheck({
+					detailList:detailList,
+					useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
+					payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : ''
+					}).then(res => {
 					if(res.status == 200){
 						const promoChangeFlag = res.data.promoChangeFlag
 						// 活动变更

+ 4 - 5
pagesB/shopiing/productDetail.vue

@@ -358,9 +358,7 @@
 				const isXPrice = this.detail&&this.detail.shopProductSubsidy&&this.detail.shopProductSubsidy.subsidyAmount<=this.detail.price
 				// 是否有促销活动
 				const hasProm = this.detail&&!this.detail.shopPromoProduct
-				// 抵扣余额是否为零
-				const izYue = this.storeAccount&&this.storeAccount.giveBalance
-				return this.$store.state.vuex_showBalanceAuth&&izYue&&hasProm&&isXPrice
+				return this.$store.state.vuex_showBalanceAuth&&hasProm&&isXPrice
 			},
 			// 门店账户信息
 			storeAccount(){
@@ -621,7 +619,8 @@
 				})
 				const _this = this
 				purchaseCheck({
-					   useSubsidyFlag: this.hasKdk? '1' : '0',
+					   useSubsidyFlag: this.hasKdk&&!this.disKdk? '1' : '0',
+					   payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : '',
 					   detailList: [{
 							productSn:this.detail.productSn,
 							productCode:this.detail.productCode,
@@ -696,7 +695,7 @@
 				})
 				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 => {
 					if(res.status == 200){