From 5b0b69bf977c4dc5e2615dade36c3274f2aa4d3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Tue, 12 Nov 2024 15:54:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/user_manage/active_list.vue         | 30 ++++++++++++-------
 .../user_manage/components/addActive.vue      | 11 +++++--
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/views/user_manage/active_list.vue b/src/views/user_manage/active_list.vue
index 8badef1..1141d7e 100644
--- a/src/views/user_manage/active_list.vue
+++ b/src/views/user_manage/active_list.vue
@@ -106,17 +106,27 @@ export default {
     methods: {
         // 切换状态
         async statusChange(e, row) {
-            try {
-                this.tableData.loading = true
-                const data = { ...row }
-                data.isUseCoupon = e
-                console.log(data.isUseCoupon)
-                await storageupActivate(data)
-                this.getTableData()
-            } catch (error) {
-                console.log(error)
-                this.tableData.loading = false
+            if (row.couponName) {
+                try {
+                    this.tableData.loading = true
+                    const data = { ...row }
+                    data.isUseCoupon = e
+                    console.log(data.isUseCoupon)
+                    await storageupActivate(data)
+                    this.getTableData()
+                } catch (error) {
+                    console.log(error)
+                    this.tableData.loading = false
+                }
+            } else {
+                console.log(22)
+                this.$message({
+                    message: '请选择优惠劵',
+                    type: 'warning'
+                });
+                return false;
             }
+
         },
         // 重置查询
         resetHandle() {
diff --git a/src/views/user_manage/components/addActive.vue b/src/views/user_manage/components/addActive.vue
index 0aee98e..efad826 100644
--- a/src/views/user_manage/components/addActive.vue
+++ b/src/views/user_manage/components/addActive.vue
@@ -64,8 +64,9 @@
                             <div class="name">{{ item.title }}</div>
                             <!-- <el-input style="width: 120px;" v-model="item.num" placeholder='请填写数量'
                                 @input="checkIfNum(item)"></el-input> -->
-                            <el-button type="text" @click="productIds.splice(index, 1)"
-                                style="margin-left: 20px;">删除</el-button>
+                            <!-- <el-button type="text" @click="productIds.splice(index, 1)"
+                                style="margin-left: 20px;">删除</el-button> -->
+                            <el-button type="text" @click="productIds = []" style="margin-left: 20px;">删除</el-button>
                         </div>
                     </div>
                 </el-form-item>
@@ -210,7 +211,11 @@ export default {
                 this.form = { ...obj }
                 // let res = await activate(obj.id)
                 // this.productIds = res
-                console.log(res, '调试1')
+                if (obj.couponName) {
+                    this.productIds = [{ title: obj.couponName }]
+
+                }
+                console.log(obj, '调试1')
             }
         },
         close() {