From 6fa3fa7822e62ce70e9a2d57a939794789b85d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Tue, 12 Oct 2021 18:06:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A0=8D=E4=BB=B7=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BF=AE=E6=94=B9=E5=8A=B5?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/promotion/couponActivity/coupon.vue |  1 +
 .../kanjia/kanjiaActivityAddGoods.vue         | 26 +++++--------------
 .../kanjia/kanjiaActivityEditGoods.vue        | 22 +++-------------
 3 files changed, 11 insertions(+), 38 deletions(-)

diff --git a/manager/src/views/promotion/couponActivity/coupon.vue b/manager/src/views/promotion/couponActivity/coupon.vue
index b350639a..3cd8eac3 100644
--- a/manager/src/views/promotion/couponActivity/coupon.vue
+++ b/manager/src/views/promotion/couponActivity/coupon.vue
@@ -221,6 +221,7 @@ export default {
             if (res.success) {
               this.$Message.success("优惠券活动已停止");
               this.getDataList();
+              this.$Modal.remove()
             }
           }).catch(() => {});
         },
diff --git a/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue b/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
index 24863082..d51b2335 100644
--- a/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
+++ b/manager/src/views/promotion/kanjia/kanjiaActivityAddGoods.vue
@@ -19,22 +19,18 @@
                 </template>
 
                 <template slot-scope="{ index }" slot="settlementPrice">
-                  <Input type="number" v-model="form.promotionGoodsList[index].settlementPrice" />
+                  <InputNumber :min="0" v-model="form.promotionGoodsList[index].settlementPrice" />
                 </template>
                 <template slot-scope="{ index }" slot="lowestPrice">
-                  <Input type="number" v-model="form.promotionGoodsList[index].lowestPrice" />
+                  <InputNumber :min="0" v-model="form.promotionGoodsList[index].lowestPrice" />
 
                 </template>
                 <template slot-scope="{ index }" slot="highestPrice">
-                  <Input type="number" v-model="form.promotionGoodsList[index].highestPrice" />
+                  <InputNumber :min="0" v-model="form.promotionGoodsList[index].highestPrice" />
 
                 </template>
-                <template slot-scope="{ index }" slot="purchasePrice">
-                  <Input type="number" v-model="form.promotionGoodsList[index].purchasePrice" />
-                </template>
-
                 <template slot-scope="{ index }" slot="stock">
-                  <Input type="number" v-model="form.promotionGoodsList[index].stock" />
+                  <InputNumber :min="0" v-model="form.promotionGoodsList[index].stock" />
                 </template>
               </Table>
             </FormItem>
@@ -122,12 +118,6 @@ export default {
           slot: "highestPrice",
           width: 110,
         },
-
-        {
-          title: "最低购买金额",
-          slot: "purchasePrice",
-          width: 110,
-        },
         {
           title: "活动库存",
           slot: "stock",
@@ -209,11 +199,7 @@ export default {
                 this.$Message.error("活动库存不能为0且不能超过商品库存");
                 return;
               }
-              // 最低购买金额格式校验
-              if (!regular.money.test(res.purchasePrice)) {
-                checkResult = false;
-                this.$Message.error("最低购买金额格式不正确");
-              }
+              
               // 结算价格金额格式校验
               if (!regular.money.test(res.settlementPrice)) {
                 checkResult = false;
@@ -324,7 +310,7 @@ export default {
       item.forEach((e) => {
         list.push({
           settlementPrice: e.settlementPrice || 0,
-          purchasePrice: e.purchasePrice || 0,
+          purchasePrice:  0,
           lowestPrice: e.lowestPrice || 0,
           highestPrice: e.highestPrice || 0,
           stock: e.stock || 0,
diff --git a/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue b/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue
index ba1cc609..b346a6c2 100644
--- a/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue
+++ b/manager/src/views/promotion/kanjia/kanjiaActivityEditGoods.vue
@@ -30,16 +30,7 @@
                 style="width: 260px"
               />
             </FormItem>
-            <FormItem label="最低购买金额" prop="purchasePrice">
-              <Input
-                :disabled="onlyView"
-                type="number"
-                v-model="form.purchasePrice"
-                placeholder="请填写最低购买金额"
-                clearable
-                style="width: 260px"
-              />
-            </FormItem>
+           
             <FormItem label="最低可砍" prop="lowestPrice">
               <Input
                 :disabled="onlyView"
@@ -156,6 +147,7 @@
       return {
         modalType: 0, // 是否编辑
         form: {
+          purchasePrice:0,
           goodsSku: {},
         },
         id: this.$route.query.id, // 砍价活动id
@@ -166,10 +158,7 @@
             {required: true, message: "请输入结算金额"},
             {validator: checkSettlementPrice},
           ],
-          purchasePrice: [
-            {required: true, message: "请输入最低购买金额"},
-            {validator: checkPurchasePrice},
-          ],
+         
           lowestPrice: [
             {required: true, message: "请输入最低可砍金额"},
             {validator: checkLowestPrice},
@@ -227,10 +216,7 @@
               this.$Message.error("活动库存不能为0且不能超过商品库存");
               return
             }
-            // 最低购买金额格式校验
-            if (!regular.money.test(params.purchasePrice)) {
-              this.$Message.error("最低购买金额格式不正确");
-            }
+          
             // 结算价格金额格式校验
             if (!regular.money.test(params.settlementPrice)) {
               this.$Message.error("结算价格金额格式不正确");