|
@@ -358,9 +358,7 @@
|
|
const isXPrice = this.detail&&this.detail.shopProductSubsidy&&this.detail.shopProductSubsidy.subsidyAmount<=this.detail.price
|
|
const isXPrice = this.detail&&this.detail.shopProductSubsidy&&this.detail.shopProductSubsidy.subsidyAmount<=this.detail.price
|
|
// 是否有促销活动
|
|
// 是否有促销活动
|
|
const hasProm = this.detail&&!this.detail.shopPromoProduct
|
|
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(){
|
|
storeAccount(){
|
|
@@ -621,7 +619,8 @@
|
|
})
|
|
})
|
|
const _this = this
|
|
const _this = this
|
|
purchaseCheck({
|
|
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: [{
|
|
detailList: [{
|
|
productSn:this.detail.productSn,
|
|
productSn:this.detail.productSn,
|
|
productCode:this.detail.productCode,
|
|
productCode:this.detail.productCode,
|
|
@@ -696,7 +695,7 @@
|
|
})
|
|
})
|
|
purchaseSave({
|
|
purchaseSave({
|
|
detailList: detailList,
|
|
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' : ''
|
|
payOnlineType: this.payType == 0 ? 'RECHARGE_BALANCE' : this.payType == 1 ? 'PAY_WECHAT_ONLINE' : ''
|
|
}).then(res => {
|
|
}).then(res => {
|
|
if(res.status == 200){
|
|
if(res.status == 200){
|