diff --git a/src/views/product/addProduct/index.vue b/src/views/product/addProduct/index.vue index 60c6607..d506bb9 100644 --- a/src/views/product/addProduct/index.vue +++ b/src/views/product/addProduct/index.vue @@ -1007,26 +1007,33 @@ - - - - 单独设置 - 默认设置 - - - - % - - - + + + + + 单独设置 + 默认设置 + + + + + + + + 百分比 + 固定数量 + + + 抵扣元 + + + % + + 百分比:当前订单该商品实际支付总金额 * 设置的比例 = 可以抵扣的金额;固定数量:指定数量 * 购买的商品数量 = 可以抵扣的金额 + + + + @@ -1459,7 +1466,10 @@ const defaultObj = { integral_give_set: 0, integral_give_type: 0, integral_give_rate: 0, - integral_give_money: 0 + integral_give_money: 0, + // 积分抵扣 + integral_deduction_type: 0, + integral_deduction_money: 0, } const objTitle = { price: { @@ -2275,7 +2285,7 @@ export default { if (e == -1) { this.formValidate.integral_rate = -1 } else { - this.formValidate.integral_rate = this.formValidate.integral_rate + this.formValidate.integral_rate = this.formValidate.integral_rate > 0 ? this.formValidate.integral_rate : 0; } }, // 选择属性确认 @@ -2675,7 +2685,10 @@ export default { integral_give_set: info.integral_give_set || 0, integral_give_type: info.integral_give_type || 0, integral_give_rate: info.integral_give_rate || 0, - integral_give_money: info.integral_give_money || 0 + integral_give_money: info.integral_give_money || 0, + //积分抵扣 + integral_deduction_type: info.integral_deduction_type || 0, + integral_deduction_money: info.integral_deduction_money || 0 }; if (info.svip_price_type != 0 && info.mer_svip_status){ this.attrVal = {