From f7d5a8f5477211a36b70ae3d629a18dbde8136a5 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Mon, 3 Feb 2025 11:36:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0=E8=B5=A0?=
 =?UTF-8?q?=E9=80=81=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/ProductList.vue | 70 +++++++++++++++++++++++++++---
 1 file changed, 63 insertions(+), 7 deletions(-)

diff --git a/src/views/merchant/ProductList.vue b/src/views/merchant/ProductList.vue
index 4aeff4f..c209e84 100644
--- a/src/views/merchant/ProductList.vue
+++ b/src/views/merchant/ProductList.vue
@@ -188,6 +188,24 @@
           <a-form-item label="标签" name="tags">
             <a-input v-model:value="formState.tags" placeholder="多个标签用逗号分隔" />
           </a-form-item>
+
+          <a-form-item 
+            label="赠送积分比例" 
+            name="gift_points_rate" 
+            required
+            extra="消费金额的百分比，例如：输入10表示赠送消费金额的10%作为积分"
+          >
+            <a-input-number
+              v-model:value="formState.gift_points_rate"
+              :min="0"
+              :max="100"
+              :precision="1"
+              :step="0.1"
+              style="width: 100%"
+              addonAfter="%"
+              placeholder="请输入0-100之间的数值"
+            />
+          </a-form-item>
         </a-form>
       </a-modal>
 
@@ -287,6 +305,24 @@
           <a-form-item label="标签" name="tags">
             <a-input v-model:value="editFormState.tags" placeholder="多个标签用逗号分隔" />
           </a-form-item>
+
+          <a-form-item 
+            label="赠送积分比例" 
+            name="gift_points_rate" 
+            required
+            extra="消费金额的百分比，例如：输入10表示赠送消费金额的10%作为积分"
+          >
+            <a-input-number
+              v-model:value="editFormState.gift_points_rate"
+              :min="0"
+              :max="100"
+              :precision="1"
+              :step="0.1"
+              style="width: 100%"
+              addonAfter="%"
+              placeholder="请输入0-100之间的数值"
+            />
+          </a-form-item>
         </a-form>
       </a-modal>
     </div>
@@ -352,7 +388,17 @@ export default defineComponent({
         title: '商品名称',
         dataIndex: 'name',
         key: 'name',
-        width: 200
+        width: 200,
+      },
+      {
+        title: '赠送积分比例',
+        dataIndex: 'gift_points_rate',
+        key: 'gift_points_rate',
+        width: 150,
+        align: 'center',
+        customRender: ({ text }) => {
+          return `${text || 0}%`
+        }
       },
       {
         title: '商品原价',
@@ -491,7 +537,8 @@ export default defineComponent({
       sale_price: null,
       settlement_amount: null,
       purchase_limit: 0,
-      tags: ''
+      tags: '',
+      gift_points_rate: 0
     })
 
     // 显示修改模态框
@@ -504,7 +551,8 @@ export default defineComponent({
         sale_price: record.sale_price,
         settlement_amount: record.settlement_amount,
         purchase_limit: record.purchase_limit,
-        tags: record.tags
+        tags: record.tags,
+        gift_points_rate: record.gift_points_rate
       }
       editModalVisible.value = true
     }
@@ -572,7 +620,8 @@ export default defineComponent({
         sale_price: null,
         settlement_amount: null,
         purchase_limit: 0,
-        tags: ''
+        tags: '',
+        gift_points_rate: 0
       }
       editModalVisible.value = false
     }
@@ -590,7 +639,8 @@ export default defineComponent({
       sale_price: null,
       settlement_amount: null,
       purchase_limit: 0,
-      tags: ''
+      tags: '',
+      gift_points_rate: 0
     })
 
     const rules = {
@@ -599,7 +649,12 @@ export default defineComponent({
       image_url: [{ required: true, message: '请上传商品图片' }],
       product_price: [{ required: true, message: '请输入商品原价' }],
       sale_price: [{ required: true, message: '请输入销售价格' }],
-      settlement_amount: [{ required: true, message: '请输入结算价格' }]
+      settlement_amount: [{ required: true, message: '请输入结算价格' }],
+      gift_points_rate: [
+        { required: true, message: '请输入赠送积分比例' },
+        { type: 'number', message: '请输入有效的数字' },
+        { type: 'number', min: 0, max: 100, message: '比例必须在0-100之间' }
+      ]
     }
 
     // 显示添加模态框
@@ -671,7 +726,8 @@ export default defineComponent({
         sale_price: null,
         settlement_amount: null,
         purchase_limit: 0,
-        tags: ''
+        tags: '',
+        gift_points_rate: 0
       }
       addModalVisible.value = false
     }