From 90eb77d891f7a3b1aeec7871a8272cdd30561b10 Mon Sep 17 00:00:00 2001 From: YeMingfei666 <1619116647@qq.com> Date: Sat, 28 Sep 2024 15:08:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pagesOrder/detail/components/extra.vue | 18 ++- pagesOrder/detail/components/list.vue | 20 ++- pagesOrder/detail/components/order.vue | 27 ++-- pagesOrder/detail/detail.vue | 125 +++++++++------ pagesOrder/index/compoents/order-item.vue | 7 +- pagesOrder/index/compoents/order-list.vue | 2 +- pagesOrder/index/index.vue | 66 +++++--- pagesOrder/pay-order/pay-order.vue | 85 +++++++--- pagesOrder/tuikuan/tuikuan.vue | 184 ++++++++++++++++++++-- 9 files changed, 409 insertions(+), 125 deletions(-) diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue index 0be1bfc..145294b 100644 --- a/pagesOrder/detail/components/extra.vue +++ b/pagesOrder/detail/components/extra.vue @@ -2,7 +2,12 @@ 附加费 - 退菜 + + {{data.name||'餐位费'}} @@ -18,6 +23,10 @@ type: Object, default: () => {} }, + orderInfo:{ + type: Object, + default: () => {} + }, table:{ type: Object, default: () => {} @@ -27,9 +36,16 @@ const statusMap={ unpaid:'未支付' } + const emits=defineEmits(['tuicai','tuikuan','printOrder']) function returnStatus(status){ return statusMap[status]||'' } + function tuikuan(){ + emits('tuikuan',props.data) + } + function tuicai(){ + emits('tuicai',props.data) + } + .gap-28 { + gap: 28rpx; + font-size: 24rpx; + } + + .list { + padding: 0 24rpx; + } + + .list .item:first-child { + border: none; + } + + .tag { + padding: 8rpx 16rpx 6rpx 16rpx; + border: 1px solid #E5E5E5; + border-radius: 4rpx; + + &.active { + border-color: #E6F0FF; + color: $my-main-color; + } + } + \ No newline at end of file