From 833676f545a58e7aff569a891a22cfdeb0800359 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 4 Mar 2025 18:05:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |   2 +-
 src/api/account/table.ts                      |  16 ++-
 src/api/order/order.ts                        |   8 ++
 src/store/modules/carts.ts                    |  34 +++--
 src/utils/websocket.ts                        |   5 +-
 src/views/order/index/components/detail.vue   |  20 ++-
 .../order/index/components/return-money.vue   |   6 +-
 src/views/order/index/index.vue               |  12 +-
 .../system-setting/pay-types/config/config.ts |   1 +
 .../Instead/components/carts/extra-fee.vue    |   4 +-
 .../tool/Instead/components/carts/item.vue    |  10 +-
 .../tool/Instead/components/carts/list.vue    |  66 +++++++--
 .../tool/Instead/components/choose-user.vue   |   4 +-
 .../Instead/components/dialog-goods-sel.vue   |   2 +-
 .../tool/Instead/components/diner-number.vue  |   2 +-
 src/views/tool/Instead/components/note.vue    |   6 +-
 src/views/tool/Instead/components/order.vue   |  64 +++++++--
 src/views/tool/Instead/components/pack.vue    |   4 +-
 .../Instead/components/popup-linshiCai.vue    |   8 +-
 .../Instead/components/popup-taocan-goods.vue |   2 +-
 .../Instead/components/popup-weight-goods.vue |  12 +-
 .../tool/Instead/components/scan-pay.vue      |   4 +-
 src/views/tool/Instead/index.vue              | 127 ++++++++++++------
 src/views/tool/table/index.vue                |   4 +-
 24 files changed, 307 insertions(+), 116 deletions(-)

diff --git a/README.md b/README.md
index c74fd43..432f451 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 ## 宝塔
 
-<http://101.37.12.135:19928/>
+<http://101.37.12.135:19928/mianban>
 chaozg
 chaozg123
 
diff --git a/src/api/account/table.ts b/src/api/account/table.ts
index 7db43e3..02586a5 100644
--- a/src/api/account/table.ts
+++ b/src/api/account/table.ts
@@ -18,11 +18,11 @@ const API = {
     });
   },
   // 获取台桌详情
