From 0c5ba4b0928a8655c11c658574ca186e9ea14852 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 27 Nov 2025 19:29:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B0=E6=A1=8C=E8=AE=A2=E5=8D=95=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=98=BE=E7=A4=BA=E9=A4=90=E4=BD=8D=E8=B4=B9=EF=BC=8C?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../table-order/components/controls.vue       |  2 +-
 .../table-order/components/goods-list.vue     | 33 ++++++++++++++++++-
 pagesCreateOrder/table-order/index.vue        |  2 ++
 stores/cart.js                                |  4 +--
 4 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/pagesCreateOrder/table-order/components/controls.vue b/pagesCreateOrder/table-order/components/controls.vue
index b2129ba..8619bf0 100644
--- a/pagesCreateOrder/table-order/components/controls.vue
+++ b/pagesCreateOrder/table-order/components/controls.vue
@@ -2,7 +2,7 @@
   <view class="box u-font-32">
     <view class="u-flex gap-30">
       <text>开单时间：</text>
-      <text class="color-666">2025/09/22 19:43</text>
+      <text class="color-666" v-if="cartStore.order">{{ cartStore.order.createTime }}</text>
     </view>
     <view class="u-flex gap-30 u-m-t-50">
       <text>就餐人数：</text>
diff --git a/pagesCreateOrder/table-order/components/goods-list.vue b/pagesCreateOrder/table-order/components/goods-list.vue
index 72ad935..c6dd9f0 100644
--- a/pagesCreateOrder/table-order/components/goods-list.vue
+++ b/pagesCreateOrder/table-order/components/goods-list.vue
@@ -32,7 +32,7 @@
             </template>
           </view>
         </view>
-        <view class="u-flex text-center" style="gap: 54rpx;min-width: 348rpx;">
+        <view class="u-flex text-center" style="gap: 54rpx; min-width: 348rpx">
           <text class="u-flex-1">{{ item.num }}</text>
           <view class="u-flex u-flex-1 u-relative">
             <text class="limit-price" v-if="showOldPrice(item)">
@@ -51,6 +51,37 @@
           }}</text>
         </view>
       </view>
+
+      <view class="item" v-if="cartStore.orderCostSummary.seatFee > 0">
+        <view class="u-flex">
+          <text>餐位费</text>
+        </view>
+        <view class="u-flex text-center" style="gap: 54rpx; min-width: 348rpx">
+          <text class="u-flex-1">{{ cartStore.personCount }}</text>
+          <view class="u-flex u-flex-1 u-relative">
+            <text class="origin-price">{{ cartStore.shopInfo.tableFee }}</text>
+          </view>
+
+          <text class="u-flex-1">
+            {{ cartStore.orderCostSummary.seatFee }}
+          </text>
+        </view>
+      </view>
+      <view class="item" v-if="cartStore.orderCostSummary.packFee > 0">
+        <view class="u-flex">
+          <text>打包费</text>
+        </view>
+        <view class="u-flex text-center" style="gap: 54rpx; min-width: 348rpx">
+          <text class="u-flex-1"></text>
+          <view class="u-flex u-flex-1 u-relative">
+            <text class="origin-price"></text>
+          </view>
+
+          <text class="u-flex-1">
+            {{ cartStore.packFee }}
+          </text>
+        </view>
+      </view>
     </view>
   </view>
 </template>
diff --git a/pagesCreateOrder/table-order/index.vue b/pagesCreateOrder/table-order/index.vue
index 15ef013..b102d74 100644
--- a/pagesCreateOrder/table-order/index.vue
+++ b/pagesCreateOrder/table-order/index.vue
@@ -135,6 +135,8 @@ const websocketUtil=inject("websocketUtil")
 
 const cartStore = useCartStore();
 const accountStore = useAccountStore();
+
+cartStore.shopInfo=accountStore.shopInfo;
 websocketUtil.onMessage((data) => {
   cartStore.onMessage(data);
 });
diff --git a/stores/cart.js b/stores/cart.js
index 1e3a040..f3d7a9e 100644
--- a/stores/cart.js
+++ b/stores/cart.js
@@ -3,7 +3,6 @@ import { defineStore } from "pinia";
 import yskUtils from "ysk-utils";
 import { getNowCart } from "@/pagesCreateOrder/util.js";
 import * as orderApi from "@/http/api/order.js";
-
 export function formatCartGoods(goods) {
   return {
     ...goods,
@@ -72,8 +71,9 @@ export const useCartStore = defineStore("cart", {
   getters: {
     //餐费费
     seatFeeConfig: (state) => {
+      console.log(state.shopInfo);
       return {
-        pricePerPerson: state.shopInfo.tableFee || 0,
+        pricePerPerson: state.shopInfo.tableFee,
         personCount: state.personCount, //就餐人数
         isEnabled: !state.shopInfo.isTableFee,
       };