优化转桌

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>

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 {