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/points.ts b/src/api/account/points.ts
index 7cc66e0..f7c5cac 100644
--- a/src/api/account/points.ts
+++ b/src/api/account/points.ts
@@ -6,7 +6,7 @@ const Api = {
 
   calcOrderUsablePoints(params: any) {
     return request<any>({
-      url: `${baseURL}/member-points/calc-usable-points`,
+      url: `${baseURL}/memberPoints/calcUsablePoints`,
       method: "get",
       params
     });
@@ -14,7 +14,7 @@ const Api = {
   // 004-根据抵扣金额计算所需积分
   calcMoneyUsablePoints(params: any) {
     return request<any>({
-      url: `${baseURL}/member-points/calc-used-points`,
+      url: `${baseURL}/memberPoints/calcUsedPoints`,
       method: "get",
       params
     });
@@ -22,7 +22,7 @@ const Api = {
   // 003-根据积分计算可抵扣金额
   calcPointsToMoney(params: any) {
     return request<any>({
-      url: `${baseURL}/member-points/calc-deduction-amount`,
+      url: `${baseURL}/memberPoints/calcDeductionAmount`,
       method: "get",
       params
     });
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/application/marketing/points/index.ts b/src/views/application/marketing/points/index.ts
index e1eaebe..5a7577c 100644
--- a/src/views/application/marketing/points/index.ts
+++ b/src/views/application/marketing/points/index.ts
@@ -1,5 +1,5 @@
 import request from "@/utils/request";
-const baseURL = "/account/admin/points/basic-setting";
+const baseURL = "/account/admin/points/basicSetting";
 // 积分-配置
 const AuthAPI = {
   // 积分基本设置详情
diff --git a/src/views/application/marketing/points/pointsconfig/BasicSettings.vue b/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
index bb71180..e2253b9 100644
--- a/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
+++ b/src/views/application/marketing/points/pointsconfig/BasicSettings.vue
@@ -54,7 +54,11 @@
     </el-form-item>
     <el-form-item label="显示样式">
       <div class="style_wrap">
-        <div class="item style1" :class="{ active: Elform.browseMode == 'list' }" @click="Elform.browseMode = 'list'">
+        <div
+          class="item style1"
+          :class="{ active: Elform.browseMode == 'list' }"
+          @click="Elform.browseMode = 'list'"
+        >
           <div class="row">
             <div class="cover"></div>
             <div class="info">
@@ -72,7 +76,11 @@
             </div>
           </div>
         </div>
-        <div class="item style2" :class="{ active: Elform.browseMode == 'grid' }" @click="Elform.browseMode = 'grid'">
+        <div
+          class="item style2"
+          :class="{ active: Elform.browseMode == 'grid' }"
+          @click="Elform.browseMode = 'grid'"
+        >
           <div class="row">
             <div class="cover"></div>
             <div class="line"></div>
@@ -99,37 +107,35 @@
 </template>
 
 <script setup>
-import { reactive } from 'vue'
-import API from '../index'
+import { reactive } from "vue";
+import API from "../index";
 // do not use same name with ref
 const Elform = reactive({
-  "enableRewards": 1,
-  "rewardsGroup": "all",
-  "consumeAmount": 0,
-  "enableDeduction": 1,
-  "deductionGroup": 'all',
-  "minPaymentAmount": 0,
-  "maxDeductionRatio": 0,
-  "equivalentPoints": 0,
-  "enablePointsMall": 1,
-  "browseMode": "list",
-})
+  enableRewards: 1,
+  rewardsGroup: "all",
+  consumeAmount: 0,
+  enableDeduction: 1,
+  deductionGroup: "all",
+  minPaymentAmount: 0,
+  maxDeductionRatio: 0,
+  equivalentPoints: 0,
+  enablePointsMall: 1,
+  browseMode: "list",
+});
 onMounted(() => {
-  getList()
-})
+  getList();
+});
 async function getList() {
-  const res = await API.getBasicSetting({})
-  for (const key in Elform) {
-    Elform[key] = res[key]
-  }
+  const res = await API.getBasicSetting({});
+  Object.assign(Elform, res);
 }
 async function onSubmit() {
-  const res = await API.BasicSettingadd(Elform)
+  const res = await API.BasicSettingadd(Elform);
   if (res.code == 200) {
     ElMessage({
-      message: '成功',
-      type: 'success',
-    })
+      message: "成功",
+      type: "success",
+    });
   }
 }
 </script>
@@ -144,7 +150,7 @@ async function onSubmit() {
     flex: 1;
     padding: 10px;
     border: 1px solid #ddd;
-    $color: #3F9EFF;
+    $color: #3f9eff;
 
     &:hover {
       cursor: pointer;
@@ -159,7 +165,7 @@ async function onSubmit() {
     }
 
     .line {
-      background-color: #D9D9D9;
+      background-color: #d9d9d9;
     }
 
     &.style1 {
diff --git a/src/views/order/index/components/detail.vue b/src/views/order/index/components/detail.vue
index dd1c41a..9059c43 100644
--- a/src/views/order/index/components/detail.vue
+++ b/src/views/order/index/components/detail.vue
@@ -1,19 +1,22 @@
 <template>
-  <div>
-    <el-drawer title="订单详情" size="60%" v-model="drawer" direction="rtl" v-loading="loading">
+  <div v-loading="loading">
+    <el-drawer title="订单详情" size="60%" v-model="drawer" direction="rtl" @close="reset">
       <div class="header">
         <div class="title" style="text-align: center">【收银订单】</div>
-        <div class="container">
+        <div class="container" v-if="user">
           <div class="info_content">
             <div class="item">
               <div class="label">会员信息</div>
               <div class="row">
-                <div>会员昵称：-</div>
-                <div>联系电话：-</div>
+                <div>会员昵称：-{{ user.nickName || "" }}</div>
+                <div>联系电话：-{{ user.phone || "" }}</div>
               </div>
             </div>
           </div>
         </div>
+        <div v-else>
+          <h3>服务员下单</h3>
+        </div>
         <div class="table">
           <div class="item">
             <div class="t">订单状态</div>
@@ -25,7 +28,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>
@@ -73,7 +76,7 @@
             <div class="row">
               <div>打包费：{{ detail.packFee || "-" }}</div>
               <div>订单原价：￥{{ detail.originAmount }}</div>
-              <div>优惠金额：￥{{ youHuiJinE }}</div>
+              <div>优惠金额：￥{{ detail.discountAmount }}</div>
               <div>
                 实收金额：
                 <span style="color: red">￥{{ detail.payAmount }}</span>
@@ -97,7 +100,14 @@
         <div>
           <div style="margin-bottom: 16px; font-size: 16px">商品信息</div>
           <template v-for="(item, index) in detail.detailMap" :key="index">
-            <el-table :data="item">
+            <h4>第{{ index }}次下单</h4>
+            <el-table
+              :data="item"
+              :ref="'refTable' + index"
+              @selection-change="selectionChange"
+              @row-click="rowClick($event, index)"
+            >
+              <el-table-column type="selection" width="55" />
               <el-table-column label="商品">
                 <template v-slot="scope">
                   <div class="shop_info">
@@ -124,18 +134,21 @@
                 <template v-slot="scope">x{{ scope.row.num }}</template>
               </el-table-column>
               <el-table-column label="单价">
-                <template v-slot="scope">￥{{ scope.row.price }}</template>
+                <template v-slot="scope">￥{{ scope.row.unitPrice }}</template>
               </el-table-column>
               <el-table-column label="小计">
                 <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
               </el-table-column>
+              <el-table-column label="实付">
+                <template v-slot="scope">￥{{ scope.row.payAmount }}</template>
+              </el-table-column>
               <el-table-column label="操作">
                 <template v-slot="scope">
                   <template v-if="detail.status != 'unpaid'">
                     <el-button
                       v-if="canTuikuan(scope.row)"
                       link
-                      size="mini"
+                      size="small"
                       @click="tuikuan(scope.row)"
                     >
                       <span>退款</span>
@@ -146,7 +159,7 @@
                     <el-button
                       v-if="canTuicai(scope.row)"
                       type="text"
-                      size="mini"
+                      size="small"
                       @click="tuiCai(scope.row)"
                     >
                       <span>退菜</span>
@@ -157,6 +170,14 @@
               </el-table-column>
             </el-table>
           </template>
+          <div class="u-p-20 u-flex u-row-right">
+            <el-checkbox
+              v-model="allSelected"
+              @change="allSelectedChange"
+              label="全选"
+            ></el-checkbox>
+            <el-button type="danger" class="u-m-l-20" @click.stop="tuikuan('all')">退款</el-button>
+          </div>
         </div>
       </div>
     </el-drawer>
@@ -176,6 +197,7 @@ import { ElMessage } from "element-plus";
 import { returnOptionsLabel } from "../config/config";
 import * as $util from "../order_goods_util.js";
 import orderApi from "@/api/order/order";
+import shopUserApi from "@/api/account/shopUser";
 import orderEnum from "./orderEnum";
 import dayjs from "dayjs";
 export default {
@@ -184,6 +206,8 @@ export default {
   },
   data() {
     return {
+      allSelected: false,
+      user: "",
       orderEnum,
       drawer: false,
       type: "1",
@@ -210,8 +234,45 @@ 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: {
+    rowClick(row, index) {
+      this.$refs["refTable" + index][0].toggleRowSelection(row);
+    },
+    selectionChange(e) {
+      console.log(e);
+    },
+    allSelectedChange(newval) {
+      for (let i in this.detail.detailMap) {
+        this.detail.detailMap[i].forEach((item) => {
+          if (newval) {
+            this.$refs["refTable" + i][0].toggleRowSelection(item, true);
+          } else {
+            this.$refs["refTable" + i][0].toggleRowSelection(item, false);
+          }
+        });
+      }
+    },
+    reset() {
+      this.user = "";
+    },
     returnPayType(payType) {
       if (!payType) {
         return "";
@@ -286,9 +347,19 @@ export default {
       this.update();
     },
     tuikuan(item) {
+      let arr = [];
+      if (item === "all") {
+        for (let i in this.detail.detailMap) {
+          arr.push(...this.$refs["refTable" + i][0].getSelectionRows());
+        }
+      } else {
+        arr = [item];
+      }
+      if (arr.length == 0) {
+        return ElMessage.error("请选择要退款的商品");
+      }
       this.selGoods = item;
-      console.log(item);
-      this.$refs.refReturnMoney.open({ ...item, priceAmount: item.canReturnAmount });
+      this.$refs.refReturnMoney.open(arr, this.detail);
     },
     tuiCai(item) {
       this.selGoods = item;
@@ -319,7 +390,13 @@ export default {
     async tbOrderInfoDetail(id) {
       try {
         this.loading = true;
-        const res = await orderApi.getHistoryList({ orderId: id });
+        const res = await orderApi.get({ orderId: id });
+        if (res.userId) {
+          shopUserApi.get({ userId: res.userId }).then((res1) => {
+            this.user = res1;
+          });
+        }
+
         this.detail = res;
         this.loading = false;
       } catch (error) {
diff --git a/src/views/order/index/components/return-money.vue b/src/views/order/index/components/return-money.vue
index dcb0b5f..1ad5982 100644
--- a/src/views/order/index/components/return-money.vue
+++ b/src/views/order/index/components/return-money.vue
@@ -1,35 +1,59 @@
 <template>
-  <el-dialog title="退款" width="410px" v-model="show" @close="reset" :modal="modal">
-    <div class="u-flex font-bold color-333">
-      {{ goods.productName }}
+  <el-dialog title="修改退款金额" width="410px" v-model="show" @close="reset" :modal="modal">
+    <div class="u-flex u-col-top">
+      <span class="u-m-0">退款商品</span>
+      <div class="u-p-l-20 goods-list">
+        <div
+          class="u-flex u-font-12 goods-list-item"
+          v-for="(goods, index) in goodsList"
+          :key="index"
+        >
+          <span class="">
+            {{ goods.productName }}
+          </span>
+          <span class="color-999 u-m-l-10">x{{ goods.num || "" }}</span>
+          <span class="color-333 u-m-l-10 u-font-600">
+            {{ goods.payAmount || "" }}
+          </span>
+        </div>
+      </div>
     </div>
-    <div class="u-flex color-999 u-m-t-4">
-      {{ goods.productSkuName || "" }}
+    <div class="u-flex u-col-top u-m-t-22">
+      <h4span class="u-m-0">支付金额</h4span>
+      <div class="u-p-l-20">
+        {{ detail.payAmount }}
+      </div>
+    </div>
+    <div class="u-flex u-col-top u-m-t-22">
+      <span class="u-m-0">优惠金额</span>
+      <div class="u-p-l-20">
+        {{ detail.discountAmount }}
+      </div>
+    </div>
+    <div class="u-p-b-16 u-m-t-22">
+      <div class="flex u-row-between">
+        <span>线下收款</span>
+        <div class="u-flex u-flex-1 u-p-l-20">
+          <el-input type="number" v-model="number" :min="min" :max="max">
+            <template #append>可退1元</template>
+          </el-input>
+        </div>
+      </div>
+      <div class="u-flex u-col-top u-m-t-22">
+        <span class="u-m-0">退款金额</span>
+        <div class="u-p-l-20">
+          <span class="color-red">￥ {{ detail.discountAmount }}</span>
+          <span class="color-666 u-m-l-4">(退款商品金额：260.16)</span>
+        </div>
+      </div>
+      <div class="u-flex u-col-top u-m-t-22">
+        <span class="u-m-0">退回优惠券</span>
+        <div class="u-p-l-20">
+          <span class="color-666 u-m-l-4">该订单未使用优惠券</span>
+        </div>
+      </div>
     </div>
 
-    <div class="u-p-b-16 border-bottom">
-      <div class="flex u-row-between">
-        <span>退款数量</span>
-        <div class="u-flex">
-          <el-input-number v-model="number" :min="min" :max="max"></el-input-number>
-        </div>
-      </div>
-      <div class="u-font-12 color-999 u-m-t-8" v-if="isSeatFee">
-        <div>
-          <span class="color-red">*</span>
-          <span>客座费只能全退</span>
-        </div>
-      </div>
-    </div>
-    <div class="u-m-t-12 u-font-12 color-999">菜品已点数量 {{ max }} 份</div>
-    <div class="u-flex u-m-t-12">
-      <span>支付金额</span>
-      <span class="">￥{{ goods.payAmount }}</span>
-    </div>
-    <div class="u-flex u-m-t-12">
-      <span>退款金额</span>
-      <span class="color-red font-bold">￥{{ tuikuanJine }}</span>
-    </div>
     <div class="u-p-b-16 border-bottom">
       <div class="flex">
         <span class="u-m-r-12">是否现金</span>
@@ -55,12 +79,12 @@
       </div>
     </div>
     <div class="u-m-t-20">
-      <el-input v-model="note" size="medium" placeholder="请输入自定义备注"></el-input>
+      <el-input v-model="note" placeholder="请输入自定义备注"></el-input>
     </div>
     <template #footer>
       <div>
-        <el-button size="medium" @click="close">取消</el-button>
-        <el-button size="medium" type="primary" @click="confirm">确定</el-button>
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="confirm">确定</el-button>
       </div>
     </template>
   </el-dialog>
@@ -81,6 +105,8 @@ export default {
   },
   data() {
     return {
+      detail: "",
+      goodsList: [],
       cash: false,
       isFloat: false,
       min: 0,
@@ -128,23 +154,10 @@ export default {
       }
       this.note = tag + "," + this.note;
     },
-    open(item) {
-      this.goods = item ? item : this.goods;
-      console.log(item);
-      if (item && item.isWeight) {
-        //称重商品
-        this.isFloat = true;
-        this.number = item.num;
-      }
-      if (item && !item.isWeight) {
-        if (item.productId != "-999") {
-          this.number = 1;
-        } else {
-          this.number = item.num;
-        }
-      }
-
+    open(goods, detailInfo) {
+      this.goodsList = goods;
       this.show = true;
+      this.detail = detailInfo;
     },
     close() {
       this.show = false;
@@ -176,7 +189,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,12 +214,22 @@ 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;
 }
+.goods-list-item {
+  height: 24px;
+  line-height: 24px;
+  background: #f0f2f5;
+  border-radius: 3px;
+  padding: 0 10px;
+}
+.goods-list-item:not(:first-child) {
+  margin-top: 6px;
+}
 </style>
\ No newline at end of file
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..19ee9a1 100644
--- a/src/views/tool/Instead/components/diner-number.vue
+++ b/src/views/tool/Instead/components/diner-number.vue
@@ -13,7 +13,7 @@
             <div>清空</div>
           </template>
           <template #input>
-            <div class="u-p-l-20 u-p-r-20 u-flex w-full">
+            <div class="u-flex w-full">
               <el-input
                 placeholder="请输入就餐人数"
                 v-model="number"
@@ -27,8 +27,8 @@
           </template>
         </key-board>
         <div class="confirm_btns">
-          <el-button @click="close">取消</el-button>
-          <el-button type="primary" @click="confirm">确定</el-button>
+          <el-button size="large" @click="close">取消</el-button>
+          <el-button size="large" type="primary" @click="confirm">确定</el-button>
         </div>
       </div>
     </el-dialog>
@@ -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..efd5b5e 100644
--- a/src/views/tool/Instead/components/order.vue
+++ b/src/views/tool/Instead/components/order.vue
@@ -7,7 +7,7 @@
           <div class="u-m-l-12">
             <p>
               <span class="name u-font-16">{{ user.nickName }}</span>
-              <span class="vip" v-if="user.isVip">>VIP{{ user.isVip }}</span>
+              <span class="vip" v-if="user.isVip">VIP{{ user.isVip }}</span>
             </p>
             <p class="u-font-14 color-666 u-m-t-10">
               <span class="money">余额：{{ user.amount }}</span>
@@ -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..2182c68 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">
@@ -97,7 +97,9 @@
               <span>就餐人数：{{ perpole || "-" }} 位</span>
               <el-icon><ArrowRight /></el-icon>
             </div>
-            <a @click="clearCarts" style="color: #1890ff">清空</a>
+            <el-button link type="primary" :disabled="carts.isEmpty" @click="clearCarts">
+              清空
+            </el-button>
           </div>
           <!-- 购物车 -->
           <cartsList
@@ -109,6 +111,7 @@
             :goodsList="goods.list"
             :oldOrder="oldOrder"
             :perpole="perpole"
+            :remark="remark"
             :table="table"
             ref="refCart"
           ></cartsList>
@@ -170,6 +173,7 @@
 
           <!-- 订单信息展示 -->
           <Order
+            ref="refOrder"
             :orderInfo="orderInfo"
             @chooseUser="showChooseUser"
             @paysuccess="refresh"
@@ -232,6 +236,9 @@ const shopUser = useUserStore();
 
 const route = useRoute();
 const router = useRouter();
+
+//整单备注
+const remark = ref("");
 //退菜
 function showReturn(cart) {
   console.log(cart);
@@ -252,13 +259,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 +276,61 @@ 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.userId) {
+        const userRes = await shopUserApi.get({ userId: res.userId });
+        user.value = userRes;
+        carts.changeUser(userRes);
+      }
       if (res.id) {
         // 获取历史订单数据
         const res1 = await orderApi.getHistoryList({
@@ -311,21 +338,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,
@@ -362,8 +397,9 @@ function getTableList() {
     tableList.value = res.records.filter((v) => v.tableCode);
   });
 }
-function getTableDetail(table_code) {
-  tableApi.get(table_code);
+async function getTableDetail(params) {
+  const res = await tableApi.get(params);
+  return res;
 }
 function tablesearchInput() {}
 //返回桌台状态颜色
@@ -378,10 +414,10 @@ function returnTableLabel(key) {
 }
 function tableClick(item) {
   console.log(item);
-  getTableDetail(item.tableCode);
+  getTableDetail({ tableCode: item.tableCode });
 
   table.value = item;
-  refCart.value.carts.changeTable(item.tableCode);
+  carts.changeTable(item.tableCode);
   refTable.value.hide();
 }
 
@@ -391,7 +427,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 +450,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 +459,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 +537,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 +582,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 +608,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 +643,7 @@ onMounted(async () => {
       router.replace(route.path);
       console.log(route.path);
       setTimeout(() => {
-        refCart.value.carts.dataReset();
+        carts.dataReset();
         refresh();
       }, 2000);
       return;
@@ -619,24 +654,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;