From c79049443a315d5d1d04702dbf5eff31579b36f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Mon, 11 Nov 2024 10:39:45 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=20=E6=B4=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop.js                               |  11 ++
 src/views/product/add_shop.vue                |  19 ++-
 src/views/product/index.vue                   |   3 -
 src/views/user_manage/active_list.vue         |  29 +++--
 .../user_manage/components/addActive.vue      | 112 ++++++++++++++----
 .../user_manage/components/downloadQR.vue     |   3 +-
 6 files changed, 137 insertions(+), 40 deletions(-)

diff --git a/src/api/shop.js b/src/api/shop.js
index 79ed2c8..55e9508 100644
--- a/src/api/shop.js
+++ b/src/api/shop.js
@@ -417,6 +417,17 @@ export function modityActivate(data) {
   });
 }
 
+/**
+ * 新增、修改活动   新的！
+ * @returns
+ */
+export function storageupActivate(data) {
+  return request({
+    url: `/shop/storage/upActivate`,
+    method: "post",
+    data
+  });
+}
 /**
  * 活动列表
  * @returns
diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 2587310..9fb6b69 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -437,7 +437,7 @@ export default {
     Editor,
     addImg,
   },
-  name:'add_shop',
+  name: 'add_shop',
   data() {
     const validatordateUsed = (rule, value, callback) => {
       if (!this.form.notices.dateUsed) {
@@ -602,17 +602,32 @@ export default {
       batchNumberForm: {
         batchNumber: 0,
       },
+      routequery: ''
     };
   },
   mounted() {
     this.tbShopUnit();
     this.tbShopCategoryGet();
     this.changeTypeEnum(0);
-
     if (this.$route.query.goods_id) {
       this.tbProductGetDetail();
     }
   },
+  watch: {
+    // 监听路由对象中的参数变化
+    $route(to, from) {
+      console.log(to.query.goods_id)
+      if (to.query.goods_id) {
+        if (this.routequery == to.query.goods_id) {
+          return false;
+        } else {
+          this.tbProductGetDetail();
+        }
+        this.routequery = to.query.goods_id
+      }
+
+    },
+  },
   methods: {
     uploadImgSucess(res, item) {
       console.log(res);
diff --git a/src/views/product/index.vue b/src/views/product/index.vue
index c9ff079..3499939 100644
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -298,11 +298,9 @@ export default {
     }
   },
   async mounted() {
-    console.log(this.$route.query.productId, 'tiaoshi1')
     if (this.$route.query.productId) {
       this.query.productId = this.$route.query.productId
     }
-    console.log(this.query)
 
     await this.tbShopCategoryGet()
     await this.getTableData()
@@ -533,7 +531,6 @@ export default {
           })
         })
 
-        console.log(res);
 
         this.tableData.loading = false
         this.tableData.data = res.content
diff --git a/src/views/user_manage/active_list.vue b/src/views/user_manage/active_list.vue
index 2d0dc88..8badef1 100644
--- a/src/views/user_manage/active_list.vue
+++ b/src/views/user_manage/active_list.vue
@@ -19,24 +19,26 @@
                 下载会员充值二维码
             </el-button>
             <div style="margin-top: 35px; font-size: 16px; color: #333;">
-                允许充值自定义金额：<el-switch v-model="shopInfo.isCustom" active-value="1" inactive-value="0" size="large" @change="customStatusChange"></el-switch>
+                允许充值自定义金额：<el-switch v-model="shopInfo.isCustom" active-value="1" inactive-value="0" size="large"
+                    @change="customStatusChange"></el-switch>
             </div>
         </div>
         <div class="head-container">
             <el-table :data="tableData.data" v-loading="tableData.loading">
                 <el-table-column label="店铺ID" prop="shopId"></el-table-column>
-                <el-table-column label="最小金额" prop="minNum"></el-table-column>
-                <el-table-column label="最大金额" prop="maxNum"></el-table-column>
-                <el-table-column label="赠送金额" prop="handselNum"></el-table-column>
-                <el-table-column label="赠送类型" prop="handselType">
+                <el-table-column label="充值金额" prop="amount"></el-table-column>
+                <el-table-column label="赠送金额" prop="giftAmount"></el-table-column>
+                <!-- <el-table-column label="赠送金额" prop="handselNum"></el-table-column> 
+                <el-table-column label="是否使用优惠券" prop="isUseCoupon">
                     <template v-slot="scope">
                         {{ scope.row.handselType | handselTypeFilter }}
                     </template>
-                </el-table-column>
-                <!-- <el-table-column label="排序" sortable prop="sort"></el-table-column> -->
-                <el-table-column label="是否启用" prop="isDel">
+</el-table-column>
+<el-table-column label="排序" sortable prop="sort"></el-table-column> -->
+                <el-table-column label="赠送积分" prop="giftPoints"></el-table-column>
+                <el-table-column label="是否使用优惠券" prop="isUseCoupon">
                     <template v-slot="scope">
-                        <el-switch v-model="scope.row.isDel" active-value="0" inactive-value="1"
+                        <el-switch v-model="scope.row.isUseCoupon" :active-value="1" :inactive-value="0"
                             @change="statusChange($event, scope.row)"></el-switch>
                     </template>
                 </el-table-column>
@@ -65,7 +67,7 @@
 import handselTypes from './handselTypes'
 import addActive from './components/addActive'
 import QR from './components/downloadQR.vue'
-import { findActivate, modityActivate } from '@/api/shop'
+import { findActivate, storageupActivate } from '@/api/shop'
 import { tbShopInfo, tbShopInfoPut } from "@/api/user";
 import dayjs from 'dayjs'
 export default {
@@ -107,8 +109,9 @@ export default {
             try {
                 this.tableData.loading = true
                 const data = { ...row }
-                data.status = e
-                await modityActivate(data)
+                data.isUseCoupon = e
+                console.log(data.isUseCoupon)
+                await storageupActivate(data)
                 this.getTableData()
             } catch (error) {
                 console.log(error)
@@ -151,7 +154,7 @@ export default {
                 }
 
                 console.log(this.shopInfo);
-                
+
             } catch (error) {
                 console.log(error)
             }
diff --git a/src/views/user_manage/components/addActive.vue b/src/views/user_manage/components/addActive.vue
index 42ace2d..45bee7d 100644
--- a/src/views/user_manage/components/addActive.vue
+++ b/src/views/user_manage/components/addActive.vue
@@ -2,7 +2,23 @@
     <div>
         <el-dialog :title="form.id ? '编辑活动' : '添加活动'" :visible.sync="dialogVisible" @close="reset">
             <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-                <el-form-item label="最小金额">
+                <el-form-item label="充值">
+                    <template>
+                        <div style="display: flex;">
+                            <el-input style="width: 220px;" placeholder="请输入金额" v-model="form.amount">
+                                <template slot="prepend">满</template>
+                                <template slot="append">元</template>
+                            </el-input>
+                            <el-input style="margin-left: 20px; width: 220px;" placeholder="请输入金额"
+                                v-model="form.giftAmount">
+                                <template slot="prepend">赠</template>
+                                <template slot="append">元</template>
+                            </el-input>
+                        </div>
+                    </template>
+                </el-form-item>
+
+                <!-- <el-form-item label="最小金额">
                     <el-input-number v-model="form.minNum" controls-position="right" :min="1"></el-input-number>
                 </el-form-item>
                 <el-form-item label="最大金额">
@@ -11,22 +27,35 @@
                 <el-form-item label="赠送金额">
                     <el-input-number v-model="form.handselNum" controls-position="right" :min="0"></el-input-number>
                 </el-form-item>
-                <!-- <el-form-item label="赠送类型">
+                <el-form-item label="赠送类型">
                     <el-select v-model="form.handselType">
                         <el-option :label="item.label" :value="item.value" v-for="item in handselTypes"
                             :key="item.value"></el-option>
                     </el-select>
-                </el-form-item> -->
+                </el-form-item>
                 <el-form-item label="状态">
                     <el-switch v-model="form.isDel" active-value="0" inactive-value="1"></el-switch>
+                </el-form-item> -->
+
+                <el-form-item label="是否使用优惠券">
+                    <el-switch v-model="form.isUseCoupon" :active-value="1" :inactive-value="0"></el-switch>
                 </el-form-item>
-                <el-form-item label="是否赠送商品">
-                    <el-switch v-model="form.isGiftPro" :active-value="1" :inactive-value="0"></el-switch>
+                <el-form-item label="数量">
+                    <el-input-number v-model="form.num" controls-position="right" :min="1"></el-input-number>
                 </el-form-item>
-                <el-form-item label="赠送商品">
+                <el-form-item label="积分">
+                    <template>
+                        <div class="labelboxss">
+                            <div>赠送</div>
+                            <el-input style="width: 140px;margin: 0 15px;" v-model="form.giftPoints"></el-input>
+                            <div>积分</div>
+                        </div>
+                    </template>
+                </el-form-item>
+                <el-form-item label="选择优惠劵">
                     <div>
                         <el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...productIds])">
-                            添加商品
+                            添加优惠劵
                         </el-button>
                     </div>
                     <div class="shop_list">
@@ -53,7 +82,9 @@
 
 <script>
 import handselTypes from '../handselTypes'
-import { modityActivate, activate } from '@/api/shop'
+import { activate, storageupActivate } from '@/api/shop'
+import { queryReceive } from '@/api/coupon'
+
 import shopList from '@/components/shopList'
 
 export default {
@@ -70,7 +101,10 @@ export default {
                 maxNum: 1,
                 handselNum: 1, // 打印类型
                 handselType: 'GD',
-                isDel: '0'
+                isDel: '0',
+                num: 1,
+                amount: '',
+                giftAmount: ''
             },
             productIds: [],
             resetForm: '',
@@ -125,21 +159,28 @@ export default {
             this.form.config.categoryList = e
         },
         onSubmitHandle() {
-            // console.log(this.form)
-            let arr = []
-            this.productIds.forEach(ele => {
-                arr.push({
-                    productId: ele.id,
-                    num: ele.num
-                })
-            })
-            this.form.products = arr
+            console.log(this.form)
+            if (this.form.amount == '') {
+                this.$message({
+                    message: '充值金额不能为空',
+                    type: 'warning'
+                });
+                return false;
+            }
+            // let arr = []
+            // this.productIds.forEach(ele => {
+            //     arr.push({
+            //         productId: ele.id,
+            //         num: ele.num
+            //     })
+            // })
+            // this.form.products = arr
             this.$refs.form.validate(async valid => {
                 if (valid) {
                     try {
                         this.loading = true
                         this.form.shopId = localStorage.getItem('shopId')
-                        let res = await modityActivate(this.form)
+                        let res = await storageupActivate(this.form)
                         this.$emit('success', res)
                         this.close()
                         this.$notify({
@@ -159,8 +200,8 @@ export default {
             this.dialogVisible = true
             if (obj && obj.id) {
                 this.form = { ...obj }
-                let res = await activate(obj.id)
-                this.productIds = res
+                // let res = await activate(obj.id)
+                // this.productIds = res
                 console.log(res, '调试1')
             }
         },
@@ -174,6 +215,35 @@ export default {
 }
 </script>
 <style scoped lang="scss">
+.labelbox {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 12px;
+    color: #666666;
+    width: 130px;
+    background: #F7F7FA;
+    border-radius: 2px 2px 2px 2px;
+    border: 1px solid #DDDFE6;
+    padding: 0 10px;
+
+    input {
+        border: none !important;
+    }
+}
+
+.labelboxss {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    font-family: Source Han Sans CN, Source Han Sans CN;
+    font-weight: 400;
+    font-size: 14px;
+    color: #666666;
+}
+
 .shop_list {
     // display: flex;/
     // flex-wrap: wrap;
diff --git a/src/views/user_manage/components/downloadQR.vue b/src/views/user_manage/components/downloadQR.vue
index e616290..eaf1b6b 100644
--- a/src/views/user_manage/components/downloadQR.vue
+++ b/src/views/user_manage/components/downloadQR.vue
@@ -25,13 +25,14 @@ export default {
     },
     methods: {
         show() {
-            this.isshow = true
             this.getlist()
         },
         async getlist() {
             let res = await getwxacode({
                 shopId: localStorage.getItem('shopId')
             })
+            this.isshow = true
+
             this.imgUrl = res
         }, downImg() {
             // window.location.href()

From a8f01db5e3951bbae181c5ed87639eacaefb6c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com>
Date: Mon, 11 Nov 2024 13:36:44 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/add_shop.vue | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index 2587310..377a0e9 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -437,7 +437,7 @@ export default {
     Editor,
     addImg,
   },
-  name:'add_shop',
+  name: 'add_shop',
   data() {
     const validatordateUsed = (rule, value, callback) => {
       if (!this.form.notices.dateUsed) {
@@ -602,6 +602,7 @@ export default {
       batchNumberForm: {
         batchNumber: 0,
       },
+      routequery:''
     };
   },
   mounted() {
@@ -613,7 +614,21 @@ export default {
       this.tbProductGetDetail();
     }
   },
-  methods: {
+  watch: {
+    // 监听路由对象中的参数变化
+    $route(to, from) {
+      console.log(to.query.goods_id)
+      if (to.query.goods_id) {
+        if (this.routequery == to.query.goods_id) {
+          return false;
+        } else {
+          this.tbProductGetDetail();
+        }
+        this.routequery = to.query.goods_id
+      }
+    }
+  },
+    methods: {
     uploadImgSucess(res, item) {
       console.log(res);
       console.log(item);

From fea219ee4204142709a19fa0c4ff7564091ce6ea Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 12 Nov 2024 09:40:23 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E5=8F=AA=E8=83=BD=E8=BE=93=E6=AD=A3?=
 =?UTF-8?q?=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/add_coupon.vue | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index 8ab7da6..93ead75 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -11,11 +11,11 @@
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
         <el-form-item label="使用门槛">
-          <el-input v-model="form.fullAmount" type="number" placeholder="" style="width: 180px;margin-right: 66px;">
+          <el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;margin-right: 66px;">
             <template slot="prepend">满</template>
             <template slot="append">元</template>
           </el-input>
-          <el-input v-model="form.discountAmount" type="number" placeholder="" style="width: 180px;">
+          <el-input v-model="form.discountAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;">
             <template slot="prepend">减</template>
             <template slot="append">元</template>
           </el-input>
@@ -79,7 +79,7 @@
           />
         </el-form-item>
         <el-form-item label="发放数量" prop="number">
-          <el-input v-model="form.number" type="number" placeholder="" style="width: 200px;" />
+          <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 200px;" />
           <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
           </el-tooltip>
@@ -96,10 +96,10 @@
         <el-form-item label="商品券券名" prop="title">
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
-        <el-form-item />
-        <el-form-item />
+        <el-form-item style="margin: 0!important;" />
+        <el-form-item style="margin: 0!important;" />
         <el-form-item label="发放数量" prop="number">
-          <el-input v-model="form.number" type="number" placeholder="" style="width: 289px;" />
+          <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 289px;" />
           <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
           </el-tooltip>

From 8f8cbae221770813115f9fe81ff7605856c97427 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 12 Nov 2024 09:41:46 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E9=99=90=E5=88=B6=E9=87=91=E9=A2=9D?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E9=87=8F=E5=8F=AA=E8=83=BD=E8=BE=93=E6=AD=A3?=
 =?UTF-8?q?=E6=95=B4=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/add_coupon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index 93ead75..a527dd1 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -105,7 +105,7 @@
           </el-tooltip>
         </el-form-item>
         <el-form-item label="使用门槛">
-          全额满<el-input v-model="form.fullAmount" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
+          全额满<el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
         </el-form-item>
         <el-form-item label="赠送商品" prop="products">
           <div>

From e5ba63d8aa8cd1e6052488239500a065543a1afc Mon Sep 17 00:00:00 2001
From: duan <1004387497@qq.com>
Date: Tue, 12 Nov 2024 10:11:33 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=88=86=E7=BB=84=E6=8E=92=E5=88=97=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/components/addGroup.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/views/product/components/addGroup.vue b/src/views/product/components/addGroup.vue
index 3bd718f..4840106 100644
--- a/src/views/product/components/addGroup.vue
+++ b/src/views/product/components/addGroup.vue
@@ -27,12 +27,19 @@
                         <el-radio :label="0">禁用</el-radio>
                     </el-radio-group>
                 </el-form-item>
-                <el-form-item label="售卖时间管控" >
+                <el-form-item label="售卖时间管控">
                     <el-radio-group v-model="form.useTime">
                         <el-radio :label="1">启用</el-radio>
                         <el-radio :label="0">禁用</el-radio>
                     </el-radio-group>
                 </el-form-item>
+                <el-form-item label="排列方式">
+                    <el-radio-group v-model="form.sortMode">
+                        <el-radio label="0">默认</el-radio>
+                        <el-radio label="1">价格由高到低</el-radio>
+                        <el-radio label="2">销量由高到低</el-radio>
+                    </el-radio-group>
+                </el-form-item>
                 <el-form-item label="" v-if="form.useTime == 1">
                     <!-- <el-time-picker is-range v-model="form.saleTime" value-format="HH:mm" format="HH:mm"
                         :picker-options="pickerOptions" range-separator="至" start-placeholder="开始时间"
@@ -51,7 +58,7 @@
 
 
                 </el-form-item>
-                <el-form-item label="分组排序" >
+                <el-form-item label="分组排序">
                     <el-input-number v-model="form.sort" controls-position="right" :min="0"></el-input-number>
                 </el-form-item>
 
@@ -86,6 +93,7 @@ export default {
                 productIds: [],
                 saleTime: [],
                 useTime: 0,
+                sortMode: '0',
                 shopId: localStorage.getItem('shopId')
             },
             pickerOptions: {
@@ -182,7 +190,7 @@ export default {
         },
         async show(obj) {
             let res = await hasPermission('允许修改分组');
-            if ( !res) { return; }
+            if (!res) { return; }
             // if()
             this.form.useTime = 0
             if (obj && obj.id) {
@@ -192,6 +200,9 @@ export default {
                 this.form.name = obj.name
                 this.form.sort = obj.sort
                 this.form.productIds = obj.productIds
+                this.form.sortMode = obj.sortMode + ''
+                console.log(obj, '体哦啊是1')
+                console.log(this.form, '体哦啊是1')
                 // if (obj.saleStartTime != null) {
                 //     this.$set(this.form, 'saleTime', [obj.saleStartTime, obj.saleEndTime])
                 // }

From 2a27c5394bb94ed54c5e3f63d8a14f7313689178 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:06:13 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8D=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/coupon/index.vue               | 175 ++++++++++++++++++
 .../user_manage/components/addActive.vue      |  48 +++--
 2 files changed, 203 insertions(+), 20 deletions(-)
 create mode 100644 src/components/coupon/index.vue

diff --git a/src/components/coupon/index.vue b/src/components/coupon/index.vue
new file mode 100644
index 0000000..78b9013
--- /dev/null
+++ b/src/components/coupon/index.vue
@@ -0,0 +1,175 @@
+<template>
+    <el-dialog title="选择优惠劵" top="5vh" :visible.sync="dialogVisible">
+        <div class="head-container">
+            <el-table ref="table" :data="tableData.list" height="500" v-loading="tableData.loading">
+                <!-- <el-table-column type="selection" width="55" align="center" v-if="!radio"></el-table-column> -->
+                <el-table-column label="名称" prop="title" />
+                <el-table-column label="使用门槛">
+                    <template v-slot="scope">
+                        {{ `满${scope.row.fullAmount}${scope.row.discountAmount ? '减' + scope.row.discountAmount + '元' :
+                            ''}` }}
+                    </template>
+                </el-table-column>
+                <el-table-column label="总发放数量" prop="number" />
+                <el-table-column label="已使用" prop="useNumber" />
+                <el-table-column label="剩余" prop="leftNumber" />
+                <el-table-column label="操作">
+                    <template v-slot="scope">
+                        <el-button type="primary" @click="selectHandle(scope.row)">选择</el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+        <el-pagination :total="tableData.total" :current-page="tableData.page + 1" :page-size="tableData.size"
+            @current-change="paginationChange" @size-change="sizeChange"
+            layout="total, sizes, prev, pager, next, jumper"></el-pagination>
+        <span slot="footer" class="dialog-footer" v-if="!radio">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="confirmHandle">确 定</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+import { getTbShopCoupon, delTbShopCoupon } from '@/api/coupon'
+export default {
+    props: {
+        // 是否为单选
+        radio: {
+            type: Boolean,
+            default: false
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            searhForm: {
+                name: '',
+                category: ''
+            },
+            categoryList: [],
+            tableData: {
+                page: 0,
+                size: 10,
+                total: 0,
+                loading: false,
+                list: []
+            },
+            goods: []
+        }
+    },
+    methods: {
+        // 单选商品
+        selectHandle(row) {
+            this.$emit('success', [{ ...row }])
+            this.close()
+        },
+        // 确定选商品
+        confirmHandle() {
+            let res = this.$refs.table.selection
+            this.$emit('success', res)
+            this.close()
+        },
+        // 重置查询
+        resetHandle() {
+            this.searhForm.name = ''
+            this.searhForm.category = ''
+            this.tableData.page = 0
+            this.tableData.size = 10
+            this.tableData.list = []
+            this.getTableData()
+        },
+        // 分页大小改变
+        sizeChange(e) {
+            this.tableData.size = e
+            this.getTableData()
+        },
+        // 分页回调
+        paginationChange(e) {
+            this.tableData.page = e - 1
+            this.getTableData()
+        },
+        // 商品列表
+        async getTableData() {
+            this.tableData.loading = true
+            try {
+                const res = await getTbShopCoupon({
+                    page: this.tableData.page,
+                    size: this.tableData.size,
+                    name: this.searhForm.name,
+                    categoryId: this.searhForm.category,
+                    shopId: localStorage.getItem('shopId'),
+                    sort: 'id',
+                })
+                this.tableData.list = res.content
+                this.tableData.total = res.totalElements
+
+                if (this.goods.length) {
+                    this.$nextTick(() => {
+                        this.selection()
+                    })
+                }
+                setTimeout(() => {
+                    this.tableData.loading = false
+                }, 500);
+            } catch (error) {
+                console.log(error)
+            }
+        },
+        // 商品分类
+        async tbShopCategoryGet() {
+            try {
+                const res = await getTbShopCoupon({
+                    page: 0,
+                    size: 100,
+                    sort: 'id',
+                    shopId: localStorage.getItem('shopId')
+                })
+                this.categoryList = res.content
+            } catch (error) {
+                console.log(error)
+            }
+        },
+        async show(goods, categoryId) {
+            this.dialogVisible = true
+            if (goods && goods.length) {
+                this.goods = goods
+            } else {
+                this.goods = []
+            }
+            this.resetHandle()
+
+            console.log(categoryId);
+
+            if (categoryId) {
+                this.searhForm.category = categoryId
+            }
+
+            console.log(this.searhForm);
+        },
+        close() {
+            this.dialogVisible = false
+        },
+        selection() {
+            this.goods.forEach(row => {
+                this.tableData.list.forEach((item, index) => {
+                    if (row.id == item.id) {
+                        this.$refs.table.toggleRowSelection(this.tableData.list[index]);
+                    }
+                })
+            });
+        }
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.shop_info {
+    display: flex;
+    align-items: center;
+
+    span {
+        margin-left: 10px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/user_manage/components/addActive.vue b/src/views/user_manage/components/addActive.vue
index 45bee7d..0aee98e 100644
--- a/src/views/user_manage/components/addActive.vue
+++ b/src/views/user_manage/components/addActive.vue
@@ -52,18 +52,18 @@
                         </div>
                     </template>
                 </el-form-item>
-                <el-form-item label="选择优惠劵">
+                <el-form-item label="选择优惠劵" v-if="form.isUseCoupon == 1">
                     <div>
-                        <el-button type="primary" icon="el-icon-plus" @click="$refs.shopListRef.show([...productIds])">
+                        <el-button type="primary" icon="el-icon-plus" @click="$refs.coupon.show([...productIds])">
                             添加优惠劵
                         </el-button>
                     </div>
                     <div class="shop_list">
                         <div class="item_wrap" style="display: flex;align-items: center;margin-top: 6px;"
                             v-for="(item, index) in productIds" :key="item.id">
-                            <div class="name">{{ item.name }}</div>
-                            <el-input style="width: 120px;" v-model="item.num" placeholder='请填写数量'
-                                @input="checkIfNum(item)"></el-input>
+                            <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>
                         </div>
@@ -75,7 +75,7 @@
                 <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
             </span>
         </el-dialog>
-        <shopList ref="shopListRef" @success="slectShop" />
+        <coupon ref="coupon" @success="slectShop" />
 
     </div>
 </template>
@@ -83,12 +83,10 @@
 <script>
 import handselTypes from '../handselTypes'
 import { activate, storageupActivate } from '@/api/shop'
-import { queryReceive } from '@/api/coupon'
-
-import shopList from '@/components/shopList'
+import coupon from '@/components/coupon'
 
 export default {
-    components: { shopList },
+    components: { coupon },
     data() {
         return {
             dialogVisible: false,
@@ -131,15 +129,16 @@ export default {
     },
     methods: {
         slectShop(res) {
-            if (this.productIds.length) {
-                res.map(async item => {
-                    if (!await this.checkShop(item.id)) {
-                        this.productIds.push({ ...item })
-                    }
-                })
-            } else {
-                this.productIds = res
-            }
+            console.log(res, 11)
+            // if (this.productIds.length) {
+            //     res.map(async item => {
+            //         if (!await this.checkShop(item.id)) {
+            //             this.productIds.push({ ...item })
+            //         }
+            //     })
+            // } else {
+            this.productIds = res
+            // }
         },
         // 判断是否存在重复商品
         checkShop(id) {
@@ -167,6 +166,16 @@ export default {
                 });
                 return false;
             }
+            if (this.form.isUseCoupon == 1) {
+                if (this.productIds.length == 0) {
+                    this.$message({
+                        message: '请选择优惠劵',
+                        type: 'warning'
+                    });
+                    return false;
+                }
+                this.form.couponId = this.productIds[0].id
+            }
             // let arr = []
             // this.productIds.forEach(ele => {
             //     arr.push({
@@ -174,7 +183,6 @@ export default {
             //         num: ele.num
             //     })
             // })
-            // this.form.products = arr
             this.$refs.form.validate(async valid => {
                 if (valid) {
                     try {

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 7/9] =?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() {

From ee9405c5a6c1866b74a65f76a5fca8b4ef730bd4 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 12 Nov 2024 16:09:54 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/add_coupon.vue | 43 +++++++++++++++++---------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue
index a527dd1..d253a6d 100644
--- a/src/views/coupon_manage/add_coupon.vue
+++ b/src/views/coupon_manage/add_coupon.vue
@@ -6,29 +6,30 @@
     </div>
     <!-- 优惠券 -->
     <div v-if="form.type == 1" class="content">
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
-        <el-form-item label="优惠券券名" prop="title">
+      <el-form ref="form" :inline="true" :model="form" :rules="rules" label-width="120px" label-position="left">
+        <el-form-item label="优惠券券名" prop="title" style="width: 100%;">
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
-        <el-form-item label="使用门槛">
+        <el-form-item label="使用门槛" prop="fullAmount">
           <el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;margin-right: 66px;">
             <template slot="prepend">满</template>
             <template slot="append">元</template>
           </el-input>
+        </el-form-item>
+        <el-form-item label="" prop="discountAmount">
           <el-input v-model="form.discountAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 180px;">
             <template slot="prepend">减</template>
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
-
-        <el-form-item label="有效期类型">
+        <el-form-item label="有效期类型" style="width: 100%;">
           <el-radio-group v-model="form.validityType">
             <el-radio v-for="item in couponEnum.validityType" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime">
+        <el-form-item v-if="form.validityType == 'custom'" label="有效时间" prop="validEndTime" style="width: 100%;">
           <el-date-picker
             v-model="validityTime"
             type="daterange"
@@ -40,12 +41,12 @@
             @change="validityChange"
           />
         </el-form-item>
-        <el-form-item label="有效期（天）" prop="validDays">
+        <el-form-item label="有效期（天）" prop="validDays" style="width: 100%;">
           <el-input v-model="form.validDays" placeholder="" style="width: 200px;">
             <template slot="append">天</template>
           </el-input>
         </el-form-item>
-        <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect">
+        <!-- <el-form-item label="使用门槛" prop="daysToTakeEffect" style="width: 100%;">
           <el-input v-model="form.daysToTakeEffect" placeholder="" style="width: 200px;">
             <template slot="prepend">隔</template>
             <template slot="append">天生效</template>
@@ -54,19 +55,19 @@
             <i class="el-icon-question" />
           </el-tooltip>
         </el-form-item> -->
-        <el-form-item label="可用周期" prop="userDays">
+        <el-form-item label="可用周期" prop="userDays" style="width: 100%;">
           <el-checkbox-group v-model="form.userDays">
             <el-checkbox v-for="(city,index) in couponEnum.cycle" :key="index" :label="city.label" @change="userDayChagne">{{ city.label }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
-        <el-form-item label="指定时间段">
+        <el-form-item label="指定时间段" style="width: 100%;">
           <el-radio-group v-model="form.useTimeType">
             <el-radio v-for="item in couponEnum.useTimeType" :key="item.value" :label="item.value">
               {{ item.label }}
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime">
+        <el-form-item v-if="form.useTimeType == 'custom'" label="指定时间段" prop="useEndTime" style="width: 100%;">
           <el-time-picker
             v-model="useTime"
             is-range
@@ -78,7 +79,7 @@
             @change="useTimeChange"
           />
         </el-form-item>
-        <el-form-item label="发放数量" prop="number">
+        <el-form-item label="发放数量" prop="number" style="width: 100%;">
           <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 200px;" />
           <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
@@ -96,15 +97,13 @@
         <el-form-item label="商品券券名" prop="title">
           <el-input v-model="form.title" placeholder="" style="width: 289px;" />
         </el-form-item>
-        <el-form-item style="margin: 0!important;" />
-        <el-form-item style="margin: 0!important;" />
         <el-form-item label="发放数量" prop="number">
           <el-input v-model="form.number" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 289px;" />
           <el-tooltip class="item" effect="dark" content="限用户自行领取，（当库存为 0时，集草等活动仍会赠送）" placement="top-start">
             <i class="el-icon-question" />
           </el-tooltip>
         </el-form-item>
-        <el-form-item label="使用门槛">
+        <el-form-item label="使用门槛" prop="fullAmount">
           全额满<el-input v-model="form.fullAmount" oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" placeholder="" style="width: 100px;margin: 0 23px;"><template slot="suffix">元</template></el-input>可用
         </el-form-item>
         <el-form-item label="赠送商品" prop="products">
@@ -186,6 +185,20 @@ export default {
             trigger: 'blur'
           }
         ],
+        fullAmount: [
+          {
+            required: true,
+            message: '填写满减金额',
+            trigger: 'blur'
+          }
+        ],
+        discountAmount: [
+          {
+            required: true,
+            message: '填写满减金额',
+            trigger: 'blur'
+          }
+        ],
         number: [
           {
             required: true,

From 251353d48e1a75ad87edbf83fa674887dc846c57 Mon Sep 17 00:00:00 2001
From: GaoHao <1210693421@qq.com>
Date: Tue, 12 Nov 2024 16:15:06 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=BB=A1?=
 =?UTF-8?q?=E5=87=8F=E8=BE=93=E5=85=A5=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/coupon_manage/coupon_list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/coupon_manage/coupon_list.vue b/src/views/coupon_manage/coupon_list.vue
index d334361..b198c79 100644
--- a/src/views/coupon_manage/coupon_list.vue
+++ b/src/views/coupon_manage/coupon_list.vue
@@ -31,7 +31,7 @@
         <el-table-column label="总发放数量" prop="number" />
         <el-table-column label="已领取" align="center">
           <template v-slot="scope">
-            <div style="display: flex;align-items: center;">
+            <div style="display: flex;align-items: center;justify-content: center;">
               <div style="width: 30px;">{{ scope.row.number-scope.row.leftNumber }}</div>
               <div style="margin: 0 10px;">|</div>
               <div style="color: #3F9EFF;cursor: pointer;flex-shrink: 0;" @click="couponDetailsOpen(scope.row)">详情</div>