From e959aba44d219f77aa75c71847ab6da32a5f0537 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Wed, 18 Dec 2024 09:41:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/product/add_shop.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue index bcc8112..aaf2af5 100644 --- a/src/views/product/add_shop.vue +++ b/src/views/product/add_shop.vue @@ -666,8 +666,8 @@ export default { singlePeopleLimit: 0, weight: '', days: couponEnum.cycle.map(item => item.value), - startTime: '', - endTime: '' + startTime: '00:00', + endTime: '23:59' }, useTime: ['00:00', '23:59'], imgList: [], From b566eaf516aa7cbc87cc221ee678da06ee20873c Mon Sep 17 00:00:00 2001 From: wwz <114797966@qq.com> Date: Wed, 18 Dec 2024 11:22:14 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E8=B4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Instead/components/transfertoPinpin.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/views/tool/Instead/components/transfertoPinpin.vue b/src/views/tool/Instead/components/transfertoPinpin.vue index 7ef5a7d..9cc789d 100644 --- a/src/views/tool/Instead/components/transfertoPinpin.vue +++ b/src/views/tool/Instead/components/transfertoPinpin.vue @@ -119,14 +119,14 @@ export default { return false; } // 判断全选增加课桌费 - var tzf = [] - try { - let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length) - let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length) - if (one && tow) { - tzf = [999] - } - } catch (error) { } + // var tzf = [] + // try { + // let one = this.itemdata.old.list.every((i, index) => i.info.length == this.multipleSelection[index].length) + // let tow = this.itemdata.list.every((icon) => icon.length == this.refcartSelection.length) + // if (one && tow) { + // tzf = [999] + // } + // } catch (error) { } // 数据处理 增加cartId方便判断 if (this.refcartSelection.length) { this.refcartSelection.forEach((i) => { @@ -138,7 +138,7 @@ export default { await placeswitch({ masterId: this.masterId, orderId: this.itemdata.orderId, //当前台桌订单id 可选 - cartIds: this.isFull ? "" : [...cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)),...tzf] , //转单的购物车商品 并桌时可不传 可选 + cartIds: this.isFull ? "" : cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), //转单的购物车商品 并桌时可不传 可选 isFull: this.isFull, //并台会将全部购物车商品转入,默认为false 可选 currentTableId: this.currentTableId, targetTableId: this.targetTableId,