1.修复购物车清空已下单商品的问题

2.转桌/并桌只显示已下单商品

src/views/home/components/cartOperation.vue

@@ -56,6 +56,13 @@
             </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">
+            <el-icon class="icon">
+                <EditPen />
+            </el-icon>
+            <el-text class="t">转桌</el-text>
+        </div>
         <div class="item" @click="props.item.id && emit('clearCart')">
             <el-icon class="icon">
                 <RefreshRight />
@@ -117,7 +124,7 @@ const props = defineProps({
         default: {}
     }
 })
-const emit = defineEmits(['confirm', 'delete', 'pending', 'clearCart'])
+const emit = defineEmits(['confirm', 'delete', 'pending', 'clearCart', 'merging'])
 
 const takeFoodCodeRef = ref(null)
 const skuModalRef = ref([])
@@ -280,6 +287,14 @@ async function kitchenPrint() {
     }
 }
 /**免厨打印 end */
+
+
+// 显示合并转桌
+function tableMergingHandle() {
+    if (props.item.id) {
+        emit('merging')
+    }
+}
 </script>
 
 <style scoped lang="scss">
@@ -287,7 +302,7 @@ async function kitchenPrint() {
     padding: 10px;
     display: flex;
     flex-direction: column;
-    gap: 15px;
+    gap: 10px;
 
     .item {
         width: 70px;