From 6119af35df15271e4485989c7aa5662fba18fa59 Mon Sep 17 00:00:00 2001
From: sjeam <359824901@qq.com>
Date: Fri, 15 Aug 2025 17:10:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B4=E5=B8=AD2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/banquet/combo/detail.vue | 11 ++++---
 src/pages/banquet/order/detail.vue | 14 ++++-----
 src/pages/banquet/order/list.vue   | 48 ++++++++++++------------------
 src/static/styles/common.scss      |  4 ++-
 4 files changed, 34 insertions(+), 43 deletions(-)

diff --git a/src/pages/banquet/combo/detail.vue b/src/pages/banquet/combo/detail.vue
index 9acf416..42e5f6c 100644
--- a/src/pages/banquet/combo/detail.vue
+++ b/src/pages/banquet/combo/detail.vue
@@ -124,7 +124,9 @@
                       :show="true" prefixIcon="" customStyle=""
                       iconStyle="font-size:28rpx;color:#59CB56;margin-right:10rpx;" lines="1" decoration="none">
                     </up-text>
-                    <u-icon slot="right" label-color="#fa4e62" :label="`X${item.number}`"></u-icon>
+                    <u-icon v-if="oder_type===1" slot="right" label-color="#fa4e62" :label="`X${item.number}`"></u-icon>
+
+                    <u-icon v-else slot="right" label-color="#fa4e62" :label="`X${orderInfo.table_number}`"></u-icon>
                   </view>
                 </template>
               </u-cell>
@@ -140,8 +142,10 @@
       <template #title>
         <view class="title font-size-32">
           <view>费用合计：</view>
-          <view class="title-tip ">
-            <text class="font-size-32  font-bold color-red">￥{{ totalPrice }}元</text>
+          <view class="title-tip " >
+            <text v-if="oder_type===1" class="font-size-32  font-bold color-red">￥{{ totalPrice }}元</text>
+            <text v-else class="font-size-32  font-bold color-red">￥{{ matchedItems_sp[0][0].dishes.price *orderInfo.table_number }}元</text>
+          
           </view>
         </view>
       </template>
@@ -236,7 +240,6 @@
         </wd-cell-group>
       </wd-form>
 
-      <!-- 一般的，检举内容由承办的党的委员会或纪律检查委员会将处理意见或复议、复查结论同申诉人见面，听取其意见。复议、复查的结论和决定，应交给申诉人一份。 -->
       <template #footer>
         <!-- <wd-button size="small" plain>查看详情</wd-button> -->
       </template>
diff --git a/src/pages/banquet/order/detail.vue b/src/pages/banquet/order/detail.vue
index e5f7f4a..65c2ff6 100644
--- a/src/pages/banquet/order/detail.vue
+++ b/src/pages/banquet/order/detail.vue
@@ -168,18 +168,14 @@
       <view>3.如若档期冲突订单被厨师取消，定金将原路返回，请放心下单。</view>
       <view>4.在此，感谢您对此平台以及厨师们的支持，您的支持就是我们前进的最大动力。</view>
 
-      <wd-form ref="form" :model="orderInfo" errorType="message">
-        <wd-cell-group border>
-          <view class="pb-4" />
-          <wd-button plain hairline custom-style="width: calc(100vw - 100rpx);" @click="payOrder(1)">确定支付</wd-button>
-          <view class="pb-2" />
-          <wd-button hairline custom-style="width: calc(100vw - 100rpx);" @click="payOrder(2)">取消订单</wd-button>
-        </wd-cell-group>
-      </wd-form>
-
       <template #footer>
+          <view class="pb-4" />
+          <wd-button plain hairline custom-style="width: calc(100vw - 120rpx);" @click="payOrder(1)">确定支付</wd-button>
+          <view class="pb-2" />
+          <wd-button hairline custom-style="width: calc(100vw - 120rpx);" @click="payOrder(2)">取消订单</wd-button>
       </template>
     </wd-card>
