From 43fad2ed87309fb7b5a927ce4e1f67fec9071fb5 Mon Sep 17 00:00:00 2001
From: aaron <>
Date: Wed, 22 Jan 2025 17:54:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=9C=80=E9=AB=98=E6=8A=B5?=
 =?UTF-8?q?=E6=89=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/merchant/ProductList.vue | 49 ++++--------------------------
 1 file changed, 6 insertions(+), 43 deletions(-)

diff --git a/src/views/merchant/ProductList.vue b/src/views/merchant/ProductList.vue
index a1ee712..0e1408a 100644
--- a/src/views/merchant/ProductList.vue
+++ b/src/views/merchant/ProductList.vue
@@ -60,10 +60,6 @@
                 {{ tag }}
               </a-tag>
             </template>
-            <!-- 最高抵扣金额 -->
-            <template v-if="column.key === 'max_deduct_points'">
-              {{ text }} 消费金
-            </template>
             <!-- 状态列 -->
             <template v-if="column.key === 'status'">
               <a-tag :color="getStatusColor(record.status)">
@@ -180,16 +176,6 @@
           <a-form-item label="标签" name="tags">
             <a-input v-model:value="formState.tags" placeholder="多个标签用逗号分隔" />
           </a-form-item>
-
-          <a-form-item label="最高抵扣消费金" name="max_deduct_points" required>
-            <a-input-number
-              v-model:value="formState.max_deduct_points"
-              :min="0"
-              :precision="0"
-              style="width: 100%"
-              placeholder="请输入最高抵扣消费金"
-            />
-          </a-form-item>
         </a-form>
       </a-modal>
 
@@ -277,16 +263,6 @@
           <a-form-item label="标签" name="tags">
             <a-input v-model:value="editFormState.tags" placeholder="多个标签用逗号分隔" />
           </a-form-item>
-
-          <a-form-item label="最高抵扣消费金" name="max_deduct_points" required>
-            <a-input-number
-              v-model:value="editFormState.max_deduct_points"
-              :min="0"
-              :precision="0"
-              style="width: 100%"
-              placeholder="请输入最高抵扣消费金"
-            />
-          </a-form-item>
         </a-form>
       </a-modal>
     </div>
@@ -381,13 +357,6 @@ export default defineComponent({
         key: 'tags',
         width: 120
       },
-      {
-        title: '最高抵扣消费金',
-        dataIndex: 'max_deduct_points',
-        key: 'max_deduct_points',
-        width: 120,
-        align: 'right'
-      },
       {
         title: '状态',
         dataIndex: 'status',
@@ -481,8 +450,7 @@ export default defineComponent({
       product_price: null,
       sale_price: null,
       settlement_amount: null,
-      tags: '',
-      max_deduct_points: null
+      tags: ''
     })
 
     // 显示修改模态框
@@ -494,8 +462,7 @@ export default defineComponent({
         product_price: record.product_price,
         sale_price: record.sale_price,
         settlement_amount: record.settlement_amount,
-        tags: record.tags,
-        max_deduct_points: record.max_deduct_points
+        tags: record.tags
       }
       editModalVisible.value = true
     }
@@ -562,8 +529,7 @@ export default defineComponent({
         product_price: null,
         sale_price: null,
         settlement_amount: null,
-        tags: '',
-        max_deduct_points: null
+        tags: ''
       }
       editModalVisible.value = false
     }
@@ -580,8 +546,7 @@ export default defineComponent({
       product_price: null,
       sale_price: null,
       settlement_amount: null,
-      tags: '',
-      max_deduct_points: null
+      tags: ''
     })
 
     const rules = {
@@ -590,8 +555,7 @@ export default defineComponent({
       image_url: [{ required: true, message: '请上传商品图片' }],
       product_price: [{ required: true, message: '请输入商品原价' }],
       sale_price: [{ required: true, message: '请输入销售价格' }],
-      settlement_amount: [{ required: true, message: '请输入结算价格' }],
-      max_deduct_points: [{ required: true, message: '请输入最高抵扣消费金' }]
+      settlement_amount: [{ required: true, message: '请输入结算价格' }]
     }
 
     // 显示添加模态框
@@ -662,8 +626,7 @@ export default defineComponent({
         product_price: null,
         sale_price: null,
         settlement_amount: null,
-        tags: '',
-        max_deduct_points: null
+        tags: ''
       }
       addModalVisible.value = false
     }