1.新增商品编辑

src/views/home/index.vue

@@ -11,7 +11,8 @@
         <div class="number" @click="takeFoodCodeRef.show()">
           <el-text class="t">{{ masterId }}</el-text>
         </div>
-        <div class="select_user" @click="fastCashierRef.show()" v-if="!memberInfo.telephone">
+        <div class="select_user" @click="fastCashierRef.show()"
+          v-if="!global.orderMemberInfo.telephone && !global.tableInfo.id">
           <div class="left">
             <el-icon class="icon">
               <WalletFilled />
@@ -27,7 +28,12 @@
             <el-icon class="icon">
               <UserFilled />
             </el-icon>
-            <el-text class="t">{{ memberInfo.telephone }}</el-text>
+            <div class="t_wrap" :class="{ 'big_text': global.orderMemberInfo.telephone && global.tableInfo.id }">
+              <div class="t" v-if="global.orderMemberInfo.telephone">
+                会员：{{ global.orderMemberInfo.telephone }}
+              </div>
+              <div class="t" v-if="global.tableInfo.id">台桌：{{ global.tableInfo.name }}</div>
+            </div>
           </div>
           <el-icon class="arrow">
             <Close />
@@ -116,7 +122,7 @@
   <takeFoodCode ref="takeFoodCodeRef" title="修改取餐号" placeholder="请输入取餐号" @success="takeFoodCodeSuccess" />
   <!-- 结算订单 -->
   <settleAccount ref="settleAccountRef" :cart="cartList" :amount="cartInfo.totalAmount" :remark="remark"
-    :masterId="masterId" :orderInfo="orderInfo" :member="memberInfo" @paySuccess="createCodeAjax(1)" />
+    :masterId="masterId" :orderInfo="orderInfo" @paySuccess="createCodeAjax(1)" />
   <!-- 快捷收银 -->
   <fastCashier ref="fastCashierRef" type="0" />
   <!-- 挂起订单 -->
@@ -132,6 +138,7 @@ export default {
 import { onMounted, ref } from "vue";
 import { useRoute } from 'vue-router'
 import { useUser } from "@/store/user.js";
+import { useGlobal } from '@/store/global.js'
 import remarkModal from "@/components/remarkModal.vue";
 import takeFoodCode from "@/components/takeFoodCode.vue";
 import cartOperation from "@/views/home/components/cartOperation.vue";
@@ -155,6 +162,8 @@ import {
 import goods from "@/views/home/components/goods.vue";
 import member from "@/views/member/index.vue";
 
+const global = useGlobal()
+
 const route = useRoute()
 
 const membershow = ref(false);
@@ -177,8 +186,6 @@ const cartLoading = ref(false);
 const orderInfo = ref({});
 const createOrderLoading = ref(false);
 
-const memberInfo = ref({})
-
 // 取餐码
 const masterId = ref("");
 
@@ -310,6 +317,7 @@ async function addCart(params, type = "add") {
     const res = await createCart({
       productId: params.productId,
       masterId: masterId.value,
+      tableId: global.tableInfo.id || '',
       shopId: store.userInfo.shopId,
       skuId: type == "add" ? params.id : params.skuId,
       number: params.number || 1,
@@ -374,7 +382,6 @@ async function createCodeAjax(type = "0") {
     });
     masterId.value = res.code;
     queryCartAjax();
-    getLocalMemberInfo()
 
     if (type == 1) {
       // 结算订单 清楚商品所有红点
@@ -385,25 +392,14 @@ async function createCodeAjax(type = "0") {
   }
 }
 
-// 从本地获取会员信息
-function getLocalMemberInfo() {
-  let localMemberInfo = useStorage.get('memberInfo')
-  if (localMemberInfo && localMemberInfo.telephone) {
-    memberInfo.value = localMemberInfo
-  } else {
-    memberInfo.value = {}
-  }
-}
-
-// 清除本地会员
+// 清除本地会员/台桌信息
 function clearMember() {
-  useStorage.del('memberInfo')
-  getLocalMemberInfo()
+  global.setOrderMember({})
+  global.setOrderTable({})
 }
 
 onMounted(() => {
   createCodeAjax();
-  getLocalMemberInfo()
 });
 </script>
 
@@ -459,7 +455,7 @@ onMounted(() => {
       align-items: center;
       justify-content: space-between;
       background-color: var(--el-color-info-light-8);
-      padding: 0 var(--el-font-size-base);
+      padding: 0 10px;
 
       .left {
         display: flex;
@@ -470,6 +466,18 @@ onMounted(() => {
           font-size: 20px;
         }
 
+        .t_wrap {
+          display: flex;
+          flex-direction: column;
+          align-items: flex-start;
+
+          &.big_text {
+            .t {
+              font-size: 12px;
+            }
+          }
+        }
+
         .t {
           font-size: var(--el-font-size-base);
           margin-left: 4px;