From ceb1aa8b33bcfc65be894fb63568257acb6dda4f Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sat, 18 Nov 2023 15:38:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE=E5=9B=BA=E5=AE=9A=E6=8A=B5?=
 =?UTF-8?q?=E6=89=A3=E9=87=91=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/addProduct/index.vue | 59 ++++++++++++++++----------
 1 file changed, 36 insertions(+), 23 deletions(-)

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 @@
             </el-col>
           </template>
           <!--积分抵扣-->
-          <el-col :span="24">
-            <el-form-item v-if="deductionStatus > 0" label="积分抵扣比例：">
-              <el-radio-group
-                v-model="deduction_set"
-                @change="changeIntergral(deduction_set)"
-              >
-                <el-radio :label="1" class="radio">单独设置</el-radio>
-                <el-radio :label="-1">默认设置</el-radio>
-              </el-radio-group>
-              <div v-if="deduction_set == 1">
-                <el-input-number
-                  v-model="formValidate.integral_rate"
-                  :min="0"
-                  controls-position="right"
-                  placeholder="请输入抵扣比例"
-                />
-                %
-              </div>
-            </el-form-item>
-          </el-col>
+          <template v-if="deductionStatus > 0">
+            <el-col :span="24">
+              <el-form-item label="积分抵扣比例：">
+                <el-radio-group v-model="deduction_set" @change="changeIntergral(deduction_set)">
+                  <el-radio :label="1" class="radio">单独设置</el-radio>
+                  <el-radio :label="-1">默认设置</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+            <template v-if="deduction_set == 1">
+              <el-col :span="24">
+                <el-form-item label="积分抵扣类型：">
+                  <el-radio-group v-model="formValidate.integral_deduction_type">
+                    <el-radio :label="0" class="radio">百分比</el-radio>
+                    <el-radio :label="1">固定数量</el-radio>
+                  </el-radio-group>
+                  <div v-if="formValidate.integral_deduction_type == 1">
+                    抵扣<el-input-number v-model="formValidate.integral_deduction_money" :min="0.01" :step="0.01" controls-position="right" placeholder="请输入抵扣金额" />元
+                  </div>
+                  <div v-else>
+                    <el-input-number v-model="formValidate.integral_rate" :min="0.01" :max="100" :step="0.01" controls-position="right" placeholder="请输入抵扣比例" />%
+                  </div>
+                  <div class="tips">百分比：当前订单该商品实际支付总金额 * 设置的比例 = 可以抵扣的金额；固定数量：指定数量 * 购买的商品数量 = 可以抵扣的金额</div>
+                </el-form-item>
+              </el-col>
+            </template>
+          </template>
         </el-row>
         <!-- 其它设置 -->
         <el-row v-if="currentTab == '6'">
@@ -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 = {