-  get(id: string | number) {
+  get(params: getRequest) {
     return request({
       url: `${baseURL}/detail`,
       method: "get",
-      params: { id }
+      params
     });
   },
   edit(data: editRequest) {
@@ -122,7 +122,17 @@ export interface editRequest {
   status?: null | string;
   [property: string]: any;
 }
-
+export interface getRequest {
+  /**
+   * 台桌id
+   */
+  id?: string;
+  /**
+   * 桌码
+   */
+  tableCode?: string;
+  [property: string]: any;
+}
 export interface getListRequest {
   /**
    * 区域id
diff --git a/src/api/order/order.ts b/src/api/order/order.ts
index 765bef8..9e86c8c 100644
--- a/src/api/order/order.ts
+++ b/src/api/order/order.ts
@@ -16,6 +16,14 @@ const OrderApi = {
       data
     });
   },
+  //订单详情
+  get(params: any) {
+    return request<any, OrderInfo>({
+      url: `${baseURL}/getOrderById`,
+      method: "get",
+      params
+    });
+  },
   // 历史订单(多次下单使用)
   getHistoryList(params: getHistoryListRequest) {
     return request<any>({
diff --git a/src/store/modules/carts.ts b/src/store/modules/carts.ts
index 54f9731..006e9d8 100644
--- a/src/store/modules/carts.ts
+++ b/src/store/modules/carts.ts
@@ -24,7 +24,8 @@ export const useCartsStore = defineStore("carts", () => {
   //台桌id
   const table_code = ref('');
 
-
+  //购物车是否初始化连接加载完成
+  const isLinkFinshed = ref(false)
   //当前购物车数据
   const list = useStorage<any[]>("carts", []);
   //历史订单数据
@@ -281,7 +282,7 @@ export const useCartsStore = defineStore("carts", () => {
     if (table_code.value) {
       sendMessage('rottable', {
         new_table_code: newVal,
-        id: list.value[0].id
+        table_code: table_code.value
       });
     } else {
       table_code.value = `${newVal}`;
@@ -320,6 +321,11 @@ export const useCartsStore = defineStore("carts", () => {
     isSelGift.value = false
     list.value = [];
     giftList.value = [];
+    oldOrder.value = {
+      detailMap: [],
+      originAmount: 0
+    }
+    vipUser.value = {}
   }
 
   // 寻找套餐商品sku
@@ -361,6 +367,7 @@ export const useCartsStore = defineStore("carts", () => {
         name: goods.name,
         specInfo: skuData.specInfo,
         packFee: goods.packFee || 0,
+        type: goods.type,
         skuData
       }
     } else {
@@ -386,6 +393,13 @@ export const useCartsStore = defineStore("carts", () => {
     }
     return newData
   }
+
+  function setOldOrder(data: any) {
+    oldOrder.value = {
+      ...data,
+      detailMap: returnDetailMap(data.detailMap)
+    }
+  }
   /**
    * 
    * @param initParams 购物车初始化参数
@@ -395,12 +409,13 @@ export const useCartsStore = defineStore("carts", () => {
 
   function init(initParams: ApifoxModel, $goodsMap: any, $oldOrder: any) {
     // 商品id对应的数据map
-    goodsMap = $goodsMap
-
-    oldOrder.value = {
-      ...$oldOrder,
-      detailMap: returnDetailMap($oldOrder.detailMap)
+    if ($goodsMap) {
+      goodsMap = $goodsMap
     }
+    if ($oldOrder) {
+      setOldOrder($oldOrder)
+    }
+
     console.log('oldOrder.detailMap', oldOrder.value.detailMap)
 
     table_code.value = initParams && initParams.table_code ? initParams.table_code : '';
@@ -423,6 +438,7 @@ export const useCartsStore = defineStore("carts", () => {
 
       // 初始化
       if (msg.operate_type === "manage_init") {
+        isLinkFinshed.value = true
         // 设置单价
         list.value = msg.data.filter((v: Record<string, any>) => {
           if (v.is_temporary) {
@@ -529,7 +545,7 @@ export const useCartsStore = defineStore("carts", () => {
     });
   }
 
-  const delArr = ['skuData', 'coverImg', 'specInfo', 'placeNum', 'update_time', 'create_time', 'packFee', 'memberPrice']
+  const delArr = ['skuData', 'coverImg', 'specInfo', 'placeNum', 'update_time', 'create_time', 'packFee', 'memberPrice', 'type']
   function sendMessage(operate_type: msgType, message: any) {
     const msg = { ...message, operate_type: operate_type, table_code: table_code.value }
     if (operate_type == 'edit') {
@@ -541,6 +557,8 @@ export const useCartsStore = defineStore("carts", () => {
     WebSocketManager.sendMessage(msg);
   }
   return {
+    isLinkFinshed,
+    setOldOrder,
     singleDiscount,
     vipDiscount,
     dataReset,
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index 76f222f..71ca7d8 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -24,12 +24,13 @@ export type msgType = 'add' | 'reduce' | 'remove' | 'edit' | 'init' | 'cleanup'
 class WebSocketManager {
   private client: WebSocket | null = null;
   private connected: boolean = false;
+  private shop_id = user.userInfo.shopId ? String(user.userInfo.shopId) : '';
   private initParams: ApifoxModel = {
     type: 'manage',
-    account: `${user.userInfo.shopId}`,
+    account: this.shop_id,
     operate_type: 'init',
     table_code: '',
-    shop_id: `${user.userInfo.shopId}`,
+    shop_id: this.shop_id,
   };
   private onMessage: (message: any) => void = function () { };
   private messageHandlers: Map<string, ((message: string) => void)[]> = new Map();
diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index dd1c41a..0cad223 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -25,7 +25,7 @@
           </div>
           <div class="item">
             <div class="t">订单金额</div>
-            <div class="b">￥{{ detail.orderAmount }}</div>
+            <div class="b">￥{{ returnOriginAmount }}</div>
           </div>
           <div class="item">
             <div class="t">订单类型</div>
@@ -97,6 +97,7 @@
         <div>
           <div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
           <template v-for="(item, index) in detail.detailMap" :key="index">
+            <h4>第{{ index }}次下单</h4>
             <el-table :data="item">
               <el-table-column label="商品">
                 <template v-slot="scope">
@@ -210,6 +211,23 @@ export default {
 
       return n;
     },
+    //计算订单原金额
+    returnOriginAmount() {
+      let amount = 0;
+      if (this.detail && this.detail.originAmount) {
+        return this.detail.originAmount;
+      }
+      if (!this.detail) {
+        return 0;
+      }
+      for (let i in this.detail.detailMap) {
+        amount += this.detail.detailMap[i].reduce((pre, cur) => {
+          return pre + cur.payAmount;
+        }, 0);
+      }
+
+      return amount.toFixed(2);
+    },
   },
   methods: {
     returnPayType(payType) {
diff --git a/src/views/order/index/components/return-money.vue b/src/views/order/index/components/return-money.vue
index dcb0b5f..70ba32a 100644
--- a/src/views/order/index/components/return-money.vue
+++ b/src/views/order/index/components/return-money.vue
@@ -176,7 +176,7 @@ export default {
 </script>
   
   <style lang="scss" scoped>
-::v-deep .el-tag {
+:deep(.el-tag) {
   margin-top: 10px;
   margin-right: 10px;
   margin-bottom: 5px;
@@ -201,11 +201,11 @@ export default {
     }
   }
 }
-::v-deep .number-box .el-input__inner::-webkit-inner-spin-button {
+:deep(.number-box .el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
-::v-deep .number-box .el-input__inner::-webkit-outer-spin-button {
+:deep(.number-box .el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
diff --git a/src/views/order/index/index.vue b/src/views/order/index/index.vue
index b6cf4b6..886238d 100644
--- a/src/views/order/index/index.vue
+++ b/src/views/order/index/index.vue
@@ -137,12 +137,14 @@ const {
 
 //计算订单原金额
 function returnOriginAmount(order: OrderInfoVo) {
-  console.log(order);
   let amount = 0;
-  // order.goods.forEach((item) => {
-  //   amount += item.productPrice * item.number;
-  // });
-  return amount;
+  if (order.originAmount) {
+    return order.originAmount;
+  }
+  order.goods?.forEach((item) => {
+    amount += item.payAmount * 1;
+  });
+  return amount.toFixed(2);
 }
 
 // 新增
diff --git a/src/views/system-setting/pay-types/config/config.ts b/src/views/system-setting/pay-types/config/config.ts
index 82360ec..b788d68 100644
--- a/src/views/system-setting/pay-types/config/config.ts
+++ b/src/views/system-setting/pay-types/config/config.ts
@@ -11,6 +11,7 @@ const options: optionObject = {
     { label: "现金", value: "cash" },
     { label: "微信", value: "weixin" },
     { label: "银行卡", value: "bank" },
+    { label: "会员支付", value: "member-account" },
     { label: "支付宝", value: "alipay" },
     { label: "刷卡", value: "deposit" },
     { label: "挂单", value: "arrears" },
diff --git a/src/views/tool/Instead/components/carts/extra-fee.vue b/src/views/tool/Instead/components/carts/extra-fee.vue
index dc5d926..97db196 100644
--- a/src/views/tool/Instead/components/carts/extra-fee.vue
+++ b/src/views/tool/Instead/components/carts/extra-fee.vue
@@ -224,12 +224,12 @@ function to2(n) {
   white-space: nowrap;
 }
 
-::v-deep .order-input-number .el-input__inner::-webkit-inner-spin-button {
+:deep(.order-input-number .el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
 
-::v-deep .order-input-number .el-input__inner::-webkit-outer-spin-button {
+:deep(.order-input-number .el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
diff --git a/src/views/tool/Instead/components/carts/item.vue b/src/views/tool/Instead/components/carts/item.vue
index 84d2f9d..734e4b5 100644
--- a/src/views/tool/Instead/components/carts/item.vue
+++ b/src/views/tool/Instead/components/carts/item.vue
@@ -254,15 +254,15 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
-::v-deep .number-box .el-input__inner {
+:deep(.number-box .el-input__inner) {
   border: none;
 }
 
-::v-deep .el-button--text {
+:deep(.el-button--text) {
   color: #000;
 }
 
-::v-deep .number-box .el-input__inner {
+:deep(.number-box .el-input__inner) {
   border: none;
   padding: 0 4px;
   text-align: center;
@@ -478,12 +478,12 @@ onMounted(() => {
   white-space: nowrap;
 }
 
-::v-deep .order-input-number .el-input__inner::-webkit-inner-spin-button {
+:deep(.order-input-number .el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
 
-::v-deep .order-input-number .el-input__inner::-webkit-outer-spin-button {
+:deep(.order-input-number .el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue
index e0a106c..d87a711 100644
--- a/src/views/tool/Instead/components/carts/list.vue
+++ b/src/views/tool/Instead/components/carts/list.vue
@@ -58,7 +58,7 @@
         </div>
       </template>
 
-      <!-- <div class="color-666 u-font-14">订单备注:{{ "123" }}</div> -->
+      <div class="color-666 u-font-14" v-if="remark">订单备注:{{ remark }}</div>
     </div>
     <div class="bottom">
       <div class="u-flex u-row-right">
@@ -88,24 +88,64 @@
         <el-link type="primary">打印制作单</el-link>
         <div>
           <span class="totalNumber">共{{ carts.totalNumber }}件</span>
-          <span class="totalPrice">￥{{ totalMoney }}</span>
+          <span class="totalPrice">￥{{ carts.payMoney }}</span>
         </div>
       </div>
       <div class="btn-group" v-if="isXianFuKuan">
-        <el-button type="primary" size="large" @click="createOrder()">微信/支付宝</el-button>
-        <el-button type="primary" size="large" @click="createOrder()">现金</el-button>
-        <el-button type="primary" size="large" @click="createOrder()">更多支付</el-button>
+        <el-button
+          type="primary"
+          size="large"
+          :disabled="!goodsMapisFinish"
+          @click="createOrder('wx-aiplay')"
+        >
+          微信/支付宝
+        </el-button>
+        <el-button
+          type="primary"
+          size="large"
+          :disabled="!goodsMapisFinish"
+          @click="createOrder('cash')"
+        >
+          现金
+        </el-button>
+        <el-button
+          type="primary"
+          size="large"
+          :disabled="!goodsMapisFinish || showOrder"
+          @click="createOrder('more-pay')"
+        >
+          更多支付
+        </el-button>
       </div>
       <div class="btn-group" v-else>
         <template v-if="!showOrder">
-          <el-button type="primary" size="large" @click="createOrder('only-create')">
+          <el-button
+            type="primary"
+            size="large"
+            :disabled="!goodsMapisFinish"
+            @click="createOrder('only-create')"
+          >
             仅下单
           </el-button>
-          <el-button type="primary" size="large" @click="createOrder('to-pay')">去结账</el-button>
+          <el-button
+            type="primary"
+            size="large"
+            :disabled="!goodsMapisFinish"
+            @click="createOrder('to-pay')"
+          >
+            去结账
+          </el-button>
         </template>
         <template v-else>
           <el-button type="default" size="large" @click="hideOrder()">加菜/返回</el-button>
-          <el-button type="primary" size="large" @click="createOrder('to-pay')">立即支付</el-button>
+          <el-button
+            type="primary"
+            size="large"
+            :disabled="!goodsMapisFinish"
+            @click="createOrder('to-pay')"
+          >
+            立即支付
+          </el-button>
         </template>
       </div>
     </div>
@@ -123,6 +163,10 @@ const shopUser = useUserStore();
 const carts = useCartsStore();
 
 const props = defineProps({
+  remark: {
+    type: String,
+    default: "",
+  },
   table: {
     type: Object,
     default: () => {
@@ -216,9 +260,9 @@ function itemClick(item) {
 function changeNumber(step, item) {
   carts.changeNumber(step * 1, item);
 }
-const totalMoney = computed(() => {
-  return (carts.payMoney * 1 + (carts.oldOrder.originAmount || 0) * 1).toFixed(2);
-});
+// const totalMoney = computed(() => {
+//   return (carts.payMoney * 1 + (carts.oldOrder.originAmount || 0) * 1).toFixed(2);
+// });
 defineExpose({
   carts,
   init,
diff --git a/src/views/tool/Instead/components/choose-user.vue b/src/views/tool/Instead/components/choose-user.vue
index 8ffc52e..e2ffafa 100644
--- a/src/views/tool/Instead/components/choose-user.vue
+++ b/src/views/tool/Instead/components/choose-user.vue
@@ -184,12 +184,12 @@ defineExpose({
     margin-left: 10px;
   }
 }
-::v-deep .el-input--small .el-input__inner {
+:deep(.el-input--small .el-input__inner) {
   height: 36px;
   line-height: 36px;
 }
 
-::v-deep .image-slot {
+:deep(.image-slot) {
   width: 100%;
   height: 100%;
   display: flex;
diff --git a/src/views/tool/Instead/components/dialog-goods-sel.vue b/src/views/tool/Instead/components/dialog-goods-sel.vue
index 35118bf..54bd2e3 100644
--- a/src/views/tool/Instead/components/dialog-goods-sel.vue
+++ b/src/views/tool/Instead/components/dialog-goods-sel.vue
@@ -161,7 +161,7 @@ defineExpose({ open, close });
   font-size: 11px;
   margin-top: 2px;
 }
-::v-deep .number-box .el-input__inner {
+:deep(.number-box .el-input__inner) {
   border: none;
   padding: 0 4px;
   text-align: center;
diff --git a/src/views/tool/Instead/components/diner-number.vue b/src/views/tool/Instead/components/diner-number.vue
index d339c36..d618d60 100644
--- a/src/views/tool/Instead/components/diner-number.vue
+++ b/src/views/tool/Instead/components/diner-number.vue
@@ -135,7 +135,7 @@ export default {
     filter: grayscale(1);
   }
 }
-::v-deep .inputs .el-input__inner {
+:deep(.inputs .el-input__inner) {
   border-color: transparent !important;
   color: rgba(0, 0, 0, 0.8);
   letter-spacing: 1.25px;
diff --git a/src/views/tool/Instead/components/note.vue b/src/views/tool/Instead/components/note.vue
index da775bb..36faa92 100644
--- a/src/views/tool/Instead/components/note.vue
+++ b/src/views/tool/Instead/components/note.vue
@@ -47,7 +47,7 @@ function addNote(tag) {
 }
 function open(remark, isOneNote) {
   isOne.value = isOneNote;
-  title.value = isOneNote ? "整单备注(提交订单时生效)" : "单品备注(提交订单时生效)";
+  title.value = !isOneNote ? "整单备注(提交订单时生效)" : "单品备注(提交订单时生效)";
   show.value = true;
   note.value = remark ? remark : "";
   const tags = localStorage.getItem("tags");
@@ -80,11 +80,11 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-dialog__body {
+:deep(.el-dialog__body) {
   margin-bottom: 14px;
   margin-top: 14px;
 }
-::v-deep .el-tag {
+:deep(.el-tag) {
   margin-top: 10px;
   margin-right: 10px;
   margin-bottom: 5px;
diff --git a/src/views/tool/Instead/components/order.vue b/src/views/tool/Instead/components/order.vue
index 4aafaa2..0bc2a45 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -74,13 +74,14 @@
             :key="index"
             size="large"
             :type="index == payTypes.sel ? 'primary' : ''"
+            :disabled="canUsePayType(item)"
             @click="changePayType(index)"
           >
             {{ item.payName }}
           </el-button>
         </div>
         <div class="u-m-t-20">
-          <el-button type="primary" size="large" @click="nowPayClick">立即支付</el-button>
+          <el-button type="primary" size="large" @click="nowPayClick()">立即支付</el-button>
         </div>
       </div>
     </div>
@@ -172,6 +173,8 @@ function discountConfirm(e) {
   if (e.discount) {
     checkOrderPay.discountAmount =
       carts.payMoney - (carts.payMoney * (e.discount / 100).toFixed(2)).toFixed(2);
+  } else {
+    checkOrderPay.discount = 0;
   }
 }
 function discountShow(e) {
@@ -246,19 +249,33 @@ const payTypes = reactive({
   list: [],
   sel: 0,
 });
+function canUsePayType(item) {
+  if (currentpayMoney.value * 1 == 0) {
+    return item.payType == "cash" ? false : true;
+  }
+  // if (item.payType == "virtual" && item.payName == "会员支付") {
+  //   return props.user.id ? false : true;
+  // }
 
+  return false;
+}
 const refScanPay = ref();
 function changePayType(i) {
   const payType = payTypes.list[i].payType;
-  refScanPayOpen(payType);
   payTypes.sel = i;
+  if (payType == "member-account") {
+    return chooseUser();
+  }
+  refScanPayOpen(payType);
 }
 
 function returnPayParams() {
   return {
+    money: currentpayMoney.value * 1,
     shopId: localStorage.getItem("shopId"),
-    authCode: "",
+    authCode: authCode,
     checkOrderPay: {
+      vipPrice: props.user.id && props.user.isVip ? 1 : 0,
       orderId: props.orderInfo.id,
       // discountRatio: (checkOrderPay.discount / 100).toFixed(2),
       discountRatio: 0,
@@ -276,6 +293,10 @@ function returnPayParams() {
 }
 
 function refScanPayOpen(payType) {
+  if (payType == "member-account") {
+    chooseUser();
+    return;
+  }
   if (payType == "deposit") {
     return refScanPay.value.open(returnPayParams(), "deposit");
   }
@@ -288,8 +309,8 @@ async function getPaytype() {
   const res = await payTypeApi.getList();
   payTypes.list = res;
 }
-function nowPayClick() {
-  const payType = payTypes.list[payTypes.sel].payType;
+function nowPayClick(payType) {
+  payType = payType || payTypes.list[payTypes.sel].payType;
   if (payType === "cash") {
     ElMessageBox.confirm("是否确认已现金收款：" + currentpayMoney.value + "元", "快捷支付", {
       confirmButtonText: "确定",
@@ -302,12 +323,20 @@ function nowPayClick() {
       .catch(() => {});
     return;
   }
+  if (payType == "member-account") {
+    if (!props.user.id) {
+      return ElMessage.error("请先选择会员");
+    }
+    payOrder(payType);
+    return;
+  }
   refScanPayOpen(payType);
 }
 
-function refScanPayConfirm(authCode, isScan) {
+let authCode = "";
+function refScanPayConfirm($authCode, isScan) {
   const payType = payTypes.list[payTypes.sel].payType;
-  payParams.authCode = authCode;
+  authCode = $authCode;
   payOrder(payType, isScan);
 }
 
@@ -325,6 +354,7 @@ async function payOrder(payType, isScan) {
     loading.close();
   }, 1000 * 20);
   let res = undefined;
+  console.log(payType);
   try {
     if (payType == "scanCode") {
       res = isScan
@@ -337,7 +367,15 @@ async function payOrder(payType, isScan) {
     if (payType == "deposit") {
       res = await payApi.vipPay({ ...returnPayParams(), payType: "scanCode" });
     }
+    if (payType == "member-account") {
+      res = await payApi.vipPay({
+        ...returnPayParams(),
+        payType: "userPay",
+        shopUserId: props.user.id,
+      });
+    }
   } catch (error) {
+    console.log(error);
     clearTimeout(payTimer);
     loading.close();
   }
@@ -357,11 +395,21 @@ const currentpayMoney = computed(() => {
   }
   return (carts.payMoney - checkOrderPay.discountAmount).toFixed(2);
 });
-
+watch(
+  () => currentpayMoney.value,
+  (newval) => {
+    if (newval * 1 <= 0) {
+      payTypes.sel = payTypes.list.findIndex((v) => v.payType == "cash");
+    }
+  }
+);
 onMounted(() => {
   getPaytype();
   pointsInit();
 });
+defineExpose({
+  nowPayClick,
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/tool/Instead/components/pack.vue b/src/views/tool/Instead/components/pack.vue
index e08e49f..1c0bd80 100644
--- a/src/views/tool/Instead/components/pack.vue
+++ b/src/views/tool/Instead/components/pack.vue
@@ -44,11 +44,11 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-::v-deep .el-dialog__body {
+:deep(.el-dialog__body) {
   margin-bottom: 14px;
   margin-top: 14px;
 }
-::v-deep .el-tag {
+:deep(.el-tag) {
   margin-top: 10px;
   margin-right: 10px;
   margin-bottom: 5px;
diff --git a/src/views/tool/Instead/components/popup-linshiCai.vue b/src/views/tool/Instead/components/popup-linshiCai.vue
index f5ff848..c162c20 100644
--- a/src/views/tool/Instead/components/popup-linshiCai.vue
+++ b/src/views/tool/Instead/components/popup-linshiCai.vue
@@ -88,11 +88,11 @@ export default {
 </script>
   
   <style lang="scss" scoped>
-::v-deep .el-dialog__body {
+:deep(.el-dialog__body) {
   margin-bottom: 14px;
   margin-top: 14px;
 }
-::v-deep .el-form-item__label {
+:deep(.el-form-item__label) {
   text-align: left;
 }
 input[type="number"]::-webkit-inner-spin-button,
@@ -100,11 +100,11 @@ input[type="number"]::-webkit-outer-spin-button {
   -webkit-appearance: none;
   margin: 0;
 }
-::v-deep .el-input__inner::-webkit-inner-spin-button {
+:deep(.el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
-::v-deep .el-input__inner::-webkit-outer-spin-button {
+:deep(el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
diff --git a/src/views/tool/Instead/components/popup-taocan-goods.vue b/src/views/tool/Instead/components/popup-taocan-goods.vue
index 854229b..1d68c88 100644
--- a/src/views/tool/Instead/components/popup-taocan-goods.vue
+++ b/src/views/tool/Instead/components/popup-taocan-goods.vue
@@ -104,7 +104,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-::v-deep.el-button {
+:deep(.el-button) {
   padding: 12px 20px;
 }
 
diff --git a/src/views/tool/Instead/components/popup-weight-goods.vue b/src/views/tool/Instead/components/popup-weight-goods.vue
index 4fcbff2..93271e9 100644
--- a/src/views/tool/Instead/components/popup-weight-goods.vue
+++ b/src/views/tool/Instead/components/popup-weight-goods.vue
@@ -120,25 +120,25 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-::v-deep.el-button {
+:deep(.el-button) {
   padding: 12px 20px;
 }
 
-::v-deep .carts .box_status {
+:deep(.carts .box_status) {
   border: none;
 }
 
-::v-deep .el-input__inner::-webkit-inner-spin-button {
+:deep(.el-input__inner::-webkit-inner-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
 
-::v-deep .el-input__inner::-webkit-outer-spin-button {
+:deep(.el-input__inner::-webkit-outer-spin-button) {
   -webkit-appearance: none;
   margin: 0;
 }
 
-::v-deep .el-button--success {
+:deep(.el-button--success) {
   border-color: #22bf64;
   background-color: #22bf64;
 }
@@ -168,7 +168,7 @@ defineExpose({
   }
 }
 
-::v-deep .inputs .el-input__inner {
+:deep(.inputs .el-input__inner) {
   border-color: transparent !important;
   color: rgba(0, 0, 0, 0.8);
   letter-spacing: 1.25px;
diff --git a/src/views/tool/Instead/components/scan-pay.vue b/src/views/tool/Instead/components/scan-pay.vue
index 45179b8..40a2dfb 100644
--- a/src/views/tool/Instead/components/scan-pay.vue
+++ b/src/views/tool/Instead/components/scan-pay.vue
@@ -59,7 +59,7 @@
 import QRCode from "qrcode";
 import orderApi from "@/api/order/order";
 import payApi from "@/api/order/pay";
-
+import { ElMessage } from "element-plus";
 export default {
   props: {
     order: {
@@ -167,7 +167,7 @@ export default {
 
     confirm() {
       if (!this.form.code) {
-        return this.$message.error("请输入或扫付款码");
+        return ElMessage.error("请输入或扫付款码");
       }
       this.close();
       this.$emit("confirm", this.form.code, this.paysSel ? true : false);
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index cab7ebb..19b834d 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="box">
+  <div class="box" v-loading="cartsLoading" element-loading-text="购物车连接初始化中，请稍等……">
     <div class="content">
       <div class="top">
         <div class="left u-flex u-col-center">
@@ -109,6 +109,7 @@
             :goodsList="goods.list"
             :oldOrder="oldOrder"
             :perpole="perpole"
+            :remark="remark"
             :table="table"
             ref="refCart"
           ></cartsList>
@@ -170,6 +171,7 @@
 
           <!-- 订单信息展示 -->
           <Order
+            ref="refOrder"
             :orderInfo="orderInfo"
             @chooseUser="showChooseUser"
             @paysuccess="refresh"
@@ -232,6 +234,9 @@ const shopUser = useUserStore();
 
 const route = useRoute();
 const router = useRouter();
+
+//整单备注
+const remark = ref("");
 //退菜
 function showReturn(cart) {
   console.log(cart);
@@ -252,13 +257,15 @@ let user = ref({});
 const refChooseUser = ref();
 function chooseUserConfirm(e) {
   user.value = e ? e : {};
-  refCart.value.carts.changeUser(e ? e : {});
+  carts.changeUser(e ? e : {});
 }
 function showChooseUser() {
   refChooseUser.value.open();
 }
 
 //订单
+const refOrder = ref();
+
 const showOrder = ref(false);
 function hideOrder() {
   showOrder.value = false;
@@ -267,43 +274,57 @@ const oldOrder = ref({ detailMap: [] });
 
 const orderInfo = ref({});
 
-let createOrderTimer = null;
+let loadingTimer = null;
+let loading = undefined;
+
 async function createOrder(key) {
-  console.log(refCart.value.carts.table_code);
-  clearTimeout(createOrderTimer);
-  const loading = ElLoading.service({
+  if (key == "wx-aiplay" && oldOrder.value.id) {
+    refOrder.value.nowPayClick("scanCode");
+    return;
+  }
+  if (key == "cash" && oldOrder.value.id) {
+    refOrder.value.nowPayClick("cash");
+    return;
+  }
+  clearTimeout(loadingTimer);
+  loading = ElLoading.service({
     lock: true,
     text: "订单生成中，请稍等……",
     background: "rgba(0, 0, 0, 0.7)",
   });
-  createOrderTimer = setTimeout(() => {
+  loadingTimer = setTimeout(() => {
     ElMessage.error("订单生成超时");
     loading.close();
   }, 1000 * 20);
   try {
+    if (key == "to-pay" && carts.list.length <= 0) {
+      showOrder.value = true;
+      return;
+    }
     const res = await orderApi.add({
       orderId: oldOrder.value.id || "",
       shopId: shopUser.userInfo.id,
       userId: user.value.userId,
-      seatNum: 0,
-      packFee: refCart.value.carts.packFee * 1,
-      originAmount: refCart.value.carts.payMoney * 1,
-      tableCode: refCart.value.carts.table_code,
+      packFee: carts.packFee * 1,
+      originAmount: carts.payMoney * 1,
+      tableCode: carts.table_code,
       dineMode: diners.sel == 0 ? "dine-in" : "take-out",
-      remark: "",
+      remark: remark.value,
       seatNum: perpole.value * 1,
       placeNum: oldOrder.value.placeNum * 1 + 1,
       waitCall: false,
       vipPrice: user.value.id && user.value.isVip,
     });
-    clearTimeout(createOrderTimer);
+    clearTimeout(loadingTimer);
     loading.close();
     if (res) {
-      refCart.value.carts.clear();
+      carts.clear();
+      carts.dataReset();
       if (key == "only-create") {
-        router.replace(route.path);
+        refresh();
         return;
       }
+
       if (res.id) {
         // 获取历史订单数据
         const res1 = await orderApi.getHistoryList({
@@ -311,21 +332,29 @@ async function createOrder(key) {
         });
         oldOrder.value = res1;
         orderInfo.value = res1;
-        refCart.value.carts.init();
+        carts.setOldOrder(res1);
       }
-      showOrder.value = true;
 
+      showOrder.value = true;
+      if (key == "wx-aiplay") {
+        refOrder.value.nowPayClick("scanCode");
+        return;
+      }
+      if (key == "cash") {
+        refOrder.value.nowPayClick("cash");
+      }
       // oldOrder.value = res;
     }
   } catch (error) {
-    clearTimeout(createOrderTimer);
+    loading.close();
+    clearTimeout(loadingTimer);
   }
 }
 
 //可选套餐商品
 const refAddTaocan = ref();
 function taocanConfirm(goods, pro_group_info) {
-  refCart.value.carts.cartsPush({
+  carts.cartsPush({
     goods_type: "package",
     product_id: goods.id,
     sku_id: goods.skuList[0].id,
@@ -381,7 +410,7 @@ function tableClick(item) {
   getTableDetail(item.tableCode);
 
   table.value = item;
-  refCart.value.carts.changeTable(item.tableCode);
+  carts.changeTable(item.tableCode);
   refTable.value.hide();
 }
 
@@ -391,7 +420,7 @@ function showaddLingShiCai() {
   refAddLingShiCai.value.open();
 }
 function addLingShiCaiConfirm(data) {
-  refCart.value.carts.add({
+  carts.add({
     sku_id: "-999",
     product_id: "-999",
     is_temporary: 1,
@@ -414,7 +443,7 @@ function showChangePrice(cart) {
   refChangePrice.value.open(cart);
 }
 function changePriceConfirm(discount_sale_amount) {
-  refCart.value.carts.updateTag("discount_sale_amount", discount_sale_amount);
+  carts.updateTag("discount_sale_amount", discount_sale_amount);
 }
 
 //打包
@@ -423,21 +452,22 @@ function showPack(packNumber, max) {
   refPack.value.open(packNumber * 1, max * 1);
 }
 function packConfirm(packNumber) {
-  refCart.value.carts.updateTag("pack_number", packNumber);
+  carts.updateTag("pack_number", packNumber);
 }
 
 //备注
 const refNote = ref(null);
 function showNote(isOneNote) {
-  const remark = isOneNote ? refCart.value.carts.selCart.remark : "";
-  console.log(remark);
-  refNote.value.open(remark, isOneNote);
+  const note = isOneNote ? carts.selCart.remark : remark.value;
+  console.log(note);
+  refNote.value.open(note, isOneNote);
 }
 function noteConfirm(note, isOneNote) {
   if (isOneNote) {
-    refCart.value.carts.updateTag("remark", note);
+    carts.updateTag("remark", note);
     return;
   }
+  remark.value = note;
 }
 
 // 搜索
@@ -500,10 +530,13 @@ async function getGoods() {
     ...goods.query,
   });
   goods.list = res.records;
-  refCart.value.carts.goods = goods.list;
+  carts.goods = goods.list;
   goodsMapisFinish.value = true;
 }
-
+const cartsLoading = computed(() => {
+  console.log(goodsMapisFinish.value, carts.isLinkFinshed);
+  return !goodsMapisFinish.value || !carts.isLinkFinshed;
+});
 function goodsClick(item) {
   if (!goodsMapisFinish.value) {
     return ElMessage.error({
@@ -542,11 +575,6 @@ function goodsClick(item) {
         number: item.skuList[0].suitNum || 1,
       };
       addCarts(sendmsg);
-      // refCart.value.carts.cartsPush({
-      //   sku_id: item.groupSnap[0].goods[0].skuId,
-      //   product_id: item.id,
-      //   number: item.groupSnap[0].goods[0].number,
-      // });
       return;
     }
     //可选套餐
@@ -573,11 +601,11 @@ function clearCarts() {
     cancelButtonText: "取消",
     type: "warning",
   }).then(() => {
-    refCart.value.carts.clear();
+    carts.clear();
   });
 }
 function addCarts(item) {
-  refCart.value.carts.add(item);
+  carts.add(item);
 }
 
 watch(
@@ -608,7 +636,7 @@ onMounted(async () => {
       router.replace(route.path);
       console.log(route.path);
       setTimeout(() => {
-        refCart.value.carts.dataReset();
+        carts.dataReset();
         refresh();
       }, 2000);
       return;
@@ -619,24 +647,37 @@ onMounted(async () => {
     if (res.userId) {
       const userRes = await shopUserApi.get({ userId: res.userId });
       user.value = userRes;
+      carts.changeUser(userRes);
+    }
+    //获取台桌数据
+    if (res.tableCode) {
+      const tableRes = await tableApi.get({ tableCode: res.tableCode });
+      table.value = tableRes || {};
     }
     if (res) {
       oldOrder.value = res;
       orderInfo.value = res;
       showOrder.value = true;
     }
-    //获取台桌数据
-    if (res.tableCode) {
-    }
   }
   init();
 });
 
 function refresh() {
+  console.log(refresh);
+  oldOrder.value = {
+    detailMap: [],
+  };
+  orderInfo.value = {};
+  showOrder.value = false;
+  user.value = {};
+  table.value = {};
   router.replace(route.path);
-  setTimeout(() => {
-    router.go(1000);
-  }, 1500);
+  carts.dataReset();
+  refCart.value.carts.init();
+  // setTimeout(() => {
+  //   router.go(0);
+  // }, 1500);
 }
 </script>
 
diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue
index b34cabc..22d80e7 100644
--- a/src/views/tool/table/index.vue
+++ b/src/views/tool/table/index.vue
@@ -361,10 +361,10 @@ onMounted(() => {});
 .icon {
   margin-left: 10px;
 }
-::v-deep .btn-group .el-button {
+:deep(.btn-group .el-button) {
   width: 100%;
 }
-::v-deep .el-dropdown-menu__item {
+:deep(.el-dropdown-menu__item) {
   line-height: 36px;
   padding: 0 20px;
   min-width: 60px;