From 2c2a87ab19ec7e3b63b16d20e8697c514a096c2b Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Mon, 1 Dec 2025 13:47:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dsocket=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E9=97=AE=E9=A2=98=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=8F=9C=E5=93=81=E7=8A=B6=E6=80=81=E6=9C=AA=E4=B8=8A=E8=8F=9C?=
 =?UTF-8?q?=E8=B6=85=E5=B8=82=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/login/index.vue                           |  2 +-
 pagesCreateOrder/index/index.vue                | 12 +++++++++++-
 .../table-order/components/goods-list.vue       | 17 ++++++++++++-----
 stores/cart.js                                  |  2 +-
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/pages/login/index.vue b/pages/login/index.vue
index 9ab3bbe..7aa1e88 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -1,7 +1,7 @@
 <template>
   <view
     class="login-wrapper u-flex u-row-right"
-    style="background-image: url('/static/login/bg.png')"
+    style="background-image: url('/static/login/bg.png');background-size: cover;"
   >
     <view class="u-flex u-row-right" style="padding-right: 266rpx">
       <view>
diff --git a/pagesCreateOrder/index/index.vue b/pagesCreateOrder/index/index.vue
index 63b4213..3bbf97d 100644
--- a/pagesCreateOrder/index/index.vue
+++ b/pagesCreateOrder/index/index.vue
@@ -523,7 +523,11 @@ function onMessage() {
       );
     }
 
-    if (msg.status == 0 && msg.type != "time_discount") {
+    if (
+      msg.status == 0 &&
+      msg.type != "time_discount" 
+    ) {
+      console.log("msg", msg);
       infoBox.showToast(msg.msg || "添加失败");
       data.isGoodsAdd = true;
       // 如果是商品库存不足起售数量
@@ -642,6 +646,9 @@ async function getHistoryOrderDetail() {
   if (shopInfo.registerType == "before") {
     return;
   }
+  if(!data.table.tableCode){
+    return;
+  }
   data.historyOrder = [];
   let res = await getHistoryOrder({
     tableCode: data.table.tableCode,
@@ -2011,6 +2018,9 @@ async function getLimit() {
 }
 
 async function getTableDetail() {
+  if(!data.table.tableCode){
+    return;
+  }
   let res = await $returnTableDetail({
     tableCode: data.table.tableCode,
   });
diff --git a/pagesCreateOrder/table-order/components/goods-list.vue b/pagesCreateOrder/table-order/components/goods-list.vue
index 4bd0a21..4a1981f 100644
--- a/pagesCreateOrder/table-order/components/goods-list.vue
+++ b/pagesCreateOrder/table-order/components/goods-list.vue
@@ -24,7 +24,11 @@
               >包
               <view class="badge">{{ item.packNumber }}</view>
             </text>
-            <template v-if="item.subStatus &&cartStore.shopInfo.registerType=='after'">
+            <template
+              v-if="
+                item.subStatus && cartStore.shopInfo.registerType == 'after'
+              "
+            >
               <text
                 class="status"
                 :class="[
@@ -111,13 +115,16 @@ const timer = setInterval(() => {
 }, 1000);
 
 //超时时间
-const maxTime = cartStore.shopInfo.serveTime*60*1000;
+const maxTime = cartStore.shopInfo.serveTime * 60 * 1000;
 
 function returnStatusClass(item) {
   if (item.subStatus == "DELIVERED") {
     return "success";
   }
-  if (item.subStatus == "READY_TO_SERVE") {
+  if (
+    item.subStatus == "READY_TO_SERVE" &&
+    returnSubStatusText(item) != "已超时"
+  ) {
     return "warning";
   }
   if (item.subStatus == "SENT_OUT") {
@@ -133,7 +140,7 @@ function returnSubStatusText(item) {
     return "待起菜";
   }
   if (item.subStatus == "READY_TO_SERVE") {
-    if (item.startOrderTime&&cartStore.shopInfo.isServeTimeControl) {
+    if (item.startOrderTime && cartStore.shopInfo.isServeTimeControl) {
       const maxWaitTime = dayjs(item.startOrderTime).add(
         maxTime,
         "millisecond"
@@ -265,7 +272,7 @@ function itemClick(item) {
   .badge {
     position: absolute;
     text-align: center;
-    $height:32rpx;
+    $height: 32rpx;
     line-height: $height;
     height: $height;
     top: calc(-#{$height} / 2);
diff --git a/stores/cart.js b/stores/cart.js
index ebc261c..1882126 100644
--- a/stores/cart.js
+++ b/stores/cart.js
@@ -188,7 +188,7 @@ export const useCartStore = defineStore("cart", {
           })
         );
       }
-      if (msg.status == 0) {
+      if (msg.status == 0&&msg.type!="time_discount") {
         uni.showToast({
           title: "添加失败",
           icon: "none",