From d14ba5e8120aec37e02bcc86e942d96378ba61df Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 13 Nov 2024 10:41:10 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F=E5=90=8E?= =?UTF-8?q?=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index 1d4c633..c0c79eb 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -3891,7 +3891,7 @@ export default { this.$router.replace({ path: "/tool/table_list" }); } else { this.$router.replace({ path: "/tool/Instead/index" }); - // this.$router.go(0); + this.$router.go(0); // this.reset(); // this.$router.replace({ path: "/tool/Instead/index" }); } From fabe5e3060d706cb905bdd88e3ecb4c6ec92f77f Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 13 Nov 2024 13:45:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=88=E4=BB=98?= =?UTF-8?q?=E8=B4=B9=E4=B8=8B=E7=8E=B0=E9=87=91=E6=94=AF=E4=BB=98=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E6=AC=A1=E7=82=B9=E5=87=BB=E6=97=B6=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/tool/Instead/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue index c0c79eb..21e4594 100644 --- a/src/views/tool/Instead/index.vue +++ b/src/views/tool/Instead/index.vue @@ -1752,7 +1752,11 @@ export default { }, yinFuJinE() { const total = this.currentPayMoney - (this.points.toMoney || 0); - return total.toFixed(2); + if(this.isCreateOrder){ + return total.toFixed(2); + }else{ + return this.allPrice; + } }, disableTuicai() { return ( From 266674272d0749e71421d5dd556ce68e15a22356 Mon Sep 17 00:00:00 2001 From: GaoHao <1210693421@qq.com> Date: Wed, 13 Nov 2024 13:46:40 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=B8=E5=95=86?= =?UTF-8?q?=E5=93=81ID=E5=AD=97=E6=AE=B5=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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/coupon_manage/add_coupon.vue b/src/views/coupon_manage/add_coupon.vue index d253a6d..017b797 100644 --- a/src/views/coupon_manage/add_coupon.vue +++ b/src/views/coupon_manage/add_coupon.vue @@ -324,7 +324,7 @@ export default { res.map(async item => { if (!await this.checkShop(item.id)) { this.form.products.push({ - id: item.id, + productId: item.id, name: item.name, num: null }) @@ -332,7 +332,7 @@ export default { }) } else { this.form.products.push({ - id: res[0].id, + productId: res[0].id, name: res[0].name, num: null }) From 13c473a2344b0825ecdd61b5e7303640887d1fcd Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Wed, 13 Nov 2024 14:30:57 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=B9=E6=8D=AEisPostpaid=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E5=8F=AF=E4=BB=A5=E9=80=80=E8=8F=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/order_manage/order_goods_util.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/order_manage/order_goods_util.js b/src/views/order_manage/order_goods_util.js index b0e821d..d12b29c 100644 --- a/src/views/order_manage/order_goods_util.js +++ b/src/views/order_manage/order_goods_util.js @@ -11,6 +11,9 @@ export function returnPackFee(arr) { } export function canTuicai(orderInfo,item){ + if(orderInfo.status=='unpaid'&&orderInfo.isPostpaid!==null&&orderInfo.isPostpaid==0){ + return false + } return orderInfo.status=='unpaid'&&orderInfo.useType!='dine-in-before'&& item.status!='return' } export function canTuiKuan(orderInfo,item){ 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 5/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 6/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 7/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 8/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 9/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 @@