From b4a706820e4dd1cb5e3b676691017708cc3e0cb8 Mon Sep 17 00:00:00 2001
From: Chopper711 <liushuai711@gmail.com>
Date: Fri, 21 Feb 2025 17:34:58 +0800
Subject: [PATCH] =?UTF-8?q?###=20feat:=20=E4=BC=98=E5=8C=96=E4=BC=98?=
 =?UTF-8?q?=E6=83=A0=E6=8A=98=E6=89=A3=E8=BE=93=E5=85=A5=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=20(master)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将`Input`组件替换为`InputNumber`组件，以确保输入的优惠折扣
  在0.1到9.9之间，并支持一位小数。
- 在`full-discount-add.vue`和`full-discount-detail.vue`文件中，
  更新了`FormItem`组件的`优惠折扣`输入逻辑。
- 在`coupon-publish.vue`文件中，更新了描述文本以强调输入
  范围和格式。
- 在`coupon.vue`文件中，修复了优惠券类型判断逻辑，增加了
  "DISCOUNT"类型和未知类型的处理。
---
 .../src/views/promotions/coupon/coupon-publish.vue |  3 ++-
 .../full-discount/full-discount-detail.vue         | 14 +++++++-------
 .../src/views/promotion/coupon/coupon-publish.vue  |  7 +++----
 seller/src/views/promotion/coupon/coupon.vue       |  6 ++++--
 .../promotion/full-discount/full-discount-add.vue  | 10 ++++++++--
 5 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/manager/src/views/promotions/coupon/coupon-publish.vue b/manager/src/views/promotions/coupon/coupon-publish.vue
index 3d5e8355..8024cefe 100644
--- a/manager/src/views/promotions/coupon/coupon-publish.vue
+++ b/manager/src/views/promotions/coupon/coupon-publish.vue
@@ -42,10 +42,11 @@
                 :max="9.9"
                 :min="0.1"
                 :step="0.1"
+                precision="1"
                 v-model="form.couponDiscount"
                 style="width: 260px">
               </InputNumber>
-              <span class="describe">请输入0-10之间数字，可以输入一位小数</span>
+              <span class="describe">请输入0-10的数字,可有一位小数</span>
             </FormItem>
             <FormItem label="面额" prop="price" v-if="form.couponType == 'PRICE'">
               <Input
diff --git a/manager/src/views/promotions/full-discount/full-discount-detail.vue b/manager/src/views/promotions/full-discount/full-discount-detail.vue
index 137d73ff..16a2d07d 100644
--- a/manager/src/views/promotions/full-discount/full-discount-detail.vue
+++ b/manager/src/views/promotions/full-discount/full-discount-detail.vue
@@ -81,14 +81,14 @@
               label="优惠折扣"
               prop="fullRate"
             >
-              <Input
-                type="text"
-                v-model="form.fullRate"
+              <InputNumber
                 placeholder="优惠折扣"
-                disabled
-                clearable
-                style="width: 260px"
-              />
+                :max="9.9"
+                :min="0.1"
+                :step="0.1"
+                precision="1"
+                v-model="form.fullRate"
+                style="width: 260px"/>
               <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
             </FormItem>
             <FormItem label="额外赠送">
diff --git a/seller/src/views/promotion/coupon/coupon-publish.vue b/seller/src/views/promotion/coupon/coupon-publish.vue
index 61766720..d6a6e861 100644
--- a/seller/src/views/promotion/coupon/coupon-publish.vue
+++ b/seller/src/views/promotion/coupon/coupon-publish.vue
@@ -38,10 +38,10 @@
                 :max="9.9"
                 :min="0.1"
                 :step="0.1"
+                precision="1"
                 v-model="form.couponDiscount"
-                style="width: 260px">
-              </InputNumber>
-              <span class="describe">请输入0-10之间数字，可以输入一位小数</span>
+                style="width: 260px"/>
+              <span class="describe">请输入0-10的数字,可有一位小数</span>
             </FormItem>
             <FormItem label="面额" prop="price" v-if="form.couponType == 'PRICE'">
               <Input
@@ -256,7 +256,6 @@ export default {
       formRule: {
         promotionName: [{ required: true, message: "活动名称不能为空" }],
         couponName: [{ required: true, message: "优惠券名称不能为空" }],
-        couponLimitNum: [{ required: true, message: "领取限制不能为空" }],
         price: [{ required: true, message: "请输入面额" }, { validator: checkPrice }],
         consumeThreshold: [
           { required: true, message: "请输入消费门槛" },
diff --git a/seller/src/views/promotion/coupon/coupon.vue b/seller/src/views/promotion/coupon/coupon.vue
index 9bf5770d..4feba24e 100644
--- a/seller/src/views/promotion/coupon/coupon.vue
+++ b/seller/src/views/promotion/coupon/coupon.vue
@@ -154,10 +154,12 @@ export default {
           key: "price",
           width: 100,
           render: (h, params) => {
-            if (params.row.price) {
+            if (params.row.couponType === "PRICE") {
               return h("priceColorScheme", {props:{value:params.row.price,color:this.$mainColor}} );
-            } else {
+            } else if(params.row.couponType === "DISCOUNT") {
               return h("div", (params.row.couponDiscount || 0) + "折");
+            }else{
+              return h("div", "未知");
             }
           },
         },
diff --git a/seller/src/views/promotion/full-discount/full-discount-add.vue b/seller/src/views/promotion/full-discount/full-discount-add.vue
index 6c315ea7..9e29b98e 100644
--- a/seller/src/views/promotion/full-discount/full-discount-add.vue
+++ b/seller/src/views/promotion/full-discount/full-discount-add.vue
@@ -38,8 +38,14 @@
                 clearable style="width: 280px" />
             </FormItem>
             <FormItem v-if="form.discountType == 'fullRateFlag'" label="优惠折扣" prop="fullRate">
-              <Input :disabled="form.promotionStatus != 'NEW'" type="text" v-model="form.fullRate" placeholder="优惠折扣"
-                clearable style="width: 280px" />
+              <InputNumber :disabled="form.promotionStatus != 'NEW'"
+                placeholder="优惠折扣"
+                :max="9.9"
+                :min="0.1"
+                :step="0.1"
+                precision="1"
+                v-model="form.fullRate"
+                style="width: 260px"/>
               <span class="describe">优惠折扣为0-10之间数字，可有一位小数</span>
             </FormItem>
             <FormItem label="额外赠送">