From 56321b23c9c51623f1e2c4d3eef2c25e29fc5662 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BD=90=E5=A4=A9=E5=A4=A7=E5=9C=A3?= <17615834396@163.com>
Date: Wed, 6 Mar 2024 10:03:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BC=E5=93=81=E5=8D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/EventMarketing/giftBlock/index.vue  | 30 +++++++------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
index 576a45ec7..59d646829 100644
--- a/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
+++ b/fuintAdmin/src/views/EventMarketing/giftBlock/index.vue
@@ -11,7 +11,7 @@
               :value="item.cardAmount">
             </el-option>
           </el-select>
-        <el-select v-model="queryParams.activateStatus" style="margin-right: 10px" placeholder="请选择">
+        <el-select v-model="queryParams.activateStatus" clearable style="margin-right: 10px" placeholder="请选择激活状态">
           <el-option
             v-for="item in option"
             :key="item.value"
@@ -19,7 +19,7 @@
             :value="item.value">
           </el-option>
         </el-select>
-        <el-select v-model="queryParams.status" style="margin-right: 10px" placeholder="请选择">
+        <el-select v-model="queryParams.sailStatus" clearable style="margin-right: 10px" placeholder="请选择出售状态">
           <el-option
             v-for="item in options"
             :key="item.value"
@@ -201,14 +201,14 @@
           </el-table-column>
           <el-table-column
             prop="status"
-            label="礼品卡状态"
+            label="礼品卡激活状态"
          >
             <template slot-scope="scope">
 
               <el-switch
-                v-model="scope.row.status"
-                :active-value="'1'"
-                :inactive-value="'2'"
+                v-model="scope.row.activateStatus"
+                :active-value="'0'"
+                :inactive-value="'1'"
                 active-color="#409EFF"
                 inactive-color="#909399"
                 @change="posteid(scope.row)"
@@ -338,7 +338,7 @@ import {
         queryParams: {
           number:'',
           remark:'',
-          activateStatus:'',
+          activateStatus:null,
           status:'',
           pageNo:1,
           pageSize:10
@@ -349,28 +349,20 @@ import {
         pageNo:1,
         pageSize:10,
         option: [
-          {
-            value: '',
-            label: '全部'
-          },
           {
           value: '1',
-          label: '已使用'
+          label: '已激活'
         }, {
           value: '0',
           label: '未激活'
         },],
         options: [
-          {
-            value: '',
-            label: '全部'
-          },
           {
             value: '1',
-            label: '正常'
+            label: '已售'
           }, {
-            value: '2',
-            label: '禁用'
+            value: '0',
+            label: '未售'
           },],
         value: '',
         tjdata:{},