From 7275bc66e9d56e110eb621217799acd50d3638a0 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 13 Nov 2024 14:37:25 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E9=97=A8=E6=A7=9B=E9=99=90=E5=88=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B0=8F=E6=95=B0=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/coupon_manage/add_coupon.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index 017b797..5a11f05 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -11,13 +11,13 @@ - + - + @@ -104,7 +104,7 @@ - 全额满可用 + 全额满可用
From 519b28f74679db159d24aca7db697384fd97b44f Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 13 Nov 2024 16:21:02 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/coupon_manage/add_coupon.vue | 85 +++++++++++++++++++++----- src/views/coupon_manage/couponEnum.js | 4 +- 2 files changed, 73 insertions(+), 16 deletions(-) diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index 5a11f05..f3f7c55 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -10,18 +10,19 @@ - + - + + @@ -29,7 +30,7 @@ - + 确 定
- -
+
- + - - - - - - 全额满可用 + + + + {{ item.label }} + + + + + + + + + + + + + + + {{ city.label }} + + + + + + {{ item.label }} + + + + + + + + + + + +
@@ -123,7 +180,6 @@
- 取 消 @@ -166,7 +222,7 @@ export default { title: '', fullAmount: null, discountAmount: null, - validityType: 'fixed', + validityType: 'custom', validStartTime: '', validEndTime: '', userDays: [], @@ -266,6 +322,7 @@ export default { */ tabClick(item) { console.log(this.form) + this.form = this.resetForm this.form.number = '' this.form.type = item.type this.$refs.form.resetFields() diff --git a/src/views/coupon_manage/couponEnum.js b/src/views/coupon_manage/couponEnum.js index f4cbaf5..973ef4c 100644 --- a/src/views/coupon_manage/couponEnum.js +++ b/src/views/coupon_manage/couponEnum.js @@ -30,11 +30,11 @@ export default { ], validityType: [ { - value: 'fixed', + value: 'custom', label: '领券后有效期内可用' }, { - value: 'custom', + value: 'fixed', label: '固定有效期范围内可用' } ], From 76774a4ec5b50b408f2e8a5a229f28632598292a Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 13 Nov 2024 17:00:15 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/coupon_manage/add_coupon.vue | 31 +++++++++++++------------- src/views/coupon_manage/couponEnum.js | 4 ++-- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index f3f7c55..4c27a53 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -22,7 +22,6 @@ - @@ -30,7 +29,12 @@ - + + + + + + - - - - - 确 定
@@ -107,7 +106,12 @@ - + + + + + + - - - - - 确 定 @@ -222,7 +221,7 @@ export default { title: '', fullAmount: null, discountAmount: null, - validityType: 'custom', + validityType: 'fixed', validStartTime: '', validEndTime: '', userDays: [], diff --git a/src/views/coupon_manage/couponEnum.js b/src/views/coupon_manage/couponEnum.js index 973ef4c..f4cbaf5 100644 --- a/src/views/coupon_manage/couponEnum.js +++ b/src/views/coupon_manage/couponEnum.js @@ -30,11 +30,11 @@ export default { ], validityType: [ { - value: 'custom', + value: 'fixed', label: '领券后有效期内可用' }, { - value: 'fixed', + value: 'custom', label: '固定有效期范围内可用' } ], From b836d1a0b47cd923acb2ef4f7eded9a485d3f4d3 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 13 Nov 2024 18:22:39 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=A5=BD=E5=8F=8B=20?= =?UTF-8?q?=E5=A5=96=E5=8A=B1=E5=88=B8=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/application/components/invite_friend/setting.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/application/components/invite_friend/setting.vue b/src/views/application/components/invite_friend/setting.vue index 1c06421..2ad629b 100644 --- a/src/views/application/components/invite_friend/setting.vue +++ b/src/views/application/components/invite_friend/setting.vue @@ -80,6 +80,9 @@ 添加券 +
+
奖励券不受优惠券发放数量影响
+
From 528344d6ce6f7ed949fa3636a7fa8e484ef609bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Wed, 13 Nov 2024 18:28:50 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=87=91=E9=A2=9D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=95=B4=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user_manage/components/addActive.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/user_manage/components/addActive.vue b/src/views/user_manage/components/addActive.vue index efad826..5054eed 100644 --- a/src/views/user_manage/components/addActive.vue +++ b/src/views/user_manage/components/addActive.vue @@ -5,12 +5,13 @@ From 094a8fc102e6e14c81ee83282df1c15bcaf95b71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=8F=E5=95=BE?= <1144797966@qq.com> Date: Thu, 14 Nov 2024 14:04:31 +0800 Subject: [PATCH 9/9] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user_manage/active_list.vue | 5 +++-- src/views/user_manage/components/addActive.vue | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/user_manage/active_list.vue b/src/views/user_manage/active_list.vue index 1141d7e..4ce7f6b 100644 --- a/src/views/user_manage/active_list.vue +++ b/src/views/user_manage/active_list.vue @@ -38,8 +38,9 @@ diff --git a/src/views/user_manage/components/addActive.vue b/src/views/user_manage/components/addActive.vue index 0d3a14f..15c4da6 100644 --- a/src/views/user_manage/components/addActive.vue +++ b/src/views/user_manage/components/addActive.vue @@ -40,8 +40,7 @@ --> - + @@ -221,7 +220,7 @@ export default { // let res = await activate(obj.id) // this.productIds = res if (obj.couponId) { - this.productIds = [{ title: obj.couponName }] + this.productIds = [{ title: obj.couponName,id:obj.couponId }] } console.log(obj, '调试1') }