From 7a56ee860708ac7ac657bb2795c525977e96eed1 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 3 Feb 2025 20:39:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20=E4=BF=83=E9=94=80?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/ProductList.vue | 41 ++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/views/merchant/ProductList.vue b/src/views/merchant/ProductList.vue
index c209e84..86bf140 100644
--- a/src/views/merchant/ProductList.vue
+++ b/src/views/merchant/ProductList.vue
@@ -189,6 +189,19 @@
             <a-input v-model:value="formState.tags" placeholder="多个标签用逗号分隔" />
           </a-form-item>
 
+          <a-form-item 
+            label="促销文本" 
+            name="promotion_text"
+            extra="显示在商品下方的促销文本，限5个字以内"
+          >
+            <a-input
+              v-model:value="formState.promotion_text"
+              placeholder="例如：新人三折"
+              :maxLength="5"
+              show-count
+            />
+          </a-form-item>
+
           <a-form-item 
             label="赠送积分比例" 
             name="gift_points_rate" 
@@ -306,6 +319,19 @@
             <a-input v-model:value="editFormState.tags" placeholder="多个标签用逗号分隔" />
           </a-form-item>
 
+          <a-form-item 
+            label="促销文本" 
+            name="promotion_text"
+            extra="显示在商品下方的促销文本，限5个字以内"
+          >
+            <a-input
+              v-model:value="editFormState.promotion_text"
+              placeholder="例如：新人三折"
+              :maxLength="5"
+              show-count
+            />
+          </a-form-item>
+
           <a-form-item 
             label="赠送积分比例" 
             name="gift_points_rate" 
@@ -538,7 +564,8 @@ export default defineComponent({
       settlement_amount: null,
       purchase_limit: 0,
       tags: '',
-      gift_points_rate: 0
+      gift_points_rate: 0,
+      promotion_text: ''
     })
 
     // 显示修改模态框
@@ -552,7 +579,8 @@ export default defineComponent({
         settlement_amount: record.settlement_amount,
         purchase_limit: record.purchase_limit,
         tags: record.tags,
-        gift_points_rate: record.gift_points_rate
+        gift_points_rate: record.gift_points_rate,
+        promotion_text: record.promotion_text
       }
       editModalVisible.value = true
     }
@@ -621,7 +649,8 @@ export default defineComponent({
         settlement_amount: null,
         purchase_limit: 0,
         tags: '',
-        gift_points_rate: 0
+        gift_points_rate: 0,
+        promotion_text: ''
       }
       editModalVisible.value = false
     }
@@ -640,7 +669,8 @@ export default defineComponent({
       settlement_amount: null,
       purchase_limit: 0,
       tags: '',
-      gift_points_rate: 0
+      gift_points_rate: 0,
+      promotion_text: ''
     })
 
     const rules = {
@@ -727,7 +757,8 @@ export default defineComponent({
         settlement_amount: null,
         purchase_limit: 0,
         tags: '',
-        gift_points_rate: 0
+        gift_points_rate: 0,
+        promotion_text: ''
       }
       addModalVisible.value = false
     }