From b31a908609a87d78713c30b5f5884421e5197b11 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 28 Oct 2024 13:50:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=A4=90=E4=BD=8D=E8=B4=B9?=
 =?UTF-8?q?=E5=92=8C=E6=89=93=E5=8C=85=E8=B4=B9=E9=A2=9D=E5=A4=96=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesOrder/detail/components/extra.vue | 4 ++--
 pagesOrder/pay-order/pay-order.vue     | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pagesOrder/detail/components/extra.vue b/pagesOrder/detail/components/extra.vue
index f56a5d9..8cfe4c8 100644
--- a/pagesOrder/detail/components/extra.vue
+++ b/pagesOrder/detail/components/extra.vue
@@ -1,5 +1,5 @@
 <template>
-	<view class="default-box-padding bg-fff border-r-12 u-m-t-20">
+	<view class="default-box-padding bg-fff border-r-12 u-m-t-20" v-if="packeFee>0||data.totalAmount>0">
 		<view class="u-flex u-row-between">
 			<view class="font-bold">附加费</view>
 				<template v-if="orderInfo.status=='unpaid'&&data.status!='return'">
@@ -13,7 +13,7 @@
 			<template v-if="data.status!='return'">
 				<view class="u-flex u-row-between u-m-t-24">
 					<view>{{data.name||'餐位费'}}</view>
-					<view>x{{data.number}}</view>
+					<view>x{{data.number||0}}</view>
 					<view class="price-min-width">￥{{data.totalAmount}}</view>
 				</view>
 			</template>
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 0ed8f1b..551888e 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -46,6 +46,7 @@
 									</view>
 									<view class="u-flex color-999 u-font-24">
 										<view class="u-m-r-20" v-if="item.payType=='vipPay'">
+											<text class="u-m-r-4">{{user.telephone||user.nickName}}</text>
 											<text>余额：</text>
 											<text>￥{{user.amount||'0'}}</text>
 										</view>
@@ -194,6 +195,7 @@
 				 type: data.id ? 0 : 1 //0 设置 1 取消
 			 }).then(res=>{
 				 user.value = data
+				 order.userId=data.id
 			 })
 		})
 	}