From fc4e47bc36d9ab8f0ce5a18a47e808631cceb43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=97=B4=E8=B4=A7?= <252048765@qq.com>
Date: Wed, 28 Aug 2024 16:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E9=80=81=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=B4=BB=E5=8A=A8=E8=8C=83=E5=9B=B4=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E4=B8=BACOMMON=5F?=
 =?UTF-8?q?STATUS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mall/promotion/rewardActivity/index.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/mall/promotion/rewardActivity/index.vue b/src/views/mall/promotion/rewardActivity/index.vue
index f68e888e7..f73b536ab 100644
--- a/src/views/mall/promotion/rewardActivity/index.vue
+++ b/src/views/mall/promotion/rewardActivity/index.vue
@@ -27,7 +27,7 @@
           placeholder="请选择活动状态"
         >
           <el-option
-            v-for="dict in getIntDictOptions(DICT_TYPE.PROMOTION_ACTIVITY_STATUS)"
+            v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
             :key="dict.value"
             :label="dict.label"
             :value="dict.value"
@@ -71,6 +71,11 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" default-expand-all row-key="id">
       <el-table-column label="活动名称" prop="name" />
+      <el-table-column label="活动范围" prop="productScope" >
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.PROMOTION_PRODUCT_SCOPE" :value="scope.row.productScope" />
+        </template>
+      </el-table-column>
       <el-table-column
         :formatter="dateFormatter"
         align="center"
@@ -85,7 +90,7 @@
       />
       <el-table-column align="center" label="状态" prop="status">
         <template #default="scope">
-          <dict-tag :type="DICT_TYPE.PROMOTION_ACTIVITY_STATUS" :value="scope.row.status" />
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
         </template>
       </el-table-column>
       <el-table-column
@@ -106,11 +111,10 @@
             编辑
           </el-button>
           <el-button
-            v-hasPermi="['product:brand:delete']"
             link
             type="danger"
             @click="handleClose(scope.row.id)"
-            v-if="scope.row.status === 10 || scope.row.status === 20"
+            v-if="scope.row.status === 0"
             v-hasPermi="['promotion:reward-activity:close']"
           >
             关闭
@@ -119,6 +123,7 @@
             link
             type="danger"
             v-else
+            v-hasPermi="['product:brand:delete']"
             @click="handleDelete(scope.row.id)"
           >
             删除