+    <view class="p-2"></view> 
   </view>
 </template>
 
diff --git a/src/pages/banquet/order/list.vue b/src/pages/banquet/order/list.vue
index 28bdd05..defe350 100644
--- a/src/pages/banquet/order/list.vue
+++ b/src/pages/banquet/order/list.vue
@@ -1,21 +1,4 @@
-<style>
-.ellipsis {
-	/* 在末尾显示省略号 */
-	width: 420rpx;
-	/* 防止文字换行 */
-	overflow: hidden;
-	/* 隐藏超出部分的文字 */
-	text-overflow: ellipsis;
-	white-space: nowrap;
-	/* 确保元素有宽度 */
-}
-
-html,
-body {
-	height: 0rpx;
-}
-</style>
-
+ 
 <template>
 	<view>
 		<up-navbar class="  " :autoBack="true" style="font-weight: bold;" leftIcon="arrow-left" title="订单列表"
@@ -31,23 +14,30 @@ body {
 			:paging-style="{ 'background-color': '#FFFFFFFF', 'padding': '20rpx' }" ref="pagingRefSP"
 			v-model="matchedItems_sp" @query="changeSP" class="fv-page  flex-col ">
 			<view v-for="(item, index) in matchedItems_sp" :key="index" @click="orderDetail(item.id)">
-				<wd-card>
-					<!-- <template #title>
-						<view> {{ item.order_sn }}</view>
-					</template> -->
-					<view class="pt-2">订单编号：{{ item.order_sn }} </view>
+				<wd-card  >
+					<template #title>
+						<view class="title">
+							<view> 创建时间：{{ item.create_time }} </view>
+							<text v-if="item.paid === 0">
+								<wd-tag custom-class="space" mark>未付款</wd-tag>
+							</text>
+							<text v-else>
+								<wd-tag custom-class="space" type="primary" mark>已付款</wd-tag>
+							</text>
+						</view>
+					</template>
+					<view>订单编号：{{ item.order_sn }} </view>
 					<view class="pt-2">联系人：{{ item.customer_name }}</view>
 					<view class="pt-2">联系电话：{{ item.phone }}</view>
 					<view class="pt-2">宴席类型：{{ item.banquet_type }}</view>
 					<view class="pt-2">宴席地址：{{ item.address }}</view>
+					<view class="pt-2">支付金额：<text  >￥{{ item.final_price }}元</text></view>
+					<view class="pt-2">预付金额：<text  >￥{{ item.prepay_price }}元</text></view>
 					<view class="pt-2">备注：{{ item.remark }}</view>
-					<view class="pt-2">支付金额：<text class="color-red">￥{{ item.final_price }}元</text></view>
-					<view class="pt-2">预付金额：<text class="color-red">￥{{ item.prepay_price }}元</text></view>
 					<template #footer>
-						<view>
-							<!-- <wd-button size="small" style="margin-right: 8px;">评价</wd-button> -->
+						<!-- <view>
 							<wd-button size="small" plain>查看详情</wd-button>
-						</view>
+						</view> -->
 					</template>
 				</wd-card>
 			</view>
@@ -56,7 +46,7 @@ body {
 		<!-- <up-button class="" style="" text="返回首页" type="primary" color="#59CB56" shape="circle" size="normal"
 			custom-style="width:calc(100vw - 50rpx)" @click="goBackHome">
 		</up-button> -->
-	 
+
 	</view>
 
 </template>
diff --git a/src/static/styles/common.scss b/src/static/styles/common.scss
index 8a4eda0..1a9f789 100644
--- a/src/static/styles/common.scss
+++ b/src/static/styles/common.scss
@@ -27,7 +27,9 @@ body {
   text-decoration: line-through;
   /* 禁用日期的文字带有删除线 */
 }
-
+// .wd-card {
+// 	border: 1px solid #e2e2e2;
+// }
 
 html,
 body {