From 5abb43cc499e2b70143105749e0f391649fc321f Mon Sep 17 00:00:00 2001
From: gyq <875626088@qq.com>
Date: Fri, 20 Dec 2024 11:26:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=BD=AC=E6=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/home/components/cartOperation.vue | 4 ++--
 src/views/home/index.vue                    | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/home/components/cartOperation.vue b/src/views/home/components/cartOperation.vue
index 4390a98..eb9528b 100644
--- a/src/views/home/components/cartOperation.vue
+++ b/src/views/home/components/cartOperation.vue
@@ -56,8 +56,8 @@
             </el-icon>
             <el-text class="t">挂单</el-text>
         </div>
-        <div class="item" @click="tableMergingHandle" :class="{ disabled: !props.item.id }"
-            v-if="shopStore.info.registerType == 'restaurant' && props.item.tableId">
+        <div class="item" @click="tableMergingHandle"
+            v-if="shopStore.info.registerType == 'restaurant' && props.item.tableId && props.item.orderId">
             <el-icon class="icon">
                 <EditPen />
             </el-icon>
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index a921087..3ac845f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -732,6 +732,7 @@ onMounted(() => {
           display: -webkit-box;
           -webkit-box-orient: vertical;
           -webkit-line-clamp: 2;
+          line-clamp: 2;
         }
 
         .num {