From 76d844274a41ca3eb2705e937449fb47279cc239 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Mon, 4 Nov 2024 10:56:10 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=9B=BE=E6=A0=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageProduct/invoicing-list/invoicing-list.vue | 4 ++-- pageProduct/static/images/icon-arrow-down-fill.svg | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 pageProduct/static/images/icon-arrow-down-fill.svg diff --git a/pageProduct/invoicing-list/invoicing-list.vue b/pageProduct/invoicing-list/invoicing-list.vue index c6406b9..807c62c 100644 --- a/pageProduct/invoicing-list/invoicing-list.vue +++ b/pageProduct/invoicing-list/invoicing-list.vue @@ -5,14 +5,14 @@ 筛选时间 - 选择类型 {{types.list[types.active].text}} - diff --git a/pageProduct/static/images/icon-arrow-down-fill.svg b/pageProduct/static/images/icon-arrow-down-fill.svg new file mode 100644 index 0000000..4275b7e --- /dev/null +++ b/pageProduct/static/images/icon-arrow-down-fill.svg @@ -0,0 +1 @@ + \ No newline at end of file From 0ad11a9866faf4a6e1fdd3229901ee6123b4e594 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Mon, 4 Nov 2024 14:23:10 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=87=E6=8D=A2=E7=94=A8=E6=88=B7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E5=B0=86=E4=B9=8B=E5=89=8D=E7=9A=84userId=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=94=B9=E4=B8=BAmemberId=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesOrder/detail/detail.vue | 9 +++++---- pagesOrder/pay-order/pay-order.vue | 25 +++++++++++++++---------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/pagesOrder/detail/detail.vue b/pagesOrder/detail/detail.vue index a3405f3..18059ef 100644 --- a/pagesOrder/detail/detail.vue +++ b/pagesOrder/detail/detail.vue @@ -221,7 +221,7 @@ if(!canJieZhang){ return } - const userId=orderDetail.info.userId||'' + const memberId=orderDetail.info.memberId||'' clearEmit() go.to('PAGES_ORDER_PAY', { tableId: options.tableId|| orderDetail.info.tableId, @@ -229,7 +229,7 @@ masterId: options.masterId, orderId: orderDetail.info.id, discount: 1, - userId + memberId }) } @@ -243,8 +243,8 @@ const options = reactive({}) async function init() { const res = await orderApi.tbOrderInfoDetail(options.id) - if(res.userId){ - queryAllShopUser({id:res.userId}).then(res=>{ + if(res.memberId){ + queryAllShopUser({id:res.memberId}).then(res=>{ if(res.content[0]){ user.value=res.content[0] } @@ -320,6 +320,7 @@ //更新选择用户 function setUser(par) { const submitPar = { + orderId:options.id||'', masterId: options.masterId, tableId: options.tableId|| orderDetail.info.tableId, vipUserId: user.value.id ? user.value.id : '', diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue index 551888e..50c53d9 100644 --- a/pagesOrder/pay-order/pay-order.vue +++ b/pagesOrder/pay-order/pay-order.vue @@ -42,13 +42,18 @@ - {{item.payName}} + {{item.payName}} - {{user.telephone||user.nickName}} - 余额： - ￥{{user.amount||'0'}} + + 会员： + {{user.telephone||user.nickName}} + + + 余额： + ￥{{user.amount||'0'}} + @@ -195,7 +200,7 @@ type: data.id ? 0 : 1 //0 设置 1 取消 }).then(res=>{ user.value = data - order.userId=data.id + order.memberId=data.id }) }) } @@ -286,7 +291,7 @@ masterId: order.masterId, orderId: order.id || order.orderId, payType, - vipUserId: order.userId, + vipUserId: order.memberId, discount: 1, code: '' }) @@ -337,11 +342,11 @@ }) let payCodeUrl = ref('') async function init() { - const res = await orderApi.tbOrderInfoDetail(order.orderId) - Object.assign(order, res) - if (order.userId) { + const orderRes = await orderApi.tbOrderInfoDetail(order.orderId) + Object.assign(order, orderRes) + if (orderRes.memberId) { queryAllShopUser({ - id: order.userId + id: orderRes.memberId }).then(res => { if(res.content[0]){ user.value =res.content[0] From 72702ca3ccfdf143ad05c6356073ca1d1472a847 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Mon, 4 Nov 2024 14:30:48 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=AD=90=E5=88=86?= =?UTF-8?q?=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pageCategory/edit-category/edit-category.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pageCategory/edit-category/edit-category.vue b/pageCategory/edit-category/edit-category.vue index 13686b4..05d9209 100644 --- a/pageCategory/edit-category/edit-category.vue +++ b/pageCategory/edit-category/edit-category.vue @@ -71,7 +71,8 @@ --> -