From 86240ee89d2aa084905e0fc6ee28c1623362dabc Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 18 Oct 2024 16:45:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesCreateOrder/confirm-order/confirm-order.vue |  2 +-
 pagesOrder/detail/components/list.vue            |  8 ++++----
 pagesOrder/detail/components/order.vue           | 11 +++++++----
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 5ae943d..af73441 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -169,7 +169,7 @@
 						</view>
 					</view>
 					<template v-if="item.note">
-						<view class="u-p-20 bg-gray u-m-t-10">
+						<view class="u-p-20 bg-gray u-m-t-16">
 							{{item.note}}
 						</view>
 					</template>
diff --git a/pagesOrder/detail/components/list.vue b/pagesOrder/detail/components/list.vue
index e0c98d5..3d43056 100644
--- a/pagesOrder/detail/components/list.vue
+++ b/pagesOrder/detail/components/list.vue
@@ -1,16 +1,16 @@
 <template>
 	<view class="default-box-padding bg-fff border-r-24 u-m-t-32" v-if="data.length">
-		<view class=" font-bold u-p-b-32 border-bottom">
+		<view class=" font-bold u-p-b-32 border-bottom u-m-b-24" v-if="orderInfo.tableName">
 			<text class="">桌号：</text>
 			<text class="">{{orderInfo.tableName||""}}</text>
 		</view>
-		<view class=" u-m-t-24 color-999 border-bottom u-p-b-24">
+		<view class="  color-999 border-bottom u-p-b-24">
 			<text>共</text>
 			<text class="color-333 "> {{goodsNumber}}</text>
 			<text>份菜品</text>
 		</view>
-		<view class="u-m-b-20 u-m-t-24" v-for="(order,orderIndex) in data" :key="orderIndex">
-			<view class=""> 第{{ order.placeNum }}次下单
+		<view class="u-m-b-20 " v-for="(order,orderIndex) in data" :key="orderIndex">
+			<view class="u-p-t-24"> 第{{ order.placeNum }}次下单
 			</view>
 			<view class="u-m-t-24 list">
 				<view class="item  u-m-b-32" v-for="(item,index) in order.info" :key="index">
diff --git a/pagesOrder/detail/components/order.vue b/pagesOrder/detail/components/order.vue
index 5785bca..be6967a 100644
--- a/pagesOrder/detail/components/order.vue
+++ b/pagesOrder/detail/components/order.vue
@@ -32,10 +32,13 @@
 			<view>订单编号</view>
 			<view>{{data.orderNo}}</view>
 		</view>
-		<!-- <view class="u-flex u-row-between u-m-t-24">
-			<view>商家备注</view>
-			<my-button plain shape="circle" :width="160" :height="60">编辑</my-button>
-		</view> -->
+		<view class="u-flex u-row-between u-m-t-24 u-col-top">
+			<view class="no-wrap">商家备注</view>
+			<view class="u-p-l-32 " style="max-width: 522rpx;    word-wrap: break-word;">
+				{{data.remark}}
+			</view>
+			<!-- <my-button plain shape="circle" :width="160" :height="60">编辑</my-button> -->
+		</view>
 	</view>
 </template>