diff --git a/.env.development b/.env.development
index 9aea75f..fc90eae 100644
--- a/.env.development
+++ b/.env.development
@@ -13,7 +13,7 @@ VITE_APP_API_URL=https://tapi.cashier.sxczgkj.cn/ # 正式
 # VITE_APP_API_URL=http://localhost:8989    # 本地
 
 # WebSocket 端点（不配置则关闭），线上 ws://api.youlai.tech/ws ，本地 ws://localhost:8989/ws
-VITE_APP_WS_ENDPOINT=
+VITE_APP_WS_ENDPOINT=wss://sockets.sxczgkj.com/wss
 
 # 启用 Mock 服务
 VITE_MOCK_DEV_SERVER=false
diff --git a/README.md b/README.md
index a9c6529..97fb75b 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,8 @@
 订单，支付相关：<https://tapi.cashier.sxczgkj.cn/order/>
 商品，耗材相关：<https://tapi.cashier.sxczgkj.cn/product/>
 系统相关：<https://tapi.cashier.sxczgkj.cn/system/>
+购物车websocket
+<https://apifox.com/apidoc/shared-2c47d665-b476-409c-9cb5-0e68a69b0292>
 
 ## 项目特色
 
diff --git a/package.json b/package.json
index d093947..14f1072 100644
--- a/package.json
+++ b/package.json
@@ -52,6 +52,7 @@
     "path-to-regexp": "^8.2.0",
     "pinia": "^2.3.1",
     "qs": "^6.14.0",
+    "sockjs-client": "^1.6.1",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
     "vue-i18n": "^11.1.0",
diff --git a/src/api/account/activate.ts b/src/api/account/activate.ts
new file mode 100644
index 0000000..e3d46b5
--- /dev/null
+++ b/src/api/account/activate.ts
@@ -0,0 +1,85 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/activate";
+const API = {
+
+  getList() {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+    });
+  },
+  edit(data: editRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+  add(data: addRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  }
+}
+export default API;
+
+export interface addRequest {
+  /**
+   * 充值金额
+   */
+  amount?: number;
+  /**
+   * 优惠卷id
+   */
+  couponId?: number;
+  /**
+   * 赠送金额
+   */
+  giftAmount?: number;
+  /**
+   * 赠送积分
+   */
+  giftPoints?: number;
+  /**
+   * 是否赠送优惠卷 0否 1是
+   */
+  isGiftCoupon?: number;
+  /**
+   * 优惠卷数量
+   */
+  num?: number;
+  [property: string]: any;
+}
+
+export interface editRequest {
+  /**
+   * 充值金额
+   */
+  amount: number;
+  /**
+   * 优惠卷id
+   */
+  couponId?: number;
+  /**
+   * 赠送金额
+   */
+  giftAmount?: number;
+  /**
+   * 赠送积分
+   */
+  giftPoints?: number;
+  id: number;
+  /**
+   * 是否赠送优惠卷 0否 1是
+   */
+  isGiftCoupon?: number;
+  /**
+   * 优惠卷数量
+   */
+  num?: number;
+  shopId?: number;
+  [property: string]: any;
+}
\ No newline at end of file
diff --git a/src/api/account/menu.ts b/src/api/account/menu.ts
index a4b5197..ba291ef 100644
--- a/src/api/account/menu.ts
+++ b/src/api/account/menu.ts
@@ -21,7 +21,7 @@ const MenuApi = {
     return request<any, MenuVO>({
       url: `${baseURL}/detail`,
       method: "get",
-      data: { id }
+      params: { id }
     });
   },
   add(data: addRequest) {
@@ -195,7 +195,7 @@ export interface editRequest {
   /**
    * 上级菜单，不传递则为顶级菜单
    */
-  pid?: number;
+  pid: number | string | null;
   title: string;
   [property: string]: any;
 }
diff --git a/src/api/account/permission.ts b/src/api/account/permission.ts
new file mode 100644
index 0000000..038b653
--- /dev/null
+++ b/src/api/account/permission.ts
@@ -0,0 +1,22 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin";
+const ShopStaffApi = {
+  // 获取店铺权限列表
+  getshopPermission() {
+    return request<any>({
+      url: `${baseURL}/shopPermission`,
+      method: "get",
+    });
+  },
+  // 获取员工对应的权限id
+  getPermission(id: number | string) {
+    return request<any>({
+      url: `${baseURL}/shopStaff/permission`,
+      method: "get",
+      params: { id }
+    });
+  },
+};
+
+export default ShopStaffApi;
diff --git a/src/api/account/role.ts b/src/api/account/role.ts
index faea2a6..52007cd 100644
--- a/src/api/account/role.ts
+++ b/src/api/account/role.ts
@@ -17,20 +17,29 @@ const RoleApi = {
       data,
     });
   },
-  update(data: editRequest) {
-    return request<any, editResponse>({
+  update(id: number | string | null, data: editRequest) {
+    const requestData = { ...data, id };
+    return request<any>({
       url: `${baseURL}`,
       method: "put",
-      data,
+      data: requestData,
     });
   },
   delete(data: delRequest) {
     return request<any, delResponse>({
       url: `${baseURL}`,
-      method: "put",
+      method: "delete",
       data,
     });
   },
+  // 获取角色对应的菜单id
+  getMenu(id: number) {
+    return request<any>({
+      url: `${baseURL}/menu`,
+      method: "get",
+      params: { id },
+    });
+  },
 };
 
 export default RoleApi;
@@ -226,3 +235,4 @@ export interface delResponse {
   [property: string]: any;
 }
 /** delete end */
+
diff --git a/src/api/account/shopMerchant.ts b/src/api/account/shopMerchant.ts
new file mode 100644
index 0000000..25418b9
--- /dev/null
+++ b/src/api/account/shopMerchant.ts
@@ -0,0 +1,55 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shopMerchant";
+const API = {
+  get(shopId: string | number) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      headers: {
+        shopId: shopId
+      }
+    });
+  },
+  edit(shopId: string | number, data: shopMerchantType) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  }
+}
+export default API;
+/**
+ * ShopMerchantEditDTO
+ */
+export interface shopMerchantType {
+  /**
+   * 支付宝appid
+   */
+  alipaySmallAppid: null | string;
+  /**
+   * 商户应用id
+   */
+  appId: null | string;
+  /**
+   * 商户秘钥
+   */
+  appSecret: null | string;
+  /**
+   * 支付密码
+   */
+  payPassword: null | string;
+  /**
+   * 支付系统商户id
+   */
+  storeId: null | string;
+  /**
+   * 微信appid
+   */
+  wechatSmallAppid: null | string;
+  [property: string]: any;
+}
\ No newline at end of file
diff --git a/src/api/account/shopUser.ts b/src/api/account/shopUser.ts
new file mode 100644
index 0000000..4831704
--- /dev/null
+++ b/src/api/account/shopUser.ts
@@ -0,0 +1,160 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shopUser";
+const API = {
+  // 获取店铺用户概述信息
+  getSummary(data: getSummaryRequest) {
+    return request({
+      url: `${baseURL}/summary`,
+      method: "get",
+      params: data
+    });
+  },
+  getList(data: getListRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      params: data
+    });
+  },
+  edit(shopId: string | number, data: editRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  },
+  // 店铺用户余额修改
+  editMoney(shopId: string | number, data: editMoneyRequest) {
+    return request({
+      url: `${baseURL}/money`,
+      method: "put",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  },
+  add(shopId: string | number, data: addRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+      headers: {
+        shopId: shopId
+      }
+    });
+  }
+}
+export default API;
+
+export interface getSummaryRequest {
+  /**
+   * 0 非vip 1 vip
+   */
+  isVip?: number;
+  [property: string]: any;
+}
+export interface getListRequest {
+  /**
+   * 0 非vip 1 vip
+   */
+  isVip?: number;
+  /**
+   * 昵称或手机号
+   */
+  key?: string;
+  [property: string]: any;
+}
+
+/**
+ * ShopUserEditDTO
+ */
+export interface editRequest {
+  /**
+   * 生日
+   */
+  birthDay?: null | string;
+  /**
+   * 对应shopUserid
+   */
+  id: number | null;
+  /**
+   * 昵称
+   */
+  nickName?: null | string;
+  /**
+   * 性别 0女 1男
+   */
+  sex?: number | null;
+  [property: string]: any;
+}
+
+/**
+ * ShopUserMoneyEditDTO
+ */
+export interface editMoneyRequest {
+  /**
+   * 对应shopUserid
+   */
+  id: number | null;
+  /**
+   * 浮动金额
+   */
+  money: number | null;
+  /**
+   * 备注
+   */
+  remark?: null | string;
+  /**
+   * 0减少 1增加
+   */
+  type: number | null;
+  [property: string]: any;
+}
+
+/**
+ * ShopUserAddDTO
+ */
+export interface addRequest {
+  /**
+   * 账户积分
+   */
+  accountPoints?: number | null;
+  /**
+   * 钱包余额
+   */
+  amount?: number | null;
+  /**
+   * 会员生日
+   */
+  birthDay?: null | string;
+  /**
+   * 用户头像
+   */
+  headImg?: null | string;
+  /**
+   * 是否会员，
+   */
+  isVip?: number | null;
+  /**
+   * 用户昵称
+   */
+  nickName: null | string;
+  /**
+   * 电话号码
+   */
+  phone: null | string;
+  /**
+   * 0-女 1男
+   */
+  sex?: number | null;
+  /**
+   * 用户Id
+   */
+  userId: number | null;
+  [property: string]: any;
+}
\ No newline at end of file
diff --git a/src/api/account/table.ts b/src/api/account/table.ts
new file mode 100644
index 0000000..0991f28
--- /dev/null
+++ b/src/api/account/table.ts
@@ -0,0 +1,128 @@
+import request from "@/utils/request";
+import { Account_BaseUrl } from "@/api/config";
+const baseURL = Account_BaseUrl + "/admin/shopTable";
+const API = {
+  // 批量生成桌码
+  fasetAdd(num: number) {
+    return request({
+      url: `${baseURL}/code`,
+      method: "post",
+      data: { num },
+    });
+  },
+  getList(data: getListRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "get",
+      params: data
+    });
+  },
+  edit(data: editRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "put",
+      data: data,
+    });
+  },
+  add(data: addRequest) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: data,
+    });
+  },
+  delete(id: number | string) {
+    return request({
+      url: `${baseURL}`,
+      method: "post",
+      data: { id },
+    });
+  }
+}
+export default API;
+/**
+ * ShopTableAddDTO
+ */
+export interface addRequest {
+  /**
+   * 区域id
+   */
+  areaId?: number | null;
+  /**
+   * 是否自动清台
+   */
+  autoClear?: number | null;
+  /**
+   * 客座数
+   */
+  capacity: number | null;
+  /**
+   * 结束数字
+   */
+  end: number | null;
+  /**
+   * 台桌前缀
+   */
+  sign: null | string;
+  /**
+   * 起始数字
+   */
+  start: number | null;
+  [property: string]: any;
+}
+
+/**
+ * ShopTableDTO
+ */
+export interface editRequest {
+  /**
+   * 区域Id
+   */
+  areaId?: number | null;
+  /**
+   * 自动清台 0手动 1自动
+   */
+  autoClear?: number | null;
+  /**
+   * 自增id
+   */
+  id: number | null;
+  /**
+   * 是否接受网络预定
+   */
+  isPredate?: number | null;
+  /**
+   * 客座数,允许的客座数量
+   */
+  maxCapacity?: number | null;
+  name?: null | string;
+  /**
+   * 网络预定台桌支付金额
+   */
+  predateAmount?: number | null;
+  /**
+   * 二维码
+   */
+  qrcode?: null | string;
+  /**
+   * 台桌排序
+   */
+  sort?: number | null;
+  /**
+   * idle-空闲 using-使用中 subscribe预定，closed--关台， opening 开台中，cleaning 台桌清理中
+   */
+  status?: null | string;
+  [property: string]: any;
+}
+
+export interface getListRequest {
+  /**
+   * 区域id
+   */
+  areaId?: number;
+  /**
+   * 桌码
+   */
+  tableCode?: string;
+  [property: string]: any;
+}
\ No newline at end of file
diff --git a/src/api/system/user.ts b/src/api/system/user.ts
index fcd4c8d..e893e3d 100644
--- a/src/api/system/user.ts
+++ b/src/api/system/user.ts
@@ -216,7 +216,7 @@ export default UserAPI;
 export interface UserInfo {
   /** 用户ID */
   userId?: number;
-
+  id?: number | string;
   /** 用户名 */
   username?: string;
 
diff --git a/src/components/CURD/PageContent.vue b/src/components/CURD/PageContent.vue
index d005bed..972aa64 100644
--- a/src/components/CURD/PageContent.vue
+++ b/src/components/CURD/PageContent.vue
@@ -8,37 +8,58 @@
           <template v-if="typeof item === 'string'">
             <!-- 新增 -->
             <template v-if="item === 'add'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="success" icon="plus"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="success"
+                icon="plus"
+                @click="handleToolbar(item)"
+              >
                 新增
               </el-button>
             </template>
             <!-- 删除 -->
             <template v-else-if="item === 'delete'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="danger" icon="delete"
-                :disabled="removeIds.length === 0" @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="danger"
+                icon="delete"
+                :disabled="removeIds.length === 0"
+                @click="handleToolbar(item)"
+              >
                 删除
               </el-button>
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'import'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="upload"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="upload"
+                @click="handleToolbar(item)"
+              >
                 导入
               </el-button>
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'export'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]" type="default" icon="download"
-                @click="handleToolbar(item)">
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                type="default"
+                icon="download"
+                @click="handleToolbar(item)"
+              >
                 导出
               </el-button>
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
-            <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon"
-              :type="item.type ?? 'default'" @click="handleToolbar(item.name)">
+            <el-button
+              v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+              :icon="item.icon"
+              :type="item.type ?? 'default'"
+              @click="handleToolbar(item.name)"
+            >
               {{ item.text }}
             </el-button>
           </template>
@@ -67,36 +88,68 @@
             </template>
             <!-- 导出 -->
             <template v-else-if="item === 'exports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:export`]" icon="download" circle title="导出"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:export`]"
+                icon="download"
+                circle
+                title="导出"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 导入 -->
             <template v-else-if="item === 'imports'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:import`]" icon="upload" circle title="导入"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:import`]"
+                icon="upload"
+                circle
+                title="导入"
+                @click="handleToolbar(item)"
+              />
             </template>
             <!-- 搜索 -->
             <template v-else-if="item === 'search'">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:query`]" icon="search" circle title="搜索"
-                @click="handleToolbar(item)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:query`]"
+                icon="search"
+                circle
+                title="搜索"
+                @click="handleToolbar(item)"
+              />
             </template>
           </template>
           <!-- 其他 -->
           <template v-else-if="typeof item === 'object'">
             <template v-if="item.auth">
-              <el-button v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]" :icon="item.icon" circle
-                :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                v-hasPerm="[`${contentConfig.pageName}:${item.auth}`]"
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
             <template v-else>
-              <el-button :icon="item.icon" circle :title="item.title" @click="handleToolbar(item.name)" />
+              <el-button
+                :icon="item.icon"
+                circle
+                :title="item.title"
+                @click="handleToolbar(item.name)"
+              />
             </template>
           </template>
         </template>
       </div>
     </div>
     <!-- 列表 -->
-    <el-table ref="tableRef" v-loading="loading" v-bind="contentConfig.table" :data="pageData" :row-key="pk"
-      @selection-change="handleSelectionChange" @filter-change="handleFilterChange">
+    <el-table
+      ref="tableRef"
+      v-loading="loading"
+      v-bind="contentConfig.table"
+      :data="pageData"
+      :row-key="pk"
+      @selection-change="handleSelectionChange"
+      @filter-change="handleFilterChange"
+    >
       <template v-for="col in cols" :key="col">
         <el-table-column v-if="col.show" v-bind="col">
           <template #default="scope">
@@ -105,15 +158,24 @@
               <template v-if="col.prop">
                 <template v-if="Array.isArray(scope.row[col.prop])">
                   <template v-for="(item, index) in scope.row[col.prop]" :key="item">
-                    <el-image :src="item" :preview-src-list="scope.row[col.prop]" :initial-index="index"
-                      :preview-teleported="true" :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40
-                        }px`" />
+                    <el-image
+                      :src="item"
+                      :preview-src-list="scope.row[col.prop]"
+                      :initial-index="index"
+                      :preview-teleported="true"
+                      :style="`width: ${col.imageWidth ?? 40}px; height: ${
+                        col.imageHeight ?? 40
+                      }px`"
+                    />
                   </template>
                 </template>
                 <template v-else>
-                  <el-image :src="scope.row[col.prop]" :preview-src-list="[scope.row[col.prop]]"
+                  <el-image
+                    :src="scope.row[col.prop]"
+                    :preview-src-list="[scope.row[col.prop]]"
                     :preview-teleported="true"
-                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`" />
+                    :style="`width: ${col.imageWidth ?? 40}px; height: ${col.imageHeight ?? 40}px`"
+                  />
                 </template>
               </template>
             </template>
@@ -135,20 +197,30 @@
             <template v-else-if="col.templet === 'switch'">
               <template v-if="col.prop">
                 <!-- pageData.length>0: 解决el-switch组件会在表格初始化的时候触发一次change事件 -->
-                <el-switch v-model="scope.row[col.prop]" :active-value="col.activeValue ?? 1"
-                  :inactive-value="col.inactiveValue ?? 0" :inline-prompt="true" :active-text="col.activeText ?? ''"
-                  :inactive-text="col.inactiveText ?? ''" :validate-event="false"
-                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)" @change="
+                <el-switch
+                  v-model="scope.row[col.prop]"
+                  :active-value="col.activeValue ?? 1"
+                  :inactive-value="col.inactiveValue ?? 0"
+                  :inline-prompt="true"
+                  :active-text="col.activeText ?? ''"
+                  :inactive-text="col.inactiveText ?? ''"
+                  :validate-event="false"
+                  :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
+                  @change="
                     pageData.length > 0 && handleModify(col.prop, scope.row[col.prop], scope.row)
-                    " />
+                  "
+                />
               </template>
             </template>
             <!-- 生成输入框组件 -->
             <template v-else-if="col.templet === 'input'">
               <template v-if="col.prop">
-                <el-input v-model="scope.row[col.prop]" :type="col.inputType ?? 'text'"
+                <el-input
+                  v-model="scope.row[col.prop]"
+                  :type="col.inputType ?? 'text'"
                   :disabled="!hasAuth(`${contentConfig.pageName}:modify`)"
-                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)" />
+                  @blur="handleModify(col.prop, scope.row[col.prop], scope.row)"
+                />
               </template>
             </template>
             <!-- 格式化为价格 -->
@@ -180,7 +252,7 @@
                 {{
                   scope.row[col.prop]
                     ? useDateFormat(scope.row[col.prop], col.dateFormat ?? "YYYY-MM-DD HH:mm:ss")
-                      .value
+                        .value
                     : ""
                 }}
               </template>
@@ -191,32 +263,68 @@
                 <template v-if="typeof item === 'string'">
                   <!-- 编辑/删除 -->
                   <template v-if="item === 'edit' || item === 'delete'">
-                    <el-button v-hasPerm="[`${contentConfig.pageName}:${item}`]"
-                      :type="item === 'edit' ? 'primary' : 'danger'" :icon="item" size="small" link @click="
+                    <el-button
+                      v-hasPerm="[`${contentConfig.pageName}:${item}`]"
+                      :type="item === 'edit' ? 'primary' : 'danger'"
+                      :icon="item"
+                      size="small"
+                      link
+                      @click="
                         handleOperat({
                           name: item,
                           row: scope.row,
                           column: scope.column,
                           $index: scope.$index,
                         })
-                        ">
+                      "
+                    >
                       {{ item === "edit" ? "编辑" : "删除" }}
                     </el-button>
                   </template>
                 </template>
                 <!-- 其他 -->
                 <template v-else-if="typeof item === 'object'">
-                  <el-button v-if="item.render === undefined || item.render(scope.row)" v-bind="item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
-                    " :icon="item.icon" :type="item.type ?? 'primary'" size="small" link @click="
-                      handleOperat({
-                        name: item.name,
-                        row: scope.row,
-                        column: scope.column,
-                        $index: scope.$index,
-                      })
-                      ">
-                    {{ item.text }}
-                  </el-button>
+                  <el-dropdown>
+                    <el-button
+                      v-if="item.render === undefined || item.render(scope.row)"
+                      v-bind="
+                        item.auth ? { 'v-hasPerm': [`${contentConfig.pageName}:${item.auth}`] } : {}
+                      "
+                      :icon="item.icon"
+                      :type="item.type ?? 'primary'"
+                      size="small"
+                      link
+                      @click="
+                        handleOperat({
+                          name: item.name,
+                          row: scope.row,
+                          column: scope.column,
+                          $index: scope.$index,
+                        })
+                      "
+                    >
+                      {{ item.text }}
+                    </el-button>
+                    <template #dropdown v-if="item.options && item.options.length > 0">
+                      <el-dropdown-menu>
+                        <el-dropdown-item
+                          @click="
+                            handleOperat({
+                              name: item.name,
+                              row: scope.row,
+                              column: scope.column,
+                              $index: scope.$index,
+                              command: opt.command ? opt.command : '',
+                            })
+                          "
+                          v-for="opt in item.options"
+                          :key="opt.value"
+                        >
+                          {{ opt.label }}
+                        </el-dropdown-item>
+                      </el-dropdown-menu>
+                    </template>
+                  </el-dropdown>
                 </template>
               </template>
             </template>
@@ -232,18 +340,33 @@
     <template v-if="showPagination">
       <el-scrollbar>
         <div class="mt-[12px]">
-          <el-pagination v-bind="pagination" @size-change="handleSizeChange" @current-change="handleCurrentChange" />
+          <el-pagination
+            v-bind="pagination"
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+          />
         </div>
       </el-scrollbar>
     </template>
     <!-- 导出弹窗 -->
-    <el-dialog v-model="exportsModalVisible" :align-center="true" title="导出数据" width="600px" style="padding-right: 0"
-      @close="handleCloseExportsModal">
+    <el-dialog
+      v-model="exportsModalVisible"
+      :align-center="true"
+      title="导出数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseExportsModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="exportsFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="exportsFormData" :rules="exportsFormRules">
+        <el-form
+          ref="exportsFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="exportsFormData"
+          :rules="exportsFormRules"
+        >
           <el-form-item label="文件名" prop="filename">
             <el-input v-model="exportsFormData.filename" clearable />
           </el-form-item>
@@ -253,10 +376,16 @@
           <el-form-item label="数据源" prop="origin">
             <el-select v-model="exportsFormData.origin">
               <el-option label="当前数据 (当前页的数据)" :value="ExportsOriginEnum.CURRENT" />
-              <el-option label="选中数据 (所有选中的数据)" :value="ExportsOriginEnum.SELECTED"
-                :disabled="selectionData.length <= 0" />
-              <el-option label="全量数据 (所有分页的数据)" :value="ExportsOriginEnum.REMOTE"
-                :disabled="contentConfig.exportsAction === undefined" />
+              <el-option
+                label="选中数据 (所有选中的数据)"
+                :value="ExportsOriginEnum.SELECTED"
+                :disabled="selectionData.length <= 0"
+              />
+              <el-option
+                label="全量数据 (所有分页的数据)"
+                :value="ExportsOriginEnum.REMOTE"
+                :disabled="contentConfig.exportsAction === undefined"
+              />
             </el-select>
           </el-form-item>
           <el-form-item label="字段" prop="fields">
@@ -277,17 +406,35 @@
       </template>
     </el-dialog>
     <!-- 导入弹窗 -->
-    <el-dialog v-model="importModalVisible" :align-center="true" title="导入数据" width="600px" style="padding-right: 0"
-      @close="handleCloseImportModal">
+    <el-dialog
+      v-model="importModalVisible"
+      :align-center="true"
+      title="导入数据"
+      width="600px"
+      style="padding-right: 0"
+      @close="handleCloseImportModal"
+    >
       <!-- 滚动 -->
       <el-scrollbar max-height="60vh">
         <!-- 表单 -->
-        <el-form ref="importFormRef" label-width="auto" style="padding-right: var(--el-dialog-padding-primary)"
-          :model="importFormData" :rules="importFormRules">
+        <el-form
+          ref="importFormRef"
+          label-width="auto"
+          style="padding-right: var(--el-dialog-padding-primary)"
+          :model="importFormData"
+          :rules="importFormRules"
+        >
           <el-form-item label="文件名" prop="files">
-            <el-upload ref="uploadRef" v-model:file-list="importFormData.files" class="w-full"
+            <el-upload
+              ref="uploadRef"
+              v-model:file-list="importFormData.files"
+              class="w-full"
               accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet, application/vnd.ms-excel"
-              :drag="true" :limit="1" :auto-upload="false" :on-exceed="handleFileExceed">
+              :drag="true"
+              :limit="1"
+              :auto-upload="false"
+              :on-exceed="handleFileExceed"
+            >
               <el-icon class="el-icon--upload"><upload-filled /></el-icon>
               <div class="el-upload__text">
                 <span>将文件拖到此处，或</span>
@@ -296,8 +443,13 @@
               <template #tip>
                 <div class="el-upload__tip">
                   *.xlsx / *.xls
-                  <el-link v-if="contentConfig.importTemplate" type="primary" icon="download" :underline="false"
-                    @click="handleDownloadTemplate">
+                  <el-link
+                    v-if="contentConfig.importTemplate"
+                    type="primary"
+                    icon="download"
+                    :underline="false"
+                    @click="handleDownloadTemplate"
+                  >
                     下载模板
                   </el-link>
                 </div>
@@ -309,7 +461,11 @@
       <!-- 弹窗底部操作按钮 -->
       <template #footer>
         <div style="padding-right: var(--el-dialog-padding-primary)">
-          <el-button type="primary" :disabled="importFormData.files.length === 0" @click="handleImportSubmit">
+          <el-button
+            type="primary"
+            :disabled="importFormData.files.length === 0"
+            @click="handleImportSubmit"
+          >
             确 定
           </el-button>
           <el-button @click="handleCloseImportModal">取 消</el-button>
@@ -785,10 +941,10 @@ function fetchPageData(formData: IObject = {}, isRestart = false) {
     .indexAction(
       showPagination
         ? {
-          [request.pageName]: pagination.currentPage,
-          [request.limitName]: pagination.pageSize,
-          ...formData,
-        }
+            [request.pageName]: pagination.currentPage,
+            [request.limitName]: pagination.pageSize,
+            ...formData,
+          }
         : formData
     )
     .then((data) => {
diff --git a/src/components/CURD/PageModal.vue b/src/components/CURD/PageModal.vue
index e17b46e..ef74130 100644
--- a/src/components/CURD/PageModal.vue
+++ b/src/components/CURD/PageModal.vue
@@ -78,7 +78,10 @@
                 <template v-else-if="item.type === 'date-picker'">
                   <el-date-picker v-model="formData[item.prop]" v-bind="item.attrs" />
                 </template>
-
+                <!-- 图片上传 -->
+                <template v-else-if="item.type === 'UpImage'">
+                  <SingleImageUpload v-model="formData[item.prop]" />
+                </template>
                 <!-- Text 文本 -->
                 <template v-else-if="item.type === 'text'">
                   <el-text v-bind="item.attrs">
@@ -237,6 +240,7 @@ const props = defineProps<{
 // 自定义事件
 const emit = defineEmits<{
   submitClick: [];
+  formDataChange: [string, any];
 }>();
 const pk = props.modalConfig.pk ?? "id";
 const modalVisible = ref(false);
@@ -256,6 +260,7 @@ for (const item of formItems) {
       watch(
         () => formData[item.prop],
         (newValue, oldValue) => {
+          emit("formDataChange", item.prop, newValue);
           item.watch && item.watch(newValue, oldValue, formData, formItems);
         }
       );
diff --git a/src/components/CURD/types.ts b/src/components/CURD/types.ts
index 7433d01..5df3f1a 100644
--- a/src/components/CURD/types.ts
+++ b/src/components/CURD/types.ts
@@ -24,6 +24,7 @@ export interface IOperatData {
   row: IObject;
   column: IObject;
   $index: number;
+  command?: string | number;
 }
 
 export interface ISearchConfig {
@@ -185,6 +186,11 @@ export interface IContentConfig<T = any> {
         text: string;
         type?: "primary" | "success" | "warning" | "danger" | "info";
         render?: (row: IObject) => boolean;
+        options?: {
+          label: string;
+          command: string | number,
+          value?: any;
+        }[];
       }
     >;
     // filter值拼接符
diff --git a/src/router/index.ts b/src/router/index.ts
index dec04d9..a13620e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -321,7 +321,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "table",
-        component: () => import("@/views/tool/table.vue"),
+        component: () => import("@/views/tool/table/index.vue"),
         name: "table",
         meta: {
           title: "台桌管理",
@@ -463,7 +463,7 @@ export const constantRoutes: RouteRecordRaw[] = [
     children: [
       {
         path: "index",
-        component: () => import("@/views/user/index.vue"),
+        component: () => import("@/views/user/list/index.vue"),
         name: "userIndex",
         meta: {
           title: "用户列表",
@@ -473,7 +473,7 @@ export const constantRoutes: RouteRecordRaw[] = [
       },
       {
         path: "active",
-        component: () => import("@/views/user/active.vue"),
+        component: () => import("@/views/user/active/index.vue"),
         name: "userActive",
         meta: {
           title: "活动管理",
diff --git a/src/store/modules/permission.ts b/src/store/modules/permission.ts
index 56f133d..c18d156 100644
--- a/src/store/modules/permission.ts
+++ b/src/store/modules/permission.ts
@@ -4,6 +4,7 @@ import { store } from "@/store";
 import router from "@/router";
 
 import MenuAPI, { type RouteVO } from "@/api/account/menu";
+const isTest = true//是否是本地调试
 const modules = import.meta.glob("../../views/**/**.vue");
 const Layout = () => import("@/layout/index.vue");
 
@@ -16,6 +17,8 @@ export const usePermissionStore = defineStore("permission", () => {
   // 路由是否加载完成
   const isRoutesLoaded = ref(false);
 
+
+
   /**
    * 获取后台动态路由数据，解析并注册到全局路由
    *
@@ -25,12 +28,18 @@ export const usePermissionStore = defineStore("permission", () => {
     return new Promise<RouteRecordRaw[]>((resolve, reject) => {
       MenuAPI.getRoutes()
         .then((data) => {
-          // const dynamicRoutes = parseDynamicRoutes(data);
-          // routes.value = [...constantRoutes, ...dynamicRoutes];
-          // isRoutesLoaded.value = true;
-          // resolve(dynamicRoutes);
-          isRoutesLoaded.value = true;
-          resolve(constantRoutes);
+          if (!isTest) {
+            const dynamicRoutes = parseDynamicRoutes(data.filter(v => v.type == 0));
+            routes.value = [...constantRoutes, ...dynamicRoutes];
+            console.log(routes.value);
+            isRoutesLoaded.value = true;
+            resolve(dynamicRoutes);
+          } else {
+
+            isRoutesLoaded.value = true;
+            resolve(constantRoutes);
+          }
+
         })
         .catch((error) => {
           reject(error);
@@ -55,7 +64,9 @@ export const usePermissionStore = defineStore("permission", () => {
    */
   const resetRouter = () => {
     // 清空本地存储的路由和菜单数据
-    // routes.value = [];
+    if (!isTest) {
+      routes.value = [];
+    }
     routes.value = constantRoutes;
     mixedLayoutLeftRoutes.value = [];
     // 从 Vue Router 中移除所有动态注册的路由
@@ -90,21 +101,33 @@ export const usePermissionStore = defineStore("permission", () => {
  */
 const parseDynamicRoutes = (rawRoutes: RouteVO[]): RouteRecordRaw[] => {
   const parsedRoutes: RouteRecordRaw[] = [];
-
   rawRoutes.forEach((route) => {
-    const normalizedRoute = { ...route } as RouteRecordRaw;
+    console.log(route.path)
+    const normalizedRoute = {
+      path: route.path,
+      meta: {
+        title: route.title,
+        icon: route.icon,
+        keepAlive: route.cache,
+        alwaysShow: route.path && route.path.startsWith('/') ? true : false,
+        hidden: route.hidden,
+      },
+      children: route.children,
+      component: route.component,
+    } as RouteRecordRaw;
 
     // 处理组件路径
     normalizedRoute.component =
-      normalizedRoute.component?.toString() === "Layout"
+      !normalizedRoute.component
         ? Layout
         : modules[`../../views/${normalizedRoute.component}.vue`] ||
-          modules["../../views/error-page/404.vue"];
-
+        modules["../../views/error-page/404.vue"];
     // 递归解析子路由
     if (normalizedRoute.children) {
+      // normalizedRoute.redirect = (!normalizedRoute.redirect && route.children.length <= 1) ? normalizedRoute.children[0].path : normalizedRoute.path
       normalizedRoute.children = parseDynamicRoutes(route.children);
     }
+    console.log(normalizedRoute)
 
     parsedRoutes.push(normalizedRoute);
   });
diff --git a/src/utils/request.ts b/src/utils/request.ts
index e1a9418..424ced4 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -4,7 +4,6 @@ import { useUserStoreHook } from "@/store/modules/user";
 import { ResultEnum } from "@/enums/ResultEnum";
 import { getToken } from "@/utils/auth";
 import router from "@/router";
-
 // 创建 axios 实例
 const service = axios.create({
   baseURL: import.meta.env.VITE_APP_BASE_API,
@@ -16,6 +15,7 @@ const service = axios.create({
 // 请求拦截器
 service.interceptors.request.use(
   (config: InternalAxiosRequestConfig) => {
+    console.log(config);
     const accessToken = getToken();
     // 如果 Authorization 设置为 no-auth，则不携带 Token，用于登录、刷新 Token 等接口
     if (config.headers.Authorization !== "no-auth" && accessToken) {
@@ -23,6 +23,7 @@ service.interceptors.request.use(
     } else {
       delete config.headers.token;
     }
+    config.headers.shopId = config.headers.shopId || useUserStoreHook().userInfo.id;
     return config;
   },
   (error) => Promise.reject(error)
@@ -37,6 +38,16 @@ service.interceptors.response.use(
     }
 
     const { code, data, msg } = response.data;
+    if (data) {
+      // 处理后台返回分页相关数据为字符串类型时，elementui组件警告
+      const kes = ['pageNumber', 'pageSize', 'totalPage', 'totalRow'];
+      const keys = Object.keys(data);
+      for (let i of kes) {
+        if (keys.includes(i)) {
+          data[i] = data[i] * 1;
+        }
+      }
+    }
     if (code === ResultEnum.SUCCESS || code === undefined || code === null) {
       return data ? data : response.data;
     }
diff --git a/src/utils/websocket copy.ts b/src/utils/websocket copy.ts
new file mode 100644
index 0000000..bd8fadb
--- /dev/null
+++ b/src/utils/websocket copy.ts	
@@ -0,0 +1,93 @@
+import { Client } from "@stomp/stompjs";
+import { getToken } from "@/utils/auth";
+
+class WebSocketManager {
+  private client: Client | null = null;
+  private messageHandlers: Map<string, ((message: string) => void)[]> = new Map();
+  private reconnectAttempts = 0;
+  private maxReconnectAttempts = 3; // 自定义最大重试次数
+  private reconnectDelay = 5000; // 重试延迟（单位：毫秒）
+
+  // 初始化 WebSocket 客户端
+  setupWebSocket() {
+    const endpoint = import.meta.env.VITE_APP_WS_ENDPOINT;
+
+    // 如果没有配置 WebSocket 端点或显式关闭，直接返回
+    if (!endpoint) {
+      console.log("WebSocket 已被禁用，如需打开请在配置文件中配置 VITE_APP_WS_ENDPOINT");
+      return;
+    }
+
+    if (this.client && this.client.connected) {
+      console.log("客户端已存在并且连接正常");
+      return this.client;
+    }
+
+    this.client = new Client({
+      brokerURL: endpoint,
+      connectHeaders: {
+        Authorization: getToken(),
+      },
+      heartbeatIncoming: 30000,
+      heartbeatOutgoing: 30000,
+      reconnectDelay: 0, // 设置为 0 禁用重连
+      onConnect: () => {
+        console.log(`连接到 WebSocket 服务器: ${endpoint}`);
+        this.reconnectAttempts = 0; // 重置重连计数
+        this.messageHandlers.forEach((handlers, topic) => {
+          handlers.forEach((handler) => {
+            this.subscribeToTopic(topic, handler);
+          });
+        });
+      },
+      onStompError: (frame) => {
+        console.error(`连接错误: ${frame.headers["message"]}`);
+        console.error(`错误详情: ${frame.body}`);
+      },
+      onDisconnect: () => {
+        console.log(`WebSocket 连接已断开: ${endpoint}`);
+        this.reconnectAttempts++;
+        if (this.reconnectAttempts < this.maxReconnectAttempts) {
+          console.log(`正在尝试重连... 尝试次数: ${this.reconnectAttempts}`);
+        } else {
+          console.log("重连次数已达上限，停止重连");
+          this.client?.deactivate();
+        }
+      },
+    });
+
+    this.client.activate();
+  }
+
+  // 订阅主题
+  public subscribeToTopic(topic: string, onMessage: (message: string) => void) {
+    console.log(`正在订阅主题: ${topic}`);
+    if (!this.client || !this.client.connected) {
+      this.setupWebSocket();
+    }
+
+    if (this.messageHandlers.has(topic)) {
+      this.messageHandlers.get(topic)?.push(onMessage);
+    } else {
+      this.messageHandlers.set(topic, [onMessage]);
+    }
+
+    if (this.client?.connected) {
+      this.client.subscribe(topic, (message) => {
+        const handlers = this.messageHandlers.get(topic);
+        handlers?.forEach((handler) => handler(message.body));
+      });
+    }
+  }
+
+  // 断开 WebSocket 连接
+  public disconnect() {
+    if (this.client) {
+      console.log("断开 WebSocket 连接");
+      this.client.deactivate();
+      this.client = null;
+    }
+  }
+}
+
+export default new WebSocketManager();
diff --git a/src/utils/websocket.ts b/src/utils/websocket.ts
index bd8fadb..e0202af 100644
--- a/src/utils/websocket.ts
+++ b/src/utils/websocket.ts
@@ -1,9 +1,10 @@
-import { Client } from "@stomp/stompjs";
-import { getToken } from "@/utils/auth";
 
 class WebSocketManager {
-  private client: Client | null = null;
+  private client: WebSocket | null = null;
+  private connected: boolean = false;
+  private onMessage: (message: any) => void = function () { };
   private messageHandlers: Map<string, ((message: string) => void)[]> = new Map();
+  private type: string = 'manage';
   private reconnectAttempts = 0;
   private maxReconnectAttempts = 3; // 自定义最大重试次数
   private reconnectDelay = 5000; // 重试延迟（单位：毫秒）
@@ -18,73 +19,52 @@ class WebSocketManager {
       return;
     }
 
-    if (this.client && this.client.connected) {
+    if (this.client && this.connected) {
       console.log("客户端已存在并且连接正常");
       return this.client;
     }
-
-    this.client = new Client({
-      brokerURL: endpoint,
-      connectHeaders: {
-        Authorization: getToken(),
-      },
-      heartbeatIncoming: 30000,
-      heartbeatOutgoing: 30000,
-      reconnectDelay: 0, // 设置为 0 禁用重连
-      onConnect: () => {
-        console.log(`连接到 WebSocket 服务器: ${endpoint}`);
-        this.reconnectAttempts = 0; // 重置重连计数
-        this.messageHandlers.forEach((handlers, topic) => {
-          handlers.forEach((handler) => {
-            this.subscribeToTopic(topic, handler);
-          });
-        });
-      },
-      onStompError: (frame) => {
-        console.error(`连接错误: ${frame.headers["message"]}`);
-        console.error(`错误详情: ${frame.body}`);
-      },
-      onDisconnect: () => {
-        console.log(`WebSocket 连接已断开: ${endpoint}`);
-        this.reconnectAttempts++;
-        if (this.reconnectAttempts < this.maxReconnectAttempts) {
-          console.log(`正在尝试重连... 尝试次数: ${this.reconnectAttempts}`);
-        } else {
-          console.log("重连次数已达上限，停止重连");
-          this.client?.deactivate();
-        }
-      },
-    });
-
-    this.client.activate();
+    this.client = new WebSocket(endpoint)
+    this.client.onopen = () => {
+      this.connected = true;
+      console.log("WebSocket 连接已建立");
+      this.sendMessage('test')
+    };
+    this.client.onclose = () => {
+      this.connected = false;
+      console.log("WebSocket 连接已断开");
+    };
+    this.client.onerror = (error) => {
+      console.error("WebSocket 发生错误:", error);
+    };
+    this.client.onmessage = (event) => {
+      const message = event.data;
+      this.getMessage(message)
+    };
+  }
+  private getMessage(message: any) {
+    console.log("收到消息:", message);
   }
 
   // 订阅主题
   public subscribeToTopic(topic: string, onMessage: (message: string) => void) {
     console.log(`正在订阅主题: ${topic}`);
-    if (!this.client || !this.client.connected) {
+    if (!this.client || !this.connected) {
       this.setupWebSocket();
     }
-
-    if (this.messageHandlers.has(topic)) {
-      this.messageHandlers.get(topic)?.push(onMessage);
-    } else {
-      this.messageHandlers.set(topic, [onMessage]);
-    }
-
-    if (this.client?.connected) {
-      this.client.subscribe(topic, (message) => {
-        const handlers = this.messageHandlers.get(topic);
-        handlers?.forEach((handler) => handler(message.body));
-      });
+    if (this.connected) {
+      this.onMessage = onMessage;
+    }
+  }
+  public sendMessage(message: any) {
+    if (this.client) {
+      this.client.send(message);
     }
   }
-
   // 断开 WebSocket 连接
   public disconnect() {
     if (this.client) {
       console.log("断开 WebSocket 连接");
-      this.client.deactivate();
+      this.client.close();
       this.client = null;
     }
   }
diff --git a/src/views/admim/system/menu/index.vue b/src/views/admim/system/menu/index.vue
index 34b74c6..e0e91f9 100644
--- a/src/views/admim/system/menu/index.vue
+++ b/src/views/admim/system/menu/index.vue
@@ -48,47 +48,67 @@
 
         <el-table-column label="图标" align="center" width="80">
           <template #default="scope">
-            <div v-if="scope.row.icon" :class="`i-svg:${scope.row.icon}`" />
+            <template v-if="scope.row.icon && scope.row.icon.startsWith('el-icon')">
+              <el-icon style="vertical-align: -0.15em">
+                <component :is="scope.row.icon.replace('el-icon-', '')" />
+              </el-icon>
+            </template>
+            <template v-else-if="scope.row.icon">
+              <svg-icon :icon-class="scope.row.icon" />
+            </template>
+          </template>
+        </el-table-column>
+        <el-table-column label="类型" align="center" width="80">
+          <template #default="scope">
+            <el-tag
+              v-if="scope.row.type === MenuTypeEnum.MENU && scope.row.path.startsWith('/')"
+              type="warning"
+            >
+              目录
+            </el-tag>
+            <el-tag
+              v-if="scope.row.type === MenuTypeEnum.MENU && !scope.row.path.startsWith('/')"
+              type="success"
+            >
+              菜单
+            </el-tag>
+            <el-tag v-if="scope.row.type === MenuTypeEnum.BUTTON" type="danger">按钮</el-tag>
+            <el-tag v-if="scope.row.type === MenuTypeEnum.EXTLINK" type="info">外链</el-tag>
           </template>
         </el-table-column>
         <el-table-column label="排序" align="left" width="150" prop="menuSort" />
-        <el-table-column label="权限标识" align="center" width="200" prop="perm" />
+        <el-table-column label="路由路径" align="left" width="250" prop="path" />
         <el-table-column label="组件路径" align="left" width="250" prop="component" />
         <el-table-column label="外链" align="left" width="80" prop="iFrame">
           <template #default="scope">
             {{ scope.row.iFrame ? "是" : "否" }}
           </template>
         </el-table-column>
-        <el-table-column label="缓存" align="left" width="80" prop="iFrame">
+        <el-table-column label="缓存" align="left" width="80" prop="cache">
           <template #default="scope">
-            {{ scope.row.iFrame ? "是" : "否" }}
+            {{ scope.row.cache ? "是" : "否" }}
           </template>
         </el-table-column>
         <el-table-column label="可见" align="left" width="80" prop="iFrame">
           <template #default="scope">
-            {{ scope.row.iFrame ? "是" : "否" }}
+            {{ scope.row.hidden ? "否" : "是" }}
           </template>
         </el-table-column>
-        <el-table-column label="商家可用" align="left" width="80" prop="iFrame">
+        <el-table-column label="创建日期" align="left" prop="createTime">
           <template #default="scope">
-            {{ scope.row.iFrame ? "是" : "否" }}
-          </template>
-        </el-table-column>
-        <el-table-column label="商家可用" align="left" width="80" prop="iFrame">
-          <template #default="scope">
-            {{ scope.row.iFrame ? "是" : "否" }}
+            {{ scope.row.createTime }}
           </template>
         </el-table-column>
         <el-table-column fixed="right" align="center" label="操作" width="220">
           <template #default="scope">
             <el-button
-              v-if="scope.row.type == 'MENU' || scope.row.type == 'MENU'"
+              v-if="scope.row.type == 0"
               v-hasPerm="['sys:menu:add']"
               type="primary"
               link
               size="small"
               icon="plus"
-              @click.stop="handleOpenDialog(scope.row.id)"
+              @click.stop="handleOpenDialog(scope.row.menuId)"
             >
               新增
             </el-button>
@@ -99,7 +119,7 @@
               link
               size="small"
               icon="edit"
-              @click.stop="handleOpenDialog(undefined, scope.row.id)"
+              @click.stop="handleOpenDialog(undefined, scope.row.menuId)"
             >
               编辑
             </el-button>
@@ -109,7 +129,7 @@
               link
               size="small"
               icon="delete"
-              @click.stop="handleDelete(scope.row.id)"
+              @click.stop="handleDelete(scope.row.menuId)"
             >
               删除
             </el-button>
@@ -144,10 +164,10 @@
         </el-form-item>
 
         <el-form-item v-if="formData.iFrame == 1" label="外链地址" prop="path">
-          <el-input v-model="formData.routePath" placeholder="请输入外链完整路径" />
+          <el-input v-model="formData.path" placeholder="请输入外链完整路径" />
         </el-form-item>
 
-        <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="routeName">
+        <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="name">
           <template #label>
             <div class="flex-y-center">
               路由名称
@@ -161,10 +181,10 @@
               </el-tooltip>
             </div>
           </template>
-          <el-input v-model="formData.routeName" placeholder="User" />
+          <el-input v-model="formData.name" placeholder="User" />
         </el-form-item>
 
-        <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="routePath">
+        <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="path">
           <template #label>
             <div class="flex-y-center">
               路由路径
@@ -181,10 +201,10 @@
           </template>
           <el-input
             v-if="formData.type == MenuTypeEnum.MENU"
-            v-model="formData.routePath"
+            v-model="formData.path"
             placeholder="system"
           />
-          <el-input v-else v-model="formData.routePath" placeholder="user" />
+          <el-input v-else v-model="formData.path" placeholder="user" />
         </el-form-item>
 
         <el-form-item v-if="formData.type == MenuTypeEnum.MENU" prop="component">
@@ -208,85 +228,10 @@
           </el-input>
         </el-form-item>
 
-        <el-form-item v-if="formData.type == MenuTypeEnum.MENU">
-          <template #label>
-            <div class="flex-y-center">
-              路由参数
-              <el-tooltip placement="bottom" effect="light">
-                <template #content>
-                  组件页面使用 `useRoute().query.参数名` 获取路由参数值。
-                </template>
-                <el-icon class="ml-1 cursor-pointer">
-                  <QuestionFilled />
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </template>
-
-          <div v-if="!formData.params || formData.params.length === 0">
-            <el-button type="success" plain @click="formData.params = [{ key: '', value: '' }]">
-              添加路由参数
-            </el-button>
-          </div>
-
-          <div v-else>
-            <div v-for="(item, index) in formData.params" :key="index">
-              <el-input v-model="item.key" placeholder="参数名" style="width: 100px" />
-
-              <span class="mx-1">=</span>
-
-              <el-input v-model="item.value" placeholder="参数值" style="width: 100px" />
-
-              <el-icon
-                v-if="formData.params.indexOf(item) === formData.params.length - 1"
-                class="ml-2 cursor-pointer color-[var(--el-color-success)]"
-                style="vertical-align: -0.15em"
-                @click="formData.params.push({ key: '', value: '' })"
-              >
-                <CirclePlusFilled />
-              </el-icon>
-              <el-icon
-                class="ml-2 cursor-pointer color-[var(--el-color-danger)]"
-                style="vertical-align: -0.15em"
-                @click="formData.params.splice(formData.params.indexOf(item), 1)"
-              >
-                <DeleteFilled />
-              </el-icon>
-            </div>
-          </div>
-        </el-form-item>
-
         <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" prop="hidden" label="显示状态">
           <el-radio-group v-model="formData.hidden">
-            <el-radio :value="1">显示</el-radio>
-            <el-radio :value="0">隐藏</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item
-          v-if="formData.type === MenuTypeEnum.MENU || formData.type === MenuTypeEnum.MENU"
-        >
-          <template #label>
-            <div class="flex-y-center">
-              始终显示
-              <el-tooltip placement="bottom" effect="light">
-                <template #content>
-                  选择“是”，即使目录或菜单下只有一个子节点，也会显示父节点。
-                  <br />
-                  选择“否”，如果目录或菜单下只有一个子节点，则只显示该子节点，隐藏父节点。
-                  <br />
-                  如果是叶子节点，请选择“否”。
-                </template>
-                <el-icon class="ml-1 cursor-pointer">
-                  <QuestionFilled />
-                </el-icon>
-              </el-tooltip>
-            </div>
-          </template>
-
-          <el-radio-group v-model="formData.alwaysShow">
-            <el-radio :value="1">是</el-radio>
-            <el-radio :value="0">否</el-radio>
+            <el-radio :value="1">隐藏</el-radio>
+            <el-radio :value="0">显示</el-radio>
           </el-radio-group>
         </el-form-item>
 
@@ -307,8 +252,12 @@
         </el-form-item>
 
         <!-- 权限标识 -->
-        <el-form-item v-if="formData.type == MenuTypeEnum.BUTTON" label="权限标识" prop="perm">
-          <el-input v-model="formData.perm" placeholder="sys:user:add" />
+        <el-form-item
+          v-if="formData.type == MenuTypeEnum.BUTTON"
+          label="权限标识"
+          prop="permission"
+        >
+          <el-input v-model="formData.permission" placeholder="sys:user:add" />
         </el-form-item>
 
         <el-form-item v-if="formData.type !== MenuTypeEnum.BUTTON" label="图标" prop="icon">
@@ -360,7 +309,7 @@ const menuOptions = ref<OptionType[]>([]);
 }
 const initialeditRequestData = ref<editRequest>({
   id: "",
-  pid: 0,
+  pid: "",
   hidden: 0,
   menuSort: 1,
   type: 0, // 默认菜单
@@ -376,12 +325,12 @@ const initialeditRequestData = ref<editRequest>({
 const formData = ref({ ...initialeditRequestData.value });
 // 表单验证规则
 const rules = reactive({
-  pid: [{ required: true, message: "请选择父级菜单", trigger: "blur" }],
+  pid: [{ required: false, message: "请选择父级菜单", trigger: "blur" }],
   title: [{ required: true, message: "请输入菜单名称", trigger: "blur" }],
   type: [{ required: true, message: "请选择菜单类型", trigger: "blur" }],
-  routeName: [{ required: true, message: "请输入路由名称", trigger: "blur" }],
-  routePath: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
-  component: [{ required: true, message: "请输入组件路径", trigger: "blur" }],
+  name: [{ required: false, message: "请输入路由名称", trigger: "blur" }],
+  path: [{ required: true, message: "请输入路由路径", trigger: "blur" }],
+  component: [{ required: false, message: "请输入组件路径", trigger: "blur" }],
   hidden: [{ required: true, message: "请选择显示状态", trigger: "change" }],
 });
 
@@ -440,10 +389,19 @@ function handleOpenDialog(pid?: string, menuId?: string) {
     .then(() => {
       dialog.visible = true;
       if (menuId) {
+        console.log(menuId);
         dialog.title = "编辑菜单";
         MenuAPI.get(menuId).then((data) => {
-          initialeditRequestData.value = { ...data };
-          formData.value = data;
+          console.log(data);
+          initialeditRequestData.value = {
+            ...data,
+          };
+          formData.value = {
+            ...data,
+            cache: data.cache ? 1 : 0,
+            hidden: data.hidden ? 1 : 0,
+            pid: !pid ? "0" : data.pid,
+          };
         });
       } else {
         dialog.title = "新增菜单";
@@ -462,7 +420,7 @@ function handleMenuTypeChange() {
         formData.value.component = "";
       } else {
         // 其他情况，保留原有的组件路径
-        formData.value.routePath = initialeditRequestData.value.routePath;
+        formData.value.path = initialeditRequestData.value.path;
         formData.value.component = initialeditRequestData.value.component;
       }
     }
@@ -475,20 +433,26 @@ function handleMenuTypeChange() {
 function handleSubmit() {
   editRequestRef.value.validate((isValid: boolean) => {
     if (isValid) {
-      const menuId = formData.value.id;
+      const menuId = formData.value.menuId;
+      const submitFormData = {
+        ...formData.value,
+        cache: formData.value.cache ? 1 : 0,
+        hidden: formData.value.hidden ? 1 : 0,
+        pid: formData.value.pid == 0 ? null : formData.value.pid,
+      };
       if (menuId) {
         //修改时父级菜单不能为当前菜单
         if (formData.value.pid == menuId) {
           ElMessage.error("父级菜单不能为当前菜单");
           return;
         }
-        MenuAPI.edit(menuId, formData.value).then(() => {
+        MenuAPI.edit(menuId, submitFormData).then(() => {
           ElMessage.success("修改成功");
           handleCloseDialog();
           handleQuery();
         });
       } else {
-        MenuAPI.add(formData.value).then(() => {
+        MenuAPI.add(submitFormData).then(() => {
           ElMessage.success("新增成功");
           handleCloseDialog();
           handleQuery();
@@ -532,7 +496,7 @@ function resetForm() {
   editRequestRef.value.clearValidate();
   formData.value = {
     id: "",
-    pid: 0,
+    pid: "",
     hidden: 0,
     menuSort: 1,
     type: 0, // 默认菜单
diff --git a/src/views/admim/system/role/components/menus.vue b/src/views/admim/system/role/components/menus.vue
new file mode 100644
index 0000000..947326b
--- /dev/null
+++ b/src/views/admim/system/role/components/menus.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="flex-x-between">
+    <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单菜单名称">
+      <template #prefix>
+        <Search />
+      </template>
+    </el-input>
+
+    <div class="flex-center ml-5">
+      <el-button type="primary" size="small" plain @click="togglePermTree">
+        <template #icon>
+          <Switch />
+        </template>
+        {{ isExpanded ? "收缩" : "展开" }}
+      </el-button>
+      <el-checkbox v-model="parentChildLinked" class="ml-5" @change="handleparentChildLinkedChange">
+        父子联动
+      </el-checkbox>
+
+      <el-tooltip placement="bottom">
+        <template #content>
+          如果只需勾选菜单菜单，不需要勾选子菜单或者按钮菜单，请关闭父子联动
+        </template>
+        <el-icon class="ml-1 color-[--el-color-primary] inline-block cursor-pointer">
+          <QuestionFilled />
+        </el-icon>
+      </el-tooltip>
+    </div>
+  </div>
+
+  <el-tree
+    ref="permTreeRef"
+    node-key="value"
+    show-checkbox
+    :data="menuPermOptions"
+    :filter-node-method="handlePermFilter"
+    :default-expand-all="true"
+    :check-strictly="!parentChildLinked"
+    class="mt-5"
+  >
+    <template #default="{ data }">
+      {{ data.label }}
+    </template>
+  </el-tree>
+</template>
+
+<script setup>
+import MenuAPI from "@/api/account/menu";
+
+const modelValue = defineModel("modelValue", {
+  type: Array,
+  required: true,
+  default: () => [],
+});
+const permKeywords = ref("");
+const isExpanded = ref(true);
+const parentChildLinked = ref(true);
+const permTreeRef = ref();
+// 展开/收缩 菜单菜单树
+function togglePermTree() {
+  isExpanded.value = !isExpanded.value;
+  if (permTreeRef.value) {
+    Object.values(permTreeRef.value.store.nodesMap).forEach((node) => {
+      if (isExpanded.value) {
+        node.expand();
+      } else {
+        node.collapse();
+      }
+    });
+  }
+}
+function handlePermFilter(value, data) {
+  if (!value) return true;
+  return data.label.includes(value);
+}
+
+// 父子菜单节点是否联动
+function handleparentChildLinkedChange(val) {
+  parentChildLinked.value = val;
+}
+
+// 菜单菜单下拉
+const menuPermOptions = ref([]);
+
+function returnMenu(menu) {
+  return menu.map((v) => {
+    return {
+      ...v,
+      label: v.title,
+      value: v.menuId,
+      children: v.children ? returnMenu(v.children) : [],
+    };
+  });
+}
+// 获取所有的菜单
+async function getMenuPermOptions() {
+  let arr = await MenuAPI.getList();
+  menuPermOptions.value = returnMenu(arr);
+}
+getMenuPermOptions();
+
+onMounted(() => {
+  console.log(modelValue.value);
+});
+
+watch(
+  () => modelValue.value,
+  (newval) => {}
+);
+
+function getPerms() {
+  return permTreeRef.value.getCheckedKeys();
+}
+function reset() {
+  permTreeRef.value.setCheckedKeys([]);
+}
+function setChecked(checkedMenuIds) {
+  checkedMenuIds.forEach((menuId) => {
+    console.log(menuId);
+    permTreeRef.value.setChecked(menuId, true, false);
+  });
+}
+defineExpose({
+  getPerms,
+  setChecked,
+  reset,
+});
+</script>
\ No newline at end of file
diff --git a/src/views/admim/system/role/index.vue b/src/views/admim/system/role/index.vue
index 04c9bb7..9d2ba79 100644
--- a/src/views/admim/system/role/index.vue
+++ b/src/views/admim/system/role/index.vue
@@ -35,18 +35,10 @@
         @selection-change="handleSelectionChange"
       >
         <el-table-column type="selection" width="55" align="center" />
-        <el-table-column label="角色名称" prop="name" min-width="100" />
-        <el-table-column label="角色编码" prop="code" width="150" />
-
-        <el-table-column label="状态" align="center" width="100">
-          <template #default="scope">
-            <el-tag v-if="scope.row.status === 1" type="success">正常</el-tag>
-            <el-tag v-else type="info">禁用</el-tag>
-          </template>
-        </el-table-column>
-
-        <el-table-column label="排序" align="center" width="80" prop="sort" />
-
+        <el-table-column label="角色名称" prop="name" />
+        <el-table-column label="角色级别" prop="level" />
+        <el-table-column label="描述" prop="description" />
+        <el-table-column label="创建日期" prop="createTime" />
         <el-table-column fixed="right" label="操作" width="220">
           <template #default="scope">
             <el-button
@@ -56,7 +48,7 @@
               icon="position"
               @click="handleOpenAssignPermDialog(scope.row)"
             >
-              分配权限
+              分配菜单
             </el-button>
             <el-button
               type="primary"
@@ -101,33 +93,24 @@
           <el-input v-model="formData.name" placeholder="请输入角色名称" />
         </el-form-item>
 
-        <el-form-item label="角色编码" prop="code">
-          <el-input v-model="formData.code" placeholder="请输入角色编码" />
+        <el-form-item label="角色等级" prop="level">
+          <el-input-number placeholder="角色等级" v-model="formData.level"></el-input-number>
         </el-form-item>
 
-        <el-form-item label="数据权限" prop="dataScope">
+        <!-- <el-form-item label="数据菜单" prop="dataScope">
           <el-select v-model="formData.dataScope">
             <el-option :key="0" label="全部数据" :value="0" />
             <el-option :key="1" label="部门及子部门数据" :value="1" />
             <el-option :key="2" label="本部门数据" :value="2" />
             <el-option :key="3" label="本人数据" :value="3" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="描述" prop="description">
+          <el-input type="textarea" v-model="formData.description" placeholder="描述" />
         </el-form-item>
 
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="formData.status">
-            <el-radio :label="1">正常</el-radio>
-            <el-radio :label="0">停用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item label="排序" prop="sort">
-          <el-input-number
-            v-model="formData.sort"
-            controls-position="right"
-            :min="0"
-            style="width: 100px"
-          />
+        <el-form-item label="菜单分配" prop="menuIdList">
+          <menuSelect ref="refmenuSelect" v-model="formData.menuIdList"></menuSelect>
         </el-form-item>
       </el-form>
 
@@ -139,14 +122,14 @@
       </template>
     </el-dialog>
 
-    <!-- 分配权限弹窗 -->
+    <!-- 分配菜单弹窗 -->
     <el-drawer
       v-model="assignPermDialogVisible"
-      :title="'【' + checkedRole.name + '】权限分配'"
+      :title="'【' + checkedRole.name + '】菜单分配'"
       size="500"
     >
       <div class="flex-x-between">
-        <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单权限名称">
+        <el-input v-model="permKeywords" clearable class="w-[150px]" placeholder="菜单菜单名称">
           <template #prefix>
             <Search />
           </template>
@@ -169,7 +152,7 @@
 
           <el-tooltip placement="bottom">
             <template #content>
-              如果只需勾选菜单权限，不需要勾选子菜单或者按钮权限，请关闭父子联动
+              如果只需勾选菜单菜单，不需要勾选子菜单或者按钮菜单，请关闭父子联动
             </template>
             <el-icon class="ml-1 color-[--el-color-primary] inline-block cursor-pointer">
               <QuestionFilled />
@@ -207,12 +190,13 @@ defineOptions({
   name: "Role",
   inheritAttrs: false,
 });
-
+import menuSelect from "./components/menus.vue";
 import RoleApi, { SysRole, addRequest, getListRequest } from "@/api/account/role";
 import MenuAPI, { type RouteVO } from "@/api/account/menu";
 
 const queryFormRef = ref();
 const addRequestRef = ref();
+const refmenuSelect = ref();
 const permTreeRef = ref();
 
 const loading = ref(false);
@@ -227,7 +211,7 @@ const queryParams = reactive<getListRequest>({
 
 // 角色表格数据
 const roleList = ref<SysRole[]>();
-// 菜单权限下拉
+// 菜单菜单下拉
 const menuPermOptions = ref<RouteVO[]>([]);
 
 // 弹窗
@@ -248,9 +232,7 @@ const formData = reactive<addRequest>({
 
 const rules = reactive({
   name: [{ required: true, message: "请输入角色名称", trigger: "blur" }],
-  code: [{ required: true, message: "请输入角色编码", trigger: "blur" }],
-  dataScope: [{ required: true, message: "请选择数据权限", trigger: "blur" }],
-  status: [{ required: true, message: "请选择状态", trigger: "blur" }],
+  level: [{ required: false, message: "请输入角色等级", trigger: "blur" }],
 });
 
 // 选中的角色
@@ -294,11 +276,19 @@ function handleSelectionChange(selection: any) {
 }
 
 // 打开角色弹窗
-function handleOpenDialog(row: SysRole) {
+async function handleOpenDialog(row: SysRole) {
   dialog.visible = true;
-  if (row.id) {
+  if (row && row.id) {
     dialog.title = "修改角色";
+    //获取角色菜单列表
+    const data = await RoleApi.getMenu(row.id);
     Object.assign(formData, row);
+    console.log(data);
+    formData.menuIdList = data;
+    setTimeout(() => {
+      refmenuSelect.value.setChecked(data);
+    }, 100);
+    console.log(formData);
   } else {
     dialog.title = "新增角色";
   }
@@ -308,10 +298,11 @@ function handleOpenDialog(row: SysRole) {
 function handleSubmit() {
   addRequestRef.value.validate((valid: any) => {
     if (valid) {
+      const checkedMenuIds: number[] = refmenuSelect.value.getPerms();
       loading.value = true;
       const roleId = formData.id;
       if (roleId) {
-        RoleApi.update({ ...formData, id: formData.id ?? null })
+        RoleApi.update(roleId, { ...formData, menuIdList: checkedMenuIds })
           .then(() => {
             ElMessage.success("修改成功");
             handleCloseDialog();
@@ -320,7 +311,8 @@ function handleSubmit() {
           .finally(() => (loading.value = false));
       } else {
         delete formData.id;
-        RoleApi.add(formData)
+
+        RoleApi.add({ ...formData, menuIdList: checkedMenuIds })
           .then(() => {
             ElMessage.success("新增成功");
             handleCloseDialog();
@@ -338,7 +330,7 @@ function handleCloseDialog() {
 
   addRequestRef.value.resetFields();
   addRequestRef.value.clearValidate();
-
+  refmenuSelect.value.reset();
   formData.id = undefined;
   formData.sort = 1;
   formData.status = 1;
@@ -378,7 +370,7 @@ interface typeRoute extends RouteVO {
   children: typeRoute[];
 }
 
-function returnMenu(menu: RouteVO[]): typeRoute[] {
+function returnMenu(menu) {
   return menu.map((v) => {
     return {
       ...v,
@@ -389,7 +381,13 @@ function returnMenu(menu: RouteVO[]): typeRoute[] {
   });
 }
 
-// 打开分配菜单权限弹窗
+// 获取所有的菜单
+async function getMenuPermOptions() {
+  let arr = await MenuAPI.getList({});
+  menuPermOptions.value = returnMenu(arr);
+}
+getMenuPermOptions();
+// 打开分配菜单菜单弹窗
 async function handleOpenAssignPermDialog(row: SysRole) {
   const roleId = row.id;
   if (roleId) {
@@ -399,34 +397,31 @@ async function handleOpenAssignPermDialog(row: SysRole) {
     checkedRole.value.id = roleId;
     checkedRole.value.name = row.name as string;
 
-    // 获取所有的菜单
-    let arr: RouteVO[] = await MenuAPI.getRoutes();
-    menuPermOptions.value = returnMenu(arr);
-
     // 回显角色已拥有的菜单
-    // RoleApi.getRoleMenuIds(roleId)
-    //   .then((data) => {
-    //     const checkedMenuIds = data;
-    //     checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
-    //   })
-    //   .finally(() => {
-    //     loading.value = false;
-    //   });
+    RoleApi.getMenu(roleId)
+      .then((data) => {
+        const checkedMenuIds = data;
+        checkedMenuIds.forEach((menuId) => permTreeRef.value!.setChecked(menuId, true, false));
+      })
+      .finally(() => {
+        loading.value = false;
+      });
   }
 }
 
-// 分配菜单权限提交
+// 分配菜单菜单提交
 function handleAssignPermSubmit() {
   const roleId = checkedRole.value.id;
+  const name = checkedRole.value.name;
   if (roleId) {
     const checkedMenuIds: number[] = permTreeRef
       .value!.getCheckedNodes(false, true)
       .map((node: any) => node.value);
 
     loading.value = true;
-    RoleApi.updateRoleMenus(roleId, checkedMenuIds)
+    RoleApi.update(roleId, { name, menuIdList: checkedMenuIds })
       .then(() => {
-        ElMessage.success("分配权限成功");
+        ElMessage.success("分配菜单成功");
         assignPermDialogVisible.value = false;
         handleResetQuery();
       })
@@ -436,7 +431,7 @@ function handleAssignPermSubmit() {
   }
 }
 
-// 展开/收缩 菜单权限树
+// 展开/收缩 菜单菜单树
 function togglePermTree() {
   isExpanded.value = !isExpanded.value;
   if (permTreeRef.value) {
@@ -449,8 +444,20 @@ function togglePermTree() {
     });
   }
 }
+function editTogglePermTree() {
+  isExpanded.value = !isExpanded.value;
+  if (permTreeRef.value) {
+    Object.values(permTreeRef.value.store.nodesMap).forEach((node: any) => {
+      if (isExpanded.value) {
+        node.expand();
+      } else {
+        node.collapse();
+      }
+    });
+  }
+}
 
-// 权限筛选
+// 菜单筛选
 watch(permKeywords, (val) => {
   permTreeRef.value!.filter(val);
 });
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 364c15d..89b71b5 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -1,7 +1,13 @@
 <template>
   <div class="login" :style="'background-image:url(' + Background + ');'">
-    <el-form ref="loginForm" :model="state.loginForm" :rules="state.loginRules" label-position="left" label-width="0px"
-      class="login-form">
+    <el-form
+      ref="loginForm"
+      :model="state.loginForm"
+      :rules="state.loginRules"
+      label-position="left"
+      label-width="0px"
+      class="login-form"
+    >
       <h3 class="title">银收客后台管理</h3>
       <el-form-item>
         <el-radio-group v-model="state.loginForm.loginType">
@@ -10,19 +16,39 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item prop="merchantName" v-if="state.loginForm.loginType == 'staff'">
-        <el-input v-model="state.loginForm.merchantName" type="text" auto-complete="off" placeholder="商户号"></el-input>
+        <el-input
+          v-model="state.loginForm.merchantName"
+          type="text"
+          auto-complete="off"
+          placeholder="商户号"
+        ></el-input>
       </el-form-item>
       <el-form-item prop="username">
-        <el-input v-model="state.loginForm.username" type="text" auto-complete="off" placeholder="账号"></el-input>
+        <el-input
+          v-model="state.loginForm.username"
+          type="text"
+          auto-complete="off"
+          placeholder="账号"
+        ></el-input>
       </el-form-item>
       <el-form-item prop="password">
-        <el-input v-model="state.loginForm.password" type="password" auto-complete="off" placeholder="密码"
-          @keyup.enter="handleLogin"></el-input>
+        <el-input
+          v-model="state.loginForm.password"
+          type="password"
+          auto-complete="off"
+          placeholder="密码"
+          @keyup.enter="handleLogin"
+        ></el-input>
       </el-form-item>
       <el-form-item prop="code">
         <div class="code_wrap">
-          <el-input v-model="state.loginForm.code" auto-complete="off" placeholder="验证码" style="width: 63%"
-            @keyup.enter="handleLogin"></el-input>
+          <el-input
+            v-model="state.loginForm.code"
+            auto-complete="off"
+            placeholder="验证码"
+            style="width: 63%"
+            @keyup.enter="handleLogin"
+          ></el-input>
           <div class="login-code">
             <img :src="state.codeUrl" @click="getCode" />
           </div>
@@ -30,8 +56,13 @@
       </el-form-item>
 
       <el-form-item style="width: 100%">
-        <el-button :loading="state.loading" size="default" type="primary" style="width: 100%"
-          @click.prevent="handleLogin">
+        <el-button
+          :loading="state.loading"
+          size="default"
+          type="primary"
+          style="width: 100%"
+          @click.prevent="handleLogin"
+        >
           <span v-if="!state.loading">登 录</span>
           <span v-else>登 录 中...</span>
         </el-button>
@@ -61,8 +92,8 @@ const state = reactive({
   codeUrl: "",
   cookiePass: "",
   loginForm: {
-    username: "",
-    password: "",
+    username: "admin",
+    password: "12345",
     // rememberMe: false,
     code: "",
     uuid: "",
@@ -152,7 +183,7 @@ function handleLogin() {
         .then(async (res) => {
           // await userStore.getUserInfo();
           const { path, queryParams } = parseRedirect();
-          console.log(res, 'Denglv返回');
+          console.log(res, "Denglv返回");
           router.push({ path: path, query: queryParams });
         })
         .catch(() => {
diff --git a/src/views/shop/list/components/detailModal.vue b/src/views/shop/list/components/detailModal.vue
index 7f83760..42e69d0 100644
--- a/src/views/shop/list/components/detailModal.vue
+++ b/src/views/shop/list/components/detailModal.vue
@@ -3,13 +3,16 @@
     <el-tabs v-model="activeName">
       <el-tab-pane label="聚合支付" name="pay">
         <el-form ref="form" :model="form" label-width="120px" label-position="left">
+          <el-form-item label="店铺id">
+            <el-input v-model="form.storeId" placeholder="请输入店铺id"></el-input>
+          </el-form-item>
           <el-form-item label="商户号">
             <el-input v-model="form.appId" placeholder="请输入商户号"></el-input>
           </el-form-item>
           <el-form-item label="商户密钥">
             <el-input
               type="textarea"
-              v-model="form.appToken"
+              v-model="form.appSecret"
               placeholder="请输入商户密钥"
             ></el-input>
           </el-form-item>
@@ -17,7 +20,10 @@
             <el-input v-model="form.payPassword" placeholder="请输入支付密码"></el-input>
           </el-form-item>
           <el-form-item label="微信appid">
-            <el-input v-model="form.smallAppid" placeholder="请输入微信小程序appid"></el-input>
+            <el-input
+              v-model="form.wechatSmallAppid"
+              placeholder="请输入微信小程序appid"
+            ></el-input>
           </el-form-item>
           <el-form-item label="支付宝appid">
             <el-input
@@ -31,32 +37,33 @@
                     <el-form-item label="支付宝商户密钥">
                         <el-input v-model="form.alipayAppToken" placeholder="请输入支付宝商户密钥"></el-input>
                     </el-form-item> -->
-          <el-form-item label="店铺id">
-            <el-input v-model="form.storeId" placeholder="请输入店铺id"></el-input>
-          </el-form-item>
+
           <el-form-item label="状态">
             <el-radio-group v-model="form.status">
-              <el-radio :label="1">启用</el-radio>
-              <el-radio :label="-1">禁用</el-radio>
+              <el-radio :value="1">启用</el-radio>
+              <el-radio :value="-1">禁用</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-form>
       </el-tab-pane>
     </el-tabs>
-    <div slot="footer" class="dialog-footer">
-      <el-button @click="close">取消</el-button>
-      <el-button type="primary" @click="submitHandle" :loading="formLoading">
-        <span v-if="!formLoading">保存</span>
-        <span v-else>保存中...</span>
-      </el-button>
-    </div>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="close">取消</el-button>
+        <el-button type="primary" @click="submitHandle" :loading="formLoading">
+          <span v-if="!formLoading">保存</span>
+          <span v-else>保存中...</span>
+        </el-button>
+      </div>
+    </template>
   </el-dialog>
 </template>
 
 <script>
 // import { tbMerchantThirdApply, tbMerchantThirdApplyPut } from "@/api/shop";
 import ShopApi from "@/api/account/shop";
-
+import shopMerchantApi from "@/api/account/shopMerchant";
+import { ElNotification } from "element-plus";
 export default {
   data() {
     return {
@@ -64,12 +71,12 @@ export default {
       activeName: "pay",
       formLoading: false,
       form: {
-        appToken: "",
+        appSecret: "",
         id: "",
         payPassword: "",
         status: 1,
         appId: "",
-        smallAppid: "",
+        wechatSmallAppid: "",
         storeId: "",
         alipaySmallAppid: "",
         alipayAppToken: "",
@@ -82,12 +89,12 @@ export default {
     async submitHandle() {
       this.formLoading = true;
       try {
-        await tbMerchantThirdApplyPut(this.form);
+        await shopMerchantApi.edit(this.form.id, this.form);
         this.$emit("success");
         this.formLoading = false;
-        this.$notify({
+        ElNotification({
           title: "成功",
-          message: `提交成功`,
+          message: `修改成功`,
           type: "success",
         });
         this.close();
@@ -100,7 +107,7 @@ export default {
       this.dialogVisible = false;
     },
     reset() {
-      this.form.appToken = "";
+      this.form.appSecret = "";
       this.form.id = "";
       this.form.payPassword = "";
       this.form.status = 1;
@@ -108,14 +115,16 @@ export default {
     },
     // 详情（配置三方支付）
     async getDetail(id) {
+      console.log(id);
       try {
-        const res = await tbMerchantThirdApply(id);
-        this.form.appToken = res.appToken;
+        const res = await shopMerchantApi.get(id);
+        this.form.appSecret = res.appSecret;
         this.form.payPassword = res.payPassword;
         this.form.status = res.status;
         this.form.appId = res.appId;
-        this.form.smallAppid = res.smallAppid;
+        this.form.wechatSmallAppid = res.wechatSmallAppid;
         this.form.alipaySmallAppid = res.alipaySmallAppid;
+        this.form.merchantName = res.merchantName;
         //this.form.alipayAppToken = res.alipayAppToken
         //this.form.alipayAppId = res.alipayAppId
         this.form.storeId = res.storeId;
@@ -126,8 +135,8 @@ export default {
     },
     show(obj) {
       if (obj && obj.id) {
-        this.form.id = obj.merchantId;
-        this.getDetail(obj.merchantId);
+        this.form.id = obj.id;
+        this.getDetail(obj.id);
       }
     },
   },
diff --git a/src/views/shop/list/index.vue b/src/views/shop/list/index.vue
index 63c3b23..ff016c9 100644
--- a/src/views/shop/list/index.vue
+++ b/src/views/shop/list/index.vue
@@ -184,12 +184,13 @@ onMounted(() => {
 
 const refDetailModal = ref(null);
 function dropdownClick(e) {
-  switch (e.command) {
-    case 1:
-      refDetailModal.value.show(e.row);
-      break;
-    default:
-      break;
+  console.log(e);
+  if (e.command == 1) {
+    refDetailModal.value.show(e.row);
+    return;
+  }
+  if (e == 5) {
+    return;
   }
 }
 // 重置查询
diff --git a/src/views/shop/staff/components/select-permission.vue b/src/views/shop/staff/components/select-permission.vue
new file mode 100644
index 0000000..3a0794d
--- /dev/null
+++ b/src/views/shop/staff/components/select-permission.vue
@@ -0,0 +1 @@
+<template>11</template>
\ No newline at end of file
diff --git a/src/views/shop/staff/index.vue b/src/views/shop/staff/index.vue
index 3a0c571..ad70a37 100644
--- a/src/views/shop/staff/index.vue
+++ b/src/views/shop/staff/index.vue
@@ -43,9 +43,8 @@
 
     <!-- 新增 -->
     <page-modal ref="addModalRef" :modal-config="addModalConfig" @submit-click="handleSubmitClick">
-      <template #url="scope">
-        <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
-        <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
+      <template #permission="scope">
+        <selectPermission></selectPermission>
       </template>
     </page-modal>
 
@@ -55,9 +54,8 @@
       :modal-config="editModalConfig"
       @submit-click="handleSubmitClick"
     >
-      <template #url="scope">
-        <FileUpload v-model="scope.formData[scope.prop]" :limit="1" v-bind="scope.attrs" />
-        <!-- <Dict v-model="scope.formData[scope.prop]" code="gender" v-bind="scope.attrs" /> -->
+      <template #permission="scope">
+        <selectPermission></selectPermission>
       </template>
     </page-modal>
   </div>
@@ -73,7 +71,9 @@ import searchConfig from "./config/search";
 import { returnOptionsLabel } from "./config/config";
 import RoleApi, { type SysRole } from "@/api/account/role";
 import ShopStaffApi from "@/api/account/shopStaff";
-
+import permissionApi from "@/api/account/permission";
+import selectPermission from "./components/select-permission.vue";
+permissionApi.getshopPermission();
 const {
   searchRef,
   contentRef,
diff --git a/src/views/tool/table.vue b/src/views/tool/table.vue
deleted file mode 100644
index 1e37ea7..0000000
--- a/src/views/tool/table.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-  <div class="app-container">11</div>
-</template>
\ No newline at end of file
diff --git a/src/views/tool/table/components/addEara.vue b/src/views/tool/table/components/addEara.vue
new file mode 100644
index 0000000..58a9afc
--- /dev/null
+++ b/src/views/tool/table/components/addEara.vue
@@ -0,0 +1,73 @@
+<template>
+    <el-dialog :title="form.id ? '编辑区域' : '添加区域'" :visible.sync="dialogVisible" @close="reset">
+        <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+            <el-form-item label="区域名称" prop="name">
+                <el-input v-model="form.name" placeholder="请输入区域名称"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="onSubmitHandle">确 定</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+import { tbShopArea } from '@/api/table'
+export default {
+    data() {
+        return {
+            dialogVisible: false,
+            form: {
+                id: '',
+                name: ''
+            },
+            rules: {
+                name: [
+                    {
+                        required: true,
+                        message: '请输入区域名称',
+                        trigger: 'blur'
+                    }
+                ]
+            }
+        }
+    },
+    methods: {
+        onSubmitHandle() {
+            this.$refs.form.validate(async valid => {
+                if (valid) {
+                    try {
+                        let res = await tbShopArea({
+                            ...this.form,
+                            shopId: localStorage.getItem('shopId')
+                        }, this.form.id ? 'put' : 'post')
+                        this.$emit('success', res)
+                        this.close()
+                        this.$notify({
+                            title: '成功',
+                            message: `${this.form.id ? '编辑' : '添加'}成功`,
+                            type: 'success'
+                        });
+                    } catch (error) {
+                        console.log(error)
+                    }
+                }
+            })
+        },
+        show(obj) {
+            this.dialogVisible = true
+            if (obj && obj.id) {
+                this.form = JSON.parse(JSON.stringify(obj))
+            }
+        },
+        close() {
+            this.dialogVisible = false
+        },
+        reset() {
+            this.form.id = ''
+            this.form.name = ''
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/tool/table/components/addTable.vue b/src/views/tool/table/components/addTable.vue
new file mode 100644
index 0000000..feb542f
--- /dev/null
+++ b/src/views/tool/table/components/addTable.vue
@@ -0,0 +1,235 @@
+<template>
+  <el-dialog
+    :title="form.id ? '编辑台桌' : '添加台桌'"
+    :visible.sync="dialogVisible"
+    @open="tbShopAreaGet"
+    @close="reset"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="120px"
+      label-position="left"
+    >
+      <el-form-item label="选择区域" prop="areaId">
+        <el-select v-model="form.areaId" placeholder="请选择区域"
+        @change="selectChange($event, 'form' , 'areaId')"
+        >
+          <el-option
+            :label="item.name"
+            :value="item.id"
+            v-for="item in areaList"
+            :key="item.id"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="台桌状态" prop="status" v-if="form.id">
+        <el-select v-model="form.status" placeholder="请选择台桌状态">
+          <el-option
+            :label="item.name"
+            :value="item.value"
+            v-for="item in status"
+            :key="item.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="台桌标识"  prop="sign">
+        <div class="u-flex">
+            <div class="u-flex" style="width: 57px;">
+                  <el-input
+              v-model="form.sign"
+              placeholder="A"
+            ></el-input>
+            </div>
+      
+          <div class="u-flex u-m-l-30" >
+            <div class="u-flex">
+                <div class="u-m-r-4">起始</div>
+                <el-input v-model="form.start" style="width: 57px;" placeholder="请输入起始值" >
+          </el-input>
+
+            </div>
+           
+          <div
+            style="
+              background-color: #D9D9D9;
+              height: 1px;
+              width: 32px;
+              border-radius: 1px;
+            "
+            class="u-m-l-16 u-m-r-16"
+          ></div>
+          <div class="u-flex">
+            <span class="u-m-r-4">结束</span>
+            <el-input v-model="form.end" style="width: 57px;" placeholder="请输入结束值">
+                
+          </el-input>
+          </div>
+       
+          </div>
+       
+        </div>
+      </el-form-item>
+      <el-form-item label="客座数">
+        <el-input-number
+          v-model="form.capacity"
+          :min="0"
+          controls-position="right"
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item label="清台管理">
+        <el-radio-group v-model="form.autoClear">
+          <el-radio-button :label="0">手动清台</el-radio-button>
+          <el-radio-button :label="1">自动清台</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="网络预定开关">
+        <el-switch
+          v-model="form.isPredate"
+          :active-value="1"
+          :inactive-value="2"
+        ></el-switch>
+      </el-form-item>
+      <el-form-item label="类型">
+        <el-radio-group v-model="form.type">
+          <el-radio-button :label="0">低消</el-radio-button>
+          <el-radio-button :label="2">计时</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="最低消费" v-if="form.type == 0">
+        <el-input-number
+          v-model="form.amount"
+          :min="0"
+          controls-position="right"
+        ></el-input-number>
+      </el-form-item>
+      <el-form-item label="每小时收费" v-if="form.type == 2">
+        <el-input-number
+          v-model="form.perhour"
+          :min="0"
+          controls-position="right"
+        ></el-input-number>
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button type="primary" :loading="loading" @click="onSubmitHandle"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { tbShopTable, tbShopAreaGet ,$fastCreateTable} from "@/api/table";
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      resetForm: "",
+      loading: false,
+      status: [
+        { value: "pending", name: "挂单中" },
+        { value: "using", name: "开台中" },
+        { value: "paying", name: "结算中" },
+        { value: "idle", name: "空闲" },
+        { value: "subscribe", name: "预定" },
+        { value: "closed", name: "关台" },
+        // {value:'opening',name:'开台中'},
+        { value: "cleaning", name: "台桌清理中" },
+      ],
+      form: {
+        id: "",
+        areaId: "",
+        sign:'',
+        start:1,
+        end:10,
+        capacity: 0,
+        isPredate: 1,
+        type: 2,
+        perhour: 0,
+        amount: 0,
+        autoClear: 1,
+      },
+      rules: {
+        areaId: [
+          {
+            required: true,
+            message: "请选择区域",
+            trigger: ["blur","change"],
+          },
+        ],
+        sign: [
+          {
+            required: true,
+            message: "请输入台桌标识",
+            trigger: ["blur","change"],
+          },
+        ],
+      },
+      areaList: [],
+    };
+  },
+  mounted() {
+    this.resetForm = { ...this.form };
+  },
+  methods: {
+    //解决selectc值改变后未验证问题
+    selectChange($event, ref, type) {
+      this.$refs[ref][0].validateField(type)
+    },
+    onSubmitHandle() {
+      this.$refs.form.validate(async (valid) => {
+        if (valid) {
+          this.loading = true;
+          try {
+            let res = await $fastCreateTable(
+              {
+                ...this.form,
+                qrcode: this.form.tableId,
+                shopId: localStorage.getItem("shopId"),
+              },
+              this.form.id ? "put" : "post"
+            );
+            this.$emit("success", res);
+            this.close();
+            this.$notify({
+              title: "成功",
+              message: `${this.form.id ? "编辑" : "添加"}成功`,
+              type: "success",
+            });
+            this.loading = false;
+          } catch (error) {
+            this.loading = false;
+            console.log(error);
+          }
+        }
+      });
+    },
+    show(obj) {
+      this.dialogVisible = true;
+      if (obj && obj.id) {
+        this.form = JSON.parse(JSON.stringify(obj));
+      }
+    },
+    close() {
+      this.dialogVisible = false;
+    },
+    reset() {
+      this.form = { ...this.resetForm };
+    },
+    // 获取区域
+    async tbShopAreaGet() {
+      try {
+        const { content } = await tbShopAreaGet({
+          shopId: localStorage.getItem("shopId"),
+        });
+        this.areaList = content;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+  },
+};
+</script>
\ No newline at end of file
diff --git a/src/views/tool/table/components/choose-diners-number.vue b/src/views/tool/table/components/choose-diners-number.vue
new file mode 100644
index 0000000..7e8231a
--- /dev/null
+++ b/src/views/tool/table/components/choose-diners-number.vue
@@ -0,0 +1,270 @@
+<template>
+  <div class="select_desk">
+    <el-dialog width="410px" title="就餐人数" :visible.sync="show">
+      <div class="select_desk_dialog u-p-b-20">
+        <key-board
+          isCanEmpty
+          v-model="number"
+          @clear="clear"
+          :max="max"
+          :maxTips=" '最多'+max+'位'"
+        >
+          <div slot="clear">清空</div>
+          <div slot="input" class="u-p-l-20 u-p-r-20 u-flex w-full">
+            <el-input
+              placeholder="请输入就餐人数"
+              v-model="number"
+              @input="inputNumber"
+              @change="inputChange"
+              type="number"
+            >
+              <template slot="append">位</template>
+            </el-input>
+          </div>
+        </key-board>
+        <div class="confirm_btns">
+          <el-button size="medium" @click="close">取消</el-button>
+          <el-button  type="primary" size="medium" @click="confirm"
+            >确定</el-button
+          >
+        </div>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+  
+  <script>
+import keyBoard from "../keyboard.vue";
+export default {
+  components: { keyBoard },
+  props:{
+    max:{
+      type:Number,
+      default:99
+    }
+  },
+  data() {
+    return {
+      number: "",
+      show: false,
+      hasOpen: false,
+      loading: false,
+    };
+  },
+  watch: {
+    number(newval) {
+      if (newval >this.max) {
+        this.number = this.max;
+        this.$message("最多只能选择"+this.max+"位就餐人数");
+      }
+      // 使用正则表达式匹配正整数
+      const regex = /^[1-9]\d*$/;
+      // 如果输入的值不是正整数，则将其设置为上一个有效值
+      if (!regex.test(newval)) {
+        this.number = newval.substring(0, newval.length - 1);
+      }
+    },
+  },
+  methods: {
+    inputNumber(e) {},
+    inputChange(e) {},
+    clear(e) {
+      console.log(e);
+      this.number = "";
+    },
+    confirm() {
+      if (this.number >this.max) {
+        return this.$message("最多只能选择"+this.max+"位就餐人数");
+      }
+      if (!this.number) {
+        return this.$message("请选择就餐人数");
+      }
+      console.log(this.number)
+      this.$emit("confirm", this.number);
+      this.close();
+    },
+    open(number) {
+      this.number = number || "";
+      this.show = true;
+    },
+    close() {
+      this.show = false;
+      this.number = "";
+    },
+  },
+  mounted() {},
+};
+</script>
+  
+  <style lang="scss" scoped>
+::v-deep.el-button {
+  padding: 12px 20px;
+}
+::v-deep .el-input__inner::-webkit-inner-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+::v-deep .el-input__inner::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+::v-deep .el-button--success {
+  border-color: #22bf64;
+  background-color: #22bf64;
+}
+.select_desk .btn {
+  height: 34px;
+}
+.tags {
+  font-size: 16px;
+  &.using {
+    color: rgb(234, 64, 37);
+  }
+  &.wait {
+    color: rgb(252, 236, 79);
+  }
+  &.idle {
+    color: rgb(137, 234, 71);
+  }
+  &.closed {
+    color: rgb(221, 221, 221);
+    filter: grayscale(1);
+  }
+}
+::v-deep .inputs .el-input__inner {
+  border-color: transparent !important;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  font-size: 20px;
+}
+.select_desk .select_desk_dialog {
+  display: flex;
+
+  flex-direction: column;
+
+  align-items: center;
+}
+
+.select_desk .select_desk_dialog .nav {
+  width: 286px;
+  height: 38px;
+  background: #dcf0e8;
+
+  justify-content: space-around;
+}
+
+.select_desk .select_desk_dialog .nav .li,
+.select_desk .select_desk_dialog .nav {
+  border-radius: 4px;
+
+  display: flex;
+
+  align-items: center;
+}
+
+.select_desk .select_desk_dialog .nav .li {
+  width: 140px;
+  height: 34px;
+  color: #0fc161;
+
+  justify-content: center;
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.select_desk .select_desk_dialog .nav .lion {
+  background: #0fc161;
+  color: #fff;
+}
+
+.select_desk .select_desk_dialog .inputs {
+  width: 370px;
+  line-height: 54px;
+  margin-top: 24px;
+  height: 54px;
+  margin-bottom: 20px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+  font-size: 20px;
+  position: relative;
+}
+
+.select_desk .select_desk_dialog .inputs .close {
+  color: #aaa;
+  position: absolute;
+  right: 10px;
+  height: 30px;
+  width: 30px;
+  line-height: 30px;
+  top: 50%;
+  margin-top: -15px;
+  cursor: pointer;
+}
+
+.select_desk .select_desk_dialog .keyboard {
+  display: flex;
+
+  flex-wrap: wrap;
+  width: 100%;
+  margin-top: 20px;
+  margin-bottom: 10px;
+  border-right: 1px solid #dcdfe6;
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.select_desk .select_desk_dialog .keyboard .li {
+  height: 60px;
+  width: 33.333%;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 24px;
+  color: #212121;
+  cursor: pointer;
+
+  user-select: none;
+  border-left: 1px solid #dcdfe6;
+  border-top: 1px solid #dcdfe6;
+
+  transition: all 0.1s;
+}
+
+.select_desk .select_desk_dialog .keyboard .li:hover {
+  background: #dcdfe6;
+}
+
+.select_desk .select_desk_dialog .keyboard .li .icon {
+  font-size: 1.3em;
+}
+
+.select_desk .select_desk_dialog .keyboard .confirm {
+  height: 140px;
+  background: #ff9f2e;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  border-right: none;
+}
+
+.select_desk .select_desk_dialog .keyboard .confirm:hover {
+  background: #f88502;
+}
+
+.confirm_btns {
+  display: flex;
+
+  justify-content: space-between;
+  width: 100%;
+}
+
+.confirm_btns .el-button {
+  width: 175px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/table/components/choose-user.vue b/src/views/tool/table/components/choose-user.vue
new file mode 100644
index 0000000..f834fca
--- /dev/null
+++ b/src/views/tool/table/components/choose-user.vue
@@ -0,0 +1,289 @@
+<template>
+  <el-dialog title="选择用户" width="850px" :visible.sync="show">
+    <div class="app-container">
+      <div class="head-container">
+        <el-form :model="query" inline>
+          <el-form-item label="">
+            <el-input
+              v-model="query.name"
+              placeholder="请输入昵称或手机号"
+            ></el-input>
+          </el-form-item>
+          <!-- <el-form-item label="是否为会员">
+            <el-select v-model="query.isVip" placeholder="是否是会员">
+              <el-option value="" label="全部"></el-option>
+              <el-option :value="1" label="是"></el-option>
+              <el-option :value="0" label="否"></el-option>
+            </el-select>
+          </el-form-item> -->
+          <el-form-item>
+            <div class="flex gap-20">
+              <el-button  type="primary" @click="getTableData" size="medium"
+                >搜索</el-button
+              >
+              <!-- <el-button @click="resetHandle" size="medium">重置</el-button> -->
+              <el-button @click="noChooseUser" size="medium"
+                >不选择用户</el-button
+              >
+              <!-- <el-button @click="resetHandle" size="medium">新建用户</el-button> -->
+            </div>
+          </el-form-item>
+        </el-form>
+      </div>
+      <!-- <div class="head-container">
+              <el-button type="primary" icon="el-icon-plus" @click="$refs.addActive.show()">
+                  添加活动
+              </el-button>
+          </div> -->
+
+      <div class="head-container">
+        <el-table :data="tableData.data" v-loading="tableData.loading" @cell-click="cellClick">
+          <el-table-column label="ID" prop="id"></el-table-column>
+          <el-table-column label="用户" prop="headImg" width="200px">
+            <template v-slot="scope">
+              <div class="user_info">
+                <el-image
+                  :src="scope.row.headImg"
+                  style="width: 40px; height: 40px; flex-shrink: 0"
+                >
+                  <div slot="error" class="image-slot">
+                    <i class="el-icon-user"></i>
+                  </div>
+                </el-image>
+                <span class="name">{{ scope.row.nickName }}</span>
+              </div>
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="手机号"
+            prop="telephone"
+            width="160"
+          ></el-table-column>
+          <!-- <el-table-column label="性别" prop="sex">
+            <template v-slot="scope">
+              <el-tag type="priamry">{{ scope.row.sex || "未知" }}</el-tag>
+            </template>
+          </el-table-column> -->
+          <el-table-column label="会员" prop="isVip">
+            <template v-slot="scope">
+              <el-tag type="warning" v-if="scope.row.isVip"
+                >会员等级{{ scope.row.isVip }}</el-tag
+              >
+              <span v-else>否</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="余额" prop="amount"></el-table-column>
+          <el-table-column label="积分" prop="totalScore"></el-table-column>
+
+          <el-table-column label="操作" width="90" fixed="right">
+            <template v-slot="scope">
+              <el-button  type="primary" size="mini" @click="choose(scope.row)">选择</el-button>
+              <!-- <el-button type="text" @click="charge(scope.row)">充值</el-button> -->
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="head-container">
+        <el-pagination
+          :total="tableData.total"
+          :current-page="tableData.page + 1"
+          :page-size="tableData.size"
+          @size-change="sizeChange"
+          @current-change="paginationChange"
+          layout="total, sizes, prev, pager, next, jumper"
+        ></el-pagination>
+      </div>
+    </div>
+  </el-dialog>
+</template>
+  
+  <script>
+import { queryAllShopUser, queryAllShopInfo } from "@/api/shop";
+import dayjs from "dayjs";
+let cacheData = {};
+export default {
+  data() {
+    return {
+      show: false,
+      query: {
+        name: "",
+      },
+      shopInfo: {
+        balanceTotal: 0,
+        userTotal: 0,
+        chageTotal: 0,
+      },
+      tableData: {
+        data: [],
+        page: 0,
+        size: 10,
+        loading: false,
+        total: 0,
+      },
+    };
+  },
+  filters: {
+    timeFilter(s) {
+      return dayjs(s).format("YYYY-MM-DD HH:mm:ss");
+    },
+  },
+  mounted() {
+    // this.getTableData();
+  },
+  methods: {
+    cellClick(user){
+      console.log(user)
+      this.$emit("chooseUser",user)
+      this.close()
+    },
+    noChooseUser(){
+        this.$emit("chooseUser",null)
+      this.close()
+
+    },
+    choose(user) {
+      this.$emit("chooseUser",user)
+      this.close()
+
+    },
+    charge(user) {
+      console.log(user);
+    },
+    close(){
+        this.show = false;
+    },
+    open() {
+      this.getTableData();
+      this.show = true;
+    },
+    toPage(type) {
+      const pages = {
+        charge: "charge_list",
+        cost: "cost_list",
+      };
+      this.$router.push({
+        name: pages[type],
+      });
+      console.log(pages[type]);
+    },
+    // 获取商家用户概述信息
+    async getShopInfo() {
+      try {
+        const res = await queryAllShopInfo(this.query);
+        this.shopInfo = res;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    sizeChange() {
+      this.tableData.page = 0;
+      this.getTableData();
+    },
+    // 切换状态
+    async statusChange(e, row) {
+      try {
+        this.tableData.loading = true;
+        const data = { ...row };
+        data.status = e;
+        await modityActivate(data);
+        this.getTableData();
+      } catch (error) {
+        console.log(error);
+        this.tableData.loading = false;
+      }
+    },
+    // 重置查询
+    resetHandle() {
+      this.query.name = "";
+      this.getTableData();
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1;
+      this.getTableData();
+    },
+    // 获取商品列表
+    async getTableData() {
+      this.tableData.loading = true;
+      try {
+        const res = await queryAllShopUser({
+          ...this.query,
+          size: this.tableData.size,
+          page: this.tableData.page + 1,
+        });
+        this.tableData.loading = false;
+        this.tableData.data = res.content;
+        this.tableData.total = res.totalElements;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+  },
+};
+</script>
+  
+  <style scoped lang="scss">
+.user_info {
+  display: flex;
+  align-items: center;
+
+  .name {
+    margin-left: 10px;
+  }
+}
+::v-deep .el-input--small .el-input__inner{
+    height: 36px;
+    line-height: 36px;
+}
+
+::v-deep .image-slot {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #efefef;
+  font-size: 20px;
+  color: #999;
+}
+
+.card {
+  background-color: #f5f5f5;
+  padding: 0 14px;
+
+  .title {
+    font-size: 22px;
+    padding-top: 14px;
+  }
+
+  .row {
+    display: flex;
+    padding: 20px 0;
+
+    .item {
+      flex: 1;
+
+      .t {
+        text-align: center;
+        color: #555;
+      }
+
+      .n {
+        color: #000;
+        font-size: 20px;
+        font-weight: bold;
+        padding-top: 6px;
+        text-align: center;
+      }
+    }
+  }
+}
+.flex{
+    display: flex;
+    align-items: center;
+}
+.gap-20{
+    gap: 20px;
+}
+</style>
+  
\ No newline at end of file
diff --git a/src/views/tool/table/components/downloadTableCode.vue b/src/views/tool/table/components/downloadTableCode.vue
new file mode 100644
index 0000000..92f0218
--- /dev/null
+++ b/src/views/tool/table/components/downloadTableCode.vue
@@ -0,0 +1,69 @@
+<template>
+    <el-dialog title="下载桌码" width="400px" :visible.sync="dialogVisible" @open="reset">
+        <el-form ref="form" :model="form" label-position="left">
+            <el-form-item label="下载数量">
+                <el-input-number v-model="form.number" :min="1" :max="500"></el-input-number>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="dialogVisible = false">取 消</el-button>
+            <el-button type="primary" :loading="loading" @click="onSubmitHandle">下 载</el-button>
+        </span>
+    </el-dialog>
+</template>
+
+<script>
+import { downloadFile } from "@/utils/index";
+import { downloadTableCode } from '@/api/table'
+export default {
+    props: {
+        total: {
+            type: [Number, String],
+            default: 1
+        }
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            loading: false,
+            form: {
+                number: 1
+            },
+            resetForm: ''
+        }
+    },
+    mounted() {
+        this.resetForm = { ...this.form }
+    },
+    methods: {
+        async onSubmitHandle() {
+            try {
+                this.loading = true
+                const file = await downloadTableCode({
+                    count: this.form.number,
+                    shopId: localStorage.getItem('shopId')
+                })
+                this.loading = false
+                this.dialogVisible = false
+                this.$message.success('下载成功')
+                downloadFile(file, "桌码", "zip");
+            } catch (error) {
+                this.loading = false
+                console.log(error);
+            }
+        },
+        show(obj) {
+            this.dialogVisible = true
+            // if (obj && obj.id) {
+            //     this.form = JSON.parse(JSON.stringify(obj))
+            // }
+        },
+        close() {
+            this.dialogVisible = false
+        },
+        reset() {
+            this.form = { ...this.resetForm }
+        }
+    }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/tool/table/components/keyboard.vue b/src/views/tool/table/components/keyboard.vue
new file mode 100644
index 0000000..8436f1f
--- /dev/null
+++ b/src/views/tool/table/components/keyboard.vue
@@ -0,0 +1,319 @@
+<template>
+  <div class="simple-Keyboard-number">
+    <div class="carts">
+      <div class="box_status">
+        <slot name="input">
+          <span> {{ number }}</span>
+        </slot>
+      </div>
+      <div class="number_list_box">
+        <div class="yd-keyboard">
+          <div class="mini-number-box1">
+            <div class="mini-number">
+              <div class="key-line">
+                <div class="key" @click="keyboradAdd('1')">1</div>
+                <div class="key" @click="keyboradAdd('2')">2</div>
+                <div class="key" @click="keyboradAdd('3')">3</div>
+              </div>
+              <div class="key-line">
+                <div class="key" @click="keyboradAdd('4')">4</div>
+                <div class="key" @click="keyboradAdd('5')">5</div>
+                <div class="key" @click="keyboradAdd('6')">6</div>
+              </div>
+              <div class="key-line">
+                <div class="key" @click="keyboradAdd('7')">7</div>
+                <div class="key" @click="keyboradAdd('8')">8</div>
+                <div class="key" @click="keyboradAdd('9')">9</div>
+              </div>
+              <div class="key-line">
+                <div class="key" @click="clearFunction">
+                  <slot name="clear"> </slot>
+                </div>
+                <div class="key" @click="keyboradAdd('0')">0</div>
+                <div
+                  class="key"
+                  style="font-size: 31px"
+                  @click="keyboradReduce"
+                >
+                  <svg
+                    t="1723453480343"
+                    class="icon"
+                    viewBox="0 0 1664 1024"
+                    version="1.1"
+                    xmlns="http://www.w3.org/2000/svg"
+                    p-id="1467"
+                    width="32"
+                    height="32"
+                  >
+                    <path
+                      d="M1526.08 1.6H459.84L41.28 416c-53.76 53.248-53.76 139.52 0 192.64l418.624 414.592v-0.064h1066.176a136.96 136.96 0 0 0 137.6-136.256V137.792a136.96 136.96 0 0 0-137.6-136.192z m-331.392 631.168c26.816 26.624 26.816 69.76 0 96.384-26.88 26.56-70.4 26.56-97.28 0l-121.28-120.128-123.328 122.112a69.76 69.76 0 0 1-97.92 0 68.096 68.096 0 0 1 0-96.96L878.208 512l-121.28-120.064a67.648 67.648 0 0 1 0-96.32c26.88-26.624 70.4-26.624 97.28 0l121.216 120.064 122.24-120.96a69.696 69.696 0 0 1 97.92 0 68.032 68.032 0 0 1 0 96.96l-122.24 120.96 121.344 120.064z"
+                      fill="#333333"
+                      p-id="1468"
+                    ></path>
+                  </svg>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <template v-if="showConfirm">
+        <div class="submit" @click="keyboradConfirm">确认</div>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+export default {
+  props: {
+    isCanEmpty: {
+      type: Boolean,
+      default: false,
+    },
+    maxTips: {
+      type: String,
+      default: "输入值超范围",
+    },
+    showConfirm: {
+      type: Boolean,
+      default: false,
+    },
+    max: {
+      type: Number,
+      default: Infinity,
+    },
+    value: {
+      type: [String, Number],
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      number: 0,
+    };
+  },
+  watch: {
+    value(newval) {
+      this.number = newval;
+    },
+    number(newval) {
+      this.$emit("input", newval);
+    },
+  },
+  methods: {
+    clearFunction() {
+      this.$emit("clear", this.number);
+    },
+    keyboradAdd(n) {
+      if (Number(this.number) == 0) {
+        return (this.number = n);
+      }
+      const newval = this.number + n;
+      if (newval > this.max) {
+        return this.$message( this.maxTips);
+      }
+      this.number = newval;
+    },
+    keyboradReduce() {
+      if (this.number.length <= 1) {
+        return (this.number = this.isCanEmpty ? "" : "0");
+      }
+      this.number = `${this.number}`.substring(0, this.number.length - 1);
+    },
+    keyboradConfirm() {
+      this.$emit("confirm", this.number);
+    },
+  },
+  mounted() {
+    this.number = `${this.value}`;
+  },
+};
+</script>
+
+<style  lang="scss" scoped>
+.yd-keyboard {
+  justify-content: center;
+  margin-bottom: 20px;
+}
+
+.mini-number-box1 .mini-number,
+.yd-keyboard {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box1 .mini-number {
+  border: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line {
+  margin-top: 0;
+}
+
+.mini-number-box1 .mini-number .key {
+  width: 122px;
+  height: 60px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin-left: 0;
+}
+.mini-number-box1 .mini-number .key:hover {
+  background-color: #dcdfe6;
+}
+.mini-number-box1 .mini-number .key:not(:last-child) {
+  border-right: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line:not(:last-child) {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.mini-number-box2 {
+  display: flex;
+
+  justify-content: center;
+}
+
+.mini-number-box2 .key {
+  width: 80px;
+  height: 70px;
+}
+
+.mini-number-box2 .function-button {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box2 .function-button .key {
+  margin-top: 8px;
+}
+
+.key-line {
+  margin-top: 8px;
+}
+
+.key,
+.key-line {
+  display: flex;
+
+  justify-content: center;
+}
+
+.key {
+  width: 64px;
+  height: 64px;
+  background: #fff;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  border-radius: 4px;
+
+  align-items: center;
+  margin-left: 8px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 34px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.simple-Keyboard-number,
+.simple-Keyboard-weight {
+  min-width: 410px;
+  background: #fff;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+.disabled-box {
+  position: absolute;
+  inset: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.carts {
+  flex-direction: column;
+  background: #fff;
+  height: 100%;
+}
+
+.carts .title,
+.carts {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+}
+
+.carts .title {
+  justify-content: space-between;
+  height: 64px;
+  border-bottom: 1px solid #ebebeb;
+  padding: 20px;
+  padding-top: 30px;
+}
+
+.carts .title .left {
+  font-family: PingFangSC-Medium;
+  font-weight: 500;
+  font-size: 18px;
+  color: #000;
+}
+
+.carts .title .right {
+  font-size: 14.4px;
+  cursor: pointer;
+}
+
+.carts .box_status {
+  margin-bottom: 20px;
+  width: 370px;
+  height: 58px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-top: 20px;
+  font-family: MicrosoftYaHei;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+}
+
+.carts .box_status span {
+  padding: 0 5px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/table/components/money-keyboard.vue b/src/views/tool/table/components/money-keyboard.vue
new file mode 100644
index 0000000..11e1909
--- /dev/null
+++ b/src/views/tool/table/components/money-keyboard.vue
@@ -0,0 +1,339 @@
+<template>
+  <el-dialog width="330px" :title="title" :visible.sync="show">
+    <div class="simple-Keyboard-number">
+      <div class="carts">
+        <div class="pad-14">
+          <div class="box_status">
+            <span class="sym">￥</span>
+            <el-input v-model="number" type="text" @input="numberInput"></el-input>
+            <!-- <span class="inputs" :contenteditable="true" @input="numberInput" type="text" >{{ number }}</span> -->
+          </div>
+        </div>
+        <div class="number_list_box">
+          <div class="yd-keyboard">
+            <div class="mini-number-box1">
+              <div class="mini-number">
+                <div class="key-line">
+                  <div class="key" @click="keyboradAdd('1')">1</div>
+                  <div class="key" @click="keyboradAdd('2')">2</div>
+                  <div class="key" @click="keyboradAdd('3')">3</div>
+                  <div
+                    class="key"
+                    style="font-size: 31px"
+                    @click="keyboradReduce"
+                  >
+                    <svg
+                      t="1723453480343"
+                      class="icon"
+                      viewBox="0 0 1664 1024"
+                      version="1.1"
+                      xmlns="http://www.w3.org/2000/svg"
+                      p-id="1467"
+                      width="32"
+                      height="32"
+                    >
+                      <path
+                        d="M1526.08 1.6H459.84L41.28 416c-53.76 53.248-53.76 139.52 0 192.64l418.624 414.592v-0.064h1066.176a136.96 136.96 0 0 0 137.6-136.256V137.792a136.96 136.96 0 0 0-137.6-136.192z m-331.392 631.168c26.816 26.624 26.816 69.76 0 96.384-26.88 26.56-70.4 26.56-97.28 0l-121.28-120.128-123.328 122.112a69.76 69.76 0 0 1-97.92 0 68.096 68.096 0 0 1 0-96.96L878.208 512l-121.28-120.064a67.648 67.648 0 0 1 0-96.32c26.88-26.624 70.4-26.624 97.28 0l121.216 120.064 122.24-120.96a69.696 69.696 0 0 1 97.92 0 68.032 68.032 0 0 1 0 96.96l-122.24 120.96 121.344 120.064z"
+                        fill="#333333"
+                        p-id="1468"
+                      ></path>
+                    </svg>
+                  </div>
+                </div>
+                <div class="key-line">
+                  <div class="key" @click="keyboradAdd('4')">4</div>
+                  <div class="key" @click="keyboradAdd('5')">5</div>
+                  <div class="key" @click="keyboradAdd('6')">6</div>
+                  <div class="key" @click="keyboradAdd('clear')">清空</div>
+                </div>
+                <div class="key-line">
+                  <div class="key" @click="keyboradAdd('7')">7</div>
+                  <div class="key" @click="keyboradAdd('8')">8</div>
+                  <div class="key" @click="keyboradAdd('9')">9</div>
+                  <div class="key"></div>
+                </div>
+                <div class="key-line">
+                  <div class="key" @click="keyboradAdd('.')">.</div>
+                  <div class="key" @click="keyboradAdd('0')">0</div>
+                  <div class="key" @click="keyboradAdd('00')">00</div>
+                  <div class="key"></div>
+                </div>
+                <div class="confirm key" @click="confirm">确认</div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <!-- <div class="submit" @click="keyboradConfirm">确认</div> -->
+      </div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+export default {
+  props: {
+    title: {
+      type: String,
+      default: "支付",
+    },
+    value: {
+      type: [String, Number],
+      default: 0,
+    },
+  },
+  data() {
+    return {
+      number: '0',
+      show:false
+    };
+  },
+  watch: {
+    number(newval) {
+      this.$emit("input", newval);
+    },
+  },
+  methods: {
+    confirm(){
+
+    },
+    open(){
+      this.show=true
+    },
+    close(){
+      this.show=false
+    },
+    numberInput(val){
+      console.log(val)
+      this.number=`${Number(val)}` 
+    },
+    keyboradAdd(n) {
+      if (n === "clear") {
+        return (this.number = '0');
+      }
+      if(n==='.'){
+        return this.number += this.number.includes('.')?'' : '.'
+      }
+      if (`${this.number}`.length<=1&&Number(this.number)===0) {
+        return (this.number = n);
+      }
+      this.number += n;
+    },
+    keyboradReduce() {
+      if (this.number.length <= 1) {
+        return (this.number = this.isCanEmpty ? "" : "0");
+      }
+      this.number = this.number.substring(0, this.number.length - 1);
+    },
+    keyboradConfirm() {
+      this.$emit("confirm", this.number);
+    },
+  },
+  mounted() {
+    this.number = `${this.value}`;
+  },
+};
+</script>
+
+<style  lang="scss" scoped>
+.pad-14 {
+  padding: 14px;
+  width: 100%;
+}
+::v-deep .el-dialog__body {
+  padding: 0;
+}
+::v-deep .el-input__inner::-webkit-outer-spin-button{
+  -webkit-appearance: none;  
+  margin: 0;  
+}  
+::v-deep .el-input__inner::-webkit-inner-spin-button {  
+  -webkit-appearance: none;  
+  margin: 0;  
+}  
+  
+/* Firefox */  
+::v-deep .el-input__inner {  
+  -moz-appearance: textfield;  
+}
+.number_list_box,
+.yd-keyboard,
+.mini-number,
+.mini-number-box1,
+.key-line {
+  width: 100%;
+}
+.yd-keyboard {
+  justify-content: center;
+}
+
+.mini-number-box1 .mini-number,
+.yd-keyboard {
+  display: flex;
+  position: relative;
+  flex-direction: column;
+}
+
+.mini-number-box1 .mini-number {
+  border-top: 1px solid #dcdfe6;
+}
+
+.mini-number-box2 {
+  display: flex;
+
+  justify-content: center;
+}
+
+.mini-number-box2 .function-button {
+  display: flex;
+  flex-direction: column;
+}
+
+.key,
+.key-line {
+  display: flex;
+  justify-content: center;
+}
+
+.key {
+  width: 25%;
+  height: 70px;
+  box-sizing: border-box;
+  background: #fff;
+  align-items: center;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 24px;
+  color: #212121;
+  text-align: center;
+  line-height: 34px;
+  cursor: pointer;
+  user-select: none;
+}
+.key:hover {
+  background-color: #dcdfe6;
+}
+.key:not(:last-child) {
+  border-right: 1px solid #dcdfe6;
+}
+
+.key-line:not(:last-child) {
+  border-bottom: 1px solid #dcdfe6;
+}
+.confirm {
+  height: 142px;
+  width: 25%;
+  background: #22bf64;
+  color: #fff;
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  border-right: none;
+}
+.confirm:hover {
+  background: rgba(34, 191, 100, 0.8666666666666667);
+}
+.simple-Keyboard-number,
+.simple-Keyboard-weight {
+  background: #fff;
+  border-radius: 4px;
+  overflow: hidden;
+}
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+.disabled-box {
+  position: absolute;
+  inset: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.carts {
+  flex-direction: column;
+  background: #fff;
+  height: 100%;
+}
+
+.carts .title,
+.carts {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+}
+
+.carts .title {
+  justify-content: space-between;
+  height: 64px;
+  border-bottom: 1px solid #ebebeb;
+  padding: 20px;
+  padding-top: 30px;
+}
+
+.carts .title .left {
+  font-family: PingFangSC-Medium;
+  font-weight: 500;
+  font-size: 18px;
+  color: #000;
+}
+
+.carts .title .right {
+  font-size: 14.4px;
+  cursor: pointer;
+}
+
+.box_status {
+  box-sizing: border-box;
+  width: 100%;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  display: flex;
+  padding: 14px;
+  align-items: flex-end;
+  font-family: MicrosoftYaHei;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  .sym {
+    font-size: 24px;
+    color: #212121;
+    width: 30px;
+    margin-bottom: 3px;
+  }
+  .inputs {
+    font-size: 28px;
+    color: #212121;
+    outline: none;
+    line-height: 37px;
+    border: none;
+    max-width: 250px;
+  }
+}
+::v-deep .el-input--small .el-input__inner{
+  font-size: 28px;
+    color: #212121;
+    outline: none;
+    line-height: 37px;
+    border: none;
+    max-width: 250px;
+    padding-left: 0;
+}
+
+.carts .box_status span {
+  padding: 0 5px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/table/components/order-btn.js b/src/views/tool/table/components/order-btn.js
new file mode 100644
index 0000000..33c7922
--- /dev/null
+++ b/src/views/tool/table/components/order-btn.js
@@ -0,0 +1,62 @@
+export const orderBtns=[
+    {
+        text: "删除",
+        disabled: false,
+      },
+      {
+        text: "规格",
+        disabled: true,
+      },
+      {
+        text: "菜品打折",
+        disabled: false,
+      },
+      {
+        text: "赠菜",
+        disabled: false,
+      },
+      {
+        text: "赠菜",
+        disabled: false,
+      },
+      {
+        text: "打包",
+        disabled: false,
+      },
+      {
+        text: "等叫",
+        disabled: false,
+      },
+      {
+        text: "整单等叫",
+        disabled: false,
+      },
+      {
+        text: "单品备注",
+        disabled: false,
+      },
+      {
+        text: "退菜",
+        disabled: false,
+      },
+      {
+        text: "附加费",
+        disabled: false,
+      },
+      {
+        text: "存单",
+        disabled: false,
+      },
+      {
+        text: "取单",
+        disabled: false,
+      },
+      {
+        text: "修改价格",
+        disabled: false,
+      },
+      {
+        text: "撤单",
+        disabled: false,
+      }
+]
\ No newline at end of file
diff --git a/src/views/tool/table/components/pay-type.vue b/src/views/tool/table/components/pay-type.vue
new file mode 100644
index 0000000..692dd8c
--- /dev/null
+++ b/src/views/tool/table/components/pay-type.vue
@@ -0,0 +1,76 @@
+<template>
+  <div>
+    <div class="title">选择支付方式</div>
+    <div class="btn_group">
+      <div class="price_select">
+        <div class="pay_btns">
+          <el-button
+            size="medium"
+            @click="changeSel(item)"
+            v-for="(item, index) in list"
+            :key="index"
+            :type="sel === item.payType ? 'primary' : ''"
+          >
+            {{ item.payName }}
+          </el-button>
+          <!-- <el-button size="medium"> 余额支付 </el-button>
+          <el-button size="medium"> 现金支付 </el-button>
+          <el-button size="medium"> 挂账 </el-button> -->
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { $getPayType } from "@/api/table";
+export default {
+  props: {
+    value: {
+      type: [String, Number],
+      default: '',
+    },
+  },
+  data() {
+    return {
+      list: [],
+      sel: "",
+    };
+  },
+  watch: {
+    sel(newval) {
+      console.log(newval);
+      this.$emit("input", newval);
+    },
+  },
+  methods: {
+    changeSel(item) {
+      this.sel = item.payType;
+      this.$emit("itemClick", item);
+    },
+    async init() {
+      const res = await $getPayType();
+      this.list = res.filter(v=>v.isDisplay);
+      console.log(res[0]);
+      this.sel = this.sel ? this.sel : res[0].payType;
+    },
+  },
+  mounted() {
+    this.init();
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.title {
+  font-size: 18px;
+  color: #000;
+  font-weight: 600;
+  padding: 20px 0;
+}
+.pay_btns .el-button {
+  margin-left: 0;
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/tool/table/components/subscribe.vue b/src/views/tool/table/components/subscribe.vue
new file mode 100644
index 0000000..d28d178
--- /dev/null
+++ b/src/views/tool/table/components/subscribe.vue
@@ -0,0 +1,269 @@
+<template>
+  <el-dialog
+    title="预约"
+    :visible.sync="dialogVisible"
+    width="500px"
+    @close="reset"
+  >
+    <el-form
+      ref="form"
+      :model="form"
+      :rules="rules"
+      label-width="120px"
+      label-position="left"
+    >
+
+      <el-form-item label="预约日期" prop="bookingDate">
+        <!-- <el-date-picker
+          v-model="form.bookingDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          :picker-options="pickerOptions"
+          placeholder="选择预约日期"
+          style="width: 200px;margin-right: 10px;"
+          @change="getShopTableList"
+        /> -->
+        <el-radio-group
+          v-model="form.bookingDate"
+          class="date"
+          @change="getShopTableList"
+        >
+          <el-radio-button
+            v-for="(item) in dateList"
+            :key="item.date"
+            :label="item.date"
+          >
+            <div style="font-size: 12px;margin-bottom: 4px;">{{ item.label }} / {{ item.date.substring(8,10) }}</div>
+            <div style="font-size: 12px;"> {{ item.day }}</div>
+          </el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="预约类型" prop="bookingType">
+        <el-radio-group v-model="form.bookingType" @change="getShopTableList">
+          <el-radio-button label="lunch">午餐</el-radio-button>
+          <el-radio-button label="dinner">晚餐</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="就餐时间" prop="bookingTime">
+        <el-time-picker
+          v-model="form.bookingTime"
+          value-format="HH:mm:ss"
+          placeholder="选择时间"
+          style="width: 100%;"
+        />
+      </el-form-item>
+      <el-form-item label="预约桌台" prop="shopTableId">
+        <el-select v-model="form.shopTableId" placeholder="请选择" style="width: 100%;">
+          <el-option
+            v-for="item in shopTableList"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用餐人数" prop="dinerNum">
+        <el-input-number v-model="form.dinerNum" :min="1" controls-position="right" style="width: 100%;"/>
+      </el-form-item>
+      <el-form-item label="订餐人" prop="bookingPerson">
+        <el-input v-model="form.bookingPerson" style="width: 200px;margin-right: 10px;" placeholder="请输入联系人姓名" />
+        <el-radio-group v-model="form.gender">
+          <el-radio-button label="1">先生</el-radio-button>
+          <el-radio-button label="2">女士</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="phoneNumber">
+        <el-input v-model="form.phoneNumber" oninput="value= value.replace(/[^0-9]/g, '')" maxlength="11" placeholder="请输入联系电话" />
+      </el-form-item>
+    </el-form>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">取 消</el-button>
+      <el-button
+        type="primary"
+        :loading="loading"
+        @click="onSubmitHandle"
+      >确 定</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+import { getShopTableList, makeShopTable } from '@/api/table'
+import dayjs from 'dayjs'
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      resetForm: '',
+      loading: false,
+      pickerOptions: {
+        disabledDate(time) {
+          return time.getTime() < Date.now() - 8.64e7 // 如果今天之前的日期都不可选，减去8.64e7是1天的毫秒数
+        }
+      },
+      dateList: [
+        { label: '今', day: '', date: '' },
+        { label: '明', day: '', date: '' },
+        { label: '后', day: '', date: '' }
+      ],
+      shopTableList: [],
+      form: {
+        bookingDate: '',
+        bookingType: 'lunch',
+        shopTableId: null,
+        dinerNum: 1,
+        bookingPerson: '',
+        phoneNumber: '',
+        gender: '1',
+        bookingTime: '',
+        diningType: '普通用餐',
+        focus: '0',
+        receiveMarketingSms: '0'
+
+      },
+      rules: {
+        shopTableId: [
+          {
+            required: true,
+            message: '请选择预约桌台',
+            trigger: ['blur']
+          }
+        ],
+        dinerNum: [
+          {
+            required: true,
+            message: '请选择用餐人数',
+            trigger: ['blur']
+          }
+        ],
+        phoneNumber: [
+          {
+            required: true,
+            message: '请输入联系方式',
+            trigger: ['blur']
+          }
+        ],
+        bookingPerson: [
+          {
+            required: true,
+            message: '请输入订餐人姓名',
+            trigger: ['blur']
+          }
+        ],
+        bookingTime: [
+          {
+            required: true,
+            message: '请选择用餐时间',
+            trigger: ['change']
+          }
+        ]
+      }
+    }
+  },
+  mounted() {
+    this.resetForm = { ...this.form }
+  },
+  methods: {
+    getWeekdays() {
+      const today = new Date()
+      const tomorrow = new Date(today)
+      const dayAfterTomorrow = new Date(today)
+
+      // 设置时间为今天
+      tomorrow.setDate(today.getDate() + 1)
+      dayAfterTomorrow.setDate(today.getDate() + 2)
+
+      // 获取星期几的方法
+      const getDayOfWeek = (date) => {
+        const days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']
+        return days[date.getDay()]
+      }
+
+      // 获取今天、明天和后天的星期几
+      const todayWeekday = getDayOfWeek(today)
+      const tomorrowWeekday = getDayOfWeek(tomorrow)
+      const dayAfterTomorrowWeekday = getDayOfWeek(dayAfterTomorrow)
+      this.dateList[0].day = todayWeekday
+      this.dateList[1].day = tomorrowWeekday
+      this.dateList[2].day = dayAfterTomorrowWeekday
+      this.dateList[0].date = dayjs(today).format('YYYY-MM-DD')
+      this.dateList[1].date = dayjs(tomorrow).format('YYYY-MM-DD')
+      this.dateList[2].date = dayjs(dayAfterTomorrow).format('YYYY-MM-DD')
+
+      this.form.bookingDate = this.dateList[0].date
+    },
+    /**
+     * 获取桌台数据
+     */
+    async getShopTableList() {
+      this.form.shopTableId = null
+      const params = {
+        bookingDate: this.form.bookingDate,
+        bookingType: this.form.bookingType
+      }
+      const res = await getShopTableList(params)
+      this.shopTableList = res
+      console.log(res)
+    },
+    onSubmitHandle() {
+      this.$refs.form.validate(async(valid) => {
+        if (valid) {
+          this.loading = true
+          try {
+            const bookingTime = this.form.bookingDate + ' ' + this.form.bookingTime
+            const params = {
+              ...this.form,
+              shopId: localStorage.getItem('shopId')
+            }
+            params.bookingTime = bookingTime
+            const res = await makeShopTable(params)
+            this.$emit('success', res)
+            this.close()
+            this.$notify({
+              title: '成功',
+              message: `预约成功`,
+              type: 'success'
+            })
+            this.loading = false
+          } catch (error) {
+            this.loading = false
+            console.log(error)
+          }
+        }
+      })
+    },
+    show(obj) {
+      this.dialogVisible = true
+      if (obj && obj.id) {
+        this.form = JSON.parse(JSON.stringify(obj))
+      }
+      this.getShopTableList()
+      this.getWeekdays()
+    },
+    close() {
+      this.dialogVisible = false
+    },
+    reset() {
+      this.form = { ...this.resetForm }
+    }
+
+  }
+}
+</script>
+<style scoped lang="scss">
+.date{
+  ::v-deep .el-form-item__content{
+    // height: 36px;
+    // display: flex;
+    // justify-content: space-between;
+  }
+  ::v-deep .el-radio-button{
+    height: 100%;
+  }
+  ::v-deep .el-radio-button__inner{
+    padding: 4px 20px;
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/tool/table/components/table-diancan copy.vue b/src/views/tool/table/components/table-diancan copy.vue
new file mode 100644
index 0000000..283e243
--- /dev/null
+++ b/src/views/tool/table/components/table-diancan copy.vue	
@@ -0,0 +1,3990 @@
+<!-- eslint-disable no-empty -->
+<template>
+  <div class="">
+    <el-dialog
+      :title="title"
+      fullscreen
+      :visible.sync="informationdialogshow"
+      @close="onclose"
+    >
+      <div slot="title" class="flex row-between flex-y-center">
+        <div class="flex" style="width: 500px">
+          <div class="el-dialog__title" style="margin-right: 10px">
+            {{ title }}
+          </div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="success" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <span
+            @click="toggleFullScreen"
+            class="flex flex-xy-center cur-pointer full-screen"
+          >
+            <svg
+              v-if="!isFullScreen"
+              t="1724396447139"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="8943"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M358.4 768H426.666667v85.333333H213.333333v-213.333333h85.333334v68.266667l128-128 59.733333 59.733333-128 128z m345.6 0l-128-128 59.733333-59.733333 132.266667 132.266666V640h85.333333v213.333333h-213.333333v-85.333333h64zM358.4 298.666667l128 128-59.733333 59.733333-128-128V426.666667H213.333333V213.333333h213.333334v85.333334H358.4z m345.6 0H640V213.333333h213.333333v213.333334h-85.333333V354.133333l-132.266667 132.266667-59.733333-59.733333 128-128z"
+                fill="#666666"
+                p-id="8944"
+              ></path>
+            </svg>
+            <svg
+              v-else
+              t="1724396479520"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="9141"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M298.666667 631.466667H226.133333v-81.066667h217.6v204.8h-85.333333v-68.266667l-128 128L170.666667 759.466667l128-128z m422.4 0l128 128-59.733334 59.733333-128-128v68.266667h-85.333333V554.666667h217.6v81.066666h-72.533333zM298.666667 341.333333L187.733333 230.4 243.2 170.666667l115.2 115.2V217.6h85.333333v204.8H226.133333V341.333333H298.666667z m430.933333 0h64v81.066667h-217.6V217.6h85.333333v72.533333L780.8 170.666667l59.733333 59.733333L729.6 341.333333z"
+                fill="#666666"
+                p-id="9142"
+              ></path>
+            </svg>
+          </span>
+        </div>
+
+        <div class="flex flex-1" style="padding-right: 50px">
+          <div class="flex-1">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="head-container search-box flex row-between" v-if="false">
+        <div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="success" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+
+        <div class="flex">
+          <div style="width: 300px">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+            <!-- @keyup.enter.native="getGoods" -->
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <!-- <el-button style="margin-right: 10px" type="primary" @click="getGoods"
+            >查询</el-button
+          >
+          <el-button @click="reset">重置</el-button> -->
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="diancan" v-loading="loading">
+        <div class="order">
+          <div class="relative">
+            <div style="padding-right: 14px">
+              <div class="choose-user flex">
+                <el-button
+                  type="success"
+                  v-if="vipUser.id === ''"
+                  @click="refChooseUserOpen"
+                  >选择用户</el-button
+                >
+                <template v-else>
+                  <div class="flex cur-pointer" @click="refChooseUserOpen">
+                    <img
+                      v-if="vipUser.headImg"
+                      class="headimg"
+                      :src="vipUser.headImg"
+                      alt=""
+                    />
+                    <div v-else class="headimg flex flex-x-y-center">
+                      <i class="el-icon-user"></i>
+                    </div>
+                    <div>
+                      <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                      <div style="margin-top: 2px" class="color-666 ft-12">
+                        余额：{{ vipUser.amount }}
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </div>
+              <div class="flex row-between">
+                <!-- <div class="tableId" @click="chooseTableOpen"> -->
+                <el-popover placement="right" width="333" trigger="click">
+                  <div>
+                    <div
+                      class="u-flex u-row-between u-p-t-8 table-item u-p-b-8"
+                      v-for="(item, index) in tableList"
+                      :key="index"
+                      @click="changeTable(item, index)"
+                    >
+                      <span> {{ item.name }}</span>
+                      <span :style="{ color: status[item.status].type }">
+                        {{
+                          status[item.status] ? status[item.status].label : ""
+                        }}</span
+                      >
+                    </div>
+                  </div>
+                  <div class="tableId" slot="reference">
+                    {{ table ? "桌台号：" + table.name : "桌台号/取餐号" }}
+                  </div>
+                </el-popover>
+
+                <div class="u-flex">
+                  <div class="u-p-r-14 border-r u-m-r-14">
+                    <div
+                      class="u-flex cursor-pointer"
+                      @click="refToggle('refChooseDinersNumber', true,perpole)"
+                    >
+                      <span>就餐人数：{{ perpole }}位</span>
+                      <span
+                        class="el-icon-arrow-right diningPeople_cell_arrow"
+                      ></span>
+                    </div>
+                  </div>
+                  <el-button
+                    @click="clearCart"
+                    type="text"
+                    size="mini"
+                    :disabled="order.list.length <= 0"
+                    >清空</el-button
+                  >
+                </div>
+              </div>
+            </div>
+            <div class="absolute bottom">
+              <div class="flex row-right youhui" v-if="giftLen">
+                <span> 已优惠￥{{ allGiftMoney | to2 }} </span>
+                <i class="el-icon-arrow-right"></i>
+              </div>
+
+              <div class="flex row-between">
+                <el-checkbox
+                  v-model="order.allPack"
+                  :disabled="!this.order.list.length"
+                  >打包</el-checkbox
+                >
+                <div class="flex">
+                  <span class="color-666" style="margin-right: 5px"
+                    >共{{ allNumber }}件</span
+                  >
+                  <span class="color-000 ft-18">￥{{ allPrice }} </span>
+                </div>
+              </div>
+
+              <div class="flex mt-14">
+                <template v-if="isCreateOrder">
+                  <button
+                    class="my-btn flex-1 default"
+                    @click="createOrderClose"
+                  >
+                    <span>加菜/返回</span>
+                  </button>
+                  <div style="width: 15px"></div>
+                  <button class="my-btn flex-1 success" @click="payOrder">
+                    <span>立即支付</span>
+                  </button>
+                </template>
+                <template v-else>
+                  <template v-if="postPay">
+                    <div class="flex-1">
+                      <el-button
+                        type="success"
+                        size="medium"
+                        :disabled="!order.list.length"
+                        @click="toCreateOrderDebounce(false)"
+                      >
+                        仅下单
+                      </el-button>
+                    </div>
+                    <div style="width: 15px"></div>
+                  </template>
+                  <div class="flex-1">
+                    <el-button
+                      size="medium"
+                      :disabled="!order.list.length && !order.old.list.length"
+                      @click="toCreateOrderDebounce(true)"
+                    >
+                      去结账
+                    </el-button>
+                  </div>
+                </template>
+              </div>
+            </div>
+            <div class="list">
+              <!-- 当前购物车列表 -->
+              <template v-if="order.list.length">
+                <cart-item
+                  @itemClick="changeOrderSel"
+                  @changeOrderNumber="changeOrderNumber"
+                  @cartGoodsNumberInput="cartGoodsNumberInput"
+                  @cartGoodsNumberChange="cartGoodsNumberChange"
+                  v-for="(item, index) in order.list"
+                  :key="index"
+                  :index="index"
+                  :item="item"
+                  :selIndex="order.selIndex"
+                ></cart-item>
+              </template>
+              <div v-if="order.gift.list.length">
+                <div class="carts_list_title">以下是优惠菜品</div>
+              </div>
+
+              <div v-if="!order.list.length">
+                <el-empty
+                  :image-size="50"
+                  description="点餐列表为空"
+                ></el-empty>
+              </div>
+            </div>
+            <!-- 已下单菜品列表 -->
+            <template v-if="order.old.list.length">
+              <div class="carts_list_title">已下单菜品</div>
+              <div class="list">
+                <cart-item
+                  @itemClick="changeOrderOldSel"
+                  :canChangeNumber="false"
+                  v-for="(item, index) in order.old.list"
+                  :key="index"
+                  :index="index"
+                  :item="item"
+                  :selIndex="order.old.selIndex"
+                ></cart-item>
+              </div>
+            </template>
+
+            <div class="order_remark" v-if="note.content">
+              订单备注： {{ note.content }}
+            </div>
+          </div>
+
+          <div class="controls">
+            <div
+              class="numberbox"
+              :class="{ 'cur-pointer': order.old.selIndex < 0 }"
+            >
+              <div class="reduce" @click="changeOrderGoodsNumber('-')">-</div>
+              <div class="input relative">
+                <div
+                  class="disabled-box"
+                  v-if="order.selIndex >= 0"
+                  @click="changeKeyboradShow(true)"
+                ></div>
+                <!-- <input type="number" :disabled="order.selIndex<0" v-model="order.number" /> -->
+                <input
+                  type="number"
+                  disabled
+                  v-model="order.number"
+                  style="display: none"
+                />
+                <input type="number" disabled v-model="order.cacheNumber" />
+              </div>
+              <div class="add" @click="changeOrderGoodsNumber()">+</div>
+            </div>
+            <!-- <div class="btn" v-for="(item, index) in order.btns" :key="index" :class="{ disabled: item.disabled }" @click="orderBtnsClick(index,item)">
+              {{ item.text }}
+            </div> -->
+            <div
+              class="btn"
+              :class="{ disabled: !isSku }"
+              @click="orderBtnsClick('sku')"
+            >
+              规格
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('gift')"
+            >
+              {{ returnGiftText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('pack')"
+            >
+              {{ returnPackText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('del')"
+            >
+              删除
+            </div>
+
+            <div
+              class="btn"
+              :class="{ disabled: !order.list.length }"
+              @click="saveOrder"
+            >
+              存单
+            </div>
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length }"
+              @click="cacheOrderShow"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div>
+
+            <!-- <div
+              class="btn"
+              :class="{ disabled: !order.list.length }"
+              @click="orderBtnsClick('save')"
+            >
+              存单
+            </div>
+
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length }"
+              @click="orderBtnsClick('getOrder')"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div> -->
+
+            <div class="btn" @click="refNoteShow">整单备注</div>
+          </div>
+        </div>
+        <div class="goods">
+          <template v-if="!isCreateOrder">
+            <div class="flex categoty">
+              <div
+                class="show_more_btn"
+                :class="{ showAll: category.showAll }"
+                @click="toggleShowAll"
+              >
+                <div class="flex">
+                  <div class="flex">
+                    <i class="el-icon-arrow-down"></i>
+                  </div>
+                  <span>展开</span>
+                </div>
+              </div>
+              <div
+                class="flex categorys"
+                :class="{ 'flex-wrap': category.showAll }"
+              >
+                <div
+                  v-for="(item, index) in category.list"
+                  :key="index"
+                  @click="changeCategoryId(item)"
+                >
+                  <el-tag
+                    size="medium"
+                    type="success"
+                    effect="dark"
+                    v-if="goods.query.categoryId === item.id"
+                    >{{ item.name }}</el-tag
+                  >
+                  <el-tag size="medium" type="success" v-else effect="plain">{{
+                    item.name
+                  }}</el-tag>
+                </div>
+              </div>
+            </div>
+            <div
+              class="no-search-result"
+              v-if="search.list.length <= 0 && goods.query.productId !== ''"
+            >
+              未找到相关商品
+            </div>
+            <div class="goods-list" v-if="goods.list.length">
+              <div
+                class="goods-item"
+                :class="{
+                  'sell-out':
+                    item.isPauseSale ||
+                    (item.typeEnum !== 'sku' && item.stockNumber <= 0),
+                  'layout-img-and-text': layout.sel === 'img-and-text',
+                  'layout-text': layout.sel === 'text',
+                  none:
+                    (goods.query.categoryId !== '') &
+                    (goods.query.categoryId != item.categoryId),
+                }"
+                @click="goodsClick(item)"
+                v-for="(item, index) in goods.list"
+                :key="index"
+              >
+                <!-- <div class="sell-out flex flex-xy-cnter">
+                  <svg t="1724210152457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6417" width="64" height="64"><path d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z" fill="#ffffff" p-id="6418"></path><path d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z" fill="#ffffff" p-id="6419"></path><path d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z" fill="#ffffff" p-id="6420"></path><path d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z" fill="#ffffff" p-id="6421"></path></svg>
+                </div> -->
+
+                <div class="flex img-box" v-if="layout.sel !== 'text'">
+                  <img class="goods-img" :src="item.coverImg" alt="" />
+                  <template v-if="layout.sel === 'img-and-text'">
+                    <div class="sell-out-svg" v-if="isSellOut(item)">
+                      <svg
+                        t="1724234807994"
+                        class="icon"
+                        viewBox="0 0 1024 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="4356"
+                        width="64"
+                        height="64"
+                      >
+                        <path
+                          d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                          fill="#ffffff"
+                          p-id="4357"
+                        ></path>
+                        <path
+                          d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                          fill="#ffffff"
+                          p-id="4358"
+                        ></path>
+                        <path
+                          d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                          fill="#ffffff"
+                          p-id="4359"
+                        ></path>
+                        <path
+                          d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                          fill="#ffffff"
+                          p-id="4360"
+                        ></path>
+                      </svg>
+                    </div>
+                  </template>
+                </div>
+                <div class="typeEnum">
+                  <span>{{ item | returntypeName }}</span>
+                </div>
+                <div class="info">
+                  <div class="name">{{ item.name }}</div>
+                  <div>
+                    <template v-if="layout.sel === 'text'">
+                      <div class="text-sell-out flex">
+                        <svg
+                          v-if="isSellOut(item)"
+                          t="1724236049267"
+                          class="icon"
+                          viewBox="0 0 1024 1024"
+                          version="1.1"
+                          xmlns="http://www.w3.org/2000/svg"
+                          p-id="4911"
+                          width="64"
+                          height="64"
+                        >
+                          <path
+                            d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                            fill="#c8c8c8"
+                            p-id="4912"
+                          ></path>
+                          <path
+                            d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                            fill="#c8c8c8"
+                            p-id="4913"
+                          ></path>
+                          <path
+                            d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                            fill="#c8c8c8"
+                            p-id="4914"
+                          ></path>
+                          <path
+                            d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                            fill="#c8c8c8"
+                            p-id="4915"
+                          ></path>
+                        </svg>
+                      </div>
+                    </template>
+                    <div class="stockNumber"></div>
+                    <div class="">￥{{ item.lowPrice }}</div>
+                    <template v-if="layout.sel === 'default'">
+                      <div class="flex" v-if="isSellOut(item)">
+                        <div class="timeSale">售罄</div>
+                      </div>
+                    </template>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </template>
+
+          <template v-else>
+            <div class="cashier_box goods_classify_list">
+              <div class="cashier_left">
+                <!-- <div class="title">选择优惠</div> -->
+                <div class="detail_box">
+                  <div class="usercard">
+                    <span
+                      class="el-avatar el-avatar--square"
+                      style="height: 50px; width: 50px; line-height: 50px"
+                      ><img v-if="vipUser.id" :src="vipUser.headImg"
+                    /></span>
+                    <div class="info">
+                      <div class="nickname">
+                        <span class="txt">{{
+                          vipUser.id ? vipUser.nickName : "服务员下单"
+                        }}</span>
+                      </div>
+                      <div class="other_info">
+                        <div class="item">余额：{{ vipUser.amount | to2 }}</div>
+                        <div class="item">积分：{{ vipUser.totalScore }}</div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- <div class="forms">
+                    <el-form
+                      ref="form"
+                      :model="createOrder.form"
+                      label-width="60px"
+                    >
+                      <el-form-item label="优惠券">
+                        <el-select
+                          style="margin-right: 10px"
+                          v-model="createOrder.quan.sel"
+                          placeholder="选择优惠券"
+                        >
+                        </el-select>
+                        <el-button size="medium " type="text">
+                          查看不可用券
+                        </el-button>
+                      </el-form-item>
+                    </el-form>
+                  </div> -->
+                </div>
+                <div class="btn_group">
+                  <el-button size="medium" @click="disCountShow">
+                    整单打折/减免
+                  </el-button>
+                  <!-- <el-button size="medium "> 免单 </el-button> -->
+                </div>
+
+                <pay-type
+                  ref="refPayType"
+                  v-model="order.payType"
+                  @itemClick="payTypeItemClick"
+                >
+                </pay-type>
+                <div style="margin-top: 20px">
+                  <el-button type="success" size="medium" @click="payOrder">
+                    <span>立即支付</span>
+                  </el-button>
+                </div>
+                <!-- <div class="flex row-right">
+                  <el-button size="medium" type="success" @click="payOrder"
+                    >确认支付</el-button
+                  >
+                </div> -->
+                <!-- <div class="title">选择支付方式</div>
+                <div class="btn_group">
+                  <div class="price_select">
+                    <div class="pay_btns">
+                      <el-button size="medium" type="success">
+                        微信支付/支付宝
+                      </el-button>
+                      <el-button size="medium"> 余额支付 </el-button>
+                      <el-button size="medium"> 现金支付 </el-button>
+                      <el-button size="medium"> 挂账 </el-button>
+                    </div>
+                  </div>
+                </div> -->
+              </div>
+              <div class="cashier_left cashier_right">
+                <div class="title">账单明细</div>
+                <div class="detail_form">
+                  <!---->
+                  <div class="detail_form_item">
+                    <div class="left">会员优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">门店优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">满减优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">优惠券</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">整单改价</div>
+                    <div class="right">
+                      -￥{{
+                        ((1 - createOrder.discount) * createOrder.data.amount)
+                          | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item" v-if="createOrder.data.packFee">
+                    <div class="left">打包费</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.packFee || "0.00" }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">桌位费/附加费</div>
+                    <div class="right">￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">总价</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.amount | to2 }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">抹零</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">应付金额</div>
+                    <div class="right redfont">
+                      ￥{{
+                        (createOrder.data.amount * createOrder.discount) | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="line"></div>
+                </div>
+              </div>
+            </div>
+          </template>
+        </div>
+      </div>
+
+      <!-- <slot name="footer">
+        <div style="display: flex; justify-content: flex-end">
+          <el-button style="margin-right: 20px" @click="haocaiCancel">取消</el-button>
+          <el-button type="primary" @click="haocaiConfirm">确定</el-button>
+        </div>
+      </slot> -->
+    </el-dialog>
+
+    <!-- 选择规格 -->
+    <el-dialog
+      width="410px"
+      :title="selGoods.title"
+      :visible.sync="selGoods.show"
+      @close="onSelGoodsSkuClose"
+    >
+      <div class="tag-group">
+        <div
+          class="tag-item"
+          v-for="(item, index) in selGoods.skuList"
+          :key="index"
+        >
+          <div class="tag-name">
+            {{ item.name }}
+            <span v-if="item.values.length >= 2"
+              >({{ item.values.length }}选1)</span
+            >
+          </div>
+          <div>
+            <span
+              style="margin: 0 10px 10px 0"
+              v-for="(val, valIndex) in item.values"
+              :key="valIndex"
+            >
+              <el-button
+                plain
+                :disabled="val.disabled"
+                @click="changeTagSel(index, val)"
+                :type="val.name === item.sel ? 'success' : ''"
+              >
+                {{ val.name }}
+              </el-button>
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer">
+        <div class="flex row-between">
+          <div>
+            <div class="price">￥{{ skuGoods.data.salePrice | to2 }}</div>
+            <div class="sku-group-text">
+              <span> {{ skuText }}</span>
+              <span>库存：{{ skuGoods.data.stockNumber || 0 }}</span>
+            </div>
+          </div>
+          <div class="flex">
+            <i class="icon-remove" @click="skuNumberReduce"></i>
+            <div style="width: 40px" class="number-box">
+              <el-input
+                :min="skuGoods.data.suit"
+                type="number"
+                v-model="skuGoods.number"
+                placeholder="0"
+              ></el-input>
+            </div>
+            <!-- <i class="el-icon-remove"></i> -->
+            <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
+          </div>
+        </div>
+        <div class="flex" style="margin-top: 14px">
+          <button
+            class="my-btn disabled flex-1"
+            v-if="!skuGoods.data.isGrounding"
+            disabled
+          >
+            已下架
+          </button>
+          <template v-else>
+            <button
+              class="my-btn disabled flex-1"
+              v-if="skuGoods.data.stockNumber <= 0"
+              disabled
+            >
+              库存不足
+            </button>
+            <button
+              class="my-btn success flex-1"
+              v-else
+              :disabled="CanConfirm"
+              @click="chooseSkuConfirm"
+            >
+              确定
+            </button>
+          </template>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 数字键盘 -->
+    <el-dialog width="410px" title="数量" :visible.sync="keyborad.show">
+      <div class="simple-Keyboard-number">
+        <div class="carts">
+          <div class="title font-bold">
+            <span class="color-000">数量</span>
+            <i class="el-icon-close" @click="changeKeyboradShow(false)"></i>
+          </div>
+          <div class="box_status">{{ keyborad.number }}</div>
+          <div class="number_list_box">
+            <div class="yd-keyboard">
+              <div class="mini-number-box1">
+                <div class="mini-number">
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('1')">1</div>
+                    <div class="key" @click="keyboradAdd('2')">2</div>
+                    <div class="key" @click="keyboradAdd('3')">3</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('4')">4</div>
+                    <div class="key" @click="keyboradAdd('5')">5</div>
+                    <div class="key" @click="keyboradAdd('6')">6</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('7')">7</div>
+                    <div class="key" @click="keyboradAdd('8')">8</div>
+                    <div class="key" @click="keyboradAdd('9')">9</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key"></div>
+                    <div class="key" @click="keyboradAdd('0')">0</div>
+                    <div
+                      class="key"
+                      style="font-size: 31px"
+                      @click="keyboradReduce"
+                    >
+                      <svg
+                        t="1723453480343"
+                        class="icon"
+                        viewBox="0 0 1664 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="1467"
+                        width="32"
+                        height="32"
+                      >
+                        <path
+                          d="M1526.08 1.6H459.84L41.28 416c-53.76 53.248-53.76 139.52 0 192.64l418.624 414.592v-0.064h1066.176a136.96 136.96 0 0 0 137.6-136.256V137.792a136.96 136.96 0 0 0-137.6-136.192z m-331.392 631.168c26.816 26.624 26.816 69.76 0 96.384-26.88 26.56-70.4 26.56-97.28 0l-121.28-120.128-123.328 122.112a69.76 69.76 0 0 1-97.92 0 68.096 68.096 0 0 1 0-96.96L878.208 512l-121.28-120.064a67.648 67.648 0 0 1 0-96.32c26.88-26.624 70.4-26.624 97.28 0l121.216 120.064 122.24-120.96a69.696 69.696 0 0 1 97.92 0 68.032 68.032 0 0 1 0 96.96l-122.24 120.96 121.344 120.064z"
+                          fill="#333333"
+                          p-id="1468"
+                        ></path>
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div>
+            <div class="submit" @click="keyboradConfirm">确认</div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 取单 -->
+    <el-dialog width="550px" title="取单" :visible.sync="prveOrder.show">
+      <div class="take_order_list">
+        <div class="tol_left_list">
+          <div
+            class="tolll_item"
+            :class="{ active: prveOrder.sel === index }"
+            @click="changePrveOrder(index)"
+            v-for="(item, index) in prveOrder.list"
+            :key="index"
+          >
+            <div class="tollli_index">{{ index + 1 }}</div>
+            <div class="tollli_price">￥{{ item.totalAmount }}</div>
+            <div class="tollli_time_and_num">
+              <div class="tollli_time">{{ item.created_at || "" }}</div>
+              <div class="tollli_num">({{ item.totalNumber }}件)</div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="tol_right_list"
+          v-if="prveOrder.list.length && prveOrder.sel >= 0"
+        >
+          <div
+            class="tolrl_item"
+            v-for="(item, index) in prveOrder.selCart"
+            :key="index"
+          >
+            <div class="tolrli_img">
+              <img :src="item.coverImg" alt="" />
+            </div>
+            <div class="tolrli_right">
+              <div class="tr_top">
+                <div class="trt_name">{{ item.name }}</div>
+                <div class="trt_num">x{{ item.number }}</div>
+                <div class="trt_price">￥{{ item.totalAmount || 0 }}</div>
+              </div>
+              <div class="tr_bottom">
+                <span class="trb_item">
+                  {{ item.specSnap | formatSpecSnap }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" class="flex row-center">
+        <div style="margin-right: 20px">
+          <el-button
+            size="medium"
+            type="success"
+            @click="confirmChoosePrveOrder"
+            >确认此单</el-button
+          >
+        </div>
+        <el-button size="medium" @click="delPrveOrder">删除此单</el-button>
+      </div>
+    </el-dialog>
+
+    <choose-user
+      ref="refChooseUser"
+      @chooseUser="chooseUserConfirm"
+    ></choose-user>
+    <choose-table
+      ref="refChooseTable"
+      @confirm="chooseTableConfirm"
+    ></choose-table>
+    <order-note ref="refOrderNote" @confirm="refOrderNoteConfirm"></order-note>
+
+    <!-- 支付时的键盘弹窗 -->
+    <money-keyboard ref="refMoneyKeyboard" :title="moneyKeyboard.title">
+    </money-keyboard>
+    <!-- 扫码支付 -->
+    <scan-pay
+      ref="refWxScanCode"
+      defaultTips="请使用扫码枪扫描微信/支付宝收款码"
+      title="扫码支付"
+      :openSwitch="false"
+      :price="createOrder.data.amount * createOrder.discount"
+      @confirm="scanPayConfirm"
+    ></scan-pay>
+    <!-- 储值卡支付 -->
+    <scan-pay
+      ref="refScanCode"
+      title="扫码支付"
+      defaultTips="注意:扫码支付请保证输入框获得焦点"
+      :openSwitch="false"
+      :price="createOrder.data.amount * createOrder.discount"
+      @confirm="scanPayConfirm"
+    ></scan-pay>
+    <!-- 打折 -->
+    <money-discount ref="refDiscount" @confirm="ChangeDiscount">
+    </money-discount>
+    <!-- 选择人数 -->
+    <choose-diners-number
+      ref="refChooseDinersNumber"
+      @confirm="chooseDinersNumberConfirm"
+    ></choose-diners-number>
+  </div>
+</template>
+
+<script>
+import _ from "lodash";
+import chooseUser from "./choose-user.vue";
+import payType from "./pay-type.vue";
+import chooseTable from "./table-diancan-components/choose-table-master.vue";
+import cartItem from "./table-diancan-components/cart-item.vue";
+import scanPay from "./table-diancan-components/scan-pay.vue";
+import moneyDiscount from "./table-diancan-components/discount.vue";
+import orderNote from "./table-diancan-components/note.vue";
+import chooseDinersNumber from "./table-diancan-components/choose-diners-number.vue";
+import moneyKeyboard from "./money-keyboard.vue";
+import dayjs from "dayjs";
+import {
+  getGoodsLists,
+  addCart,
+  getCart,
+  $clearCart,
+  $removeCart,
+  $updateCart,
+  $allPack,
+  $createOrder,
+  $getMasterId,
+  $cacheOrder,
+  $getCacheOrder,
+  $delOrder,
+  $setUser,
+  $payOrder,
+  $choseTable,
+  $choseCount
+} from "@/api/table";
+import { tbShopCategoryGet } from "@/api/shop";
+import {
+  isCanBuy,
+  arrayContainsAll,
+  generateCombinations,
+  returnReverseVal,
+} from "./util.js";
+import $status from "../status.js";
+import { tbShopTableGet } from "@/api/table";
+export default {
+  components: {
+    chooseUser,
+    chooseTable,
+    payType,
+    orderNote,
+    moneyKeyboard,
+    scanPay,
+    moneyDiscount,
+    cartItem,
+    chooseDinersNumber,
+  },
+  data() {
+    return {
+      //台桌列表
+      tableList: [],
+      status: $status,
+      //就餐人数
+      perpole: "",
+      //整体点餐页面loading
+      loading: false,
+      //台桌点餐页面打开时带来的参数 isAddGoods 加菜    isPayOrder结账
+      key: "",
+      //是否是从挂单里取出来的订单
+      isPrverOrder: false,
+      //是否全屏
+      isFullScreen: false,
+      moneyKeyboard: {
+        show: true,
+        title: "支付",
+      },
+      //true后付款false先付款
+      postPay: true,
+      //是否打印
+      isPrint: false,
+      // 备注
+      note: {
+        content: "",
+        isShow: false,
+      },
+      isCreateOrder: false,
+      $goodsData: "",
+      search: {
+        list: [],
+      },
+      skuGoods: {
+        number: 1,
+        data: {
+          stockNumber: 0,
+          salePrice: 0,
+        },
+      },
+      selGoods: {
+        isEdit: false,
+        data: {},
+        skuList: [],
+        skuMap: [],
+        title: "",
+        show: false,
+      },
+      dayjs,
+      dialogshow: false, //弹框显示
+      dialogtitle: "", //文字显示
+      informationdialogshow: false,
+      informationdialogshowedit: false,
+      goods: {
+        list: [],
+        query: {
+          productId: "",
+          categoryId: "",
+          page: 1,
+          size: 300,
+        },
+        loading: false,
+        total: 0,
+      },
+      order: {
+        orderId: "",
+        payType: "",
+        masterId: "",
+        allPack: false,
+        btns: [
+          {
+            text: "规格",
+            disabled: false,
+          },
+          {
+            text: "赠送",
+            disabled: false,
+          },
+          {
+            text: "打包",
+            disabled: false,
+          },
+          {
+            text: "删除",
+            disabled: false,
+          },
+        ],
+        list: [],
+        gift: {
+          list: [],
+          selIndex: -1,
+        },
+        //已下单菜品
+        old: {
+          list: [],
+          selIndex: -1,
+        },
+        query: {
+          page: 1,
+          size: 20,
+        },
+        number: 1,
+        cacheNumber: 1,
+        selIndex: -1,
+        total: 0,
+      },
+      table: "",
+      category: {
+        list: [],
+        showAll: false,
+      },
+      keyborad: {
+        show: false,
+        number: "0",
+      },
+      prveOrder: {
+        list: [],
+        show: false,
+        sel: 0,
+        selCart: [],
+      },
+      layout: {
+        list: [
+          { label: "经典布局", value: "default" },
+          { label: "图文显示", value: "img-and-text" },
+          { label: "文字显示", value: "text" },
+        ],
+        sel: "img-and-text",
+      },
+      // 选择用户
+      vipUser: {
+        id: "",
+      },
+      //餐桌号
+      masterId: "",
+      canUpdate: true,
+      //下单
+      createOrder: {
+        code: "",
+        status: "",
+        discount: 1,
+        form: {},
+        data: {
+          amount: 0,
+        },
+        quan: {
+          list: [],
+          sel: "",
+        },
+      },
+      timer: null,
+    };
+  },
+  computed: {
+    title() {
+      return this.table ? "代客下单" + `(${this.table.name})` : "代客下单";
+    },
+    allGiftMoney() {
+      const price = this.order.list
+        .filter((v) => v.isGift === "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return price;
+    },
+    giftLen() {
+      return this.order.list.filter((v) => v.isGift === "true").length;
+    },
+    isSku() {
+      if (this.order.selIndex < 0 || this.order.list.length <= 0) {
+        return false;
+      }
+      return this.order.list[this.order.selIndex].specSnap;
+    },
+    returnGiftText() {
+      if (this.order.selIndex < 0) {
+        return "赠送";
+      }
+      return this.order.list[this.order.selIndex].isGift === "true"
+        ? "取消赠送"
+        : "赠送";
+    },
+    returnPackText() {
+      if (this.order.selIndex < 0) {
+        return "打包";
+      }
+      return this.order.list[this.order.selIndex].isPack === "true"
+        ? "取消打包"
+        : "打包";
+    },
+    skuText() {
+      const result = this.selGoods.skuList.reduce((a, b) => {
+        return a + (b.sel ? b.sel + "+" : "");
+      }, "");
+      return result.substring(0, result.length - 1);
+    },
+    allPrice() {
+      const oldPrice = this.order.old.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      const price = this.order.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return (oldPrice + price).toFixed(2);
+    },
+    allNumber() {
+      const oldNumber = this.order.old.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      const cartNumber = this.order.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      return oldNumber + cartNumber;
+    },
+    selGoodsHide() {
+      this.selGoods.show = false;
+    },
+    CanConfirm() {
+      if (!this.selGoods.skuList.length) {
+        return true;
+      }
+      return (
+        this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+        this.selGoods.skuList.length
+      );
+    },
+  },
+  filters: {
+    formatSpecSnap(str) {
+      if (str === "" || str === null || str === undefined) {
+        return "";
+      }
+      return str.replaceAll(",", " / ");
+    },
+    to2(n) {
+      if (n === undefined) {
+        return "";
+      }
+      return Number(n).toFixed(2);
+    },
+    returntypeName(item) {
+      return item.typeEnum === "sku" ? "多规格" : "单规格";
+    },
+  },
+  watch: {
+    perpole(newval) {
+      if(newval){
+        $choseCount({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        num: newval,
+      });
+      }
+    },
+    table(oldval, newval) {
+      if (oldval && newval) {
+        console.log(oldval, newval);
+        $choseTable({
+          orderId: 4462,
+          oldTableId: oldval.tableId,
+          newTableId: newval.tableId,
+        });
+      }
+    },
+    masterId: function (val) {
+      console.log(val);
+    },
+    isCreateOrder: function (val) {
+      if (!val) {
+        this.createOrder.discount = 1;
+      }
+    },
+    "vipUser.id": async function (val) {
+      let masterId = this.order.masterId;
+      if (!masterId) {
+        const res = await this.getMasterId();
+        masterId = res.masterId;
+      }
+      this.masterId = masterId;
+      $setUser({
+        tableId: this.table.tableId,
+        masterId: this.masterId,
+        vipUserId: val,
+        type: val === "" ? 1 : 0,
+      });
+    },
+    "prveOrder.list.length": function (val) {
+      if (val !== 0) {
+        this.prveOrder.selCart =
+          this.prveOrder.list[this.prveOrder.sel].carList;
+      } else {
+        this.prveOrder.selCart = [];
+      }
+      console.log(this.prveOrder.selCart);
+    },
+    "prveOrder.sel": function (val) {
+      this.prveOrder.selCart =
+        this.prveOrder.list.length !== 0
+          ? this.prveOrder.list[val].carList
+          : [];
+      console.log(this.prveOrder.selCart);
+      if (val < 0) {
+        this.prveOrde.show = false;
+      }
+    },
+    // 本地缓存版本
+    // "prveOrder.list.length": function (val) {
+    //   console.log(val);
+    //   if (val !== 0) {
+    //     this.prveOrder.selCart = this.prveOrder.list[this.prveOrder.sel].cart;
+    //     localStorage.setItem(
+    //       "orderList",
+    //       JSON.stringify(
+    //         this.prveOrder.list.map((v) => {
+    //           return { ...v, cart: JSON.stringify(v.cart) };
+    //         })
+    //       )
+    //     );
+    //   } else {
+    //     this.prveOrder.selCart = [];
+    //     localStorage.removeItem("orderList");
+    //   }
+    //   console.log(this.prveOrder.selCart);
+    // },
+    // "prveOrder.sel": function (val) {
+    //   this.prveOrder.selCart =
+    //     this.prveOrder.list.length !== 0 ? this.prveOrder.list[val].cart : [];
+    //   console.log(this.prveOrder.selCart);
+    // },
+    "order.allPack": function (val) {
+      console.log(val);
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      $allPack({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        state: val ? 1 : 0,
+      }).then((res) => {
+        this.order.list.map((v) => {
+          v.isPack = `${val}`;
+        });
+      });
+    },
+    "order.selIndex": function (val, oldval) {
+      console.log(val);
+      this.order.old.selIndex = -1;
+      if (val === -1) {
+        // return (this.order.number = 1);
+        this.order.cacheNumber = 1;
+      } else {
+        this.order.cacheNumber = this.order.list[val].number;
+        // this.order.number = this.order.list[val].number;
+      }
+    },
+    "order.list.length": function (val) {
+      if (val <= 0) {
+        this.order.selIndex = -1;
+      }
+      if (this.order.selIndex >= 0) {
+        this.order.cacheNumber = this.order.list[this.order.selIndex].number;
+        // this.order.number = this.order.list[this.order.selIndex].number;
+      }
+    },
+    "order.number": _.debounce(function (newval) {
+      if (this.order.list.length <= 0 || this.order.selIndex < 0) {
+        return;
+      }
+      this.createOrderClose();
+
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      const oldGoods = this.order.old.list.find((v) => {
+        return v.productId === productId && v.skuId === skuId;
+      });
+      $updateCart({
+        cartId: item.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: this.order.number + (oldGoods ? oldGoods.number : 0), // 0会删除此商品
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+          number: this.order.number,
+        });
+      });
+      return;
+      this.updateOrder({
+        num: newval, // 0会删除此商品
+      });
+    }, 30),
+    "goods.query.productId": function (newval) {
+      if (!this.$goodsData) {
+        return;
+      }
+      if (newval == "") {
+        this.goods.list = this.$goodsData || [];
+      } else {
+        const newarr = this.$goodsData.filter((v) =>
+          v.name.includes(newval.trim())
+        );
+        this.search.list = newarr;
+        this.goods.list = newarr.length ? newarr : this.$goodsData;
+      }
+    },
+  },
+  mounted() {
+    // this.getGoods();
+    // this.getCategory();
+    // this.refToggle('refScanCode',true)
+    // this.refToggle("refDiscount", true);
+  },
+  methods: {
+    // 台桌列表
+    async getTable() {
+      try {
+        const { content, total } = await tbShopTableGet({
+          shopId: localStorage.getItem("shopId"),
+        });
+        console.log(content);
+        this.tableList = content;
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    changeTable(item) {
+      this.table = item;
+    },
+    chooseDinersNumberConfirm(e) {
+      this.perpole = e;
+    },
+    //扫码支付弹窗确认
+    scanPayConfirm(code) {
+      this.createOrder.code = code;
+      if (!code) {
+        return this.$message.error("请输入或扫付款码");
+      }
+      this.pays();
+    },
+    payTypeItemClick(item) {
+      console.log(item);
+      console.log(this.vipUser.id);
+      if (item.payType == "vipPay") {
+        return this.refChooseUserOpen();
+      }
+      if (item.payType == "deposit") {
+        //储值卡支付
+        return this.refToggle("refScanCode", true);
+      }
+      if (item.payType == "scanCode") {
+        //扫码支付
+        return this.refToggle("refWxScanCode", true);
+      }
+    },
+    ChangeDiscount(discount) {
+      this.createOrder.discount = discount;
+    },
+    disCountShow() {
+      const { amount } = this.createOrder.data;
+      this.refToggle("refDiscount", true, {
+        amount,
+        discount: this.createOrder.discount * 100,
+      });
+    },
+    refToggle(key, isShow, data) {
+      if (!this.$refs[key]) {
+        return;
+      }
+      isShow ? this.$refs[key].open(data) : this.$refs[key].close(data);
+    },
+    //购物车商品输入框数量输入
+    cartGoodsNumberInput(newval, index) {
+      const item = this.order.list[index];
+      console.log(item);
+      this.order.cacheNumber = newval;
+      item.number = newval;
+    },
+    //购物车商品输入框数量改变
+    cartGoodsNumberChange(newval, index) {
+      const item = this.order.list[index];
+      newval = `${newval}`.split(".")[0] * 1;
+      console.log(newval);
+      this.order.cacheNumber = newval;
+      this.order.number = newval;
+    },
+    //判读单规格商品是否售尽
+    isSellOut(item) {
+      return (
+        item.isPauseSale ||
+        (item.typeEnum !== "sku" && item.specList[0].stockNumber <= 0)
+      );
+    },
+    toggleFullScreen() {
+      if (!document.fullscreenElement) {
+        this.enterFullScreen();
+      } else {
+        this.exitFullScreen();
+      }
+    },
+    enterFullScreen() {
+      let element = document.documentElement;
+      if (element.requestFullscreen) {
+        element.requestFullscreen();
+      } else if (element.mozRequestFullScreen) {
+        /* Firefox */
+        element.mozRequestFullScreen();
+      } else if (element.webkitRequestFullscreen) {
+        /* Chrome, Safari & Opera */
+        element.webkitRequestFullscreen();
+      } else if (element.msRequestFullscreen) {
+        /* IE/Edge */
+        element.msRequestFullscreen();
+      }
+      this.isFullScreen = true;
+    },
+    exitFullScreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        /* Firefox */
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        /* Chrome, Safari and Opera */
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        /* IE/Edge */
+        document.msExitFullscreen();
+      }
+      this.isFullScreen = false;
+    },
+    //打开输入钱的键盘
+    openMoneyKeyboard() {
+      this.$refs.refMoneyKeyboard.open();
+    },
+    changePostPay(val) {
+      this.postPay = val;
+    },
+    //改变是否打印
+    changeIsPrint(e) {
+      console.log(e);
+      this.isPrint = e;
+    },
+    refOrderNoteConfirm(note) {
+      this.note.content = note;
+    },
+    refNoteShow() {
+      this.$refs.refOrderNote.open(this.note.content);
+    },
+    // 支付订单前的处理
+    async payOrder() {
+      if (this.order.payType == "vipPay" && !this.vipUser.id) {
+        return this.refChooseUserOpen();
+      }
+      if (this.order.payType == "scanCode") {
+        return this.refToggle("refWxScanCode", true);
+      }
+      if (this.order.payType == "deposit") {
+        return this.refToggle("refScanCode", true);
+      }
+      console.log({
+        orderId: this.createOrder.data.id,
+        payType: this.order.payType,
+      });
+      this.pays();
+    },
+    // 支付订单
+    async pays() {
+      this.loading = true;
+      try {
+        const res = await $payOrder({
+          tableId: this.table.tableId,
+          masterId: this.masterId,
+          orderId: this.createOrder.data.id,
+          payType: this.order.payType,
+          vipUserId: this.vipUser.id,
+          discount: this.createOrder.discount,
+          code: this.createOrder.code,
+        });
+        this.loading = false;
+        this.payOrderSuccess();
+      } catch (error) {
+        this.loading = false;
+      }
+    },
+    payOrderSuccess() {
+      this.$notify({
+        title: "支付成功",
+        type: "success",
+      });
+      this.reset();
+      this.close();
+    },
+    chooseTableConfirm(item) {
+      console.log(item);
+      this.table = item;
+    },
+    chooseTableOpen() {
+      this.$refs.refChooseTable.open();
+    },
+    chooseUserConfirm(user) {
+      console.log(user);
+      if (user) {
+        this.vipUser = user;
+      } else {
+        this.vipUser = { id: "" };
+      }
+    },
+    refChooseUserOpen() {
+      this.$refs.refChooseUser.open();
+    },
+    createOrderClose() {
+      this.isCreateOrder = false;
+    },
+    //生成订单
+    toCreateOrderDebounce(isNowPay) {
+      if (
+        this.createOrder.status != "" &&
+        this.createOrder.status != "success"
+      ) {
+        return;
+      }
+      this.createOrder.status = "loading";
+      this.toCreateOrder(isNowPay);
+    },
+    async toCreateOrder(isNowPay = false) {
+      console.log(this.order);
+      console.log(this.order.orderId);
+      const res = await $createOrder({
+        masterId: this.order.masterId || this.masterId,
+        vipUserId: this.vipUser.id,
+        tableId: this.table.tableId,
+        note: this.note.content,
+        postPay: this.postPay,
+        orderld: this.order.orderId,
+      });
+      //后付款
+      console.log(this.postPay);
+      console.log(isNowPay);
+      console.log(this.postPay && isNowPay);
+      this.createOrder.status = "success";
+      if (this.postPay && !isNowPay) {
+        this.$notify({
+          title: "下单成功",
+          type: "success",
+        });
+        return this.close();
+      }
+      this.createOrder.data = res;
+      if (!this.isPrverOrder) {
+        const { masterId } = await this.getMasterId();
+        this.masterId = masterId;
+      }
+      this.isCreateOrder = true;
+    },
+
+    // 获取取餐号
+    getMasterId() {
+      return $getMasterId({
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+      });
+    },
+    onSelGoodsSkuClose() {
+      this.selGoods.isEdit = false;
+    },
+    changePrveOrder(index) {
+      this.prveOrder.sel = index;
+    },
+    //更新购物车商品数据
+    updateOrder(par = {}) {
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      addCart({
+        masterId: this.masterId,
+        vipUserId: this.vipUser.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: number,
+        isPack: isPack === "true" ? true : false,
+        isGift: isGift === "true" ? true : false,
+        ...par,
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+        });
+      });
+    },
+    keyboradAdd(n) {
+      if (Number(this.keyborad.number) === 0) {
+        return (this.keyborad.number = n);
+      }
+      this.keyborad.number += n;
+    },
+    keyboradReduce() {
+      if (this.keyborad.number.length <= 1) {
+        return (this.keyborad.number = "0");
+      }
+      this.keyborad.number = this.keyborad.number.substring(
+        0,
+        this.keyborad.number.length - 1
+      );
+    },
+    keyboradConfirm() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      // 如果设置为0,商品数量减1
+      if (this.keyborad.number == 0) {
+        this.changeOrderNumber(this.order.selIndex, true);
+      } else {
+        orderGoods.number = Number(this.keyborad.number);
+      }
+      this.order.cacheNumber = orderGoods.number;
+      this.order.number = orderGoods.number;
+      this.changeKeyboradShow(false);
+    },
+    changeKeyboradShow(show) {
+      if (show) {
+        this.keyborad.number = `${this.order.list[this.order.selIndex].number}`;
+      }
+      this.keyborad.show = show;
+    },
+    // 获取本地缓存挂单
+    // getPrveCart() {
+    //   const arr = localStorage.getItem("orderList")
+    //     ? JSON.parse(localStorage.getItem("orderList"))
+    //     : [];
+    //   this.prveOrder.list = arr.map((v) => {
+    //     return { ...v, cart: JSON.parse(v.cart) };
+    //   });
+    // },
+
+    //右侧控制按钮点击事件
+    orderBtnsClick(key) {
+      const orderGoods = this.order.list[this.order.selIndex];
+      this.createOrderClose();
+      if (key === "sku") {
+        this.selGoods.title = orderGoods.name;
+        this.selGoods.isEdit = true;
+        const item = this.goods.list.find((v) => v.id == orderGoods.productId);
+        console.log(item);
+        return this.showSelGoods({ ...item, ...orderGoods });
+      }
+      if (key === "gift") {
+        const isGift = orderGoods.isGift === "true" ? "flase" : "true";
+        this.updateOrder({ isGift: isGift === "true" ? true : false });
+        return;
+      }
+      if (key === "pack") {
+        const isPack = orderGoods.isPack === "true" ? "flase" : "true";
+        this.updateOrder({ isPack: isPack === "true" ? true : false });
+        return;
+      }
+      if (key === "del") {
+        return this.removeCart();
+      }
+      if (key === "save") {
+        this.prveOrder.list.push({
+          cart: this.order.list,
+          id: Date.now(),
+          created_at: `${new Date().getHours()}:${new Date().getMinutes()}`,
+          goods_num: this.allNumber,
+          order_total: this.allPrice,
+        });
+        localStorage.setItem(
+          "orderList",
+          JSON.stringify(
+            this.prveOrder.list.map((v) => {
+              return { ...v, cart: JSON.stringify(v.cart) };
+            })
+          )
+        );
+        this.order.list = [];
+        this.order.selIndex = -1;
+        return;
+      }
+      if (key === "getOrder") {
+        this.prveOrder.show = true;
+        this.getPrveCart();
+        return;
+      }
+    },
+    //选择挂单确认
+    async confirmChoosePrveOrder() {
+      if (this.prveOrder.list.length <= 0) {
+        return;
+      }
+      // const { sel } = this.prveOrder;
+      // const order=this.prveOrder.list[sel];
+      // const res=await $cacheOrder({
+      //   orderId:order.orderId,
+      //   isPending:false,
+      //   tableId:this.table.tableId,
+      //   masterId:order.carList[0].masterId
+      // })
+
+      const { masterId, tableId, userId, remark, id } = await $cacheOrder({
+        orderId: this.prveOrder.list[this.prveOrder.sel].orderId,
+        isPending: false,
+      });
+      this.order.orderId = id;
+      console.log(this.order.orderId);
+
+      this.masterId = masterId;
+      this.isPrverOrder = true;
+      console.log(masterId);
+      const { records } = await getCart({
+        masterId,
+        tableId,
+        vipUserId: userId != "null" ? userId : "",
+      });
+      console.log(records);
+      this.order.list = [];
+      this.order.masterId = masterId;
+      this.order.list = records;
+      this.prveOrder.show = false;
+      this.note.content = remark || "";
+      // this.delPrveOrder(false);
+    },
+    //删除挂单
+    async delPrveOrder(isRequest = true) {
+      const { sel } = this.prveOrder;
+      if (this.prveOrder.list <= 0 || sel < 0) {
+        return;
+      }
+      const order = this.prveOrder.list[sel];
+      const orderMasterId = order.carList[0].masterId;
+      //当前订单是否是当前挂单
+      const nowOrderIsPrverOrder =
+        this.isPrverOrder && orderMasterId === this.masterId;
+      if (nowOrderIsPrverOrder) {
+        const res = await this.$confirm(
+          "您正在删除当前购物车订单,是否删除?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).catch((err) => {
+          console.log(err);
+        });
+        if (!res) {
+          return;
+        }
+      }
+      if (isRequest) {
+        const res = await $delOrder({
+          orderId: order.orderId,
+        });
+        if (nowOrderIsPrverOrder) {
+          this.note.content = "";
+          this.order.list = [];
+        }
+        this.$notify({
+          message: "删除成功",
+          type: "success",
+        });
+      }
+      this.prveOrder.list.splice(sel, 1);
+      this.prveOrder.sel = sel - 1 <= 0 ? 0 : sel - 1;
+    },
+    //打开挂起订单
+    async cacheOrderShow() {
+      this.prveOrder.show = true;
+      const res = await this.getCacheOrder(true);
+      this.prveOrder.list = res;
+      if (this.prveOrder.list.length && this.prveOrder.sel !== -1) {
+        const item = this.prveOrder.list[this.prveOrder.sel];
+        console.log(item);
+        if (item) {
+          this.prveOrder.selCart = item.carList;
+        }
+      }
+    },
+    //获取挂起订单
+    async getCacheOrder(isReturn = false) {
+      this.createOrderClose();
+      if (isReturn) {
+        return $getCacheOrder({ tableId: this.table.tableId });
+      }
+      const res = await $getCacheOrder({ tableId: this.table.tableId });
+      this.prveOrder.list = res;
+    },
+    //存单
+    async saveOrder() {
+      this.createOrderClose();
+      const res = await $cacheOrder({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+        isPending: true,
+        note: this.note.content,
+      });
+      this.isPrverOrder = false;
+      this.order.masterId = "";
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.note.content = "";
+      this.order.orderId = "";
+      this.$nextTick(() => {
+        this.getCacheOrder();
+      });
+      const masterIdRes = await this.getMasterId();
+      this.masterId = masterIdRes.masterId;
+    },
+    // 删除购物车商品
+    removeCart() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      $removeCart({
+        cartId: orderGoods.id,
+        tableId: this.table.tableId,
+      });
+      this.order.list.splice(this.order.selIndex, 1);
+      const newval = this.order.selIndex - 1;
+      this.order.selIndex = newval <= 0 ? 0 : newval;
+
+      //  this.$message({
+      //         type: "success",
+      //         message: "清除成功!",
+      //       });
+    },
+    // 点击订单里的加减改变购物车商品数量
+    async changeOrderNumber(index, isReduce) {
+      if (index < 0) {
+        return;
+      }
+      this.order.selIndex = index;
+      console.log(index);
+      console.log(isReduce);
+      const item = this.order.list[index];
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return this.removeCart();
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      // const res= await addCart({
+      //    productId: item.productId,
+      //     skuId: item.skuId,
+      //     tableId: this.table.tableId,
+      //     num: newval, // 0会删除此商品
+      //     isPack: false, // 是否打包
+      // })
+      this.order.list[index].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    // 点击右侧控制列表上的加减改变购物车商品数量
+    changeOrderGoodsNumber(isReduce) {
+      if (this.order.selIndex < 0) {
+        return;
+      }
+      const item = this.order.list[this.order.selIndex];
+      console.log(item);
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return;
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      console.log(newval);
+
+      // this.order.list[this.order.selIndex].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    //清空购物车
+    clearCart() {
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      this.$confirm("确定要清空点餐列表吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          $clearCart({
+            masterId: this.masterId,
+            tableId: this.table.tableId,
+          }).then((res) => {
+            this.order.list = [];
+            this.order.selIndex = -1;
+            this.$message({
+              type: "success",
+              message: "清除成功!",
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    skuNumberAdd() {
+      const number = Number(this.skuGoods.number);
+      if (number > 10000) {
+        return;
+      }
+      this.skuGoods.number = number + 1;
+    },
+    skuNumberReduce() {
+      if (this.skuGoods.number - 1 <= 0) {
+        return;
+      }
+      this.skuGoods.number -= 1;
+    },
+    toggleShowAll() {
+      this.category.showAll = !this.category.showAll;
+    },
+    changeCategoryId(item) {
+      this.goods.query.categoryId = item.id;
+    },
+    async getCategory() {
+      const { content } = await tbShopCategoryGet({
+        page: 0,
+        size: 100,
+        sort: "id",
+        shopId: localStorage.getItem("shopId"),
+      });
+      this.category.list = content.reduce((prve, cur) => {
+        prve.push(cur);
+        return [...prve, ...cur.childrenList];
+      }, []);
+      this.category.list.unshift({
+        id: "",
+        name: "全部",
+      });
+    },
+    //改变购物车菜品选中
+    changeOrderSel(index) {
+      this.order.selIndex = index;
+      this.order.old.selIndex = -1;
+    },
+    //改变已下单菜品选中
+    changeOrderOldSel(index) {
+      this.order.old.selIndex = index;
+      this.order.cacheNumber = this.order.old.list[index].number;
+    },
+    chooseSkuConfirm() {
+      if (this.timer) {
+        return;
+      }
+      this.skuGoodsAdd();
+      this.timer = setTimeout(() => {
+        clearTimeout(this.timer);
+        this.timer = null;
+      }, 500);
+      console.log(this.timer);
+    },
+    async skuGoodsAdd() {
+      let name = this.selGoods.skuList.reduce((prve, cur) => {
+        return prve + cur.sel + ",";
+      }, "");
+      name = name.substring(0, name.length - 1);
+      // const item = this.selGoods.data.specList.find((v) => v.specSnap === name);
+      const item = this.selGoods.skuMap[name];
+      if (!item.isGrounding) {
+        //该商品已经下架
+        return this.$notify({
+          title: "该商品规格已经下架",
+          type: "error",
+        });
+      }
+      let res = "";
+
+      console.log(orderGoods);
+      //更改购物车订单商品规格数量
+      if (this.selGoods.isEdit) {
+        res = await $updateCart({
+          cartId: this.order.list[this.order.selIndex].id,
+          productId: this.selGoods.data.productId,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+        });
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: name,
+        });
+        this.$notify({
+          title: "更新成功",
+          type: "success",
+        });
+        this.selGoods.show = false;
+        this.order.cacheNumber = this.skuGoods.number;
+        return;
+      }
+
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      const oldOrderGoods = this.order.old.list.find((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      if (orderGoods || oldOrderGoods) {
+        //更新
+        const newNum =
+          (oldOrderGoods ? oldOrderGoods.number : 0) +
+          (orderGoods ? orderGoods.number * 1 : 0) +
+          this.skuGoods.number;
+        res = await $updateCart({
+          cartId: orderGoods ? orderGoods.id : oldOrderGoods.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: newNum, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        if (this.key && orderGoodsIndex == -1) {
+          this.orderListPush({
+            ...res,
+            specSnap: name,
+            number: this.skuGoods.number,
+          });
+        } else {
+          orderGoods.number += this.skuGoods.number;
+          this.order.selIndex = orderGoodsIndex;
+          this.order.cacheNumber = orderGoods.number;
+        }
+      } else {
+        //添加
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush({ ...res, specSnap: name });
+        // this.orderListPush({
+        //   skuId: item.id,
+        //   number: this.skuGoods.number,
+        //   specSnap: name,
+        // });
+      }
+
+      this.$notify({
+        title: orderGoods ? "更新成功" : "添加成功",
+        type: "success",
+      });
+      this.selGoods.show = false;
+    },
+    orderListPush(item) {
+      const { isPack, isGift } = item;
+      // const isPack=item.isPack==='false'?false:true
+      // const isGift=item.isGift==='false'?false:true
+      this.order.list.push({ ...item, isPack, isGift });
+      this.order.selIndex = this.order.list.length - 1;
+    },
+    //设置规格按钮的禁止状态
+    setTagDisabled() {
+      const selArr = this.selGoods.skuList.reduce((prve, cur) => {
+        if (cur.sel) {
+          prve.push(cur.sel);
+        } else {
+        }
+        return prve;
+      }, []);
+      console.log(selArr);
+      let selArrAllGroup = generateCombinations(selArr, selArr.length - 1);
+      console.log(selArrAllGroup);
+      const matchArr = [];
+      for (let key in this.selGoods.skuMap) {
+        const goods = this.selGoods.skuMap[key];
+        const keyArr = key.split(",");
+        for (let spe of selArrAllGroup) {
+          if (arrayContainsAll(keyArr, spe)) {
+            matchArr.push(goods);
+            break;
+          }
+        }
+      }
+      console.log(matchArr);
+      const skuList = this.selGoods.skuList;
+      console.log(skuList);
+      //全部规格都已下架
+      if (!matchArr.length) {
+        for (let k in skuList) {
+          for (let i in skuList[k].values) {
+            this.$set(skuList[k].values[i], "disabled", true);
+          }
+        }
+        return;
+      }
+      const includeSkuMap = matchArr.reduce((prve, cur) => {
+        const speArr = cur.specSnap.split(",");
+        for (let i of speArr) {
+          if (!prve.hasOwnProperty("i")) {
+            prve[i] = matchArr
+              .filter((v) => v.specSnap.match(i))
+              .every((v) => {
+                // return isCanBuy(v,this.selGoods.data.isStock)
+                return isCanBuy(v);
+              });
+          }
+        }
+        return prve;
+      }, {});
+      console.log(includeSkuMap);
+      for (let i in includeSkuMap) {
+        for (let k in skuList) {
+          const index = skuList[k].valueArr.findIndex((val) => val === i);
+          if (index !== -1) {
+            this.$set(skuList[k].values[index], "disabled", includeSkuMap[i]);
+          }
+        }
+      }
+    },
+    changeTagSel(index, val) {
+      this.$set(this.selGoods.skuList[index], "sel", val.name);
+      let specSnap = this.selGoods.skuList.reduce((a, b) => {
+        return a + b.sel + ",";
+      }, "");
+      specSnap = specSnap.substring(0, specSnap.length - 1);
+      for (let sku of this.selGoods.skuList) {
+        console.log(sku);
+      }
+      this.setTagDisabled();
+      const canChooseGoods = this.selGoods.skuList.every((v) => v.sel);
+      if (canChooseGoods) {
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+      }
+    },
+    onclose() {
+      this.$emit("close");
+      this.reset();
+    },
+    reset() {
+      // this.goods.list = [];
+      this.loading = false;
+      this.order.masterId = "";
+      this.order.list = [];
+      this.order.query.page = 1;
+      this.goods.total = 0;
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.order.old.list = [];
+      this.prveOrder.list = [];
+      this.prveOrder.selIndex = -1;
+      this.order.old.selIndex = -1;
+      this.isCreateOrder = false;
+      this.createOrder.status = "";
+      this.createOrder.code = "";
+      this.note.content = "";
+      this.vipUser = { id: "" };
+      this.allPack = false;
+      this.note.content = "";
+      this.isPrverOrder = false;
+      this.createOrder.discount = 1;
+      this.order.cacheNumber = 1;
+      this.key = "";
+      this.order.orderId = "";
+      this.perpole=''
+    },
+    //获取购物车数据
+    async getCart() {
+      const res = await getCart({
+        ...this.order.query,
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+      });
+      this.order.list = res.records;
+      if (this.key) {
+        // this.order.old.list = res.records;
+      } else {
+      }
+      this.order.total = res.total;
+    },
+    showSelGoods(item) {
+      console.log(item);
+      this.selGoods.data = item;
+      this.selGoods.skuMap = {};
+      const specList = item.specList;
+      this.setSelGoodsSkuMap(specList);
+      this.setSelGoodsSkuList(
+        JSON.parse(item.skuResult.tagSnap),
+        item.specSnap
+      );
+      this.setTagDisabled();
+      const skuGoods = this.selGoods.skuMap[item.specSnap];
+      this.skuGoods.data = skuGoods;
+      this.skuGoods.number = item.number ? item.number : skuGoods.suit || 1;
+      this.selGoods.title = item.name;
+      this.selGoods.show = true;
+    },
+    // 备份版本，会过滤下架和售尽以为库存小于等于0的商品
+    async goodsClickback(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        for (let i in specList) {
+          this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+        }
+        console.log(this.selGoods.skuMap);
+
+        let specSnap = "";
+        let tagSnap = JSON.parse(item.skuResult.tagSnap).map((v) => {
+          return { ...v, newval: {} };
+        });
+        const canUseSpecSnap = {};
+        const canBudyGoods = specList.filter(
+          (v) => v.isGrounding && v.isPauseSale != 1 && v.stockNumber > 0
+        );
+        canBudyGoods.map((v) => {
+          v.specSnap.split(",").map((spe) => {
+            canUseSpecSnap[spe] = spe;
+          });
+        });
+        console.log(canUseSpecSnap);
+        for (let i in canUseSpecSnap) {
+          const item = tagSnap.find((v) => v.value.match(i));
+          item.newval[i] = i;
+        }
+        tagSnap = tagSnap.map((v) => {
+          const newvals = Object.keys(v.newval);
+          specSnap += newvals[0] + ",";
+          return {
+            ...v,
+            values: newvals,
+            sel: newvals[0],
+          };
+        });
+        console.log(tagSnap);
+        console.log(canUseSpecSnap);
+        console.log(canBudyGoods);
+        this.selGoods.skuList = tagSnap;
+        // this.selGoods.skuList = tagSnap.map((v) => {
+        //   const values = v.value.split(",");
+        //   specSnap += values[0] + ",";
+        //   return {
+        //     ...v,
+        //     values: newval,
+        //     sel: values[0],
+        //   };
+        // });
+        specSnap = specSnap.substring(0, specSnap.length - 1);
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        console.log(skuGoods);
+        this.skuGoods.number = skuGoods.suit || 1;
+        console.log(this.skuGoods.data);
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.order.selIndex = orderGoodsIndex;
+      } else {
+        //增加
+        console.log(item);
+        const num = item.specList[0].suit;
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: num <= 0 ? 1 : num, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    //多规格商品弹窗时，找到默认可以下单的规格商品
+    findGoods(skuList = [], goodsListMap = {}) {
+      const skuMapNumber = skuList.reduce((prve, cur) => {
+        for (let i in cur.valueArr) {
+          prve[cur.valueArr[i]] = i;
+        }
+        return prve;
+      }, {});
+      const canBudyGoods = this.selGoods.data.specList
+        .filter((v) => isCanBuy(v))
+        .sort((a, b) => {
+          const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          const bNumber = b.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          return aNumber - bNumber;
+        });
+      return canBudyGoods[0];
+    },
+    //设置商品默认选中,规格禁止以及选中
+    setSkugoodsDefaultInit() {
+      const skuList = this.selGoods.skuList;
+      const goodsListMap = this.selGoods.skuMap;
+      const skuGoods = this.findGoods(skuList, goodsListMap);
+      console.log(skuGoods);
+      if (skuGoods) {
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+        skuGoods.specSnap.split(",").map((v, index) => {
+          skuList[index].sel = v;
+        });
+      }
+      this.setTagDisabled();
+    },
+    // 设置当前选中商品skuList
+    setSelGoodsSkuList(skuList, specSnap) {
+      const specSnapArr = specSnap ? specSnap.split(",") : [];
+      this.selGoods.skuList = skuList.map((v, index) => {
+        const values = v.value.split(",");
+        return {
+          ...v,
+          valueArr: values,
+          sel: specSnap ? specSnapArr[index] : "",
+          values: values.map((name) => {
+            return { name, disabled: false };
+          }),
+        };
+      });
+    },
+    setSelGoodsSkuMap(specList) {
+      for (let i in specList) {
+        this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+      }
+    },
+    //根据右侧商品单规格多规格做不同处理
+    async goodsClick(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        this.setSelGoodsSkuMap(specList);
+        console.log(this.selGoods.skuMap);
+        this.setSelGoodsSkuList(JSON.parse(item.skuResult.tagSnap));
+        this.setSkugoodsDefaultInit();
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.order.selIndex = orderGoodsIndex;
+      } else {
+        //增加
+        console.log(item);
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: item.specList[0].suit, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    async getGoods() {
+      const res = await getGoodsLists(this.goods.query);
+      const goods = res.records.filter((v) => {
+        if (!v) {
+          return false;
+        }
+        let isShow = true;
+        if (v.typeEnum !== "sku") {
+          isShow = v.specList.length >= 1;
+        }
+        return isShow;
+      });
+      this.goods.list = goods;
+      this.goods.total = res.total;
+      this.$goodsData = goods;
+    },
+    async open(item, key, perpoleNumber) {
+      this.table = item;
+      this.key = key;
+      if (this.key == "isPayOrder") {
+        this.isCreateOrder = true;
+      }
+      this.informationdialogshow;
+      this.informationdialogshow = true;
+      const res = await this.getMasterId();
+      this.masterId = res.masterId;
+      this.perpole = perpoleNumber;
+      if (this.key == "isPayOrder") {
+        this.toCreateOrder(true);
+      }
+      this.getCart();
+      this.getGoods();
+      this.getCategory();
+      // this.getPrveCart();
+      this.getCacheOrder();
+      this.getTable();
+    },
+    close() {
+      this.informationdialogshow = false;
+      this.$emit("close");
+    },
+    resetCommodityArr() {
+      this.commodityArr = [];
+      this.$refs.addSelect.resetFields();
+    },
+    haocaiCancel() {
+      this.informationdialogshow = false;
+    },
+    haocaiConfirm() {
+      console.log(haocaiSelectedMap);
+
+      this.$emit("confirm", haocaiSelectedMap);
+      this.informationdialogshow = false;
+      return;
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1;
+      this.getTableData();
+    },
+    paginationChangeinformation(e) {
+      this.goods.query.page = e;
+      this.getGoods();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/* 针对所有input type="number" */
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.full-screen {
+  margin-left: 10px;
+  svg {
+    width: 24px;
+    height: 24px;
+  }
+  &:hover {
+    path {
+      fill: #1890ff;
+    }
+  }
+}
+
+.icon-add {
+  color: rgb(34, 191, 100);
+  font-size: 22px;
+  cursor: pointer;
+}
+.prve-car-len {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 2px;
+  right: 2px;
+  height: 16px;
+  width: 16px;
+  font-size: 12px;
+  color: rgb(255, 255, 255);
+  border-radius: 50%;
+  background-color: rgb(250, 85, 85);
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+}
+::v-deep .el-button--text {
+  color: #000;
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+  padding: 0 4px;
+  text-align: center;
+}
+::v-deep .el-empty {
+  padding: 0;
+}
+::v-deep .el-button--success:not(.is-disabled) {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .el-tag--dark .el-tag--success {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .flex-1 .el-button {
+  width: 100%;
+}
+::v-deep .el-button--success.is-plain {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border: 1px solid #22bf64;
+}
+::v-deep .el-button--medium {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+// ::v-deep .el-button.is-plain:hover, .el-button.is-plain:focus{
+//   background: rgba(34, 191, 100, .1);
+//     color: #22bf64;
+//     border: 1px solid #22bf64;
+// }
+
+::v-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 {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.carts_list_title {
+  padding: 16px 0 12px 0;
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.4);
+  &::after {
+    content: "";
+    flex: 1;
+    height: 1px;
+    background-color: #ebebeb;
+    margin-left: 10px;
+  }
+}
+.border-r {
+  border-right: 1px solid #ebebeb;
+}
+.lh-16 {
+  line-height: 16px;
+}
+.good_info_discount {
+  height: 16px;
+  padding: 0 3px;
+  color: #ff3f3f;
+  background-color: rgba(255, 63, 63, 0.1);
+  border-radius: 2px;
+  margin-left: 6px;
+  font-size: 12px;
+  white-space: nowrap;
+}
+.icon-remove {
+  border: 1px solid #d8d8d8;
+  width: 22px;
+  height: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  &::after {
+    content: "";
+    display: block;
+    width: 10px;
+    height: 1px;
+    background: #999;
+  }
+}
+.row-center {
+  justify-content: center;
+}
+.sku-group-text {
+  text-align: left;
+  color: #666;
+  font-size: 11px;
+  margin-top: 2px;
+}
+
+.price {
+  font-size: 18px;
+  text-align: left;
+  color: rgb(255, 81, 82);
+  font-weight: 600;
+}
+.youhui {
+  color: #c12a2a;
+  font-size: 13px;
+  line-height: 16px;
+}
+
+::v-deep .el-dialog__footer {
+  border-top: 1px solid #efefef;
+}
+
+.sku-bottom {
+  padding: 14px 12px 5px;
+}
+
+.relative {
+  position: relative;
+}
+.col-baseline {
+  align-items: baseline;
+}
+.cursor-pointer {
+  cursor: pointer;
+}
+.flex-x-y-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #efefef;
+}
+::v-deep .el-dialog__body {
+  padding: 0 20px;
+}
+.absolute {
+  position: absolute;
+}
+
+.order-number-box {
+  position: relative;
+
+  .absolute {
+    width: 60px;
+    height: 40px;
+    right: -30px;
+    top: -12px;
+    position: absolute;
+
+    .order-input-number {
+      position: absolute;
+      right: -6px;
+      top: 0;
+      justify-content: center;
+      align-items: center;
+      display: none;
+      background-color: #fff;
+      border: 1px solid #e4e7ed;
+      border-radius: 4px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+      padding: 9px 6px;
+      background-color: #fff;
+      height: 40px;
+    }
+
+    &:hover .order-input-number {
+      display: flex;
+    }
+  }
+}
+
+.ft-12 {
+  font-size: 12px;
+}
+
+.ft-18 {
+  font-size: 18px;
+}
+
+.transition {
+  transition: all 0.2s ease-in-out;
+}
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #efefef;
+}
+
+.tableId {
+  padding: 9px 15px;
+  border: 1px solid #dcdfe6;
+  font-size: 12px;
+  border-radius: 3px;
+  cursor: pointer;
+
+  &:hover {
+    border-color: #409eff;
+    color: #409eff;
+    background-color: rgba(24, 144, 255, 0.1);
+  }
+}
+
+.cur-pointer {
+  cursor: pointer;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.flex-wrap {
+  flex-wrap: wrap;
+}
+
+.mt-14 {
+  margin-top: 14px;
+}
+
+.my-btn {
+  outline: none;
+  height: 40px;
+  font-size: 14px;
+  line-height: 40px;
+  color: #000;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 0 5px;
+  background-color: #fff;
+  position: relative;
+
+  &.disabled {
+    color: #c0c4cc;
+    cursor: not-allowed;
+    background-color: #fff;
+    border-color: #ebeef5;
+  }
+}
+.flex-xy-cnter {
+  justify-content: center;
+  align-items: center;
+}
+.flex-wrap {
+  flex: 1;
+}
+.headimg {
+  width: 34px;
+  height: 34px;
+  display: block;
+  border-radius: 2px;
+  margin-right: 6px;
+}
+.take_order_list {
+  padding: 14px 0;
+  display: flex;
+  justify-content: space-between;
+  .tol_left_list {
+    height: 360px;
+    margin-right: 24px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolll_item {
+      border: 1px solid rgb(247, 247, 250);
+      height: 86px;
+      width: 130px;
+      padding: 10px 14px;
+      margin-bottom: 12px;
+      border-radius: 4px;
+      color: #303133;
+
+      background-color: #f7f7fa;
+      &.active {
+        border: 1px solid rgb(0, 194, 95);
+        background-color: rgba(0, 194, 95, 0.1);
+        color: rgb(0, 194, 95) !important;
+        .tollli_time,
+        .tollli_num {
+          color: rgb(0, 194, 95) !important;
+        }
+      }
+      cursor: pointer;
+      .tollli_index {
+        font-weight: 600;
+        font-size: 18px;
+      }
+      .tollli_price {
+        margin-top: 8px;
+        font-size: 14px;
+      }
+      .tollli_time_and_num {
+        margin-top: 6px;
+        display: flex;
+        justify-content: space-between;
+        .tollli_time,
+        .tollli_num {
+          font-size: 12px;
+          color: #909399;
+        }
+      }
+    }
+  }
+  .tol_right_list {
+    flex: 1;
+    height: 360px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolrl_item {
+      display: flex;
+      padding: 2px 2px 13px 2px;
+      margin-bottom: 12px;
+      border-bottom: 1px solid #ebebeb;
+      .tolrli_img {
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 4px;
+        }
+      }
+      .tolrli_right {
+        display: flex;
+        justify-content: space-between;
+        flex: 1;
+        flex-direction: column;
+        padding: 1px 0 1px 8px;
+        .tr_top {
+          display: flex;
+          justify-content: space-between;
+          .trt_name {
+            width: 150px;
+            font-size: 14px;
+            color: #212121;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .trt_num {
+            font-size: 14px;
+            color: #212121;
+          }
+          .trt_price {
+            width: 100px;
+            text-align: right;
+            font-size: 14px;
+            color: #212121;
+          }
+        }
+        .tr_bottom {
+          font-size: 12px;
+          color: #999;
+        }
+      }
+    }
+  }
+}
+
+.success {
+  color: #fff;
+  border-color: #22bf64;
+  background-color: rgb(34, 191, 100);
+}
+
+.categoty {
+  position: sticky;
+  top: 0;
+  background-color: #f7f7fa;
+  z-index: 1;
+  padding-top: 14px;
+  margin-left: 7px;
+
+  .show_more_btn {
+    padding: 0 10px;
+    color: #1890ff;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    user-select: none;
+    min-width: 80px;
+    background: #f7f7fa;
+    position: absolute;
+    right: -20px;
+    top: 14px;
+    height: 38px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .el-icon-arrow-down {
+      transition: all 0.2s;
+    }
+
+    &.showAll .el-icon-arrow-down {
+      transform: rotate(180deg);
+    }
+  }
+}
+
+.search-box {
+  display: flex;
+  justify-content: flex-end;
+  margin-left: 12px;
+  border-bottom: 1px solid #ebebeb;
+}
+::v-deep .el-dialog__title {
+  font-size: 20px;
+  font-weight: 600;
+}
+
+::v-deep .categorys .el-tag--plain.el-tag--success {
+  border: 1px solid #dcdfe6;
+  color: #000;
+  font-weight: 600;
+}
+
+::v-deep .el-dialog {
+  user-select: none;
+}
+
+::v-deep .categorys .el-tag {
+  min-width: 80px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 14px;
+  font-size: 14px;
+  font-weight: 600;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+}
+
+::v-deep .tag-group .el-tag {
+  min-width: 80px;
+  height: 28px;
+  line-height: 28px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 15px;
+  font-size: 14px;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+  border-radius: 4px;
+}
+
+::v-deep .tag-group .el-tag--light {
+  color: #000;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+}
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: #22bf64;
+  border-color: #22bf64;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #22bf64;
+}
+
+::v-deep .tag-group .el-tag--dark {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border-color: #22bf64;
+}
+.no-search-result {
+  color: #888;
+  margin: 0 0 10px 7px;
+}
+
+.numberbox {
+  border: 1px solid #dcdfe6;
+  background-color: #fff;
+  color: #000;
+  min-height: 38px;
+  line-height: 38px;
+  text-align: center;
+  border-radius: 4px;
+  position: relative;
+  margin: 0 0 10px;
+
+  .reduce,
+  .add {
+    font-size: 28px;
+    color: #999;
+    height: 38px;
+    line-height: 38px;
+    text-align: center;
+  }
+
+  .input {
+    font-size: 30px;
+    display: flex;
+    overflow: hidden;
+    padding: 0 10px;
+    height: 50px;
+    border-top: 1px solid #dcdfe6;
+    border-bottom: 1px solid #dcdfe6;
+
+    input {
+      height: 100%;
+      width: 100%;
+      box-sizing: border-box;
+      outline: none;
+      justify-content: center;
+      border: none;
+      text-align: center;
+    }
+  }
+}
+.table-item {
+  cursor: pointer;
+  transition: 0.2s ease-in-out;
+  &:hover {
+    background: #f4f9ff;
+  }
+}
+.tag-group {
+  margin-top: 10px;
+
+  .tag-item {
+    margin-bottom: 20px;
+
+    .tag-name {
+      margin-bottom: 10px;
+      font-size: 12px;
+      color: #999;
+    }
+  }
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+}
+
+.row-between {
+  justify-content: space-between;
+}
+
+.row-right {
+  justify-content: flex-end;
+}
+
+.none {
+  display: none !important;
+}
+
+.handle {
+  font-size: 18px;
+  color: #999;
+
+  &:hover {
+    cursor: grab;
+  }
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 8px;
+    display: flex;
+    flex-direction: column;
+
+    .tag_wrap {
+      display: flex;
+    }
+  }
+}
+
+.font-bold {
+  font-weight: bold;
+}
+
+.head-container .filter-item {
+  margin: 0 5px 0 0;
+}
+
+.diancan {
+  display: flex;
+  height: calc(100vh - 75px);
+  .choose-user {
+    padding: 10px 0;
+    border-bottom: 1px solid #ebebeb;
+    margin-bottom: 10px;
+  }
+  .order {
+    border-radius: 6px;
+    display: flex;
+    padding-left: 12px;
+    .bottom {
+      left: 0;
+      right: 0;
+      box-sizing: border-box;
+      padding: 14px;
+      bottom: 0;
+      background-color: #fff;
+      z-index: 10;
+      border-top: 1px solid #ebebeb;
+    }
+
+    .list {
+      width: 352px;
+      padding: 12px 12px 0 0;
+    }
+
+    .controls {
+      min-width: 106px;
+      width: 106px;
+      border-radius: 4px;
+      background-color: #f7f7fa;
+      padding: 14px 10px;
+      position: relative;
+      overflow-y: auto;
+
+      .btn {
+        border: 1px solid #dcdfe6;
+        background-color: #fff;
+        color: #000;
+        min-height: 38px;
+        line-height: 38px;
+        text-align: center;
+        border-radius: 4px;
+        position: relative;
+        cursor: pointer;
+        margin: 0 0 10px;
+
+        &.disabled {
+          color: #999;
+          pointer-events: none;
+          cursor: no-drop;
+          background-color: rgb(250, 250, 252);
+        }
+      }
+    }
+
+    .order-item {
+      padding: 4px;
+      border-radius: 2px;
+      display: flex;
+      cursor: pointer;
+      align-items: center;
+      justify-content: space-between;
+      background-color: rgba(0, 0, 0, 0);
+      transition: all 0.3s;
+      .pack {
+        right: 100%;
+        width: 18px;
+        height: 18px;
+        background: #35ac6a;
+        border-radius: 4px 0 4px 0;
+        font-size: 12px;
+        color: #fff;
+        text-align: center;
+        line-height: 17px;
+      }
+      &.active {
+        background-color: rgba(0, 0, 0, 0.04);
+      }
+
+      .total-price {
+        width: 94px;
+        text-align: right;
+      }
+
+      .good-info {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-width: 70px;
+
+        .specSnap {
+          color: #999;
+          font-size: 12px;
+          margin-top: 3px;
+        }
+      }
+
+      .name {
+        font-size: 13px;
+        text-align: left;
+        color: #212121;
+        overflow: hidden;
+      }
+
+      .img {
+        width: 40px;
+        height: 40px;
+        position: relative;
+        margin-right: 10px;
+
+        img {
+          width: 40px;
+          height: 40px;
+        }
+      }
+    }
+  }
+
+  .goods {
+    box-sizing: border-box;
+    flex: 1;
+    background-color: #f7f7fa;
+    margin-left: 20px;
+    padding: 0 15px 14px 15px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    .goods-list {
+      display: flex;
+      flex-wrap: wrap;
+
+      .goods-item {
+        position: relative;
+        cursor: pointer;
+        min-width: 98px;
+        max-width: 100px;
+        height: 100px;
+        // flex: 1;
+        margin: 0 7px 14px;
+        border-radius: 4px;
+        .timeSale {
+          text-align: center;
+          border-radius: 10px;
+          background-color: hsla(0, 0%, 99.2%, 0.5);
+          color: #fff;
+          font-size: 10px;
+          line-height: 16px;
+          padding: 2px 10px;
+          margin-top: 2px;
+        }
+        .sell-out {
+          width: 100%;
+          height: 100%;
+          padding: 10px;
+          background: rgba(0, 0, 0, 0.4);
+          z-index: 2;
+          position: absolute;
+          top: 0;
+          font-size: 14px;
+          font-weight: 400;
+          text-align: left;
+          color: #fff;
+        }
+        overflow: hidden;
+        position: relative;
+
+        .typeEnum {
+          position: absolute;
+          right: 0;
+          top: 0;
+          border-radius: 0 0 0 10px;
+          background-color: #46a6ff;
+          color: #fff;
+          padding: 2px 10px;
+          display: none;
+        }
+
+        .info {
+          font-size: 14px;
+          position: absolute;
+          inset: 0;
+          background: rgba(0, 0, 0, 0.4);
+          color: #fff;
+          box-sizing: border-box;
+          padding: 10px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+        .img-box {
+          width: 100%;
+          height: 100%;
+          position: relative;
+        }
+        .text-sell-out {
+          width: 100%;
+          justify-content: center;
+          height: 60px;
+          svg {
+            width: 60px;
+            height: 60px;
+          }
+          // z-index: 1;
+          // position: absolute;
+          // right: 0;
+          // top: 0;
+        }
+        .sell-out-svg {
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          bottom: 0;
+          background: rgba(0, 0, 0, 0.5);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        img {
+          width: 100%;
+          height: 100%;
+        }
+        &.layout-img-and-text {
+          min-width: 116px !important;
+          max-width: 136px !important;
+          height: 175px;
+          background-color: #fff;
+          display: flex;
+          flex-direction: column;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.07);
+          .img-box {
+            width: 136px;
+          }
+          img {
+            width: 136px;
+            height: 125px;
+          }
+          .info {
+            position: inherit;
+            background-color: #fff;
+            padding: 4px 4px 8px;
+            color: #000;
+            .name {
+              font-size: 15px;
+              font-weight: 600;
+              height: 20px;
+              line-height: 20px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              margin-bottom: 2px;
+            }
+            .price {
+              font-size: 13px;
+            }
+          }
+        }
+        &.layout-text {
+          margin: 0 5px 10px;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.08);
+          min-width: 128px !important;
+          max-width: 148px !important;
+          background-color: #fff;
+          height: auto;
+          .info {
+            background-color: #fff;
+
+            position: inherit;
+            color: #000;
+            .name {
+              font-weight: 600;
+              font-size: 15px;
+              color: #000;
+              line-height: 22px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+
+              height: 44px;
+            }
+
+            .price {
+              font-weight: 600;
+              font-size: 16px;
+              margin: 6px 0 0;
+            }
+          }
+          img {
+            display: none;
+          }
+        }
+        &.layout-text.sell-out {
+          .info {
+            color: #c8c8c8;
+
+            .name {
+              color: #c8c8c8;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.carts {
+  flex-direction: column;
+  background: #fff;
+  height: 100%;
+  position: relative;
+  z-index: 10;
+}
+
+.carts .title,
+.carts {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+}
+
+.carts .title {
+  justify-content: space-between;
+  height: 64px;
+  border-bottom: 1px solid #ebebeb;
+  padding: 20px;
+  padding-top: 30px;
+}
+
+.carts .title .left {
+  font-family: PingFangSC-Medium;
+  font-weight: 500;
+  font-size: 18px;
+  color: #000;
+}
+
+.carts .title .right {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.carts .box_status {
+  width: 370px;
+  height: 58px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-top: 20px;
+  font-family: MicrosoftYaHei;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+}
+
+.carts .box_status span {
+  padding: 0 5px;
+}
+
+.number_list_box {
+  width: 370px;
+  background: #fff;
+  border-radius: 3px;
+  margin: 20px 0;
+}
+
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+
+.yd-keyboard {
+  justify-content: center;
+  margin-top: -8px;
+  margin-left: -8px;
+}
+
+.mini-number-box1 .mini-number,
+.yd-keyboard {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box1 .mini-number {
+  margin-left: 8px;
+  border: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line {
+  margin-top: 0;
+}
+
+.mini-number-box1 .mini-number .key {
+  width: 122px;
+  height: 60px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin-left: 0;
+}
+
+.mini-number-box1 .mini-number .key:not(:last-child) {
+  border-right: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line:not(:last-child) {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.mini-number-box2 {
+  display: flex;
+
+  justify-content: center;
+}
+
+.mini-number-box2 .key {
+  width: 80px;
+  height: 70px;
+}
+
+.mini-number-box2 .function-button {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box2 .function-button .key {
+  margin-top: 8px;
+}
+
+.key-line {
+  margin-top: 8px;
+}
+
+.key,
+.key-line {
+  display: flex;
+
+  justify-content: center;
+}
+
+.key {
+  width: 64px;
+  height: 64px;
+  background: #fff;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  border-radius: 4px;
+
+  align-items: center;
+  margin-left: 8px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 34px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.simple-Keyboard-number,
+.simple-Keyboard-weight {
+  min-width: 410px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 999;
+  background: #fff;
+  -webkit-box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  border-radius: 4px;
+  overflow: hidden;
+}
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+.disabled-box {
+  position: absolute;
+  inset: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.cashier_box {
+  display: flex;
+  width: 100%;
+  padding-top: 14px;
+  flex: 1;
+  background: #f7f7fa;
+  position: relative;
+  margin: 0 24px 0 0;
+  border-radius: 4px;
+  overflow-y: auto;
+}
+
+.cashier_left .el-form-item {
+  margin-bottom: 0;
+}
+
+.cashier_left {
+  padding: 0 20px 0;
+
+  flex: 1;
+  min-width: 310px;
+}
+
+.cashier_left .title {
+  font-size: 18px;
+  color: #000;
+  font-weight: 600;
+  padding: 20px 0;
+}
+
+.cashier_left .detail_box {
+  background: #fff;
+  border-radius: 4px;
+  padding: 0 14px;
+  margin-bottom: 20px;
+}
+
+.cashier_left .detail_box .forms {
+  padding: 10px 0;
+  border-top: 1px solid #ebebeb;
+}
+
+.cashier_left .detail_box .usercard {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+  height: 80px;
+  cursor: pointer;
+}
+
+.cashier_left .detail_box .usercard .info {
+  margin-left: 10px;
+
+  display: flex;
+
+  flex-direction: column;
+
+  justify-content: space-around;
+}
+
+.cashier_left .detail_box .usercard .info .nickname {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+}
+
+.cashier_left .detail_box .usercard .info .nickname .txt {
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 25px;
+  line-height: 25px;
+}
+::v-deep .cashier_left .el-form-item__label {
+  text-align: left;
+}
+.cashier_left .detail_box .usercard .info .nickname .vip_level {
+  font-size: 12px;
+  padding: 0 5px;
+  background: #f7793d;
+  height: 20px;
+  line-height: 20px;
+  color: #fff;
+  border-radius: 4px;
+}
+
+.cashier_left .detail_box .usercard .info .other_info {
+  display: flex;
+  font-size: 14px;
+  color: #666;
+}
+
+.cashier_left .detail_box .usercard .info .other_info .item {
+  margin-right: 10px;
+}
+
+.cashier_right {
+  min-width: 250px;
+  border-left: 1px solid #ebebeb;
+
+  display: flex;
+
+  flex-direction: column;
+  padding-bottom: 20px;
+}
+
+.cashier_right .detail_form {
+  flex: 1;
+  overflow-y: auto;
+}
+
+.cashier_right .detail_form .detail_form_item {
+  display: flex;
+
+  justify-content: space-between;
+  position: relative;
+  margin-bottom: 16px;
+
+  align-items: center;
+}
+
+.cashier_right .detail_form .detail_form_item .left {
+  font-size: 14px;
+  color: #000;
+  letter-spacing: 1px;
+}
+
+.cashier_right .detail_form .detail_form_item .right {
+  font-size: 14px;
+  color: #000;
+
+  display: flex;
+  margin-right: 40px;
+}
+
+.cashier_right .detail_form .detail_form_item .right .btn {
+  font-size: 14px;
+  color: #1890ff;
+  margin-left: 10px;
+  cursor: pointer;
+  position: absolute;
+  right: 0;
+}
+
+.cashier_right .detail_form .detail_form_item .right .dfi_button {
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-left: 10px;
+  width: 98px;
+  height: 36px;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.8);
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.cashier_right .detail_form .detail_form_item .redfont {
+  color: #fa5555;
+  font-size: 20px;
+}
+
+.cashier_right .detail_form .line {
+  width: 100%;
+  height: 1px;
+  background: #ebebeb;
+  margin-top: 4px;
+  margin-bottom: 20px;
+}
+
+.cashier_right .pay_btn {
+  width: 100%;
+  line-height: 44px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  color: #fff;
+  letter-spacing: 1px;
+  cursor: pointer;
+}
+
+.cashier_right .pay_btn:hover {
+  opacity: 0.9;
+}
+
+.btn1 {
+  background: #22bf64;
+  color: #fff;
+  border: none;
+}
+.pay_btns .el-button + .el-button {
+  margin-left: 0;
+}
+
+.pay_btns .el-button {
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+
+.pay_btns .el-button:disabled {
+  border: 1px solid #dcdfe6;
+}
+</style>
diff --git a/src/views/tool/table/components/table-diancan-back.vue b/src/views/tool/table/components/table-diancan-back.vue
new file mode 100644
index 0000000..a407f04
--- /dev/null
+++ b/src/views/tool/table/components/table-diancan-back.vue
@@ -0,0 +1,3804 @@
+<!-- eslint-disable no-empty -->
+<template>
+  <div class="">
+    <el-dialog
+      :title="title"
+      fullscreen
+      :visible.sync="informationdialogshow"
+      @close="onclose"
+    >
+      <div slot="title" class="flex row-between flex-y-center">
+        <div class="flex" style="width: 500px">
+          <div class="el-dialog__title" style="margin-right: 10px">
+            {{ title }}
+          </div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="success" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <span
+            @click="toggleFullScreen"
+            class="flex flex-xy-center cur-pointer full-screen"
+          >
+            <svg
+              v-if="!isFullScreen"
+              t="1724396447139"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="8943"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M358.4 768H426.666667v85.333333H213.333333v-213.333333h85.333334v68.266667l128-128 59.733333 59.733333-128 128z m345.6 0l-128-128 59.733333-59.733333 132.266667 132.266666V640h85.333333v213.333333h-213.333333v-85.333333h64zM358.4 298.666667l128 128-59.733333 59.733333-128-128V426.666667H213.333333V213.333333h213.333334v85.333334H358.4z m345.6 0H640V213.333333h213.333333v213.333334h-85.333333V354.133333l-132.266667 132.266667-59.733333-59.733333 128-128z"
+                fill="#666666"
+                p-id="8944"
+              ></path>
+            </svg>
+            <svg
+              v-else
+              t="1724396479520"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="9141"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M298.666667 631.466667H226.133333v-81.066667h217.6v204.8h-85.333333v-68.266667l-128 128L170.666667 759.466667l128-128z m422.4 0l128 128-59.733334 59.733333-128-128v68.266667h-85.333333V554.666667h217.6v81.066666h-72.533333zM298.666667 341.333333L187.733333 230.4 243.2 170.666667l115.2 115.2V217.6h85.333333v204.8H226.133333V341.333333H298.666667z m430.933333 0h64v81.066667h-217.6V217.6h85.333333v72.533333L780.8 170.666667l59.733333 59.733333L729.6 341.333333z"
+                fill="#666666"
+                p-id="9142"
+              ></path>
+            </svg>
+          </span>
+        </div>
+
+        <div class="flex flex-1" style="padding-right: 50px">
+          <div class="flex-1">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="head-container search-box flex row-between" v-if="false">
+        <div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="success" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+
+        <div class="flex">
+          <div style="width: 300px">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+            <!-- @keyup.enter.native="getGoods" -->
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <!-- <el-button style="margin-right: 10px" type="primary" @click="getGoods"
+            >查询</el-button
+          >
+          <el-button @click="reset">重置</el-button> -->
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="diancan">
+        <div class="order">
+          <div class="relative">
+            <div style="padding-right: 14px">
+              <div class="choose-user flex">
+                <el-button
+                  type="success"
+                  v-if="vipUser.id === ''"
+                  @click="refChooseUserOpen"
+                  >选择用户</el-button
+                >
+                <template v-else>
+                  <div class="flex cur-pointer" @click="refChooseUserOpen">
+                    <img
+                      v-if="vipUser.headImg"
+                      class="headimg"
+                      :src="vipUser.headImg"
+                      alt=""
+                    />
+                    <div v-else class="headimg flex flex-x-y-center">
+                      <i class="el-icon-user"></i>
+                    </div>
+                    <div>
+                      <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                      <div style="margin-top: 2px" class="color-666 ft-12">
+                        余额：{{ vipUser.amount }}
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </div>
+              <div class="flex row-between">
+                <!-- <div class="tableId" @click="chooseTableOpen"> -->
+                <div class="tableId">
+                  {{ table ? "桌台号：" + table.name : "桌台号/取餐号" }}
+                </div>
+
+                <el-button
+                  @click="clearCart"
+                  type="text"
+                  size="mini"
+                  :disabled="order.list.length <= 0"
+                  >清空</el-button
+                >
+                <!-- <div
+                  class="clear cur-pointer color-000 flex"
+                  @click="clearCart"
+                >
+                  清空
+                </div> -->
+              </div>
+            </div>
+            <div class="absolute bottom">
+              <div class="flex row-right youhui" v-if="giftLen">
+                <span> 已优惠￥{{ allGiftMoney | to2 }} </span>
+                <i class="el-icon-arrow-right"></i>
+              </div>
+
+              <div class="flex row-between">
+                <el-checkbox
+                  v-model="order.allPack"
+                  :disabled="!this.order.list.length"
+                  >打包</el-checkbox
+                >
+                <div class="flex">
+                  <span class="color-666" style="margin-right: 5px"
+                    >共{{ allNumber }}件</span
+                  >
+                  <span class="color-000 ft-18">￥{{ allPrice }} </span>
+                </div>
+              </div>
+
+              <div class="flex mt-14">
+                <template v-if="isCreateOrder">
+                  <button
+                    class="my-btn flex-1 default"
+                    @click="createOrderClose"
+                  >
+                    <span>加菜/返回</span>
+                  </button>
+                  <div style="width: 15px"></div>
+                  <button class="my-btn flex-1 success" @click="payOrder">
+                    <span>立即支付</span>
+                  </button>
+                </template>
+                <template v-else>
+                  <!-- <el-dropdown
+                    split-button
+                    size="medium"
+                    type="success"
+                    @command="changeIsPrint"
+                  >
+                    {{ isPrint ? "下单并打印制作单" : "仅下单(不打印)" }}
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item :command="false"
+                        >仅下单(不打印)</el-dropdown-item
+                      >
+                      <el-dropdown-item :command="true"
+                        >下单并打印制作单</el-dropdown-item
+                      >
+                    </el-dropdown-menu>
+                  </el-dropdown> -->
+                  <template v-if="postPay">
+                    <div class="flex-1">
+                      <el-button
+                        type="success"
+                        size="medium"
+                        :disabled="!order.list.length"
+                        @click="toCreateOrder(false)"
+                      >
+                        仅下单
+                      </el-button>
+                    </div>
+                    <div style="width: 15px"></div>
+                  </template>
+                  <div class="flex-1">
+                    <el-button
+                      size="medium"
+                      :disabled="!order.list.length && !order.old.list.length"
+                      @click="toCreateOrder(true)"
+                    >
+                      去结账
+                    </el-button>
+                  </div>
+                </template>
+              </div>
+            </div>
+            <div class="list">
+              <!-- 当前购物车列表 -->
+              <template v-if="order.list.length">
+                <cart-item
+                  @itemClick="changeOrderSel"
+                  @changeOrderNumber="changeOrderNumber"
+                  @cartGoodsNumberInput="cartGoodsNumberInput"
+                  @cartGoodsNumberChange="cartGoodsNumberChange"
+                  v-for="(item, index) in order.list"
+                  :key="index"
+                  :index="index"
+                  :item="item"
+                  :selIndex="order.selIndex"
+                ></cart-item>
+              </template>
+              <div v-if="order.gift.list.length">
+                <div class="carts_list_title">以下是优惠菜品</div>
+              </div>
+
+              <div v-if="!order.list.length">
+                <el-empty
+                  :image-size="50"
+                  description="点餐列表为空"
+                ></el-empty>
+              </div>
+            </div>
+            <!-- 已下单菜品列表 -->
+            <template v-if="order.old.list.length">
+              <div class="carts_list_title">已下单菜品</div>
+              <div class="list">
+                <cart-item
+                  @itemClick="changeOrderOldSel"
+                  :canChangeNumber="false"
+                  v-for="(item, index) in order.old.list"
+                  :key="index"
+                  :index="index"
+                  :item="item"
+                  :selIndex="order.old.selIndex"
+                ></cart-item>
+              </div>
+            </template>
+
+            <div class="order_remark" v-if="note.content">
+              订单备注： {{ note.content }}
+            </div>
+          </div>
+
+          <div class="controls">
+            <div
+              class="numberbox"
+              :class="{ 'cur-pointer': order.old.selIndex < 0 }"
+            >
+              <div class="reduce" @click="changeOrderGoodsNumber('-')">-</div>
+              <div class="input relative">
+                <div
+                  class="disabled-box"
+                  v-if="order.selIndex >= 0"
+                  @click="changeKeyboradShow(true)"
+                ></div>
+                <!-- <input type="number" :disabled="order.selIndex<0" v-model="order.number" /> -->
+                <input
+                  type="number"
+                  disabled
+                  v-model="order.number"
+                  style="display: none"
+                />
+                <input type="number" disabled v-model="order.cacheNumber" />
+              </div>
+              <div class="add" @click="changeOrderGoodsNumber()">+</div>
+            </div>
+            <!-- <div class="btn" v-for="(item, index) in order.btns" :key="index" :class="{ disabled: item.disabled }" @click="orderBtnsClick(index,item)">
+              {{ item.text }}
+            </div> -->
+            <div
+              class="btn"
+              :class="{ disabled: !isSku }"
+              @click="orderBtnsClick('sku')"
+            >
+              规格
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('gift')"
+            >
+              {{ returnGiftText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('pack')"
+            >
+              {{ returnPackText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('del')"
+            >
+              删除
+            </div>
+
+            <div
+              class="btn"
+              :class="{ disabled: !order.list.length }"
+              @click="saveOrder"
+            >
+              存单
+            </div>
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length }"
+              @click="cacheOrderShow"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div>
+
+            <!-- <div
+              class="btn"
+              :class="{ disabled: !order.list.length }"
+              @click="orderBtnsClick('save')"
+            >
+              存单
+            </div>
+
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length }"
+              @click="orderBtnsClick('getOrder')"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div> -->
+
+            <div class="btn" @click="refNoteShow">整单备注</div>
+          </div>
+        </div>
+        <div class="goods">
+          <template v-if="!isCreateOrder">
+            <div class="flex categoty">
+              <div
+                class="show_more_btn"
+                :class="{ showAll: category.showAll }"
+                @click="toggleShowAll"
+              >
+                <div class="flex">
+                  <div class="flex">
+                    <i class="el-icon-arrow-down"></i>
+                  </div>
+                  <span>展开</span>
+                </div>
+              </div>
+              <div
+                class="flex categorys"
+                :class="{ 'flex-wrap': category.showAll }"
+              >
+                <div
+                  v-for="(item, index) in category.list"
+                  :key="index"
+                  @click="changeCategoryId(item)"
+                >
+                  <el-tag
+                    size="medium"
+                    type="success"
+                    effect="dark"
+                    v-if="goods.query.categoryId === item.id"
+                    >{{ item.name }}</el-tag
+                  >
+                  <el-tag size="medium" type="success" v-else effect="plain">{{
+                    item.name
+                  }}</el-tag>
+                </div>
+              </div>
+            </div>
+            <div
+              class="no-search-result"
+              v-if="search.list.length <= 0 && goods.query.productId !== ''"
+            >
+              未找到相关商品
+            </div>
+            <div class="goods-list" v-if="goods.list.length">
+              <div
+                class="goods-item"
+                :class="{
+                  'sell-out':
+                    item.isPauseSale ||
+                    (item.typeEnum !== 'sku' && item.stockNumber <= 0),
+                  'layout-img-and-text': layout.sel === 'img-and-text',
+                  'layout-text': layout.sel === 'text',
+                  none:
+                    (goods.query.categoryId !== '') &
+                    (goods.query.categoryId != item.categoryId),
+                }"
+                @click="goodsClick(item)"
+                v-for="(item, index) in goods.list"
+                :key="index"
+              >
+                <!-- <div class="sell-out flex flex-xy-cnter">
+                  <svg t="1724210152457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6417" width="64" height="64"><path d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z" fill="#ffffff" p-id="6418"></path><path d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z" fill="#ffffff" p-id="6419"></path><path d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z" fill="#ffffff" p-id="6420"></path><path d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z" fill="#ffffff" p-id="6421"></path></svg>
+                </div> -->
+
+                <div class="flex img-box" v-if="layout.sel !== 'text'">
+                  <img class="goods-img" :src="item.coverImg" alt="" />
+                  <template v-if="layout.sel === 'img-and-text'">
+                    <div class="sell-out-svg" v-if="isSellOut(item)">
+                      <svg
+                        t="1724234807994"
+                        class="icon"
+                        viewBox="0 0 1024 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="4356"
+                        width="64"
+                        height="64"
+                      >
+                        <path
+                          d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                          fill="#ffffff"
+                          p-id="4357"
+                        ></path>
+                        <path
+                          d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                          fill="#ffffff"
+                          p-id="4358"
+                        ></path>
+                        <path
+                          d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                          fill="#ffffff"
+                          p-id="4359"
+                        ></path>
+                        <path
+                          d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                          fill="#ffffff"
+                          p-id="4360"
+                        ></path>
+                      </svg>
+                    </div>
+                  </template>
+                </div>
+                <div class="typeEnum">
+                  <span>{{ item | returntypeName }}</span>
+                </div>
+                <div class="info">
+                  <div class="name">{{ item.name }}</div>
+                  <div>
+                    <template v-if="layout.sel === 'text'">
+                      <div class="text-sell-out flex">
+                        <svg
+                          v-if="isSellOut(item)"
+                          t="1724236049267"
+                          class="icon"
+                          viewBox="0 0 1024 1024"
+                          version="1.1"
+                          xmlns="http://www.w3.org/2000/svg"
+                          p-id="4911"
+                          width="64"
+                          height="64"
+                        >
+                          <path
+                            d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                            fill="#c8c8c8"
+                            p-id="4912"
+                          ></path>
+                          <path
+                            d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                            fill="#c8c8c8"
+                            p-id="4913"
+                          ></path>
+                          <path
+                            d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                            fill="#c8c8c8"
+                            p-id="4914"
+                          ></path>
+                          <path
+                            d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                            fill="#c8c8c8"
+                            p-id="4915"
+                          ></path>
+                        </svg>
+                      </div>
+                    </template>
+                    <div class="stockNumber"></div>
+                    <div class="">￥{{ item.lowPrice }}</div>
+                    <template v-if="layout.sel === 'default'">
+                      <div class="flex" v-if="isSellOut(item)">
+                        <div class="timeSale">售罄</div>
+                      </div>
+                    </template>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </template>
+
+          <template v-else>
+            <div class="cashier_box goods_classify_list">
+              <div class="cashier_left">
+                <!-- <div class="title">选择优惠</div> -->
+                <div class="detail_box">
+                  <div class="usercard">
+                    <span
+                      class="el-avatar el-avatar--square"
+                      style="height: 50px; width: 50px; line-height: 50px"
+                      ><img v-if="vipUser.id" :src="vipUser.headImg"
+                    /></span>
+                    <div class="info">
+                      <div class="nickname">
+                        <span class="txt">{{
+                          vipUser.id ? vipUser.nickName : "服务员下单"
+                        }}</span>
+                      </div>
+                      <div class="other_info">
+                        <div class="item">余额：{{ vipUser.amount | to2 }}</div>
+                        <div class="item">积分：{{ vipUser.totalScore }}</div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- <div class="forms">
+                    <el-form
+                      ref="form"
+                      :model="createOrder.form"
+                      label-width="60px"
+                    >
+                      <el-form-item label="优惠券">
+                        <el-select
+                          style="margin-right: 10px"
+                          v-model="createOrder.quan.sel"
+                          placeholder="选择优惠券"
+                        >
+                        </el-select>
+                        <el-button size="medium " type="text">
+                          查看不可用券
+                        </el-button>
+                      </el-form-item>
+                    </el-form>
+                  </div> -->
+                </div>
+                <div class="btn_group">
+                  <el-button size="medium" @click="disCountShow">
+                    整单打折/减免
+                  </el-button>
+                  <!-- <el-button size="medium "> 免单 </el-button> -->
+                </div>
+
+                <pay-type ref="refPayType" v-model="order.payType"> </pay-type>
+                <div style="margin-top: 20px">
+                  <el-button type="success" size="medium" @click="payOrder">
+                    <span>立即支付</span>
+                  </el-button>
+                </div>
+                <!-- <div class="flex row-right">
+                  <el-button size="medium" type="success" @click="payOrder"
+                    >确认支付</el-button
+                  >
+                </div> -->
+                <!-- <div class="title">选择支付方式</div>
+                <div class="btn_group">
+                  <div class="price_select">
+                    <div class="pay_btns">
+                      <el-button size="medium" type="success">
+                        微信支付/支付宝
+                      </el-button>
+                      <el-button size="medium"> 余额支付 </el-button>
+                      <el-button size="medium"> 现金支付 </el-button>
+                      <el-button size="medium"> 挂账 </el-button>
+                    </div>
+                  </div>
+                </div> -->
+              </div>
+              <div class="cashier_left cashier_right">
+                <div class="title">账单明细</div>
+                <div class="detail_form">
+                  <!---->
+                  <div class="detail_form_item">
+                    <div class="left">会员优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">门店优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">满减优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">优惠券</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">整单改价</div>
+                    <div class="right">
+                      -￥{{
+                        ((1 - createOrder.discount) * createOrder.data.amount)
+                          | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item" v-if="createOrder.data.packFee">
+                    <div class="left">打包费</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.packFee || "0.00" }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">桌位费/附加费</div>
+                    <div class="right">￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">总价</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.amount | to2 }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">抹零</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">应付金额</div>
+                    <div class="right redfont">
+                      ￥{{
+                        (createOrder.data.amount * createOrder.discount) | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="line"></div>
+                </div>
+              </div>
+            </div>
+          </template>
+        </div>
+      </div>
+
+      <!-- <slot name="footer">
+        <div style="display: flex; justify-content: flex-end">
+          <el-button style="margin-right: 20px" @click="haocaiCancel">取消</el-button>
+          <el-button type="primary" @click="haocaiConfirm">确定</el-button>
+        </div>
+      </slot> -->
+    </el-dialog>
+
+    <!-- 选择规格 -->
+    <el-dialog
+      width="410px"
+      :title="selGoods.title"
+      :visible.sync="selGoods.show"
+      @close="onSelGoodsSkuClose"
+    >
+      <div class="tag-group">
+        <div
+          class="tag-item"
+          v-for="(item, index) in selGoods.skuList"
+          :key="index"
+        >
+          <div class="tag-name">
+            {{ item.name }}
+            <span v-if="item.values.length >= 2"
+              >({{ item.values.length }}选1)</span
+            >
+          </div>
+          <div>
+            <span
+              style="margin: 0 10px 10px 0"
+              v-for="(val, valIndex) in item.values"
+              :key="valIndex"
+            >
+              <el-button
+                plain
+                :disabled="val.disabled"
+                @click="changeTagSel(index, val)"
+                :type="val.name === item.sel ? 'success' : ''"
+              >
+                {{ val.name }}
+              </el-button>
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer">
+        <div class="flex row-between">
+          <div>
+            <div class="price">￥{{ skuGoods.data.salePrice | to2 }}</div>
+            <div class="sku-group-text">
+              <span> {{ skuText }}</span>
+              <span>库存：{{ skuGoods.data.stockNumber || "" }}</span>
+            </div>
+          </div>
+          <div class="flex">
+            <i class="icon-remove" @click="skuNumberReduce"></i>
+            <div style="width: 40px" class="number-box">
+              <el-input
+                :min="skuGoods.data.suit"
+                type="number"
+                v-model="skuGoods.number"
+                placeholder="0"
+              ></el-input>
+            </div>
+            <!-- <i class="el-icon-remove"></i> -->
+            <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
+          </div>
+        </div>
+        <div class="flex" style="margin-top: 14px">
+          <button
+            class="my-btn disabled flex-1"
+            v-if="!skuGoods.data.isGrounding"
+            disabled
+          >
+            已下架
+          </button>
+          <button
+            class="my-btn success flex-1"
+            v-else
+            :disabled="CanConfirm"
+            @click="chooseSkuConfirm"
+          >
+            确定
+          </button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 数字键盘 -->
+    <el-dialog width="410px" title="数量" :visible.sync="keyborad.show">
+      <div class="simple-Keyboard-number">
+        <div class="carts">
+          <div class="title font-bold">
+            <span class="color-000">数量</span>
+            <i class="el-icon-close" @click="changeKeyboradShow(false)"></i>
+          </div>
+          <div class="box_status">{{ keyborad.number }}</div>
+          <div class="number_list_box">
+            <div class="yd-keyboard">
+              <div class="mini-number-box1">
+                <div class="mini-number">
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('1')">1</div>
+                    <div class="key" @click="keyboradAdd('2')">2</div>
+                    <div class="key" @click="keyboradAdd('3')">3</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('4')">4</div>
+                    <div class="key" @click="keyboradAdd('5')">5</div>
+                    <div class="key" @click="keyboradAdd('6')">6</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('7')">7</div>
+                    <div class="key" @click="keyboradAdd('8')">8</div>
+                    <div class="key" @click="keyboradAdd('9')">9</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key"></div>
+                    <div class="key" @click="keyboradAdd('0')">0</div>
+                    <div
+                      class="key"
+                      style="font-size: 31px"
+                      @click="keyboradReduce"
+                    >
+                      <svg
+                        t="1723453480343"
+                        class="icon"
+                        viewBox="0 0 1664 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="1467"
+                        width="32"
+                        height="32"
+                      >
+                        <path
+                          d="M1526.08 1.6H459.84L41.28 416c-53.76 53.248-53.76 139.52 0 192.64l418.624 414.592v-0.064h1066.176a136.96 136.96 0 0 0 137.6-136.256V137.792a136.96 136.96 0 0 0-137.6-136.192z m-331.392 631.168c26.816 26.624 26.816 69.76 0 96.384-26.88 26.56-70.4 26.56-97.28 0l-121.28-120.128-123.328 122.112a69.76 69.76 0 0 1-97.92 0 68.096 68.096 0 0 1 0-96.96L878.208 512l-121.28-120.064a67.648 67.648 0 0 1 0-96.32c26.88-26.624 70.4-26.624 97.28 0l121.216 120.064 122.24-120.96a69.696 69.696 0 0 1 97.92 0 68.032 68.032 0 0 1 0 96.96l-122.24 120.96 121.344 120.064z"
+                          fill="#333333"
+                          p-id="1468"
+                        ></path>
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div>
+            <div class="submit" @click="keyboradConfirm">确认</div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 取单 -->
+    <el-dialog width="550px" title="取单" :visible.sync="prveOrder.show">
+      <div class="take_order_list">
+        <div class="tol_left_list">
+          <div
+            class="tolll_item"
+            :class="{ active: prveOrder.sel === index }"
+            @click="changePrveOrder(index)"
+            v-for="(item, index) in prveOrder.list"
+            :key="index"
+          >
+            <div class="tollli_index">{{ index + 1 }}</div>
+            <div class="tollli_price">￥{{ item.totalAmount }}</div>
+            <div class="tollli_time_and_num">
+              <div class="tollli_time">{{ item.created_at || "" }}</div>
+              <div class="tollli_num">({{ item.totalNumber }}件)</div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="tol_right_list"
+          v-if="prveOrder.list.length && prveOrder.sel >= 0"
+        >
+          <div
+            class="tolrl_item"
+            v-for="(item, index) in prveOrder.selCart"
+            :key="index"
+          >
+            <div class="tolrli_img">
+              <img :src="item.coverImg" alt="" />
+            </div>
+            <div class="tolrli_right">
+              <div class="tr_top">
+                <div class="trt_name">{{ item.name }}</div>
+                <div class="trt_num">x{{ item.number }}</div>
+                <div class="trt_price">￥{{ item.totalAmount || 0 }}</div>
+              </div>
+              <div class="tr_bottom">
+                <span class="trb_item">
+                  {{ item.specSnap | formatSpecSnap }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" class="flex row-center">
+        <div style="margin-right: 20px">
+          <el-button
+            size="medium"
+            type="success"
+            @click="confirmChoosePrveOrder"
+            >确认此单</el-button
+          >
+        </div>
+        <el-button size="medium" @click="delPrveOrder">删除此单</el-button>
+      </div>
+    </el-dialog>
+
+    <choose-user
+      ref="refChooseUser"
+      @chooseUser="chooseUserConfirm"
+    ></choose-user>
+    <choose-table
+      ref="refChooseTable"
+      @confirm="chooseTableConfirm"
+    ></choose-table>
+    <order-note ref="refOrderNote" @confirm="refOrderNoteConfirm"></order-note>
+
+    <!-- 支付时的键盘弹窗 -->
+    <money-keyboard ref="refMoneyKeyboard" :title="moneyKeyboard.title">
+    </money-keyboard>
+
+    <!-- 扫码支付 -->
+    <scan-pay ref="refScanCode"></scan-pay>
+    <!-- 打折 -->
+    <money-discount ref="refDiscount" @confirm="ChangeDiscount">
+    </money-discount>
+  </div>
+</template>
+
+<script>
+import chooseUser from "./choose-user.vue";
+import payType from "./pay-type.vue";
+import chooseTable from "./table-diancan-components/choose-table-master.vue";
+import cartItem from "./table-diancan-components/cart-item.vue";
+import scanPay from "./table-diancan-components/scan-pay.vue";
+import moneyDiscount from "./table-diancan-components/discount.vue";
+import orderNote from "./table-diancan-components/note.vue";
+import moneyKeyboard from "./money-keyboard.vue";
+import dayjs from "dayjs";
+import {
+  getGoodsLists,
+  addCart,
+  getCart,
+  $clearCart,
+  $removeCart,
+  $updateCart,
+  $allPack,
+  $createOrder,
+  $getMasterId,
+  $cacheOrder,
+  $getCacheOrder,
+  $delOrder,
+  $setUser,
+  $payOrder,
+} from "@/api/table";
+import { tbShopCategoryGet } from "@/api/shop";
+import {
+  isCanBuy,
+  arrayContainsAll,
+  generateCombinations,
+  returnReverseVal,
+} from "./util.js";
+
+export default {
+  components: {
+    chooseUser,
+    chooseTable,
+    payType,
+    orderNote,
+    moneyKeyboard,
+    scanPay,
+    moneyDiscount,
+    cartItem,
+  },
+  data() {
+    return {
+      //台桌点餐页面打开时带来的参数 isAddGoods 加菜    isPayOrder结账
+      key: "",
+      //是否是从挂单里取出来的订单
+      isPrverOrder: false,
+      //是否全屏
+      isFullScreen: false,
+      moneyKeyboard: {
+        show: true,
+        title: "支付",
+      },
+      //true后付款false先付款
+      postPay: true,
+      //是否打印
+      isPrint: false,
+      // 备注
+      note: {
+        content: "",
+        isShow: false,
+      },
+      isCreateOrder: false,
+      $goodsData: "",
+      search: {
+        list: [],
+      },
+      skuGoods: {
+        number: 1,
+        data: {
+          stockNumber: 0,
+          salePrice: 0,
+        },
+      },
+      selGoods: {
+        isEdit: false,
+        data: {},
+        skuList: [],
+        skuMap: [],
+        title: "",
+        show: false,
+      },
+      dayjs,
+      dialogshow: false, //弹框显示
+      dialogtitle: "", //文字显示
+      informationdialogshow: false,
+      informationdialogshowedit: false,
+      goods: {
+        list: [],
+        query: {
+          productId: "",
+          categoryId: "",
+          page: 1,
+          size: 300,
+        },
+        loading: false,
+        total: 0,
+      },
+      order: {
+        payType: "",
+        masterId: "",
+        allPack: false,
+        btns: [
+          {
+            text: "规格",
+            disabled: false,
+          },
+          {
+            text: "赠送",
+            disabled: false,
+          },
+          {
+            text: "打包",
+            disabled: false,
+          },
+          {
+            text: "删除",
+            disabled: false,
+          },
+        ],
+        list: [],
+        gift: {
+          list: [],
+          selIndex: -1,
+        },
+        //已下单菜品
+        old: {
+          list: [],
+          selIndex: -1,
+        },
+        query: {
+          page: 1,
+          size: 20,
+        },
+        number: 1,
+        cacheNumber: 1,
+        selIndex: -1,
+        total: 0,
+      },
+      table: "",
+      category: {
+        list: [],
+        showAll: false,
+      },
+      keyborad: {
+        show: false,
+        number: "0",
+      },
+      prveOrder: {
+        list: [],
+        show: false,
+        sel: 0,
+        selCart: [],
+      },
+      layout: {
+        list: [
+          { label: "经典布局", value: "default" },
+          { label: "图文显示", value: "img-and-text" },
+          { label: "文字显示", value: "text" },
+        ],
+        sel: "img-and-text",
+      },
+      // 选择用户
+      vipUser: {
+        id: "",
+      },
+      //餐桌号
+      masterId: "",
+      canUpdate: true,
+      //下单
+      createOrder: {
+        discount: 1,
+        form: {},
+        data: {},
+        quan: {
+          list: [],
+          sel: "",
+        },
+      },
+      timer: null,
+    };
+  },
+  computed: {
+    title() {
+      return this.table ? "代客下单" + `(${this.table.name})` : "代客下单";
+    },
+    allGiftMoney() {
+      const price = this.order.list
+        .filter((v) => v.isGift === "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return price;
+    },
+    giftLen() {
+      return this.order.list.filter((v) => v.isGift === "true").length;
+    },
+    isSku() {
+      if (this.order.selIndex < 0 || this.order.list.length <= 0) {
+        return false;
+      }
+      return this.order.list[this.order.selIndex].specSnap;
+    },
+    returnGiftText() {
+      if (this.order.selIndex < 0) {
+        return "赠送";
+      }
+      return this.order.list[this.order.selIndex].isGift === "true"
+        ? "取消赠送"
+        : "赠送";
+    },
+    returnPackText() {
+      if (this.order.selIndex < 0) {
+        return "打包";
+      }
+      return this.order.list[this.order.selIndex].isPack === "true"
+        ? "取消打包"
+        : "打包";
+    },
+    skuText() {
+      const result = this.selGoods.skuList.reduce((a, b) => {
+        return a + (b.sel ? b.sel + "+" : "");
+      }, "");
+      return result.substring(0, result.length - 1);
+    },
+    allPrice() {
+      const oldPrice = this.order.old.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      const price = this.order.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return (oldPrice + price).toFixed(2);
+    },
+    allNumber() {
+      const oldNumber = this.order.old.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      const cartNumber = this.order.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      return oldNumber + cartNumber;
+    },
+    selGoodsHide() {
+      this.selGoods.show = false;
+    },
+    CanConfirm() {
+      if (!this.selGoods.skuList.length) {
+        return true;
+      }
+      return (
+        this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+        this.selGoods.skuList.length
+      );
+    },
+  },
+  filters: {
+    formatSpecSnap(str) {
+      if (str === "" || str === null || str === undefined) {
+        return "";
+      }
+      return str.replaceAll(",", " / ");
+    },
+    to2(n) {
+      if (n === undefined) {
+        return "";
+      }
+      return Number(n).toFixed(2);
+    },
+    returntypeName(item) {
+      return item.typeEnum === "sku" ? "多规格" : "单规格";
+    },
+  },
+  watch: {
+    masterId: function (val) {
+      console.log(val);
+    },
+    isCreateOrder: function (val) {
+      if (!val) {
+        this.createOrder.discount = 1;
+      }
+    },
+    "vipUser.id": async function (val) {
+      let masterId = this.order.masterId;
+      if (!masterId) {
+        const res = await this.getMasterId();
+        masterId = res.masterId;
+      }
+      this.masterId = masterId;
+      $setUser({
+        tableId: this.table.tableId,
+        masterId: this.masterId,
+        vipUserId: val,
+        type: val === "" ? 1 : 0,
+      });
+    },
+    "prveOrder.list.length": function (val) {
+      if (val !== 0) {
+        this.prveOrder.selCart =
+          this.prveOrder.list[this.prveOrder.sel].carList;
+      } else {
+        this.prveOrder.selCart = [];
+      }
+      console.log(this.prveOrder.selCart);
+    },
+    "prveOrder.sel": function (val) {
+      this.prveOrder.selCart =
+        this.prveOrder.list.length !== 0
+          ? this.prveOrder.list[val].carList
+          : [];
+      console.log(this.prveOrder.selCart);
+      if (val < 0) {
+        this.prveOrde.show = false;
+      }
+    },
+    // 本地缓存版本
+    // "prveOrder.list.length": function (val) {
+    //   console.log(val);
+    //   if (val !== 0) {
+    //     this.prveOrder.selCart = this.prveOrder.list[this.prveOrder.sel].cart;
+    //     localStorage.setItem(
+    //       "orderList",
+    //       JSON.stringify(
+    //         this.prveOrder.list.map((v) => {
+    //           return { ...v, cart: JSON.stringify(v.cart) };
+    //         })
+    //       )
+    //     );
+    //   } else {
+    //     this.prveOrder.selCart = [];
+    //     localStorage.removeItem("orderList");
+    //   }
+    //   console.log(this.prveOrder.selCart);
+    // },
+    // "prveOrder.sel": function (val) {
+    //   this.prveOrder.selCart =
+    //     this.prveOrder.list.length !== 0 ? this.prveOrder.list[val].cart : [];
+    //   console.log(this.prveOrder.selCart);
+    // },
+    "order.allPack": function (val) {
+      console.log(val);
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      $allPack({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        state: val ? 1 : 0,
+      }).then((res) => {
+        this.order.list.map((v) => {
+          v.isPack = `${val}`;
+        });
+      });
+    },
+    "order.selIndex": function (val, oldval) {
+      console.log(val);
+      if (val === -1) {
+        // return (this.order.number = 1);
+        this.order.cacheNumber = 1;
+      } else {
+        this.order.cacheNumber = this.order.list[val].number;
+        // this.order.number = this.order.list[val].number;
+      }
+    },
+    "order.list.length": function (val) {
+      if (val <= 0) {
+        this.order.selIndex = -1;
+      }
+      if (this.order.selIndex >= 0) {
+        this.order.cacheNumber = this.order.list[this.order.selIndex].number;
+        // this.order.number = this.order.list[this.order.selIndex].number;
+      }
+    },
+    "order.number": function (newval) {
+      if (this.order.list.length <= 0 || this.order.selIndex < 0) {
+        return;
+      }
+      this.createOrderClose();
+
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      const oldGoods=this.order.old.list.find(v=>{
+        return v.productId===productId && v.skuId===skuId 
+      })
+      $updateCart({
+        cartId: item.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: this.order.number+(oldGoods?oldGoods.number:0), // 0会删除此商品
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+          number: this.order.number
+        });
+      });
+      return;
+      this.updateOrder({
+        num: newval, // 0会删除此商品
+      });
+    },
+    "goods.query.productId": function (newval) {
+      if (!this.$goodsData) {
+        return;
+      }
+      if (newval == "") {
+        this.goods.list = this.$goodsData || [];
+      } else {
+        const newarr = this.$goodsData.filter((v) =>
+          v.name.includes(newval.trim())
+        );
+        this.search.list = newarr;
+        this.goods.list = newarr.length ? newarr : this.$goodsData;
+      }
+    },
+  },
+  mounted() {
+    // this.getGoods();
+    // this.getCategory();
+    // this.refToggle('refScanCode',true)
+    // this.refToggle("refDiscount", true);
+  },
+  methods: {
+    ChangeDiscount(discount) {
+      this.createOrder.discount = discount;
+    },
+    disCountShow() {
+      const { amount } = this.createOrder.data;
+      this.refToggle("refDiscount", true, {
+        amount,
+        discount: this.createOrder.discount * 100,
+      });
+    },
+    refToggle(key, isShow, data) {
+      if (!this.$refs[key]) {
+        return;
+      }
+      isShow ? this.$refs[key].open(data) : this.$refs[key].close(data);
+    },
+    //购物车商品输入框数量输入
+    cartGoodsNumberInput(newval, index) {
+      const item = this.order.list[index];
+      console.log(item);
+      this.order.cacheNumber = newval;
+      item.number = newval;
+    },
+    //购物车商品输入框数量改变
+    cartGoodsNumberChange(newval, index) {
+      const item = this.order.list[index];
+      newval = `${newval}`.split(".")[0] * 1;
+      console.log(newval);
+      this.order.cacheNumber = newval;
+      this.order.number = newval;
+    },
+    //判读单规格商品是否售尽
+    isSellOut(item) {
+      return (
+        item.isPauseSale ||
+        (item.typeEnum !== "sku" && item.specList[0].stockNumber <= 0)
+      );
+    },
+    toggleFullScreen() {
+      if (!document.fullscreenElement) {
+        this.enterFullScreen();
+      } else {
+        this.exitFullScreen();
+      }
+    },
+    enterFullScreen() {
+      let element = document.documentElement;
+      if (element.requestFullscreen) {
+        element.requestFullscreen();
+      } else if (element.mozRequestFullScreen) {
+        /* Firefox */
+        element.mozRequestFullScreen();
+      } else if (element.webkitRequestFullscreen) {
+        /* Chrome, Safari & Opera */
+        element.webkitRequestFullscreen();
+      } else if (element.msRequestFullscreen) {
+        /* IE/Edge */
+        element.msRequestFullscreen();
+      }
+      this.isFullScreen = true;
+    },
+    exitFullScreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        /* Firefox */
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        /* Chrome, Safari and Opera */
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        /* IE/Edge */
+        document.msExitFullscreen();
+      }
+      this.isFullScreen = false;
+    },
+    //打开输入钱的键盘
+    openMoneyKeyboard() {
+      this.$refs.refMoneyKeyboard.open();
+    },
+    changePostPay(val) {
+      this.postPay = val;
+    },
+    //改变是否打印
+    changeIsPrint(e) {
+      console.log(e);
+      this.isPrint = e;
+    },
+    refOrderNoteConfirm(note) {
+      this.note.content = note;
+    },
+    refNoteShow() {
+      this.$refs.refOrderNote.open(this.note.content);
+    },
+    // 支付订单
+    async payOrder() {
+      console.log({
+        orderId: this.createOrder.data.id,
+        payType: this.order.payType,
+      });
+      const res = await $payOrder({
+        tableId: this.table.tableId,
+        masterId: this.masterId,
+        orderId: this.createOrder.data.id,
+        payType: this.order.payType,
+        vipUserId: this.vipUser.id,
+        discount: this.createOrder.discount,
+      });
+      this.payOrderSuccess();
+    },
+    payOrderSuccess() {
+      this.$notify({
+        title: "支付成功",
+        type: "success",
+      });
+      this.reset();
+      this.close();
+    },
+    chooseTableConfirm(item) {
+      console.log(item);
+      this.table = item;
+    },
+    chooseTableOpen() {
+      this.$refs.refChooseTable.open();
+    },
+    chooseUserConfirm(user) {
+      console.log(user);
+      if (user) {
+        this.vipUser = user;
+      } else {
+        this.vipUser = { id: "" };
+      }
+    },
+    refChooseUserOpen() {
+      this.$refs.refChooseUser.open();
+    },
+    createOrderClose() {
+      this.isCreateOrder = false;
+    },
+    //生成订单
+    async toCreateOrder(isNowPay = false) {
+      const res = await $createOrder({
+        masterId: this.order.masterId || this.masterId,
+        vipUserId: this.vipUser.id,
+        tableId: this.table.tableId,
+        note: this.note.content,
+        postPay: this.postPay,
+      });
+      //后付款
+      console.log(this.postPay);
+      console.log(isNowPay);
+      console.log(this.postPay && isNowPay);
+      if (this.postPay && !isNowPay) {
+        this.$notify({
+          title: "下单成功",
+          type: "success",
+        });
+        return this.close();
+      }
+      this.createOrder.data = res;
+      if (!this.isPrverOrder) {
+        const { masterId } = await this.getMasterId();
+        this.masterId = masterId;
+      }
+
+      this.isCreateOrder = true;
+    },
+
+    // 获取取餐号
+    getMasterId() {
+      return $getMasterId({
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+      });
+    },
+    onSelGoodsSkuClose() {
+      this.selGoods.isEdit = false;
+    },
+    changePrveOrder(index) {
+      this.prveOrder.sel = index;
+    },
+    //更新购物车商品数据
+    updateOrder(par = {}) {
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      addCart({
+        masterId: this.masterId,
+        vipUserId: this.vipUser.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: number,
+        isPack: isPack === "true" ? true : false,
+        isGift: isGift === "true" ? true : false,
+        ...par,
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+        });
+      });
+    },
+    keyboradAdd(n) {
+      if (Number(this.keyborad.number) === 0) {
+        return (this.keyborad.number = n);
+      }
+      this.keyborad.number += n;
+    },
+    keyboradReduce() {
+      if (this.keyborad.number.length <= 1) {
+        return (this.keyborad.number = "0");
+      }
+      this.keyborad.number = this.keyborad.number.substring(
+        0,
+        this.keyborad.number.length - 1
+      );
+    },
+    keyboradConfirm() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      // 如果设置为0,商品数量减1
+      if (this.keyborad.number == 0) {
+        this.changeOrderNumber(this.order.selIndex, true);
+      } else {
+        orderGoods.number = Number(this.keyborad.number);
+      }
+      this.order.cacheNumber = orderGoods.number;
+      this.order.number = orderGoods.number;
+      this.changeKeyboradShow(false);
+    },
+    changeKeyboradShow(show) {
+      if (show) {
+        this.keyborad.number = `${this.order.list[this.order.selIndex].number}`;
+      }
+      this.keyborad.show = show;
+    },
+    // 获取本地缓存挂单
+    // getPrveCart() {
+    //   const arr = localStorage.getItem("orderList")
+    //     ? JSON.parse(localStorage.getItem("orderList"))
+    //     : [];
+    //   this.prveOrder.list = arr.map((v) => {
+    //     return { ...v, cart: JSON.parse(v.cart) };
+    //   });
+    // },
+
+    //右侧控制按钮点击事件
+    orderBtnsClick(key) {
+      const orderGoods = this.order.list[this.order.selIndex];
+      this.createOrderClose();
+      if (key === "sku") {
+        this.selGoods.title = orderGoods.name;
+        this.selGoods.isEdit = true;
+        const item = this.goods.list.find((v) => v.id == orderGoods.productId);
+        console.log(item);
+        return this.showSelGoods({ ...item, ...orderGoods });
+      }
+      if (key === "gift") {
+        const isGift = orderGoods.isGift === "true" ? "flase" : "true";
+        this.updateOrder({ isGift: isGift === "true" ? true : false });
+        return;
+      }
+      if (key === "pack") {
+        const isPack = orderGoods.isPack === "true" ? "flase" : "true";
+        this.updateOrder({ isPack: isPack === "true" ? true : false });
+        return;
+      }
+      if (key === "del") {
+        return this.removeCart();
+      }
+      if (key === "save") {
+        this.prveOrder.list.push({
+          cart: this.order.list,
+          id: Date.now(),
+          created_at: `${new Date().getHours()}:${new Date().getMinutes()}`,
+          goods_num: this.allNumber,
+          order_total: this.allPrice,
+        });
+        localStorage.setItem(
+          "orderList",
+          JSON.stringify(
+            this.prveOrder.list.map((v) => {
+              return { ...v, cart: JSON.stringify(v.cart) };
+            })
+          )
+        );
+        this.order.list = [];
+        this.order.selIndex = -1;
+        return;
+      }
+      if (key === "getOrder") {
+        this.prveOrder.show = true;
+        this.getPrveCart();
+        return;
+      }
+    },
+    //选择挂单确认
+    async confirmChoosePrveOrder() {
+      if (this.prveOrder.list.length <= 0) {
+        return;
+      }
+      // const { sel } = this.prveOrder;
+      // const order=this.prveOrder.list[sel];
+      // const res=await $cacheOrder({
+      //   orderId:order.orderId,
+      //   isPending:false,
+      //   tableId:this.table.tableId,
+      //   masterId:order.carList[0].masterId
+      // })
+
+      const { masterId, tableId, userId, remark } = await $cacheOrder({
+        orderId: this.prveOrder.list[this.prveOrder.sel].orderId,
+        isPending: false,
+      });
+      this.masterId = masterId;
+      this.isPrverOrder = true;
+      console.log(masterId);
+      const { records } = await getCart({
+        masterId,
+        tableId,
+        vipUserId: userId != "null" ? userId : "",
+      });
+      console.log(records);
+      this.order.list = [];
+      this.order.masterId = masterId;
+      this.order.list = records;
+      this.prveOrder.show = false;
+      this.note.content = remark || "";
+      // this.delPrveOrder(false);
+    },
+    //删除挂单
+    async delPrveOrder(isRequest = true) {
+      const { sel } = this.prveOrder;
+      const order = this.prveOrder.list[sel];
+      const orderMasterId = order.carList[0].masterId;
+      //当前订单是否是当前挂单
+      const nowOrderIsPrverOrder =
+        this.isPrverOrder && orderMasterId === this.masterId;
+      if (nowOrderIsPrverOrder) {
+        const res = await this.$confirm(
+          "您正在删除当前购物车订单,是否删除?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).catch((err) => {
+          console.log(err);
+        });
+        if (!res) {
+          return;
+        }
+      }
+      if (isRequest) {
+        const res = await $delOrder({
+          orderId: order.orderId,
+        });
+        if (nowOrderIsPrverOrder) {
+          this.note.content = "";
+          this.order.list = [];
+        }
+        this.$notify({
+          message: "删除成功",
+          type: "success",
+        });
+      }
+      this.prveOrder.list.splice(sel, 1);
+      this.prveOrder.sel = sel - 1 <= 0 ? 0 : sel - 1;
+    },
+    //打开挂起订单
+    async cacheOrderShow() {
+      this.prveOrder.show = true;
+      const res = await this.getCacheOrder(true);
+      this.prveOrder.list = res;
+      if (this.prveOrder.list.length && this.prveOrder.sel !== -1) {
+        const item = this.prveOrder.list[this.prveOrder.sel];
+        console.log(item);
+        if (item) {
+          this.prveOrder.selCart = item.carList;
+        }
+      }
+    },
+    //获取挂起订单
+    async getCacheOrder(isReturn = false) {
+      this.createOrderClose();
+      if (isReturn) {
+        return $getCacheOrder({ tableId: this.table.tableId });
+      }
+      const res = await $getCacheOrder({ tableId: this.table.tableId });
+      this.prveOrder.list = res;
+    },
+    //存单
+    async saveOrder() {
+      this.createOrderClose();
+      const res = await $cacheOrder({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+        isPending: true,
+        note: this.note.content,
+      });
+      this.isPrverOrder = false;
+      this.order.masterId = "";
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.note.content = "";
+      this.$nextTick(() => {
+        this.getCacheOrder();
+      });
+      const masterIdRes = await this.getMasterId();
+      this.masterId = masterIdRes.masterId;
+    },
+    // 删除购物车商品
+    removeCart() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      $removeCart({
+        cartId: orderGoods.id,
+        tableId: this.table.tableId,
+      });
+      this.order.list.splice(this.order.selIndex, 1);
+      const newval = this.order.selIndex - 1;
+      this.order.selIndex = newval <= 0 ? 0 : newval;
+
+      //  this.$message({
+      //         type: "success",
+      //         message: "清除成功!",
+      //       });
+    },
+    // 点击订单里的加减改变购物车商品数量
+    async changeOrderNumber(index, isReduce) {
+      if (index < 0) {
+        return;
+      }
+      this.order.selIndex = index;
+      console.log(index);
+      console.log(isReduce);
+      const item = this.order.list[index];
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return this.removeCart();
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      // const res= await addCart({
+      //    productId: item.productId,
+      //     skuId: item.skuId,
+      //     tableId: this.table.tableId,
+      //     num: newval, // 0会删除此商品
+      //     isPack: false, // 是否打包
+      // })
+      this.order.list[index].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    // 点击右侧控制列表上的加减改变购物车商品数量
+    changeOrderGoodsNumber(isReduce) {
+      if (this.order.selIndex < 0) {
+        return;
+      }
+      const item = this.order.list[this.order.selIndex];
+      console.log(item);
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return;
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      console.log(newval);
+
+      // this.order.list[this.order.selIndex].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    //清空购物车
+    clearCart() {
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      this.$confirm("确定要清空点餐列表吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          $clearCart({
+            masterId: this.masterId,
+            tableId: this.table.tableId,
+          }).then((res) => {
+            this.order.list = [];
+            this.order.selIndex = -1;
+            this.$message({
+              type: "success",
+              message: "清除成功!",
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    skuNumberAdd() {
+      const number = Number(this.skuGoods.number);
+      if (number > 10000) {
+        return;
+      }
+      this.skuGoods.number = number + 1;
+    },
+    skuNumberReduce() {
+      if (this.skuGoods.number - 1 <= 0) {
+        return;
+      }
+      this.skuGoods.number -= 1;
+    },
+    toggleShowAll() {
+      this.category.showAll = !this.category.showAll;
+    },
+    changeCategoryId(item) {
+      this.goods.query.categoryId = item.id;
+    },
+    async getCategory() {
+      const { content } = await tbShopCategoryGet({
+        page: 0,
+        size: 100,
+        sort: "id",
+        shopId: localStorage.getItem("shopId"),
+      });
+      this.category.list = content.reduce((prve, cur) => {
+        prve.push(cur);
+        return [...prve, ...cur.childrenList];
+      }, []);
+      this.category.list.unshift({
+        id: "",
+        name: "全部",
+      });
+    },
+    //改变购物车菜品选中
+    changeOrderSel(index) {
+      this.order.selIndex = index;
+      this.order.old.selIndex = -1;
+    },
+    //改变已下单菜品选中
+    changeOrderOldSel(index) {
+      this.order.old.selIndex = index;
+      this.order.cacheNumber = this.order.old.list[index].number;
+    },
+    chooseSkuConfirm() {
+      if (this.timer) {
+        return;
+      }
+      this.skuGoodsAdd();
+      this.timer = setTimeout(() => {
+        clearTimeout(this.timer);
+        this.timer = null;
+      }, 500);
+      console.log(this.timer);
+    },
+    async skuGoodsAdd() {
+      let name = this.selGoods.skuList.reduce((prve, cur) => {
+        return prve + cur.sel + ",";
+      }, "");
+      name = name.substring(0, name.length - 1);
+      // const item = this.selGoods.data.specList.find((v) => v.specSnap === name);
+      const item = this.selGoods.skuMap[name];
+      if (!item.isGrounding) {
+        //该商品已经下架
+        return this.$notify({
+          title: "该商品规格已经下架",
+          type: "error",
+        });
+      }
+      let res = "";
+
+      console.log(orderGoods);
+      //更改购物车订单商品规格数量
+      if (this.selGoods.isEdit) {
+        res = await $updateCart({
+          cartId: this.order.list[this.order.selIndex].id,
+          productId: this.selGoods.data.productId,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+        });
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: name,
+        });
+        this.$notify({
+          title: "更新成功",
+          type: "success",
+        });
+        this.selGoods.show = false;
+        this.order.cacheNumber = this.skuGoods.number;
+        return;
+      }
+
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      const oldOrderGoods = this.order.old.list.find((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      if (orderGoods || oldOrderGoods) {
+        //更新
+        const newNum=(oldOrderGoods?oldOrderGoods.number:0)+(orderGoods?orderGoods.number * 1:0)  + this.skuGoods.number
+        res = await $updateCart({
+          cartId: orderGoods?orderGoods.id:oldOrderGoods.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num:newNum, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        if (this.key && orderGoodsIndex == -1) {
+          this.orderListPush({
+            ...res,
+            specSnap: name,
+            number: this.skuGoods.number,
+          });
+        } else {
+          orderGoods.number += this.skuGoods.number;
+          this.order.selIndex = orderGoodsIndex;
+          this.order.cacheNumber = orderGoods.number;
+        }
+      } else {
+        //添加
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush({ ...res, specSnap: name });
+        // this.orderListPush({
+        //   skuId: item.id,
+        //   number: this.skuGoods.number,
+        //   specSnap: name,
+        // });
+      }
+
+      this.$notify({
+        title: orderGoods ? "更新成功" : "添加成功",
+        type: "success",
+      });
+      this.selGoods.show = false;
+    },
+    orderListPush(item) {
+      const { isPack, isGift } = item;
+      // const isPack=item.isPack==='false'?false:true
+      // const isGift=item.isGift==='false'?false:true
+      this.order.list.push({ ...item, isPack, isGift });
+      this.order.selIndex = this.order.list.length - 1;
+    },
+    //设置规格按钮的禁止状态
+    setTagDisabled() {
+      const selArr = this.selGoods.skuList.reduce((prve, cur) => {
+        if (cur.sel) {
+          prve.push(cur.sel);
+        } else {
+        }
+        return prve;
+      }, []);
+      console.log(selArr);
+      let selArrAllGroup = generateCombinations(selArr, selArr.length - 1);
+      console.log(selArrAllGroup);
+      const matchArr = [];
+      for (let key in this.selGoods.skuMap) {
+        const goods = this.selGoods.skuMap[key];
+        const keyArr = key.split(",");
+        for (let spe of selArrAllGroup) {
+          if (arrayContainsAll(keyArr, spe)) {
+            matchArr.push(goods);
+            break;
+          }
+        }
+      }
+      console.log(matchArr);
+      const skuList = this.selGoods.skuList;
+      console.log(skuList);
+      //全部规格都已下架
+      if (!matchArr.length) {
+        for (let k in skuList) {
+          for (let i in skuList[k].values) {
+            this.$set(skuList[k].values[i], "disabled", true);
+          }
+        }
+        return;
+      }
+      const includeSkuMap = matchArr.reduce((prve, cur) => {
+        const speArr = cur.specSnap.split(",");
+        for (let i of speArr) {
+          if (!prve.hasOwnProperty("i")) {
+            prve[i] = matchArr
+              .filter((v) => v.specSnap.match(i))
+              .every((v) => {
+                return (
+                  !v.isGrounding || v.isPauseSale == 1 || v.stockNumber <= 0
+                );
+              });
+          }
+        }
+        return prve;
+      }, {});
+      for (let i in includeSkuMap) {
+        for (let k in skuList) {
+          const index = skuList[k].valueArr.findIndex((val) => val === i);
+          if (index !== -1) {
+            this.$set(skuList[k].values[index], "disabled", includeSkuMap[i]);
+          }
+        }
+      }
+    },
+    changeTagSel(index, val) {
+      this.$set(this.selGoods.skuList[index], "sel", val.name);
+      let specSnap = this.selGoods.skuList.reduce((a, b) => {
+        return a + b.sel + ",";
+      }, "");
+      specSnap = specSnap.substring(0, specSnap.length - 1);
+      for (let sku of this.selGoods.skuList) {
+        console.log(sku);
+      }
+      this.setTagDisabled();
+      const canChooseGoods = this.selGoods.skuList.every((v) => v.sel);
+      if (canChooseGoods) {
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+      }
+    },
+    onclose() {
+      this.$emit("close");
+      this.reset();
+    },
+    reset() {
+      // this.goods.list = [];
+      this.order.masterId = "";
+      this.order.list = [];
+      this.order.query.page = 1;
+      this.goods.total = 0;
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.order.old.list = [];
+      this.order.old.selIndex = -1;
+      this.isCreateOrder = false;
+      this.note.content = "";
+      this.vipUser = { id: "" };
+      this.allPack = false;
+      this.note.content = "";
+      this.isPrverOrder = false;
+      this.createOrder.discount = 1;
+      this.key = "";
+    },
+    //获取购物车数据
+    async getCart() {
+      const res = await getCart({
+        ...this.order.query,
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+      });
+      if (this.key) {
+        this.order.old.list = res.records;
+      } else {
+        this.order.list = res.records;
+      }
+      this.order.total = res.total;
+    },
+    showSelGoods(item) {
+      console.log(item);
+      this.selGoods.data = item;
+      this.selGoods.skuMap = {};
+      const specList = item.specList;
+      this.setSelGoodsSkuMap(specList);
+      this.setSelGoodsSkuList(
+        JSON.parse(item.skuResult.tagSnap),
+        item.specSnap
+      );
+      this.setTagDisabled();
+      const skuGoods = this.selGoods.skuMap[item.specSnap];
+      this.skuGoods.data = skuGoods;
+      this.skuGoods.number = item.number ? item.number : skuGoods.suit || 1;
+      this.selGoods.title = item.name;
+      this.selGoods.show = true;
+    },
+    // 备份版本，会过滤下架和售尽以为库存小于等于0的商品
+    async goodsClickback(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        for (let i in specList) {
+          this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+        }
+        console.log(this.selGoods.skuMap);
+
+        let specSnap = "";
+        let tagSnap = JSON.parse(item.skuResult.tagSnap).map((v) => {
+          return { ...v, newval: {} };
+        });
+        const canUseSpecSnap = {};
+        const canBudyGoods = specList.filter(
+          (v) => v.isGrounding && v.isPauseSale != 1 && v.stockNumber > 0
+        );
+        canBudyGoods.map((v) => {
+          v.specSnap.split(",").map((spe) => {
+            canUseSpecSnap[spe] = spe;
+          });
+        });
+        console.log(canUseSpecSnap);
+        for (let i in canUseSpecSnap) {
+          const item = tagSnap.find((v) => v.value.match(i));
+          item.newval[i] = i;
+        }
+        tagSnap = tagSnap.map((v) => {
+          const newvals = Object.keys(v.newval);
+          specSnap += newvals[0] + ",";
+          return {
+            ...v,
+            values: newvals,
+            sel: newvals[0],
+          };
+        });
+        console.log(tagSnap);
+        console.log(canUseSpecSnap);
+        console.log(canBudyGoods);
+        this.selGoods.skuList = tagSnap;
+        // this.selGoods.skuList = tagSnap.map((v) => {
+        //   const values = v.value.split(",");
+        //   specSnap += values[0] + ",";
+        //   return {
+        //     ...v,
+        //     values: newval,
+        //     sel: values[0],
+        //   };
+        // });
+        specSnap = specSnap.substring(0, specSnap.length - 1);
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        console.log(skuGoods);
+        this.skuGoods.number = skuGoods.suit || 1;
+        console.log(this.skuGoods.data);
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.order.selIndex = orderGoodsIndex;
+      } else {
+        //增加
+        console.log(item);
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: item.specList[0].suit, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    //多规格商品弹窗时，找到默认可以下单的规格商品
+    findGoods(skuList = [], goodsListMap = {}) {
+      const skuMapNumber = skuList.reduce((prve, cur) => {
+        for (let i in cur.valueArr) {
+          prve[cur.valueArr[i]] = i;
+        }
+        return prve;
+      }, {});
+      const canBudyGoods = this.selGoods.data.specList
+        .filter((v) => isCanBuy(v))
+        .sort((a, b) => {
+          const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          const bNumber = b.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          return aNumber - bNumber;
+        });
+      return canBudyGoods[0];
+    },
+    //设置商品默认选中,规格禁止以及选中
+    setSkugoodsDefaultInit() {
+      const skuList = this.selGoods.skuList;
+      const goodsListMap = this.selGoods.skuMap;
+      const skuGoods = this.findGoods(skuList, goodsListMap);
+      console.log(skuGoods);
+      if (skuGoods) {
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+        skuGoods.specSnap.split(",").map((v, index) => {
+          skuList[index].sel = v;
+        });
+      }
+      this.setTagDisabled();
+    },
+    // 设置当前选中商品skuList
+    setSelGoodsSkuList(skuList, specSnap) {
+      const specSnapArr = specSnap ? specSnap.split(",") : [];
+      this.selGoods.skuList = skuList.map((v, index) => {
+        const values = v.value.split(",");
+        return {
+          ...v,
+          valueArr: values,
+          sel: specSnap ? specSnapArr[index] : "",
+          values: values.map((name) => {
+            return { name, disabled: false };
+          }),
+        };
+      });
+    },
+    setSelGoodsSkuMap(specList) {
+      for (let i in specList) {
+        this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+      }
+    },
+    //根据右侧商品单规格多规格做不同处理
+    async goodsClick(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        this.setSelGoodsSkuMap(specList);
+        console.log(this.selGoods.skuMap);
+        this.setSelGoodsSkuList(JSON.parse(item.skuResult.tagSnap));
+        this.setSkugoodsDefaultInit();
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.order.selIndex = orderGoodsIndex;
+      } else {
+        //增加
+        console.log(item);
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: item.specList[0].suit, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    async getGoods() {
+      const res = await getGoodsLists(this.goods.query);
+      const goods = res.records.filter((v) => {
+        if (!v) {
+          return false;
+        }
+        let isShow = true;
+        if (v.typeEnum !== "sku") {
+          isShow = v.specList.length >= 1;
+        }
+        return isShow;
+      });
+      this.goods.list = goods;
+      this.goods.total = res.total;
+      this.$goodsData = goods;
+    },
+    async open(item, key) {
+      this.table = item;
+      this.key = key;
+      if (this.key == "isPayOrder") {
+        this.isCreateOrder = true;
+      }
+      this.informationdialogshow;
+      this.informationdialogshow = true;
+      const res = await this.getMasterId();
+      this.masterId = res.masterId;
+      if (this.key == "isPayOrder") {
+        this.toCreateOrder(true);
+      }
+      this.getCart();
+      this.getGoods();
+      this.getCategory();
+      // this.getPrveCart();
+      this.getCacheOrder();
+    },
+    close() {
+      this.informationdialogshow = false;
+      this.$emit("close");
+    },
+    resetCommodityArr() {
+      this.commodityArr = [];
+      this.$refs.addSelect.resetFields();
+    },
+    haocaiCancel() {
+      this.informationdialogshow = false;
+    },
+    haocaiConfirm() {
+      console.log(haocaiSelectedMap);
+
+      this.$emit("confirm", haocaiSelectedMap);
+      this.informationdialogshow = false;
+      return;
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1;
+      this.getTableData();
+    },
+    paginationChangeinformation(e) {
+      this.goods.query.page = e;
+      this.getGoods();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/* 针对所有input type="number" */
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.full-screen {
+  margin-left: 10px;
+  svg {
+    width: 24px;
+    height: 24px;
+  }
+  &:hover {
+    path {
+      fill: #1890ff;
+    }
+  }
+}
+
+.icon-add {
+  color: rgb(34, 191, 100);
+  font-size: 22px;
+  cursor: pointer;
+}
+.prve-car-len {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 2px;
+  right: 2px;
+  height: 16px;
+  width: 16px;
+  font-size: 12px;
+  color: rgb(255, 255, 255);
+  border-radius: 50%;
+  background-color: rgb(250, 85, 85);
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+}
+::v-deep .el-button--text {
+  color: #000;
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+  padding: 0 4px;
+  text-align: center;
+}
+::v-deep .el-empty {
+  padding: 0;
+}
+::v-deep .el-button--success:not(.is-disabled) {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .el-tag--dark .el-tag--success {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .flex-1 .el-button {
+  width: 100%;
+}
+::v-deep .el-button--success.is-plain {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border: 1px solid #22bf64;
+}
+::v-deep .el-button--medium {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+// ::v-deep .el-button.is-plain:hover, .el-button.is-plain:focus{
+//   background: rgba(34, 191, 100, .1);
+//     color: #22bf64;
+//     border: 1px solid #22bf64;
+// }
+
+::v-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 {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.carts_list_title {
+  padding: 16px 0 12px 0;
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.4);
+  &::after {
+    content: "";
+    flex: 1;
+    height: 1px;
+    background-color: #ebebeb;
+    margin-left: 10px;
+  }
+}
+
+.lh-16 {
+  line-height: 16px;
+}
+.good_info_discount {
+  height: 16px;
+  padding: 0 3px;
+  color: #ff3f3f;
+  background-color: rgba(255, 63, 63, 0.1);
+  border-radius: 2px;
+  margin-left: 6px;
+  font-size: 12px;
+  white-space: nowrap;
+}
+.icon-remove {
+  border: 1px solid #d8d8d8;
+  width: 22px;
+  height: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  &::after {
+    content: "";
+    display: block;
+    width: 10px;
+    height: 1px;
+    background: #999;
+  }
+}
+.row-center {
+  justify-content: center;
+}
+.sku-group-text {
+  text-align: left;
+  color: #666;
+  font-size: 11px;
+  margin-top: 2px;
+}
+
+.price {
+  font-size: 18px;
+  text-align: left;
+  color: rgb(255, 81, 82);
+  font-weight: 600;
+}
+.youhui {
+  color: #c12a2a;
+  font-size: 13px;
+  line-height: 16px;
+}
+
+::v-deep .el-dialog__footer {
+  border-top: 1px solid #efefef;
+}
+
+.sku-bottom {
+  padding: 14px 12px 5px;
+}
+
+.relative {
+  position: relative;
+}
+.col-baseline {
+  align-items: baseline;
+}
+.flex-x-y-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #efefef;
+}
+::v-deep .el-dialog__body {
+  padding: 0 20px;
+}
+.absolute {
+  position: absolute;
+}
+
+.order-number-box {
+  position: relative;
+
+  .absolute {
+    width: 60px;
+    height: 40px;
+    right: -30px;
+    top: -12px;
+    position: absolute;
+
+    .order-input-number {
+      position: absolute;
+      right: -6px;
+      top: 0;
+      justify-content: center;
+      align-items: center;
+      display: none;
+      background-color: #fff;
+      border: 1px solid #e4e7ed;
+      border-radius: 4px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+      padding: 9px 6px;
+      background-color: #fff;
+      height: 40px;
+    }
+
+    &:hover .order-input-number {
+      display: flex;
+    }
+  }
+}
+
+.ft-12 {
+  font-size: 12px;
+}
+
+.ft-18 {
+  font-size: 18px;
+}
+
+.transition {
+  transition: all 0.2s ease-in-out;
+}
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #efefef;
+}
+
+.tableId {
+  padding: 9px 15px;
+  border: 1px solid #dcdfe6;
+  font-size: 12px;
+  border-radius: 3px;
+  cursor: pointer;
+
+  &:hover {
+    border-color: #409eff;
+    color: #409eff;
+    background-color: rgba(24, 144, 255, 0.1);
+  }
+}
+
+.cur-pointer {
+  cursor: pointer;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.flex-wrap {
+  flex-wrap: wrap;
+}
+
+.mt-14 {
+  margin-top: 14px;
+}
+
+.my-btn {
+  outline: none;
+  height: 40px;
+  font-size: 14px;
+  line-height: 40px;
+  color: #000;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 0 5px;
+  background-color: #fff;
+  position: relative;
+
+  &.disabled {
+    color: #c0c4cc;
+    cursor: not-allowed;
+    background-color: #fff;
+    border-color: #ebeef5;
+  }
+}
+.flex-xy-cnter {
+  justify-content: center;
+  align-items: center;
+}
+.flex-wrap {
+  flex: 1;
+}
+.headimg {
+  width: 34px;
+  height: 34px;
+  display: block;
+  border-radius: 2px;
+  margin-right: 6px;
+}
+.take_order_list {
+  padding: 14px 0;
+  display: flex;
+  justify-content: space-between;
+  .tol_left_list {
+    height: 360px;
+    margin-right: 24px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolll_item {
+      border: 1px solid rgb(247, 247, 250);
+      height: 86px;
+      width: 130px;
+      padding: 10px 14px;
+      margin-bottom: 12px;
+      border-radius: 4px;
+      color: #303133;
+
+      background-color: #f7f7fa;
+      &.active {
+        border: 1px solid rgb(0, 194, 95);
+        background-color: rgba(0, 194, 95, 0.1);
+        color: rgb(0, 194, 95) !important;
+        .tollli_time,
+        .tollli_num {
+          color: rgb(0, 194, 95) !important;
+        }
+      }
+      cursor: pointer;
+      .tollli_index {
+        font-weight: 600;
+        font-size: 18px;
+      }
+      .tollli_price {
+        margin-top: 8px;
+        font-size: 14px;
+      }
+      .tollli_time_and_num {
+        margin-top: 6px;
+        display: flex;
+        justify-content: space-between;
+        .tollli_time,
+        .tollli_num {
+          font-size: 12px;
+          color: #909399;
+        }
+      }
+    }
+  }
+  .tol_right_list {
+    flex: 1;
+    height: 360px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolrl_item {
+      display: flex;
+      padding: 2px 2px 13px 2px;
+      margin-bottom: 12px;
+      border-bottom: 1px solid #ebebeb;
+      .tolrli_img {
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 4px;
+        }
+      }
+      .tolrli_right {
+        display: flex;
+        justify-content: space-between;
+        flex: 1;
+        flex-direction: column;
+        padding: 1px 0 1px 8px;
+        .tr_top {
+          display: flex;
+          justify-content: space-between;
+          .trt_name {
+            width: 150px;
+            font-size: 14px;
+            color: #212121;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .trt_num {
+            font-size: 14px;
+            color: #212121;
+          }
+          .trt_price {
+            width: 100px;
+            text-align: right;
+            font-size: 14px;
+            color: #212121;
+          }
+        }
+        .tr_bottom {
+          font-size: 12px;
+          color: #999;
+        }
+      }
+    }
+  }
+}
+
+.success {
+  color: #fff;
+  border-color: #22bf64;
+  background-color: rgb(34, 191, 100);
+}
+
+.categoty {
+  position: sticky;
+  top: 0;
+  background-color: #f7f7fa;
+  z-index: 1;
+  padding-top: 14px;
+  margin-left: 7px;
+
+  .show_more_btn {
+    padding: 0 10px;
+    color: #1890ff;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    user-select: none;
+    min-width: 80px;
+    background: #f7f7fa;
+    position: absolute;
+    right: -20px;
+    top: 14px;
+    height: 38px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .el-icon-arrow-down {
+      transition: all 0.2s;
+    }
+
+    &.showAll .el-icon-arrow-down {
+      transform: rotate(180deg);
+    }
+  }
+}
+
+.search-box {
+  display: flex;
+  justify-content: flex-end;
+  margin-left: 12px;
+  border-bottom: 1px solid #ebebeb;
+}
+::v-deep .el-dialog__title {
+  font-size: 20px;
+  font-weight: 600;
+}
+
+::v-deep .categorys .el-tag--plain.el-tag--success {
+  border: 1px solid #dcdfe6;
+  color: #000;
+  font-weight: 600;
+}
+
+::v-deep .el-dialog {
+  user-select: none;
+}
+
+::v-deep .categorys .el-tag {
+  min-width: 80px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 14px;
+  font-size: 14px;
+  font-weight: 600;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+}
+
+::v-deep .tag-group .el-tag {
+  min-width: 80px;
+  height: 28px;
+  line-height: 28px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 15px;
+  font-size: 14px;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+  border-radius: 4px;
+}
+
+::v-deep .tag-group .el-tag--light {
+  color: #000;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+}
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: #22bf64;
+  border-color: #22bf64;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #22bf64;
+}
+
+::v-deep .tag-group .el-tag--dark {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border-color: #22bf64;
+}
+.no-search-result {
+  color: #888;
+  margin: 0 0 10px 7px;
+}
+
+.numberbox {
+  border: 1px solid #dcdfe6;
+  background-color: #fff;
+  color: #000;
+  min-height: 38px;
+  line-height: 38px;
+  text-align: center;
+  border-radius: 4px;
+  position: relative;
+  margin: 0 0 10px;
+
+  .reduce,
+  .add {
+    font-size: 28px;
+    color: #999;
+    height: 38px;
+    line-height: 38px;
+    text-align: center;
+  }
+
+  .input {
+    font-size: 30px;
+    display: flex;
+    overflow: hidden;
+    padding: 0 10px;
+    height: 50px;
+    border-top: 1px solid #dcdfe6;
+    border-bottom: 1px solid #dcdfe6;
+
+    input {
+      height: 100%;
+      width: 100%;
+      box-sizing: border-box;
+      outline: none;
+      justify-content: center;
+      border: none;
+      text-align: center;
+    }
+  }
+}
+
+.tag-group {
+  margin-top: 10px;
+
+  .tag-item {
+    margin-bottom: 20px;
+
+    .tag-name {
+      margin-bottom: 10px;
+      font-size: 12px;
+      color: #999;
+    }
+  }
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+}
+
+.row-between {
+  justify-content: space-between;
+}
+
+.row-right {
+  justify-content: flex-end;
+}
+
+.none {
+  display: none !important;
+}
+
+.handle {
+  font-size: 18px;
+  color: #999;
+
+  &:hover {
+    cursor: grab;
+  }
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 8px;
+    display: flex;
+    flex-direction: column;
+
+    .tag_wrap {
+      display: flex;
+    }
+  }
+}
+
+.font-bold {
+  font-weight: bold;
+}
+
+.head-container .filter-item {
+  margin: 0 5px 0 0;
+}
+
+.diancan {
+  display: flex;
+  height: calc(100vh - 75px);
+  .choose-user {
+    padding: 10px 0;
+    border-bottom: 1px solid #ebebeb;
+    margin-bottom: 10px;
+  }
+  .order {
+    border-radius: 6px;
+    display: flex;
+    padding-left: 12px;
+    .bottom {
+      left: 0;
+      right: 0;
+      box-sizing: border-box;
+      padding: 14px;
+      bottom: 0;
+      background-color: #fff;
+      z-index: 10;
+      border-top: 1px solid #ebebeb;
+    }
+
+    .list {
+      width: 352px;
+      padding: 12px 12px 0 0;
+    }
+
+    .controls {
+      min-width: 106px;
+      width: 106px;
+      border-radius: 4px;
+      background-color: #f7f7fa;
+      padding: 14px 10px;
+      position: relative;
+      overflow-y: auto;
+
+      .btn {
+        border: 1px solid #dcdfe6;
+        background-color: #fff;
+        color: #000;
+        min-height: 38px;
+        line-height: 38px;
+        text-align: center;
+        border-radius: 4px;
+        position: relative;
+        cursor: pointer;
+        margin: 0 0 10px;
+
+        &.disabled {
+          color: #999;
+          pointer-events: none;
+          cursor: no-drop;
+          background-color: rgb(250, 250, 252);
+        }
+      }
+    }
+
+    .order-item {
+      padding: 4px;
+      border-radius: 2px;
+      display: flex;
+      cursor: pointer;
+      align-items: center;
+      justify-content: space-between;
+      background-color: rgba(0, 0, 0, 0);
+      transition: all 0.3s;
+      .pack {
+        right: 100%;
+        width: 18px;
+        height: 18px;
+        background: #35ac6a;
+        border-radius: 4px 0 4px 0;
+        font-size: 12px;
+        color: #fff;
+        text-align: center;
+        line-height: 17px;
+      }
+      &.active {
+        background-color: rgba(0, 0, 0, 0.04);
+      }
+
+      .total-price {
+        width: 94px;
+        text-align: right;
+      }
+
+      .good-info {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-width: 70px;
+
+        .specSnap {
+          color: #999;
+          font-size: 12px;
+          margin-top: 3px;
+        }
+      }
+
+      .name {
+        font-size: 13px;
+        text-align: left;
+        color: #212121;
+        overflow: hidden;
+      }
+
+      .img {
+        width: 40px;
+        height: 40px;
+        position: relative;
+        margin-right: 10px;
+
+        img {
+          width: 40px;
+          height: 40px;
+        }
+      }
+    }
+  }
+
+  .goods {
+    box-sizing: border-box;
+    flex: 1;
+    background-color: #f7f7fa;
+    margin-left: 20px;
+    padding: 0 15px 14px 15px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    .goods-list {
+      display: flex;
+      flex-wrap: wrap;
+
+      .goods-item {
+        position: relative;
+        cursor: pointer;
+        min-width: 98px;
+        max-width: 100px;
+        height: 100px;
+        // flex: 1;
+        margin: 0 7px 14px;
+        border-radius: 4px;
+        .timeSale {
+          text-align: center;
+          border-radius: 10px;
+          background-color: hsla(0, 0%, 99.2%, 0.5);
+          color: #fff;
+          font-size: 10px;
+          line-height: 16px;
+          padding: 2px 10px;
+          margin-top: 2px;
+        }
+        .sell-out {
+          width: 100%;
+          height: 100%;
+          padding: 10px;
+          background: rgba(0, 0, 0, 0.4);
+          z-index: 2;
+          position: absolute;
+          top: 0;
+          font-size: 14px;
+          font-weight: 400;
+          text-align: left;
+          color: #fff;
+        }
+        overflow: hidden;
+        position: relative;
+
+        .typeEnum {
+          position: absolute;
+          right: 0;
+          top: 0;
+          border-radius: 0 0 0 10px;
+          background-color: #46a6ff;
+          color: #fff;
+          padding: 2px 10px;
+          display: none;
+        }
+
+        .info {
+          font-size: 14px;
+          position: absolute;
+          inset: 0;
+          background: rgba(0, 0, 0, 0.4);
+          color: #fff;
+          box-sizing: border-box;
+          padding: 10px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+        .img-box {
+          width: 100%;
+          height: 100%;
+          position: relative;
+        }
+        .text-sell-out {
+          width: 100%;
+          justify-content: center;
+          height: 60px;
+          svg {
+            width: 60px;
+            height: 60px;
+          }
+          // z-index: 1;
+          // position: absolute;
+          // right: 0;
+          // top: 0;
+        }
+        .sell-out-svg {
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          bottom: 0;
+          background: rgba(0, 0, 0, 0.5);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        img {
+          width: 100%;
+          height: 100%;
+        }
+        &.layout-img-and-text {
+          min-width: 116px !important;
+          max-width: 136px !important;
+          height: 175px;
+          background-color: #fff;
+          display: flex;
+          flex-direction: column;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.07);
+          .img-box {
+            width: 136px;
+          }
+          img {
+            width: 136px;
+            height: 125px;
+          }
+          .info {
+            position: inherit;
+            background-color: #fff;
+            padding: 4px 4px 8px;
+            color: #000;
+            .name {
+              font-size: 15px;
+              font-weight: 600;
+              height: 20px;
+              line-height: 20px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              margin-bottom: 2px;
+            }
+            .price {
+              font-size: 13px;
+            }
+          }
+        }
+        &.layout-text {
+          margin: 0 5px 10px;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.08);
+          min-width: 128px !important;
+          max-width: 148px !important;
+          background-color: #fff;
+          height: auto;
+          .info {
+            background-color: #fff;
+
+            position: inherit;
+            color: #000;
+            .name {
+              font-weight: 600;
+              font-size: 15px;
+              color: #000;
+              line-height: 22px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+
+              height: 44px;
+            }
+
+            .price {
+              font-weight: 600;
+              font-size: 16px;
+              margin: 6px 0 0;
+            }
+          }
+          img {
+            display: none;
+          }
+        }
+        &.layout-text.sell-out {
+          .info {
+            color: #c8c8c8;
+
+            .name {
+              color: #c8c8c8;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.carts {
+  flex-direction: column;
+  background: #fff;
+  height: 100%;
+  position: relative;
+  z-index: 10;
+}
+
+.carts .title,
+.carts {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+}
+
+.carts .title {
+  justify-content: space-between;
+  height: 64px;
+  border-bottom: 1px solid #ebebeb;
+  padding: 20px;
+  padding-top: 30px;
+}
+
+.carts .title .left {
+  font-family: PingFangSC-Medium;
+  font-weight: 500;
+  font-size: 18px;
+  color: #000;
+}
+
+.carts .title .right {
+  font-size: 14.4px;
+  cursor: pointer;
+}
+
+.carts .box_status {
+  width: 370px;
+  height: 58px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-top: 20px;
+  font-family: MicrosoftYaHei;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+}
+
+.carts .box_status span {
+  padding: 0 5px;
+}
+
+.number_list_box {
+  width: 370px;
+  background: #fff;
+  border-radius: 3px;
+  margin: 20px 0;
+}
+
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+
+.yd-keyboard {
+  justify-content: center;
+  margin-top: -8px;
+  margin-left: -8px;
+}
+
+.mini-number-box1 .mini-number,
+.yd-keyboard {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box1 .mini-number {
+  margin-left: 8px;
+  border: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line {
+  margin-top: 0;
+}
+
+.mini-number-box1 .mini-number .key {
+  width: 122px;
+  height: 60px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin-left: 0;
+}
+
+.mini-number-box1 .mini-number .key:not(:last-child) {
+  border-right: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line:not(:last-child) {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.mini-number-box2 {
+  display: flex;
+
+  justify-content: center;
+}
+
+.mini-number-box2 .key {
+  width: 80px;
+  height: 70px;
+}
+
+.mini-number-box2 .function-button {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box2 .function-button .key {
+  margin-top: 8px;
+}
+
+.key-line {
+  margin-top: 8px;
+}
+
+.key,
+.key-line {
+  display: flex;
+
+  justify-content: center;
+}
+
+.key {
+  width: 64px;
+  height: 64px;
+  background: #fff;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  border-radius: 4px;
+
+  align-items: center;
+  margin-left: 8px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 34px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.simple-Keyboard-number,
+.simple-Keyboard-weight {
+  min-width: 410px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 999;
+  background: #fff;
+  -webkit-box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  border-radius: 4px;
+  overflow: hidden;
+}
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+.disabled-box {
+  position: absolute;
+  inset: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.cashier_box {
+  display: flex;
+  width: 100%;
+  padding-top: 14px;
+  flex: 1;
+  background: #f7f7fa;
+  position: relative;
+  margin: 0 24px 0 0;
+  border-radius: 4px;
+  overflow-y: auto;
+}
+
+.cashier_left .el-form-item {
+  margin-bottom: 0;
+}
+
+.cashier_left {
+  padding: 0 20px 0;
+
+  flex: 1;
+  min-width: 310px;
+}
+
+.cashier_left .title {
+  font-size: 18px;
+  color: #000;
+  font-weight: 600;
+  padding: 20px 0;
+}
+
+.cashier_left .detail_box {
+  background: #fff;
+  border-radius: 4px;
+  padding: 0 14px;
+  margin-bottom: 20px;
+}
+
+.cashier_left .detail_box .forms {
+  padding: 10px 0;
+  border-top: 1px solid #ebebeb;
+}
+
+.cashier_left .detail_box .usercard {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+  height: 80px;
+  cursor: pointer;
+}
+
+.cashier_left .detail_box .usercard .info {
+  margin-left: 10px;
+
+  display: flex;
+
+  flex-direction: column;
+
+  justify-content: space-around;
+}
+
+.cashier_left .detail_box .usercard .info .nickname {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+}
+
+.cashier_left .detail_box .usercard .info .nickname .txt {
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 25px;
+  line-height: 25px;
+}
+::v-deep .cashier_left .el-form-item__label {
+  text-align: left;
+}
+.cashier_left .detail_box .usercard .info .nickname .vip_level {
+  font-size: 12px;
+  padding: 0 5px;
+  background: #f7793d;
+  height: 20px;
+  line-height: 20px;
+  color: #fff;
+  border-radius: 4px;
+}
+
+.cashier_left .detail_box .usercard .info .other_info {
+  display: flex;
+  font-size: 14px;
+  color: #666;
+}
+
+.cashier_left .detail_box .usercard .info .other_info .item {
+  margin-right: 10px;
+}
+
+.cashier_right {
+  min-width: 250px;
+  border-left: 1px solid #ebebeb;
+
+  display: flex;
+
+  flex-direction: column;
+  padding-bottom: 20px;
+}
+
+.cashier_right .detail_form {
+  flex: 1;
+  overflow-y: auto;
+}
+
+.cashier_right .detail_form .detail_form_item {
+  display: flex;
+
+  justify-content: space-between;
+  position: relative;
+  margin-bottom: 16px;
+
+  align-items: center;
+}
+
+.cashier_right .detail_form .detail_form_item .left {
+  font-size: 14px;
+  color: #000;
+  letter-spacing: 1px;
+}
+
+.cashier_right .detail_form .detail_form_item .right {
+  font-size: 14px;
+  color: #000;
+
+  display: flex;
+  margin-right: 40px;
+}
+
+.cashier_right .detail_form .detail_form_item .right .btn {
+  font-size: 14px;
+  color: #1890ff;
+  margin-left: 10px;
+  cursor: pointer;
+  position: absolute;
+  right: 0;
+}
+
+.cashier_right .detail_form .detail_form_item .right .dfi_button {
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-left: 10px;
+  width: 98px;
+  height: 36px;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.8);
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.cashier_right .detail_form .detail_form_item .redfont {
+  color: #fa5555;
+  font-size: 20px;
+}
+
+.cashier_right .detail_form .line {
+  width: 100%;
+  height: 1px;
+  background: #ebebeb;
+  margin-top: 4px;
+  margin-bottom: 20px;
+}
+
+.cashier_right .pay_btn {
+  width: 100%;
+  line-height: 44px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  color: #fff;
+  letter-spacing: 1px;
+  cursor: pointer;
+}
+
+.cashier_right .pay_btn:hover {
+  opacity: 0.9;
+}
+
+.btn1 {
+  background: #22bf64;
+  color: #fff;
+  border: none;
+}
+.pay_btns .el-button + .el-button {
+  margin-left: 0;
+}
+
+.pay_btns .el-button {
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+
+.pay_btns .el-button:disabled {
+  border: 1px solid #dcdfe6;
+}
+</style>
diff --git a/src/views/tool/table/components/table-diancan-oldList-back.vue b/src/views/tool/table/components/table-diancan-oldList-back.vue
new file mode 100644
index 0000000..50452fd
--- /dev/null
+++ b/src/views/tool/table/components/table-diancan-oldList-back.vue
@@ -0,0 +1,3839 @@
+<!-- eslint-disable no-empty -->
+<template>
+  <div class="">
+    <el-dialog
+      :title="title"
+      fullscreen
+      :visible.sync="informationdialogshow"
+      @close="onclose"
+    >
+      <div slot="title" class="flex row-between flex-y-center">
+        <div class="flex" style="width: 500px">
+          <div class="el-dialog__title" style="margin-right: 10px">
+            {{ title }}
+          </div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="success" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+          <span
+            @click="toggleFullScreen"
+            class="flex flex-xy-center cur-pointer full-screen"
+          >
+            <svg
+              v-if="!isFullScreen"
+              t="1724396447139"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="8943"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M358.4 768H426.666667v85.333333H213.333333v-213.333333h85.333334v68.266667l128-128 59.733333 59.733333-128 128z m345.6 0l-128-128 59.733333-59.733333 132.266667 132.266666V640h85.333333v213.333333h-213.333333v-85.333333h64zM358.4 298.666667l128 128-59.733333 59.733333-128-128V426.666667H213.333333V213.333333h213.333334v85.333334H358.4z m345.6 0H640V213.333333h213.333333v213.333334h-85.333333V354.133333l-132.266667 132.266667-59.733333-59.733333 128-128z"
+                fill="#666666"
+                p-id="8944"
+              ></path>
+            </svg>
+            <svg
+              v-else
+              t="1724396479520"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="9141"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M298.666667 631.466667H226.133333v-81.066667h217.6v204.8h-85.333333v-68.266667l-128 128L170.666667 759.466667l128-128z m422.4 0l128 128-59.733334 59.733333-128-128v68.266667h-85.333333V554.666667h217.6v81.066666h-72.533333zM298.666667 341.333333L187.733333 230.4 243.2 170.666667l115.2 115.2V217.6h85.333333v204.8H226.133333V341.333333H298.666667z m430.933333 0h64v81.066667h-217.6V217.6h85.333333v72.533333L780.8 170.666667l59.733333 59.733333L729.6 341.333333z"
+                fill="#666666"
+                p-id="9142"
+              ></path>
+            </svg>
+          </span>
+        </div>
+
+        <div class="flex flex-1" style="padding-right: 50px">
+          <div class="flex-1">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="head-container search-box flex row-between" v-if="false">
+        <div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="success" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+
+        <div class="flex">
+          <div style="width: 300px">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+            <!-- @keyup.enter.native="getGoods" -->
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <!-- <el-button style="margin-right: 10px" type="primary" @click="getGoods"
+            >查询</el-button
+          >
+          <el-button @click="reset">重置</el-button> -->
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="diancan">
+        <div class="order">
+          <div class="relative">
+            <div style="padding-right: 14px">
+              <div class="choose-user flex">
+                <el-button
+                  type="success"
+                  v-if="vipUser.id === ''"
+                  @click="refChooseUserOpen"
+                  >选择用户</el-button
+                >
+                <template v-else>
+                  <div class="flex cur-pointer" @click="refChooseUserOpen">
+                    <img
+                      v-if="vipUser.headImg"
+                      class="headimg"
+                      :src="vipUser.headImg"
+                      alt=""
+                    />
+                    <div v-else class="headimg flex flex-x-y-center">
+                      <i class="el-icon-user"></i>
+                    </div>
+                    <div>
+                      <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                      <div style="margin-top: 2px" class="color-666 ft-12">
+                        余额：{{ vipUser.amount }}
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </div>
+              <div class="flex row-between">
+                <!-- <div class="tableId" @click="chooseTableOpen"> -->
+                <div class="tableId">
+                  {{ table ? "桌台号：" + table.name : "桌台号/取餐号" }}
+                </div>
+
+                <el-button
+                  @click="clearCart"
+                  type="text"
+                  size="mini"
+                  :disabled="order.list.length <= 0"
+                  >清空</el-button
+                >
+                <!-- <div
+                  class="clear cur-pointer color-000 flex"
+                  @click="clearCart"
+                >
+                  清空
+                </div> -->
+              </div>
+            </div>
+            <div class="absolute bottom">
+              <div class="flex row-right youhui" v-if="giftLen">
+                <span> 已优惠￥{{ allGiftMoney | to2 }} </span>
+                <i class="el-icon-arrow-right"></i>
+              </div>
+
+              <div class="flex row-between">
+                <el-checkbox
+                  v-model="order.allPack"
+                  :disabled="!this.order.list.length"
+                  >打包</el-checkbox
+                >
+                <div class="flex">
+                  <span class="color-666" style="margin-right: 5px"
+                    >共{{ allNumber }}件</span
+                  >
+                  <span class="color-000 ft-18">￥{{ allPrice }} </span>
+                </div>
+              </div>
+
+              <div class="flex mt-14">
+                <template v-if="isCreateOrder">
+                  <button
+                    class="my-btn flex-1 default"
+                    @click="createOrderClose"
+                  >
+                    <span>加菜/返回</span>
+                  </button>
+                  <div style="width: 15px"></div>
+                  <button class="my-btn flex-1 success" @click="payOrder">
+                    <span>立即支付</span>
+                  </button>
+                </template>
+                <template v-else>
+                  <!-- <el-dropdown
+                    split-button
+                    size="medium"
+                    type="success"
+                    @command="changeIsPrint"
+                  >
+                    {{ isPrint ? "下单并打印制作单" : "仅下单(不打印)" }}
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item :command="false"
+                        >仅下单(不打印)</el-dropdown-item
+                      >
+                      <el-dropdown-item :command="true"
+                        >下单并打印制作单</el-dropdown-item
+                      >
+                    </el-dropdown-menu>
+                  </el-dropdown> -->
+                  <template v-if="postPay">
+                    <div class="flex-1">
+                      <el-button
+                        type="success"
+                        size="medium"
+                        :disabled="!order.list.length"
+                        @click="toCreateOrder(false)"
+                      >
+                        仅下单
+                      </el-button>
+                    </div>
+                    <div style="width: 15px"></div>
+                  </template>
+                  <div class="flex-1">
+                    <el-button
+                      size="medium"
+                      :disabled="!order.list.length && !order.old.list.length"
+                      @click="toCreateOrder(true)"
+                    >
+                      去结账
+                    </el-button>
+                  </div>
+                </template>
+              </div>
+            </div>
+            <div class="list">
+              <!-- 当前购物车列表 -->
+              <template v-if="order.list.length">
+                <cart-item
+                  @itemClick="changeOrderSel"
+                  @changeOrderNumber="changeOrderNumber"
+                  @cartGoodsNumberInput="cartGoodsNumberInput"
+                  @cartGoodsNumberChange="cartGoodsNumberChange"
+                  v-for="(item, index) in order.list"
+                  :key="index"
+                  :index="index"
+                  :item="item"
+                  :selIndex="order.selIndex"
+                ></cart-item>
+              </template>
+              <div v-if="order.gift.list.length">
+                <div class="carts_list_title">以下是优惠菜品</div>
+              </div>
+
+              <div v-if="!order.list.length">
+                <el-empty
+                  :image-size="50"
+                  description="点餐列表为空"
+                ></el-empty>
+              </div>
+            </div>
+            <!-- 已下单菜品列表 -->
+            <template v-if="order.old.list.length">
+              <div class="carts_list_title">已下单菜品</div>
+              <div class="list">
+                <cart-item
+                  @itemClick="changeOrderOldSel"
+                  :canChangeNumber="false"
+                  v-for="(item, index) in order.old.list"
+                  :key="index"
+                  :index="index"
+                  :item="item"
+                  :selIndex="order.old.selIndex"
+                ></cart-item>
+              </div>
+            </template>
+
+            <div class="order_remark" v-if="note.content">
+              订单备注： {{ note.content }}
+            </div>
+          </div>
+
+          <div class="controls">
+            <div
+              class="numberbox"
+              :class="{ 'cur-pointer': order.old.selIndex < 0 }"
+            >
+              <div class="reduce" @click="changeOrderGoodsNumber('-')">-</div>
+              <div class="input relative">
+                <div
+                  class="disabled-box"
+                  v-if="order.selIndex >= 0"
+                  @click="changeKeyboradShow(true)"
+                ></div>
+                <!-- <input type="number" :disabled="order.selIndex<0" v-model="order.number" /> -->
+                <input
+                  type="number"
+                  disabled
+                  v-model="order.number"
+                  style="display: none"
+                />
+                <input type="number" disabled v-model="order.cacheNumber" />
+              </div>
+              <div class="add" @click="changeOrderGoodsNumber()">+</div>
+            </div>
+            <!-- <div class="btn" v-for="(item, index) in order.btns" :key="index" :class="{ disabled: item.disabled }" @click="orderBtnsClick(index,item)">
+              {{ item.text }}
+            </div> -->
+            <div
+              class="btn"
+              :class="{ disabled: !isSku }"
+              @click="orderBtnsClick('sku')"
+            >
+              规格
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('gift')"
+            >
+              {{ returnGiftText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('pack')"
+            >
+              {{ returnPackText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('del')"
+            >
+              删除
+            </div>
+
+            <div
+              class="btn"
+              :class="{ disabled: !order.list.length ||key}"
+              @click="saveOrder"
+            >
+              存单
+            </div>
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length ||key}"
+              @click="cacheOrderShow"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div>
+
+            <!-- <div
+              class="btn"
+              :class="{ disabled: !order.list.length }"
+              @click="orderBtnsClick('save')"
+            >
+              存单
+            </div>
+
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length }"
+              @click="orderBtnsClick('getOrder')"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div> -->
+
+            <div class="btn" @click="refNoteShow">整单备注</div>
+          </div>
+        </div>
+        <div class="goods">
+          <template v-if="!isCreateOrder">
+            <div class="flex categoty">
+              <div
+                class="show_more_btn"
+                :class="{ showAll: category.showAll }"
+                @click="toggleShowAll"
+              >
+                <div class="flex">
+                  <div class="flex">
+                    <i class="el-icon-arrow-down"></i>
+                  </div>
+                  <span>展开</span>
+                </div>
+              </div>
+              <div
+                class="flex categorys"
+                :class="{ 'flex-wrap': category.showAll }"
+              >
+                <div
+                  v-for="(item, index) in category.list"
+                  :key="index"
+                  @click="changeCategoryId(item)"
+                >
+                  <el-tag
+                    size="medium"
+                    type="success"
+                    effect="dark"
+                    v-if="goods.query.categoryId === item.id"
+                    >{{ item.name }}</el-tag
+                  >
+                  <el-tag size="medium" type="success" v-else effect="plain">{{
+                    item.name
+                  }}</el-tag>
+                </div>
+              </div>
+            </div>
+            <div
+              class="no-search-result"
+              v-if="search.list.length <= 0 && goods.query.productId !== ''"
+            >
+              未找到相关商品
+            </div>
+            <div class="goods-list" v-if="goods.list.length">
+              <div
+                class="goods-item"
+                :class="{
+                  'sell-out':
+                    item.isPauseSale ||
+                    (item.typeEnum !== 'sku' && item.stockNumber <= 0),
+                  'layout-img-and-text': layout.sel === 'img-and-text',
+                  'layout-text': layout.sel === 'text',
+                  none:
+                    (goods.query.categoryId !== '') &
+                    (goods.query.categoryId != item.categoryId),
+                }"
+                @click="goodsClick(item)"
+                v-for="(item, index) in goods.list"
+                :key="index"
+              >
+                <!-- <div class="sell-out flex flex-xy-cnter">
+                  <svg t="1724210152457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6417" width="64" height="64"><path d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z" fill="#ffffff" p-id="6418"></path><path d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z" fill="#ffffff" p-id="6419"></path><path d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z" fill="#ffffff" p-id="6420"></path><path d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z" fill="#ffffff" p-id="6421"></path></svg>
+                </div> -->
+
+                <div class="flex img-box" v-if="layout.sel !== 'text'">
+                  <img class="goods-img" :src="item.coverImg" alt="" />
+                  <template v-if="layout.sel === 'img-and-text'">
+                    <div class="sell-out-svg" v-if="isSellOut(item)">
+                      <svg
+                        t="1724234807994"
+                        class="icon"
+                        viewBox="0 0 1024 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="4356"
+                        width="64"
+                        height="64"
+                      >
+                        <path
+                          d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                          fill="#ffffff"
+                          p-id="4357"
+                        ></path>
+                        <path
+                          d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                          fill="#ffffff"
+                          p-id="4358"
+                        ></path>
+                        <path
+                          d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                          fill="#ffffff"
+                          p-id="4359"
+                        ></path>
+                        <path
+                          d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                          fill="#ffffff"
+                          p-id="4360"
+                        ></path>
+                      </svg>
+                    </div>
+                  </template>
+                </div>
+                <div class="typeEnum">
+                  <span>{{ item | returntypeName }}</span>
+                </div>
+                <div class="info">
+                  <div class="name">{{ item.name }}</div>
+                  <div>
+                    <template v-if="layout.sel === 'text'">
+                      <div class="text-sell-out flex">
+                        <svg
+                          v-if="isSellOut(item)"
+                          t="1724236049267"
+                          class="icon"
+                          viewBox="0 0 1024 1024"
+                          version="1.1"
+                          xmlns="http://www.w3.org/2000/svg"
+                          p-id="4911"
+                          width="64"
+                          height="64"
+                        >
+                          <path
+                            d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                            fill="#c8c8c8"
+                            p-id="4912"
+                          ></path>
+                          <path
+                            d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                            fill="#c8c8c8"
+                            p-id="4913"
+                          ></path>
+                          <path
+                            d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                            fill="#c8c8c8"
+                            p-id="4914"
+                          ></path>
+                          <path
+                            d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                            fill="#c8c8c8"
+                            p-id="4915"
+                          ></path>
+                        </svg>
+                      </div>
+                    </template>
+                    <div class="stockNumber"></div>
+                    <div class="">￥{{ item.lowPrice }}</div>
+                    <template v-if="layout.sel === 'default'">
+                      <div class="flex" v-if="isSellOut(item)">
+                        <div class="timeSale">售罄</div>
+                      </div>
+                    </template>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </template>
+
+          <template v-else>
+            <div class="cashier_box goods_classify_list">
+              <div class="cashier_left">
+                <!-- <div class="title">选择优惠</div> -->
+                <div class="detail_box">
+                  <div class="usercard">
+                    <span
+                      class="el-avatar el-avatar--square"
+                      style="height: 50px; width: 50px; line-height: 50px"
+                      ><img v-if="vipUser.id" :src="vipUser.headImg"
+                    /></span>
+                    <div class="info">
+                      <div class="nickname">
+                        <span class="txt">{{
+                          vipUser.id ? vipUser.nickName : "服务员下单"
+                        }}</span>
+                      </div>
+                      <div class="other_info">
+                        <div class="item">余额：{{ vipUser.amount | to2 }}</div>
+                        <div class="item">积分：{{ vipUser.totalScore }}</div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- <div class="forms">
+                    <el-form
+                      ref="form"
+                      :model="createOrder.form"
+                      label-width="60px"
+                    >
+                      <el-form-item label="优惠券">
+                        <el-select
+                          style="margin-right: 10px"
+                          v-model="createOrder.quan.sel"
+                          placeholder="选择优惠券"
+                        >
+                        </el-select>
+                        <el-button size="medium " type="text">
+                          查看不可用券
+                        </el-button>
+                      </el-form-item>
+                    </el-form>
+                  </div> -->
+                </div>
+                <div class="btn_group">
+                  <el-button size="medium" @click="disCountShow">
+                    整单打折/减免
+                  </el-button>
+                  <!-- <el-button size="medium "> 免单 </el-button> -->
+                </div>
+
+                <pay-type ref="refPayType" v-model="order.payType"> </pay-type>
+                <div style="margin-top: 20px">
+                  <el-button type="success" size="medium" @click="payOrder">
+                    <span>立即支付</span>
+                  </el-button>
+                </div>
+                <!-- <div class="flex row-right">
+                  <el-button size="medium" type="success" @click="payOrder"
+                    >确认支付</el-button
+                  >
+                </div> -->
+                <!-- <div class="title">选择支付方式</div>
+                <div class="btn_group">
+                  <div class="price_select">
+                    <div class="pay_btns">
+                      <el-button size="medium" type="success">
+                        微信支付/支付宝
+                      </el-button>
+                      <el-button size="medium"> 余额支付 </el-button>
+                      <el-button size="medium"> 现金支付 </el-button>
+                      <el-button size="medium"> 挂账 </el-button>
+                    </div>
+                  </div>
+                </div> -->
+              </div>
+              <div class="cashier_left cashier_right">
+                <div class="title">账单明细</div>
+                <div class="detail_form">
+                  <!---->
+                  <div class="detail_form_item">
+                    <div class="left">会员优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">门店优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">满减优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">优惠券</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">整单改价</div>
+                    <div class="right">
+                      -￥{{
+                        ((1 - createOrder.discount) * createOrder.data.amount)
+                          | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item" v-if="createOrder.data.packFee">
+                    <div class="left">打包费</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.packFee || "0.00" }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">桌位费/附加费</div>
+                    <div class="right">￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">总价</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.amount | to2 }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">抹零</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">应付金额</div>
+                    <div class="right redfont">
+                      ￥{{
+                        (createOrder.data.amount * createOrder.discount) | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="line"></div>
+                </div>
+              </div>
+            </div>
+          </template>
+        </div>
+      </div>
+
+      <!-- <slot name="footer">
+        <div style="display: flex; justify-content: flex-end">
+          <el-button style="margin-right: 20px" @click="haocaiCancel">取消</el-button>
+          <el-button type="primary" @click="haocaiConfirm">确定</el-button>
+        </div>
+      </slot> -->
+    </el-dialog>
+
+    <!-- 选择规格 -->
+    <el-dialog
+      width="410px"
+      :title="selGoods.title"
+      :visible.sync="selGoods.show"
+      @close="onSelGoodsSkuClose"
+    >
+      <div class="tag-group">
+        <div
+          class="tag-item"
+          v-for="(item, index) in selGoods.skuList"
+          :key="index"
+        >
+          <div class="tag-name">
+            {{ item.name }}
+            <span v-if="item.values.length >= 2"
+              >({{ item.values.length }}选1)</span
+            >
+          </div>
+          <div>
+            <span
+              style="margin: 0 10px 10px 0"
+              v-for="(val, valIndex) in item.values"
+              :key="valIndex"
+            >
+              <el-button
+                plain
+                :disabled="val.disabled"
+                @click="changeTagSel(index, val)"
+                :type="val.name === item.sel ? 'success' : ''"
+              >
+                {{ val.name }}
+              </el-button>
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer">
+        <div class="flex row-between">
+          <div>
+            <div class="price">￥{{ skuGoods.data.salePrice | to2 }}</div>
+            <div class="sku-group-text">
+              <span> {{ skuText }}</span>
+              <span>库存：{{ skuGoods.data.stockNumber || 0 }}</span>
+            </div>
+          </div>
+          <div class="flex">
+            <i class="icon-remove" @click="skuNumberReduce"></i>
+            <div style="width: 40px" class="number-box">
+              <el-input
+                :min="skuGoods.data.suit"
+                type="number"
+                v-model="skuGoods.number"
+                placeholder="0"
+              ></el-input>
+            </div>
+            <!-- <i class="el-icon-remove"></i> -->
+            <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
+          </div>
+        </div>
+        <div class="flex" style="margin-top: 14px">
+          <button
+            class="my-btn disabled flex-1"
+            v-if="!skuGoods.data.isGrounding"
+            disabled
+          >
+            已下架
+          </button>
+          <template v-else>
+            <button
+            class="my-btn disabled flex-1"
+            v-if=" skuGoods.data.stockNumber<=0"
+            disabled
+          >
+            库存不足
+          </button>
+            <button
+            class="my-btn success flex-1"
+            v-else
+            :disabled="CanConfirm"
+            @click="chooseSkuConfirm"
+          >
+            确定
+          </button>
+          
+           
+          </template>
+         
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 数字键盘 -->
+    <el-dialog width="410px" title="数量" :visible.sync="keyborad.show">
+      <div class="simple-Keyboard-number">
+        <div class="carts">
+          <div class="title font-bold">
+            <span class="color-000">数量</span>
+            <i class="el-icon-close" @click="changeKeyboradShow(false)"></i>
+          </div>
+          <div class="box_status">{{ keyborad.number }}</div>
+          <div class="number_list_box">
+            <div class="yd-keyboard">
+              <div class="mini-number-box1">
+                <div class="mini-number">
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('1')">1</div>
+                    <div class="key" @click="keyboradAdd('2')">2</div>
+                    <div class="key" @click="keyboradAdd('3')">3</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('4')">4</div>
+                    <div class="key" @click="keyboradAdd('5')">5</div>
+                    <div class="key" @click="keyboradAdd('6')">6</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('7')">7</div>
+                    <div class="key" @click="keyboradAdd('8')">8</div>
+                    <div class="key" @click="keyboradAdd('9')">9</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key"></div>
+                    <div class="key" @click="keyboradAdd('0')">0</div>
+                    <div
+                      class="key"
+                      style="font-size: 31px"
+                      @click="keyboradReduce"
+                    >
+                      <svg
+                        t="1723453480343"
+                        class="icon"
+                        viewBox="0 0 1664 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="1467"
+                        width="32"
+                        height="32"
+                      >
+                        <path
+                          d="M1526.08 1.6H459.84L41.28 416c-53.76 53.248-53.76 139.52 0 192.64l418.624 414.592v-0.064h1066.176a136.96 136.96 0 0 0 137.6-136.256V137.792a136.96 136.96 0 0 0-137.6-136.192z m-331.392 631.168c26.816 26.624 26.816 69.76 0 96.384-26.88 26.56-70.4 26.56-97.28 0l-121.28-120.128-123.328 122.112a69.76 69.76 0 0 1-97.92 0 68.096 68.096 0 0 1 0-96.96L878.208 512l-121.28-120.064a67.648 67.648 0 0 1 0-96.32c26.88-26.624 70.4-26.624 97.28 0l121.216 120.064 122.24-120.96a69.696 69.696 0 0 1 97.92 0 68.032 68.032 0 0 1 0 96.96l-122.24 120.96 121.344 120.064z"
+                          fill="#333333"
+                          p-id="1468"
+                        ></path>
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div>
+            <div class="submit" @click="keyboradConfirm">确认</div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 取单 -->
+    <el-dialog width="550px" title="取单" :visible.sync="prveOrder.show">
+      <div class="take_order_list">
+        <div class="tol_left_list">
+          <div
+            class="tolll_item"
+            :class="{ active: prveOrder.sel === index }"
+            @click="changePrveOrder(index)"
+            v-for="(item, index) in prveOrder.list"
+            :key="index"
+          >
+            <div class="tollli_index">{{ index + 1 }}</div>
+            <div class="tollli_price">￥{{ item.totalAmount }}</div>
+            <div class="tollli_time_and_num">
+              <div class="tollli_time">{{ item.created_at || "" }}</div>
+              <div class="tollli_num">({{ item.totalNumber }}件)</div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="tol_right_list"
+          v-if="prveOrder.list.length && prveOrder.sel >= 0"
+        >
+          <div
+            class="tolrl_item"
+            v-for="(item, index) in prveOrder.selCart"
+            :key="index"
+          >
+            <div class="tolrli_img">
+              <img :src="item.coverImg" alt="" />
+            </div>
+            <div class="tolrli_right">
+              <div class="tr_top">
+                <div class="trt_name">{{ item.name }}</div>
+                <div class="trt_num">x{{ item.number }}</div>
+                <div class="trt_price">￥{{ item.totalAmount || 0 }}</div>
+              </div>
+              <div class="tr_bottom">
+                <span class="trb_item">
+                  {{ item.specSnap | formatSpecSnap }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" class="flex row-center">
+        <div style="margin-right: 20px">
+          <el-button
+            size="medium"
+            type="success"
+            @click="confirmChoosePrveOrder"
+            >确认此单</el-button
+          >
+        </div>
+        <el-button size="medium" @click="delPrveOrder">删除此单</el-button>
+      </div>
+    </el-dialog>
+
+    <choose-user
+      ref="refChooseUser"
+      @chooseUser="chooseUserConfirm"
+    ></choose-user>
+    <choose-table
+      ref="refChooseTable"
+      @confirm="chooseTableConfirm"
+    ></choose-table>
+    <order-note ref="refOrderNote" @confirm="refOrderNoteConfirm"></order-note>
+
+    <!-- 支付时的键盘弹窗 -->
+    <money-keyboard ref="refMoneyKeyboard" :title="moneyKeyboard.title">
+    </money-keyboard>
+
+    <!-- 扫码支付 -->
+    <scan-pay ref="refScanCode"></scan-pay>
+    <!-- 打折 -->
+    <money-discount ref="refDiscount" @confirm="ChangeDiscount">
+    </money-discount>
+  </div>
+</template>
+
+<script>
+import _ from "lodash";
+import chooseUser from "./choose-user.vue";
+import payType from "./pay-type.vue";
+import chooseTable from "./table-diancan-components/choose-table-master.vue";
+import cartItem from "./table-diancan-components/cart-item.vue";
+import scanPay from "./table-diancan-components/scan-pay.vue";
+import moneyDiscount from "./table-diancan-components/discount.vue";
+import orderNote from "./table-diancan-components/note.vue";
+import moneyKeyboard from "./money-keyboard.vue";
+import dayjs from "dayjs";
+import {
+  getGoodsLists,
+  addCart,
+  getCart,
+  $clearCart,
+  $removeCart,
+  $updateCart,
+  $allPack,
+  $createOrder,
+  $getMasterId,
+  $cacheOrder,
+  $getCacheOrder,
+  $delOrder,
+  $setUser,
+  $payOrder,
+} from "@/api/table";
+import { tbShopCategoryGet } from "@/api/shop";
+import {
+  isCanBuy,
+  arrayContainsAll,
+  generateCombinations,
+  returnReverseVal,
+} from "./util.js";
+export default {
+  components: {
+    chooseUser,
+    chooseTable,
+    payType,
+    orderNote,
+    moneyKeyboard,
+    scanPay,
+    moneyDiscount,
+    cartItem,
+  },
+  data() {
+    return {
+      //台桌点餐页面打开时带来的参数 isAddGoods 加菜    isPayOrder结账
+      key: "",
+      //是否是从挂单里取出来的订单
+      isPrverOrder: false,
+      //是否全屏
+      isFullScreen: false,
+      moneyKeyboard: {
+        show: true,
+        title: "支付",
+      },
+      //true后付款false先付款
+      postPay: true,
+      //是否打印
+      isPrint: false,
+      // 备注
+      note: {
+        content: "",
+        isShow: false,
+      },
+      isCreateOrder: false,
+      $goodsData: "",
+      search: {
+        list: [],
+      },
+      skuGoods: {
+        number: 1,
+        data: {
+          stockNumber: 0,
+          salePrice: 0,
+        },
+      },
+      selGoods: {
+        isEdit: false,
+        data: {},
+        skuList: [],
+        skuMap: [],
+        title: "",
+        show: false,
+      },
+      dayjs,
+      dialogshow: false, //弹框显示
+      dialogtitle: "", //文字显示
+      informationdialogshow: false,
+      informationdialogshowedit: false,
+      goods: {
+        list: [],
+        query: {
+          productId: "",
+          categoryId: "",
+          page: 1,
+          size: 300,
+        },
+        loading: false,
+        total: 0,
+      },
+      order: {
+        orderId:"",
+        payType: "",
+        masterId: "",
+        allPack: false,
+        btns: [
+          {
+            text: "规格",
+            disabled: false,
+          },
+          {
+            text: "赠送",
+            disabled: false,
+          },
+          {
+            text: "打包",
+            disabled: false,
+          },
+          {
+            text: "删除",
+            disabled: false,
+          },
+        ],
+        list: [],
+        gift: {
+          list: [],
+          selIndex: -1,
+        },
+        //已下单菜品
+        old: {
+          list: [],
+          selIndex: -1,
+        },
+        query: {
+          page: 1,
+          size: 20,
+        },
+        number: 1,
+        cacheNumber: 1,
+        selIndex: -1,
+        total: 0,
+      },
+      table: "",
+      category: {
+        list: [],
+        showAll: false,
+      },
+      keyborad: {
+        show: false,
+        number: "0",
+      },
+      prveOrder: {
+        list: [],
+        show: false,
+        sel: 0,
+        selCart: [],
+      },
+      layout: {
+        list: [
+          { label: "经典布局", value: "default" },
+          { label: "图文显示", value: "img-and-text" },
+          { label: "文字显示", value: "text" },
+        ],
+        sel: "img-and-text",
+      },
+      // 选择用户
+      vipUser: {
+        id: "",
+      },
+      //餐桌号
+      masterId: "",
+      canUpdate: true,
+      //下单
+      createOrder: {
+        discount: 1,
+        form: {},
+        data: {},
+        quan: {
+          list: [],
+          sel: "",
+        },
+      },
+      timer: null,
+    };
+  },
+  computed: {
+    title() {
+      return this.table ? "代客下单" + `(${this.table.name})` : "代客下单";
+    },
+    allGiftMoney() {
+      const price = this.order.list
+        .filter((v) => v.isGift === "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return price;
+    },
+    giftLen() {
+      return this.order.list.filter((v) => v.isGift === "true").length;
+    },
+    isSku() {
+      if (this.order.selIndex < 0 || this.order.list.length <= 0) {
+        return false;
+      }
+      return this.order.list[this.order.selIndex].specSnap;
+    },
+    returnGiftText() {
+      if (this.order.selIndex < 0) {
+        return "赠送";
+      }
+      return this.order.list[this.order.selIndex].isGift === "true"
+        ? "取消赠送"
+        : "赠送";
+    },
+    returnPackText() {
+      if (this.order.selIndex < 0) {
+        return "打包";
+      }
+      return this.order.list[this.order.selIndex].isPack === "true"
+        ? "取消打包"
+        : "打包";
+    },
+    skuText() {
+      const result = this.selGoods.skuList.reduce((a, b) => {
+        return a + (b.sel ? b.sel + "+" : "");
+      }, "");
+      return result.substring(0, result.length - 1);
+    },
+    allPrice() {
+      const oldPrice = this.order.old.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      const price = this.order.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return (oldPrice + price).toFixed(2);
+    },
+    allNumber() {
+      const oldNumber = this.order.old.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      const cartNumber = this.order.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      return oldNumber + cartNumber;
+    },
+    selGoodsHide() {
+      this.selGoods.show = false;
+    },
+    CanConfirm() {
+      if (!this.selGoods.skuList.length) {
+        return true;
+      }
+      return (
+        this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+        this.selGoods.skuList.length
+      );
+    },
+  },
+  filters: {
+    formatSpecSnap(str) {
+      if (str === "" || str === null || str === undefined) {
+        return "";
+      }
+      return str.replaceAll(",", " / ");
+    },
+    to2(n) {
+      if (n === undefined) {
+        return "";
+      }
+      return Number(n).toFixed(2);
+    },
+    returntypeName(item) {
+      return item.typeEnum === "sku" ? "多规格" : "单规格";
+    },
+  },
+  watch: {
+    masterId: function (val) {
+      console.log(val);
+    },
+    isCreateOrder: function (val) {
+      if (!val) {
+        this.createOrder.discount = 1;
+      }
+    },
+    "vipUser.id": async function (val) {
+      let masterId = this.order.masterId;
+      if (!masterId) {
+        const res = await this.getMasterId();
+        masterId = res.masterId;
+      }
+      this.masterId = masterId;
+      $setUser({
+        tableId: this.table.tableId,
+        masterId: this.masterId,
+        vipUserId: val,
+        type: val === "" ? 1 : 0,
+      });
+    },
+    "prveOrder.list.length": function (val) {
+      if (val !== 0) {
+        this.prveOrder.selCart =
+          this.prveOrder.list[this.prveOrder.sel].carList;
+      } else {
+        this.prveOrder.selCart = [];
+      }
+      console.log(this.prveOrder.selCart);
+    },
+    "prveOrder.sel": function (val) {
+      this.prveOrder.selCart =
+        this.prveOrder.list.length !== 0
+          ? this.prveOrder.list[val].carList
+          : [];
+      console.log(this.prveOrder.selCart);
+      if (val < 0) {
+        this.prveOrde.show = false;
+      }
+    },
+    // 本地缓存版本
+    // "prveOrder.list.length": function (val) {
+    //   console.log(val);
+    //   if (val !== 0) {
+    //     this.prveOrder.selCart = this.prveOrder.list[this.prveOrder.sel].cart;
+    //     localStorage.setItem(
+    //       "orderList",
+    //       JSON.stringify(
+    //         this.prveOrder.list.map((v) => {
+    //           return { ...v, cart: JSON.stringify(v.cart) };
+    //         })
+    //       )
+    //     );
+    //   } else {
+    //     this.prveOrder.selCart = [];
+    //     localStorage.removeItem("orderList");
+    //   }
+    //   console.log(this.prveOrder.selCart);
+    // },
+    // "prveOrder.sel": function (val) {
+    //   this.prveOrder.selCart =
+    //     this.prveOrder.list.length !== 0 ? this.prveOrder.list[val].cart : [];
+    //   console.log(this.prveOrder.selCart);
+    // },
+    "order.allPack": function (val) {
+      console.log(val);
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      $allPack({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        state: val ? 1 : 0,
+      }).then((res) => {
+        this.order.list.map((v) => {
+          v.isPack = `${val}`;
+        });
+      });
+    },
+    "order.selIndex": function (val, oldval) {
+      console.log(val);
+      this.order.old.selIndex=-1
+      if (val === -1) {
+        // return (this.order.number = 1);
+        this.order.cacheNumber = 1;
+      } else {
+        this.order.cacheNumber = this.order.list[val].number;
+        // this.order.number = this.order.list[val].number;
+      }
+    },
+    "order.list.length": function (val) {
+      if (val <= 0) {
+        this.order.selIndex = -1;
+      }
+      if (this.order.selIndex >= 0) {
+        this.order.cacheNumber = this.order.list[this.order.selIndex].number;
+        // this.order.number = this.order.list[this.order.selIndex].number;
+      }
+    },
+    "order.number": _.debounce(function (newval) {
+      if (this.order.list.length <= 0 || this.order.selIndex < 0) {
+        return;
+      }
+      this.createOrderClose();
+
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      const oldGoods = this.order.old.list.find((v) => {
+        return v.productId === productId && v.skuId === skuId;
+      });
+      $updateCart({
+        cartId: item.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: this.order.number + (oldGoods ? oldGoods.number : 0), // 0会删除此商品
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+          number: this.order.number,
+        });
+      });
+      return;
+      this.updateOrder({
+        num: newval, // 0会删除此商品
+      });
+    }, 30),
+    "goods.query.productId": function (newval) {
+      if (!this.$goodsData) {
+        return;
+      }
+      if (newval == "") {
+        this.goods.list = this.$goodsData || [];
+      } else {
+        const newarr = this.$goodsData.filter((v) =>
+          v.name.includes(newval.trim())
+        );
+        this.search.list = newarr;
+        this.goods.list = newarr.length ? newarr : this.$goodsData;
+      }
+    },
+  },
+  mounted() {
+    // this.getGoods();
+    // this.getCategory();
+    // this.refToggle('refScanCode',true)
+    // this.refToggle("refDiscount", true);
+  },
+  methods: {
+    ChangeDiscount(discount) {
+      this.createOrder.discount = discount;
+    },
+    disCountShow() {
+      const { amount } = this.createOrder.data;
+      this.refToggle("refDiscount", true, {
+        amount,
+        discount: this.createOrder.discount * 100,
+      });
+    },
+    refToggle(key, isShow, data) {
+      if (!this.$refs[key]) {
+        return;
+      }
+      isShow ? this.$refs[key].open(data) : this.$refs[key].close(data);
+    },
+    //购物车商品输入框数量输入
+    cartGoodsNumberInput(newval, index) {
+      const item = this.order.list[index];
+      console.log(item);
+      this.order.cacheNumber = newval;
+      item.number = newval;
+    },
+    //购物车商品输入框数量改变
+    cartGoodsNumberChange(newval, index) {
+      const item = this.order.list[index];
+      newval = `${newval}`.split(".")[0] * 1;
+      console.log(newval);
+      this.order.cacheNumber = newval;
+      this.order.number = newval;
+    },
+    //判读单规格商品是否售尽
+    isSellOut(item) {
+      return (
+        item.isPauseSale ||
+        (item.typeEnum !== "sku" && item.specList[0].stockNumber <= 0)
+      );
+    },
+    toggleFullScreen() {
+      if (!document.fullscreenElement) {
+        this.enterFullScreen();
+      } else {
+        this.exitFullScreen();
+      }
+    },
+    enterFullScreen() {
+      let element = document.documentElement;
+      if (element.requestFullscreen) {
+        element.requestFullscreen();
+      } else if (element.mozRequestFullScreen) {
+        /* Firefox */
+        element.mozRequestFullScreen();
+      } else if (element.webkitRequestFullscreen) {
+        /* Chrome, Safari & Opera */
+        element.webkitRequestFullscreen();
+      } else if (element.msRequestFullscreen) {
+        /* IE/Edge */
+        element.msRequestFullscreen();
+      }
+      this.isFullScreen = true;
+    },
+    exitFullScreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        /* Firefox */
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        /* Chrome, Safari and Opera */
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        /* IE/Edge */
+        document.msExitFullscreen();
+      }
+      this.isFullScreen = false;
+    },
+    //打开输入钱的键盘
+    openMoneyKeyboard() {
+      this.$refs.refMoneyKeyboard.open();
+    },
+    changePostPay(val) {
+      this.postPay = val;
+    },
+    //改变是否打印
+    changeIsPrint(e) {
+      console.log(e);
+      this.isPrint = e;
+    },
+    refOrderNoteConfirm(note) {
+      this.note.content = note;
+    },
+    refNoteShow() {
+      this.$refs.refOrderNote.open(this.note.content);
+    },
+    // 支付订单
+    async payOrder() {
+      console.log({
+        orderId: this.createOrder.data.id,
+        payType: this.order.payType,
+      });
+      const res = await $payOrder({
+        tableId: this.table.tableId,
+        masterId: this.masterId,
+        orderId: this.createOrder.data.id,
+        payType: this.order.payType,
+        vipUserId: this.vipUser.id,
+        discount: this.createOrder.discount,
+      });
+      this.payOrderSuccess();
+    },
+    payOrderSuccess() {
+      this.$notify({
+        title: "支付成功",
+        type: "success",
+      });
+      this.reset();
+      this.close();
+    },
+    chooseTableConfirm(item) {
+      console.log(item);
+      this.table = item;
+    },
+    chooseTableOpen() {
+      this.$refs.refChooseTable.open();
+    },
+    chooseUserConfirm(user) {
+      console.log(user);
+      if (user) {
+        this.vipUser = user;
+      } else {
+        this.vipUser = { id: "" };
+      }
+    },
+    refChooseUserOpen() {
+      this.$refs.refChooseUser.open();
+    },
+    createOrderClose() {
+      this.isCreateOrder = false;
+    },
+    //生成订单
+    toCreateOrderDebounce:_.debounce(()=>{
+
+    },100),
+    async toCreateOrder(isNowPay = false) {
+      console.log(this.order)
+      console.log(this.order.orderId)
+      const res = await $createOrder({
+        masterId: this.order.masterId || this.masterId,
+        vipUserId: this.vipUser.id,
+        tableId: this.table.tableId,
+        note: this.note.content,
+        postPay: this.postPay,
+        orderld:this.order.orderId
+      });
+      //后付款
+      console.log(this.postPay);
+      console.log(isNowPay);
+      console.log(this.postPay && isNowPay);
+      if (this.postPay && !isNowPay) {
+        this.$notify({
+          title: "下单成功",
+          type: "success",
+        });
+        return this.close();
+      }
+      this.createOrder.data = res;
+      if (!this.isPrverOrder) {
+        const { masterId } = await this.getMasterId();
+        this.masterId = masterId;
+      }
+
+      this.isCreateOrder = true;
+    },
+
+    // 获取取餐号
+    getMasterId() {
+      return $getMasterId({
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+      });
+    },
+    onSelGoodsSkuClose() {
+      this.selGoods.isEdit = false;
+    },
+    changePrveOrder(index) {
+      this.prveOrder.sel = index;
+    },
+    //更新购物车商品数据
+    updateOrder(par = {}) {
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      addCart({
+        masterId: this.masterId,
+        vipUserId: this.vipUser.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: number,
+        isPack: isPack === "true" ? true : false,
+        isGift: isGift === "true" ? true : false,
+        ...par,
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+        });
+      });
+    },
+    keyboradAdd(n) {
+      if (Number(this.keyborad.number) === 0) {
+        return (this.keyborad.number = n);
+      }
+      this.keyborad.number += n;
+    },
+    keyboradReduce() {
+      if (this.keyborad.number.length <= 1) {
+        return (this.keyborad.number = "0");
+      }
+      this.keyborad.number = this.keyborad.number.substring(
+        0,
+        this.keyborad.number.length - 1
+      );
+    },
+    keyboradConfirm() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      // 如果设置为0,商品数量减1
+      if (this.keyborad.number == 0) {
+        this.changeOrderNumber(this.order.selIndex, true);
+      } else {
+        orderGoods.number = Number(this.keyborad.number);
+      }
+      this.order.cacheNumber = orderGoods.number;
+      this.order.number = orderGoods.number;
+      this.changeKeyboradShow(false);
+    },
+    changeKeyboradShow(show) {
+      if (show) {
+        this.keyborad.number = `${this.order.list[this.order.selIndex].number}`;
+      }
+      this.keyborad.show = show;
+    },
+    // 获取本地缓存挂单
+    // getPrveCart() {
+    //   const arr = localStorage.getItem("orderList")
+    //     ? JSON.parse(localStorage.getItem("orderList"))
+    //     : [];
+    //   this.prveOrder.list = arr.map((v) => {
+    //     return { ...v, cart: JSON.parse(v.cart) };
+    //   });
+    // },
+
+    //右侧控制按钮点击事件
+    orderBtnsClick(key) {
+      const orderGoods = this.order.list[this.order.selIndex];
+      this.createOrderClose();
+      if (key === "sku") {
+        this.selGoods.title = orderGoods.name;
+        this.selGoods.isEdit = true;
+        const item = this.goods.list.find((v) => v.id == orderGoods.productId);
+        console.log(item);
+        return this.showSelGoods({ ...item, ...orderGoods });
+      }
+      if (key === "gift") {
+        const isGift = orderGoods.isGift === "true" ? "flase" : "true";
+        this.updateOrder({ isGift: isGift === "true" ? true : false });
+        return;
+      }
+      if (key === "pack") {
+        const isPack = orderGoods.isPack === "true" ? "flase" : "true";
+        this.updateOrder({ isPack: isPack === "true" ? true : false });
+        return;
+      }
+      if (key === "del") {
+        return this.removeCart();
+      }
+      if (key === "save") {
+        this.prveOrder.list.push({
+          cart: this.order.list,
+          id: Date.now(),
+          created_at: `${new Date().getHours()}:${new Date().getMinutes()}`,
+          goods_num: this.allNumber,
+          order_total: this.allPrice,
+        });
+        localStorage.setItem(
+          "orderList",
+          JSON.stringify(
+            this.prveOrder.list.map((v) => {
+              return { ...v, cart: JSON.stringify(v.cart) };
+            })
+          )
+        );
+        this.order.list = [];
+        this.order.selIndex = -1;
+        return;
+      }
+      if (key === "getOrder") {
+        this.prveOrder.show = true;
+        this.getPrveCart();
+        return;
+      }
+    },
+    //选择挂单确认
+    async confirmChoosePrveOrder() {
+      if (this.prveOrder.list.length <= 0) {
+        return;
+      }
+      // const { sel } = this.prveOrder;
+      // const order=this.prveOrder.list[sel];
+      // const res=await $cacheOrder({
+      //   orderId:order.orderId,
+      //   isPending:false,
+      //   tableId:this.table.tableId,
+      //   masterId:order.carList[0].masterId
+      // })
+
+      const { masterId, tableId, userId, remark,id } = await $cacheOrder({
+        orderId: this.prveOrder.list[this.prveOrder.sel].orderId,
+        isPending: false,
+      });
+      this.order.orderId = id;
+      console.log(  this.order.orderId)
+
+      this.masterId = masterId;
+      this.isPrverOrder = true;
+      console.log(masterId);
+      const { records } = await getCart({
+        masterId,
+        tableId,
+        vipUserId: userId != "null" ? userId : "",
+      });
+      console.log(records);
+      this.order.list = [];
+      this.order.masterId = masterId;
+      this.order.list = records;
+      this.prveOrder.show = false;
+      this.note.content = remark || "";
+      // this.delPrveOrder(false);
+    },
+    //删除挂单
+    async delPrveOrder(isRequest = true) {
+      const { sel } = this.prveOrder;
+      if(this.prveOrder.list<=0||sel<0){
+        return
+      }
+      const order = this.prveOrder.list[sel];
+      const orderMasterId = order.carList[0].masterId;
+      //当前订单是否是当前挂单
+      const nowOrderIsPrverOrder =
+        this.isPrverOrder && orderMasterId === this.masterId;
+      if (nowOrderIsPrverOrder) {
+        const res = await this.$confirm(
+          "您正在删除当前购物车订单,是否删除?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).catch((err) => {
+          console.log(err);
+        });
+        if (!res) {
+          return;
+        }
+      }
+      if (isRequest) {
+        const res = await $delOrder({
+          orderId: order.orderId,
+        });
+        if (nowOrderIsPrverOrder) {
+          this.note.content = "";
+          this.order.list = [];
+        }
+        this.$notify({
+          message: "删除成功",
+          type: "success",
+        });
+      }
+      this.prveOrder.list.splice(sel, 1);
+      this.prveOrder.sel = sel - 1 <= 0 ? 0 : sel - 1;
+    },
+    //打开挂起订单
+    async cacheOrderShow() {
+      this.prveOrder.show = true;
+      const res = await this.getCacheOrder(true);
+      this.prveOrder.list = res;
+      if (this.prveOrder.list.length && this.prveOrder.sel !== -1) {
+        const item = this.prveOrder.list[this.prveOrder.sel];
+        console.log(item);
+        if (item) {
+          this.prveOrder.selCart = item.carList;
+        }
+      }
+    },
+    //获取挂起订单
+    async getCacheOrder(isReturn = false) {
+      this.createOrderClose();
+      if (isReturn) {
+        return $getCacheOrder({ tableId: this.table.tableId });
+      }
+      const res = await $getCacheOrder({ tableId: this.table.tableId });
+      this.prveOrder.list = res;
+    },
+    //存单
+    async saveOrder() {
+      this.createOrderClose();
+      const res = await $cacheOrder({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+        isPending: true,
+        note: this.note.content,
+      });
+      this.isPrverOrder = false;
+      this.order.masterId = "";
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.note.content = "";
+      this.order.orderId=""
+      this.$nextTick(() => {
+        this.getCacheOrder();
+      });
+      const masterIdRes = await this.getMasterId();
+      this.masterId = masterIdRes.masterId;
+    },
+    // 删除购物车商品
+    removeCart() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      $removeCart({
+        cartId: orderGoods.id,
+        tableId: this.table.tableId,
+      });
+      this.order.list.splice(this.order.selIndex, 1);
+      const newval = this.order.selIndex - 1;
+      this.order.selIndex = newval <= 0 ? 0 : newval;
+
+      //  this.$message({
+      //         type: "success",
+      //         message: "清除成功!",
+      //       });
+    },
+    // 点击订单里的加减改变购物车商品数量
+    async changeOrderNumber(index, isReduce) {
+      if (index < 0) {
+        return;
+      }
+      this.order.selIndex = index;
+      console.log(index);
+      console.log(isReduce);
+      const item = this.order.list[index];
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return this.removeCart();
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      // const res= await addCart({
+      //    productId: item.productId,
+      //     skuId: item.skuId,
+      //     tableId: this.table.tableId,
+      //     num: newval, // 0会删除此商品
+      //     isPack: false, // 是否打包
+      // })
+      this.order.list[index].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    // 点击右侧控制列表上的加减改变购物车商品数量
+    changeOrderGoodsNumber(isReduce) {
+      if (this.order.selIndex < 0) {
+        return;
+      }
+      const item = this.order.list[this.order.selIndex];
+      console.log(item);
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return;
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      console.log(newval);
+
+      // this.order.list[this.order.selIndex].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    //清空购物车
+    clearCart() {
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      this.$confirm("确定要清空点餐列表吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          $clearCart({
+            masterId: this.masterId,
+            tableId: this.table.tableId,
+          }).then((res) => {
+            this.order.list = [];
+            this.order.selIndex = -1;
+            this.$message({
+              type: "success",
+              message: "清除成功!",
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    skuNumberAdd() {
+      const number = Number(this.skuGoods.number);
+      if (number > 10000) {
+        return;
+      }
+      this.skuGoods.number = number + 1;
+    },
+    skuNumberReduce() {
+      if (this.skuGoods.number - 1 <= 0) {
+        return;
+      }
+      this.skuGoods.number -= 1;
+    },
+    toggleShowAll() {
+      this.category.showAll = !this.category.showAll;
+    },
+    changeCategoryId(item) {
+      this.goods.query.categoryId = item.id;
+    },
+    async getCategory() {
+      const { content } = await tbShopCategoryGet({
+        page: 0,
+        size: 100,
+        sort: "id",
+        shopId: localStorage.getItem("shopId"),
+      });
+      this.category.list = content.reduce((prve, cur) => {
+        prve.push(cur);
+        return [...prve, ...cur.childrenList];
+      }, []);
+      this.category.list.unshift({
+        id: "",
+        name: "全部",
+      });
+    },
+    //改变购物车菜品选中
+    changeOrderSel(index) {
+      this.order.selIndex = index;
+      this.order.old.selIndex = -1;
+    },
+    //改变已下单菜品选中
+    changeOrderOldSel(index) {
+      this.order.old.selIndex = index;
+      this.order.cacheNumber = this.order.old.list[index].number;
+    },
+    chooseSkuConfirm() {
+      if (this.timer) {
+        return;
+      }
+      this.skuGoodsAdd();
+      this.timer = setTimeout(() => {
+        clearTimeout(this.timer);
+        this.timer = null;
+      }, 500);
+      console.log(this.timer);
+    },
+    async skuGoodsAdd() {
+      let name = this.selGoods.skuList.reduce((prve, cur) => {
+        return prve + cur.sel + ",";
+      }, "");
+      name = name.substring(0, name.length - 1);
+      // const item = this.selGoods.data.specList.find((v) => v.specSnap === name);
+      const item = this.selGoods.skuMap[name];
+      if (!item.isGrounding) {
+        //该商品已经下架
+        return this.$notify({
+          title: "该商品规格已经下架",
+          type: "error",
+        });
+      }
+      let res = "";
+
+      console.log(orderGoods);
+      //更改购物车订单商品规格数量
+      if (this.selGoods.isEdit) {
+        res = await $updateCart({
+          cartId: this.order.list[this.order.selIndex].id,
+          productId: this.selGoods.data.productId,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+        });
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: name,
+        });
+        this.$notify({
+          title: "更新成功",
+          type: "success",
+        });
+        this.selGoods.show = false;
+        this.order.cacheNumber = this.skuGoods.number;
+        return;
+      }
+
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      const oldOrderGoods = this.order.old.list.find((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      if (orderGoods || oldOrderGoods) {
+        //更新
+        const newNum =
+          (oldOrderGoods ? oldOrderGoods.number : 0) +
+          (orderGoods ? orderGoods.number * 1 : 0) +
+          this.skuGoods.number;
+        res = await $updateCart({
+          cartId: orderGoods ? orderGoods.id : oldOrderGoods.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: newNum, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        if (this.key && orderGoodsIndex == -1) {
+          this.orderListPush({
+            ...res,
+            specSnap: name,
+            number: this.skuGoods.number,
+          });
+        } else {
+          orderGoods.number += this.skuGoods.number;
+          this.order.selIndex = orderGoodsIndex;
+          this.order.cacheNumber = orderGoods.number;
+        }
+      } else {
+        //添加
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush({ ...res, specSnap: name });
+        // this.orderListPush({
+        //   skuId: item.id,
+        //   number: this.skuGoods.number,
+        //   specSnap: name,
+        // });
+      }
+
+      this.$notify({
+        title: orderGoods ? "更新成功" : "添加成功",
+        type: "success",
+      });
+      this.selGoods.show = false;
+    },
+    orderListPush(item) {
+      const { isPack, isGift } = item;
+      // const isPack=item.isPack==='false'?false:true
+      // const isGift=item.isGift==='false'?false:true
+      this.order.list.push({ ...item, isPack, isGift });
+      this.order.selIndex = this.order.list.length - 1;
+    },
+    //设置规格按钮的禁止状态
+    setTagDisabled() {
+      const selArr = this.selGoods.skuList.reduce((prve, cur) => {
+        if (cur.sel) {
+          prve.push(cur.sel);
+        } else {
+        }
+        return prve;
+      }, []);
+      console.log(selArr);
+      let selArrAllGroup = generateCombinations(selArr, selArr.length - 1);
+      console.log(selArrAllGroup);
+      const matchArr = [];
+      for (let key in this.selGoods.skuMap) {
+        const goods = this.selGoods.skuMap[key];
+        const keyArr = key.split(",");
+        for (let spe of selArrAllGroup) {
+          if (arrayContainsAll(keyArr, spe)) {
+            matchArr.push(goods);
+            break;
+          }
+        }
+      }
+      console.log(matchArr);
+      const skuList = this.selGoods.skuList;
+      console.log(skuList);
+      //全部规格都已下架
+      if (!matchArr.length) {
+        for (let k in skuList) {
+          for (let i in skuList[k].values) {
+            this.$set(skuList[k].values[i], "disabled", true);
+          }
+        }
+        return;
+      }
+      const includeSkuMap = matchArr.reduce((prve, cur) => {
+        const speArr = cur.specSnap.split(",");
+        for (let i of speArr) {
+          if (!prve.hasOwnProperty("i")) {
+            prve[i] = matchArr
+              .filter((v) => v.specSnap.match(i))
+              .every((v) => {
+                // return isCanBuy(v,this.selGoods.data.isStock)
+                return isCanBuy(v)
+              });
+          }
+        }
+        return prve;
+      }, {});
+      console.log(includeSkuMap)
+      for (let i in includeSkuMap) {
+        for (let k in skuList) {
+          const index = skuList[k].valueArr.findIndex((val) => val === i);
+          if (index !== -1) {
+            this.$set(skuList[k].values[index], "disabled", includeSkuMap[i]);
+          }
+        }
+      }
+    },
+    changeTagSel(index, val) {
+      this.$set(this.selGoods.skuList[index], "sel", val.name);
+      let specSnap = this.selGoods.skuList.reduce((a, b) => {
+        return a + b.sel + ",";
+      }, "");
+      specSnap = specSnap.substring(0, specSnap.length - 1);
+      for (let sku of this.selGoods.skuList) {
+        console.log(sku);
+      }
+      this.setTagDisabled();
+      const canChooseGoods = this.selGoods.skuList.every((v) => v.sel);
+      if (canChooseGoods) {
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+      }
+    },
+    onclose() {
+      this.$emit("close");
+      this.reset();
+    },
+    reset() {
+      // this.goods.list = [];
+      this.order.masterId = "";
+      this.order.list = [];
+      this.order.query.page = 1;
+      this.goods.total = 0;
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.order.old.list = [];
+      this.prveOrder.list=[];
+      this.prveOrder.selIndex=-1
+      this.order.old.selIndex = -1;
+      this.isCreateOrder = false;
+      this.note.content = "";
+      this.vipUser = { id: "" };
+      this.allPack = false;
+      this.note.content = "";
+      this.isPrverOrder = false;
+      this.createOrder.discount = 1;
+      this.order.cacheNumber=1
+      this.key = "";
+      this.order.orderId=''
+    },
+    //获取购物车数据
+    async getCart() {
+      const res = await getCart({
+        ...this.order.query,
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+      });
+      if (this.key) {
+        this.order.old.list = res.records;
+      } else {
+        this.order.list = res.records;
+      }
+      this.order.total = res.total;
+    },
+    showSelGoods(item) {
+      console.log(item);
+      this.selGoods.data = item;
+      this.selGoods.skuMap = {};
+      const specList = item.specList;
+      this.setSelGoodsSkuMap(specList);
+      this.setSelGoodsSkuList(
+        JSON.parse(item.skuResult.tagSnap),
+        item.specSnap
+      );
+      this.setTagDisabled();
+      const skuGoods = this.selGoods.skuMap[item.specSnap];
+      this.skuGoods.data = skuGoods;
+      this.skuGoods.number = item.number ? item.number : skuGoods.suit || 1;
+      this.selGoods.title = item.name;
+      this.selGoods.show = true;
+    },
+    // 备份版本，会过滤下架和售尽以为库存小于等于0的商品
+    async goodsClickback(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        for (let i in specList) {
+          this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+        }
+        console.log(this.selGoods.skuMap);
+
+        let specSnap = "";
+        let tagSnap = JSON.parse(item.skuResult.tagSnap).map((v) => {
+          return { ...v, newval: {} };
+        });
+        const canUseSpecSnap = {};
+        const canBudyGoods = specList.filter(
+          (v) => v.isGrounding && v.isPauseSale != 1 && v.stockNumber > 0
+        );
+        canBudyGoods.map((v) => {
+          v.specSnap.split(",").map((spe) => {
+            canUseSpecSnap[spe] = spe;
+          });
+        });
+        console.log(canUseSpecSnap);
+        for (let i in canUseSpecSnap) {
+          const item = tagSnap.find((v) => v.value.match(i));
+          item.newval[i] = i;
+        }
+        tagSnap = tagSnap.map((v) => {
+          const newvals = Object.keys(v.newval);
+          specSnap += newvals[0] + ",";
+          return {
+            ...v,
+            values: newvals,
+            sel: newvals[0],
+          };
+        });
+        console.log(tagSnap);
+        console.log(canUseSpecSnap);
+        console.log(canBudyGoods);
+        this.selGoods.skuList = tagSnap;
+        // this.selGoods.skuList = tagSnap.map((v) => {
+        //   const values = v.value.split(",");
+        //   specSnap += values[0] + ",";
+        //   return {
+        //     ...v,
+        //     values: newval,
+        //     sel: values[0],
+        //   };
+        // });
+        specSnap = specSnap.substring(0, specSnap.length - 1);
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        console.log(skuGoods);
+        this.skuGoods.number = skuGoods.suit || 1;
+        console.log(this.skuGoods.data);
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.order.selIndex = orderGoodsIndex;
+      } else {
+        //增加
+        console.log(item);
+        const num= item.specList[0].suit
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num:num<=0?1:num, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    //多规格商品弹窗时，找到默认可以下单的规格商品
+    findGoods(skuList = [], goodsListMap = {}) {
+      const skuMapNumber = skuList.reduce((prve, cur) => {
+        for (let i in cur.valueArr) {
+          prve[cur.valueArr[i]] = i;
+        }
+        return prve;
+      }, {});
+      const canBudyGoods = this.selGoods.data.specList
+        .filter((v) => isCanBuy(v))
+        .sort((a, b) => {
+          const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          const bNumber = b.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          return aNumber - bNumber;
+        });
+      return canBudyGoods[0];
+    },
+    //设置商品默认选中,规格禁止以及选中
+    setSkugoodsDefaultInit() {
+      const skuList = this.selGoods.skuList;
+      const goodsListMap = this.selGoods.skuMap;
+      const skuGoods = this.findGoods(skuList, goodsListMap);
+      console.log(skuGoods);
+      if (skuGoods) {
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+        skuGoods.specSnap.split(",").map((v, index) => {
+          skuList[index].sel = v;
+        });
+      }
+      this.setTagDisabled();
+    },
+    // 设置当前选中商品skuList
+    setSelGoodsSkuList(skuList, specSnap) {
+      const specSnapArr = specSnap ? specSnap.split(",") : [];
+      this.selGoods.skuList = skuList.map((v, index) => {
+        const values = v.value.split(",");
+        return {
+          ...v,
+          valueArr: values,
+          sel: specSnap ? specSnapArr[index] : "",
+          values: values.map((name) => {
+            return { name, disabled: false };
+          }),
+        };
+      });
+    },
+    setSelGoodsSkuMap(specList) {
+      for (let i in specList) {
+        this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+      }
+    },
+    //根据右侧商品单规格多规格做不同处理
+    async goodsClick(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        this.setSelGoodsSkuMap(specList);
+        console.log(this.selGoods.skuMap);
+        this.setSelGoodsSkuList(JSON.parse(item.skuResult.tagSnap));
+        this.setSkugoodsDefaultInit();
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.order.selIndex = orderGoodsIndex;
+      } else {
+        //增加
+        console.log(item);
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: item.specList[0].suit, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    async getGoods() {
+      const res = await getGoodsLists(this.goods.query);
+      const goods = res.records.filter((v) => {
+        if (!v) {
+          return false;
+        }
+        let isShow = true;
+        if (v.typeEnum !== "sku") {
+          isShow = v.specList.length >= 1;
+        }
+        return isShow;
+      });
+      this.goods.list = goods;
+      this.goods.total = res.total;
+      this.$goodsData = goods;
+    },
+    async open(item, key) {
+      this.table = item;
+      this.key = key;
+      if (this.key == "isPayOrder") {
+        this.isCreateOrder = true;
+      }
+      this.informationdialogshow;
+      this.informationdialogshow = true;
+      const res = await this.getMasterId();
+      this.masterId = res.masterId;
+      if (this.key == "isPayOrder") {
+        this.toCreateOrder(true);
+      }
+      this.getCart();
+      this.getGoods();
+      this.getCategory();
+      // this.getPrveCart();
+      this.getCacheOrder();
+    },
+    close() {
+      this.informationdialogshow = false;
+      this.$emit("close");
+    },
+    resetCommodityArr() {
+      this.commodityArr = [];
+      this.$refs.addSelect.resetFields();
+    },
+    haocaiCancel() {
+      this.informationdialogshow = false;
+    },
+    haocaiConfirm() {
+      console.log(haocaiSelectedMap);
+
+      this.$emit("confirm", haocaiSelectedMap);
+      this.informationdialogshow = false;
+      return;
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1;
+      this.getTableData();
+    },
+    paginationChangeinformation(e) {
+      this.goods.query.page = e;
+      this.getGoods();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/* 针对所有input type="number" */
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.full-screen {
+  margin-left: 10px;
+  svg {
+    width: 24px;
+    height: 24px;
+  }
+  &:hover {
+    path {
+      fill: #1890ff;
+    }
+  }
+}
+
+.icon-add {
+  color: rgb(34, 191, 100);
+  font-size: 22px;
+  cursor: pointer;
+}
+.prve-car-len {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 2px;
+  right: 2px;
+  height: 16px;
+  width: 16px;
+  font-size: 12px;
+  color: rgb(255, 255, 255);
+  border-radius: 50%;
+  background-color: rgb(250, 85, 85);
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+}
+::v-deep .el-button--text {
+  color: #000;
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+  padding: 0 4px;
+  text-align: center;
+}
+::v-deep .el-empty {
+  padding: 0;
+}
+::v-deep .el-button--success:not(.is-disabled) {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .el-tag--dark .el-tag--success {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .flex-1 .el-button {
+  width: 100%;
+}
+::v-deep .el-button--success.is-plain {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border: 1px solid #22bf64;
+}
+::v-deep .el-button--medium {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+// ::v-deep .el-button.is-plain:hover, .el-button.is-plain:focus{
+//   background: rgba(34, 191, 100, .1);
+//     color: #22bf64;
+//     border: 1px solid #22bf64;
+// }
+
+::v-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 {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.carts_list_title {
+  padding: 16px 0 12px 0;
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.4);
+  &::after {
+    content: "";
+    flex: 1;
+    height: 1px;
+    background-color: #ebebeb;
+    margin-left: 10px;
+  }
+}
+
+.lh-16 {
+  line-height: 16px;
+}
+.good_info_discount {
+  height: 16px;
+  padding: 0 3px;
+  color: #ff3f3f;
+  background-color: rgba(255, 63, 63, 0.1);
+  border-radius: 2px;
+  margin-left: 6px;
+  font-size: 12px;
+  white-space: nowrap;
+}
+.icon-remove {
+  border: 1px solid #d8d8d8;
+  width: 22px;
+  height: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  &::after {
+    content: "";
+    display: block;
+    width: 10px;
+    height: 1px;
+    background: #999;
+  }
+}
+.row-center {
+  justify-content: center;
+}
+.sku-group-text {
+  text-align: left;
+  color: #666;
+  font-size: 11px;
+  margin-top: 2px;
+}
+
+.price {
+  font-size: 18px;
+  text-align: left;
+  color: rgb(255, 81, 82);
+  font-weight: 600;
+}
+.youhui {
+  color: #c12a2a;
+  font-size: 13px;
+  line-height: 16px;
+}
+
+::v-deep .el-dialog__footer {
+  border-top: 1px solid #efefef;
+}
+
+.sku-bottom {
+  padding: 14px 12px 5px;
+}
+
+.relative {
+  position: relative;
+}
+.col-baseline {
+  align-items: baseline;
+}
+.flex-x-y-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #efefef;
+}
+::v-deep .el-dialog__body {
+  padding: 0 20px;
+}
+.absolute {
+  position: absolute;
+}
+
+.order-number-box {
+  position: relative;
+
+  .absolute {
+    width: 60px;
+    height: 40px;
+    right: -30px;
+    top: -12px;
+    position: absolute;
+
+    .order-input-number {
+      position: absolute;
+      right: -6px;
+      top: 0;
+      justify-content: center;
+      align-items: center;
+      display: none;
+      background-color: #fff;
+      border: 1px solid #e4e7ed;
+      border-radius: 4px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+      padding: 9px 6px;
+      background-color: #fff;
+      height: 40px;
+    }
+
+    &:hover .order-input-number {
+      display: flex;
+    }
+  }
+}
+
+.ft-12 {
+  font-size: 12px;
+}
+
+.ft-18 {
+  font-size: 18px;
+}
+
+.transition {
+  transition: all 0.2s ease-in-out;
+}
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #efefef;
+}
+
+.tableId {
+  padding: 9px 15px;
+  border: 1px solid #dcdfe6;
+  font-size: 12px;
+  border-radius: 3px;
+  cursor: pointer;
+
+  &:hover {
+    border-color: #409eff;
+    color: #409eff;
+    background-color: rgba(24, 144, 255, 0.1);
+  }
+}
+
+.cur-pointer {
+  cursor: pointer;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.flex-wrap {
+  flex-wrap: wrap;
+}
+
+.mt-14 {
+  margin-top: 14px;
+}
+
+.my-btn {
+  outline: none;
+  height: 40px;
+  font-size: 14px;
+  line-height: 40px;
+  color: #000;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 0 5px;
+  background-color: #fff;
+  position: relative;
+
+  &.disabled {
+    color: #c0c4cc;
+    cursor: not-allowed;
+    background-color: #fff;
+    border-color: #ebeef5;
+  }
+}
+.flex-xy-cnter {
+  justify-content: center;
+  align-items: center;
+}
+.flex-wrap {
+  flex: 1;
+}
+.headimg {
+  width: 34px;
+  height: 34px;
+  display: block;
+  border-radius: 2px;
+  margin-right: 6px;
+}
+.take_order_list {
+  padding: 14px 0;
+  display: flex;
+  justify-content: space-between;
+  .tol_left_list {
+    height: 360px;
+    margin-right: 24px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolll_item {
+      border: 1px solid rgb(247, 247, 250);
+      height: 86px;
+      width: 130px;
+      padding: 10px 14px;
+      margin-bottom: 12px;
+      border-radius: 4px;
+      color: #303133;
+
+      background-color: #f7f7fa;
+      &.active {
+        border: 1px solid rgb(0, 194, 95);
+        background-color: rgba(0, 194, 95, 0.1);
+        color: rgb(0, 194, 95) !important;
+        .tollli_time,
+        .tollli_num {
+          color: rgb(0, 194, 95) !important;
+        }
+      }
+      cursor: pointer;
+      .tollli_index {
+        font-weight: 600;
+        font-size: 18px;
+      }
+      .tollli_price {
+        margin-top: 8px;
+        font-size: 14px;
+      }
+      .tollli_time_and_num {
+        margin-top: 6px;
+        display: flex;
+        justify-content: space-between;
+        .tollli_time,
+        .tollli_num {
+          font-size: 12px;
+          color: #909399;
+        }
+      }
+    }
+  }
+  .tol_right_list {
+    flex: 1;
+    height: 360px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolrl_item {
+      display: flex;
+      padding: 2px 2px 13px 2px;
+      margin-bottom: 12px;
+      border-bottom: 1px solid #ebebeb;
+      .tolrli_img {
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 4px;
+        }
+      }
+      .tolrli_right {
+        display: flex;
+        justify-content: space-between;
+        flex: 1;
+        flex-direction: column;
+        padding: 1px 0 1px 8px;
+        .tr_top {
+          display: flex;
+          justify-content: space-between;
+          .trt_name {
+            width: 150px;
+            font-size: 14px;
+            color: #212121;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .trt_num {
+            font-size: 14px;
+            color: #212121;
+          }
+          .trt_price {
+            width: 100px;
+            text-align: right;
+            font-size: 14px;
+            color: #212121;
+          }
+        }
+        .tr_bottom {
+          font-size: 12px;
+          color: #999;
+        }
+      }
+    }
+  }
+}
+
+.success {
+  color: #fff;
+  border-color: #22bf64;
+  background-color: rgb(34, 191, 100);
+}
+
+.categoty {
+  position: sticky;
+  top: 0;
+  background-color: #f7f7fa;
+  z-index: 1;
+  padding-top: 14px;
+  margin-left: 7px;
+
+  .show_more_btn {
+    padding: 0 10px;
+    color: #1890ff;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    user-select: none;
+    min-width: 80px;
+    background: #f7f7fa;
+    position: absolute;
+    right: -20px;
+    top: 14px;
+    height: 38px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .el-icon-arrow-down {
+      transition: all 0.2s;
+    }
+
+    &.showAll .el-icon-arrow-down {
+      transform: rotate(180deg);
+    }
+  }
+}
+
+.search-box {
+  display: flex;
+  justify-content: flex-end;
+  margin-left: 12px;
+  border-bottom: 1px solid #ebebeb;
+}
+::v-deep .el-dialog__title {
+  font-size: 20px;
+  font-weight: 600;
+}
+
+::v-deep .categorys .el-tag--plain.el-tag--success {
+  border: 1px solid #dcdfe6;
+  color: #000;
+  font-weight: 600;
+}
+
+::v-deep .el-dialog {
+  user-select: none;
+}
+
+::v-deep .categorys .el-tag {
+  min-width: 80px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 14px;
+  font-size: 14px;
+  font-weight: 600;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+}
+
+::v-deep .tag-group .el-tag {
+  min-width: 80px;
+  height: 28px;
+  line-height: 28px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 15px;
+  font-size: 14px;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+  border-radius: 4px;
+}
+
+::v-deep .tag-group .el-tag--light {
+  color: #000;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+}
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  background-color: #22bf64;
+  border-color: #22bf64;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  color: #22bf64;
+}
+
+::v-deep .tag-group .el-tag--dark {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border-color: #22bf64;
+}
+.no-search-result {
+  color: #888;
+  margin: 0 0 10px 7px;
+}
+
+.numberbox {
+  border: 1px solid #dcdfe6;
+  background-color: #fff;
+  color: #000;
+  min-height: 38px;
+  line-height: 38px;
+  text-align: center;
+  border-radius: 4px;
+  position: relative;
+  margin: 0 0 10px;
+
+  .reduce,
+  .add {
+    font-size: 28px;
+    color: #999;
+    height: 38px;
+    line-height: 38px;
+    text-align: center;
+  }
+
+  .input {
+    font-size: 30px;
+    display: flex;
+    overflow: hidden;
+    padding: 0 10px;
+    height: 50px;
+    border-top: 1px solid #dcdfe6;
+    border-bottom: 1px solid #dcdfe6;
+
+    input {
+      height: 100%;
+      width: 100%;
+      box-sizing: border-box;
+      outline: none;
+      justify-content: center;
+      border: none;
+      text-align: center;
+    }
+  }
+}
+
+.tag-group {
+  margin-top: 10px;
+
+  .tag-item {
+    margin-bottom: 20px;
+
+    .tag-name {
+      margin-bottom: 10px;
+      font-size: 12px;
+      color: #999;
+    }
+  }
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+}
+
+.row-between {
+  justify-content: space-between;
+}
+
+.row-right {
+  justify-content: flex-end;
+}
+
+.none {
+  display: none !important;
+}
+
+.handle {
+  font-size: 18px;
+  color: #999;
+
+  &:hover {
+    cursor: grab;
+  }
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 8px;
+    display: flex;
+    flex-direction: column;
+
+    .tag_wrap {
+      display: flex;
+    }
+  }
+}
+
+.font-bold {
+  font-weight: bold;
+}
+
+.head-container .filter-item {
+  margin: 0 5px 0 0;
+}
+
+.diancan {
+  display: flex;
+  height: calc(100vh - 75px);
+  .choose-user {
+    padding: 10px 0;
+    border-bottom: 1px solid #ebebeb;
+    margin-bottom: 10px;
+  }
+  .order {
+    border-radius: 6px;
+    display: flex;
+    padding-left: 12px;
+    .bottom {
+      left: 0;
+      right: 0;
+      box-sizing: border-box;
+      padding: 14px;
+      bottom: 0;
+      background-color: #fff;
+      z-index: 10;
+      border-top: 1px solid #ebebeb;
+    }
+
+    .list {
+      width: 352px;
+      padding: 12px 12px 0 0;
+    }
+
+    .controls {
+      min-width: 106px;
+      width: 106px;
+      border-radius: 4px;
+      background-color: #f7f7fa;
+      padding: 14px 10px;
+      position: relative;
+      overflow-y: auto;
+
+      .btn {
+        border: 1px solid #dcdfe6;
+        background-color: #fff;
+        color: #000;
+        min-height: 38px;
+        line-height: 38px;
+        text-align: center;
+        border-radius: 4px;
+        position: relative;
+        cursor: pointer;
+        margin: 0 0 10px;
+
+        &.disabled {
+          color: #999;
+          pointer-events: none;
+          cursor: no-drop;
+          background-color: rgb(250, 250, 252);
+        }
+      }
+    }
+
+    .order-item {
+      padding: 4px;
+      border-radius: 2px;
+      display: flex;
+      cursor: pointer;
+      align-items: center;
+      justify-content: space-between;
+      background-color: rgba(0, 0, 0, 0);
+      transition: all 0.3s;
+      .pack {
+        right: 100%;
+        width: 18px;
+        height: 18px;
+        background: #35ac6a;
+        border-radius: 4px 0 4px 0;
+        font-size: 12px;
+        color: #fff;
+        text-align: center;
+        line-height: 17px;
+      }
+      &.active {
+        background-color: rgba(0, 0, 0, 0.04);
+      }
+
+      .total-price {
+        width: 94px;
+        text-align: right;
+      }
+
+      .good-info {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-width: 70px;
+
+        .specSnap {
+          color: #999;
+          font-size: 12px;
+          margin-top: 3px;
+        }
+      }
+
+      .name {
+        font-size: 13px;
+        text-align: left;
+        color: #212121;
+        overflow: hidden;
+      }
+
+      .img {
+        width: 40px;
+        height: 40px;
+        position: relative;
+        margin-right: 10px;
+
+        img {
+          width: 40px;
+          height: 40px;
+        }
+      }
+    }
+  }
+
+  .goods {
+    box-sizing: border-box;
+    flex: 1;
+    background-color: #f7f7fa;
+    margin-left: 20px;
+    padding: 0 15px 14px 15px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    .goods-list {
+      display: flex;
+      flex-wrap: wrap;
+
+      .goods-item {
+        position: relative;
+        cursor: pointer;
+        min-width: 98px;
+        max-width: 100px;
+        height: 100px;
+        // flex: 1;
+        margin: 0 7px 14px;
+        border-radius: 4px;
+        .timeSale {
+          text-align: center;
+          border-radius: 10px;
+          background-color: hsla(0, 0%, 99.2%, 0.5);
+          color: #fff;
+          font-size: 10px;
+          line-height: 16px;
+          padding: 2px 10px;
+          margin-top: 2px;
+        }
+        .sell-out {
+          width: 100%;
+          height: 100%;
+          padding: 10px;
+          background: rgba(0, 0, 0, 0.4);
+          z-index: 2;
+          position: absolute;
+          top: 0;
+          font-size: 14px;
+          font-weight: 400;
+          text-align: left;
+          color: #fff;
+        }
+        overflow: hidden;
+        position: relative;
+
+        .typeEnum {
+          position: absolute;
+          right: 0;
+          top: 0;
+          border-radius: 0 0 0 10px;
+          background-color: #46a6ff;
+          color: #fff;
+          padding: 2px 10px;
+          display: none;
+        }
+
+        .info {
+          font-size: 14px;
+          position: absolute;
+          inset: 0;
+          background: rgba(0, 0, 0, 0.4);
+          color: #fff;
+          box-sizing: border-box;
+          padding: 10px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+        .img-box {
+          width: 100%;
+          height: 100%;
+          position: relative;
+        }
+        .text-sell-out {
+          width: 100%;
+          justify-content: center;
+          height: 60px;
+          svg {
+            width: 60px;
+            height: 60px;
+          }
+          // z-index: 1;
+          // position: absolute;
+          // right: 0;
+          // top: 0;
+        }
+        .sell-out-svg {
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          bottom: 0;
+          background: rgba(0, 0, 0, 0.5);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        img {
+          width: 100%;
+          height: 100%;
+        }
+        &.layout-img-and-text {
+          min-width: 116px !important;
+          max-width: 136px !important;
+          height: 175px;
+          background-color: #fff;
+          display: flex;
+          flex-direction: column;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.07);
+          .img-box {
+            width: 136px;
+          }
+          img {
+            width: 136px;
+            height: 125px;
+          }
+          .info {
+            position: inherit;
+            background-color: #fff;
+            padding: 4px 4px 8px;
+            color: #000;
+            .name {
+              font-size: 15px;
+              font-weight: 600;
+              height: 20px;
+              line-height: 20px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              margin-bottom: 2px;
+            }
+            .price {
+              font-size: 13px;
+            }
+          }
+        }
+        &.layout-text {
+          margin: 0 5px 10px;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.08);
+          min-width: 128px !important;
+          max-width: 148px !important;
+          background-color: #fff;
+          height: auto;
+          .info {
+            background-color: #fff;
+
+            position: inherit;
+            color: #000;
+            .name {
+              font-weight: 600;
+              font-size: 15px;
+              color: #000;
+              line-height: 22px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+
+              height: 44px;
+            }
+
+            .price {
+              font-weight: 600;
+              font-size: 16px;
+              margin: 6px 0 0;
+            }
+          }
+          img {
+            display: none;
+          }
+        }
+        &.layout-text.sell-out {
+          .info {
+            color: #c8c8c8;
+
+            .name {
+              color: #c8c8c8;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.carts {
+  flex-direction: column;
+  background: #fff;
+  height: 100%;
+  position: relative;
+  z-index: 10;
+}
+
+.carts .title,
+.carts {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+}
+
+.carts .title {
+  justify-content: space-between;
+  height: 64px;
+  border-bottom: 1px solid #ebebeb;
+  padding: 20px;
+  padding-top: 30px;
+}
+
+.carts .title .left {
+  font-family: PingFangSC-Medium;
+  font-weight: 500;
+  font-size: 18px;
+  color: #000;
+}
+
+.carts .title .right {
+  font-size: 14.4px;
+  cursor: pointer;
+}
+
+.carts .box_status {
+  width: 370px;
+  height: 58px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-top: 20px;
+  font-family: MicrosoftYaHei;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+}
+
+.carts .box_status span {
+  padding: 0 5px;
+}
+
+.number_list_box {
+  width: 370px;
+  background: #fff;
+  border-radius: 3px;
+  margin: 20px 0;
+}
+
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+
+.yd-keyboard {
+  justify-content: center;
+  margin-top: -8px;
+  margin-left: -8px;
+}
+
+.mini-number-box1 .mini-number,
+.yd-keyboard {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box1 .mini-number {
+  margin-left: 8px;
+  border: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line {
+  margin-top: 0;
+}
+
+.mini-number-box1 .mini-number .key {
+  width: 122px;
+  height: 60px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin-left: 0;
+}
+
+.mini-number-box1 .mini-number .key:not(:last-child) {
+  border-right: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line:not(:last-child) {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.mini-number-box2 {
+  display: flex;
+
+  justify-content: center;
+}
+
+.mini-number-box2 .key {
+  width: 80px;
+  height: 70px;
+}
+
+.mini-number-box2 .function-button {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box2 .function-button .key {
+  margin-top: 8px;
+}
+
+.key-line {
+  margin-top: 8px;
+}
+
+.key,
+.key-line {
+  display: flex;
+
+  justify-content: center;
+}
+
+.key {
+  width: 64px;
+  height: 64px;
+  background: #fff;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  border-radius: 4px;
+
+  align-items: center;
+  margin-left: 8px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 34px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.simple-Keyboard-number,
+.simple-Keyboard-weight {
+  min-width: 410px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 999;
+  background: #fff;
+  -webkit-box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  border-radius: 4px;
+  overflow: hidden;
+}
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+.disabled-box {
+  position: absolute;
+  inset: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.cashier_box {
+  display: flex;
+  width: 100%;
+  padding-top: 14px;
+  flex: 1;
+  background: #f7f7fa;
+  position: relative;
+  margin: 0 24px 0 0;
+  border-radius: 4px;
+  overflow-y: auto;
+}
+
+.cashier_left .el-form-item {
+  margin-bottom: 0;
+}
+
+.cashier_left {
+  padding: 0 20px 0;
+
+  flex: 1;
+  min-width: 310px;
+}
+
+.cashier_left .title {
+  font-size: 18px;
+  color: #000;
+  font-weight: 600;
+  padding: 20px 0;
+}
+
+.cashier_left .detail_box {
+  background: #fff;
+  border-radius: 4px;
+  padding: 0 14px;
+  margin-bottom: 20px;
+}
+
+.cashier_left .detail_box .forms {
+  padding: 10px 0;
+  border-top: 1px solid #ebebeb;
+}
+
+.cashier_left .detail_box .usercard {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+  height: 80px;
+  cursor: pointer;
+}
+
+.cashier_left .detail_box .usercard .info {
+  margin-left: 10px;
+
+  display: flex;
+
+  flex-direction: column;
+
+  justify-content: space-around;
+}
+
+.cashier_left .detail_box .usercard .info .nickname {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+}
+
+.cashier_left .detail_box .usercard .info .nickname .txt {
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 25px;
+  line-height: 25px;
+}
+::v-deep .cashier_left .el-form-item__label {
+  text-align: left;
+}
+.cashier_left .detail_box .usercard .info .nickname .vip_level {
+  font-size: 12px;
+  padding: 0 5px;
+  background: #f7793d;
+  height: 20px;
+  line-height: 20px;
+  color: #fff;
+  border-radius: 4px;
+}
+
+.cashier_left .detail_box .usercard .info .other_info {
+  display: flex;
+  font-size: 14px;
+  color: #666;
+}
+
+.cashier_left .detail_box .usercard .info .other_info .item {
+  margin-right: 10px;
+}
+
+.cashier_right {
+  min-width: 250px;
+  border-left: 1px solid #ebebeb;
+
+  display: flex;
+
+  flex-direction: column;
+  padding-bottom: 20px;
+}
+
+.cashier_right .detail_form {
+  flex: 1;
+  overflow-y: auto;
+}
+
+.cashier_right .detail_form .detail_form_item {
+  display: flex;
+
+  justify-content: space-between;
+  position: relative;
+  margin-bottom: 16px;
+
+  align-items: center;
+}
+
+.cashier_right .detail_form .detail_form_item .left {
+  font-size: 14px;
+  color: #000;
+  letter-spacing: 1px;
+}
+
+.cashier_right .detail_form .detail_form_item .right {
+  font-size: 14px;
+  color: #000;
+
+  display: flex;
+  margin-right: 40px;
+}
+
+.cashier_right .detail_form .detail_form_item .right .btn {
+  font-size: 14px;
+  color: #1890ff;
+  margin-left: 10px;
+  cursor: pointer;
+  position: absolute;
+  right: 0;
+}
+
+.cashier_right .detail_form .detail_form_item .right .dfi_button {
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-left: 10px;
+  width: 98px;
+  height: 36px;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.8);
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.cashier_right .detail_form .detail_form_item .redfont {
+  color: #fa5555;
+  font-size: 20px;
+}
+
+.cashier_right .detail_form .line {
+  width: 100%;
+  height: 1px;
+  background: #ebebeb;
+  margin-top: 4px;
+  margin-bottom: 20px;
+}
+
+.cashier_right .pay_btn {
+  width: 100%;
+  line-height: 44px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  color: #fff;
+  letter-spacing: 1px;
+  cursor: pointer;
+}
+
+.cashier_right .pay_btn:hover {
+  opacity: 0.9;
+}
+
+.btn1 {
+  background: #22bf64;
+  color: #fff;
+  border: none;
+}
+.pay_btns .el-button + .el-button {
+  margin-left: 0;
+}
+
+.pay_btns .el-button {
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+
+.pay_btns .el-button:disabled {
+  border: 1px solid #dcdfe6;
+}
+</style>
diff --git a/src/views/tool/table/components/table-diancan.vue b/src/views/tool/table/components/table-diancan.vue
new file mode 100644
index 0000000..1b5dcae
--- /dev/null
+++ b/src/views/tool/table/components/table-diancan.vue
@@ -0,0 +1,4302 @@
+<!-- eslint-disable no-empty -->
+<template>
+  <div class="">
+    <el-dialog
+      :title="title"
+      fullscreen
+      :visible.sync="informationdialogshow"
+      @close="onclose"
+    >
+      <div slot="title" class="flex row-between flex-y-center">
+        <div class="flex" style="width: 500px">
+          <div class="el-dialog__title" style="margin-right: 10px">
+            {{ title }}
+          </div>
+          <!-- 先付后付start -->
+          <!-- <el-dropdown @command="changePostPay">
+            <el-button plain type="primary" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown> -->
+          <el-button plain type="primary" size="mini">
+            {{ postPay ? "后付费" : "先付费" }}
+          </el-button>
+          <!-- 先付后付end -->
+          <span
+            @click="toggleFullScreen"
+            class="flex flex-xy-center cur-pointer full-screen"
+          >
+            <svg
+              v-if="!isFullScreen"
+              t="1724396447139"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="8943"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M358.4 768H426.666667v85.333333H213.333333v-213.333333h85.333334v68.266667l128-128 59.733333 59.733333-128 128z m345.6 0l-128-128 59.733333-59.733333 132.266667 132.266666V640h85.333333v213.333333h-213.333333v-85.333333h64zM358.4 298.666667l128 128-59.733333 59.733333-128-128V426.666667H213.333333V213.333333h213.333334v85.333334H358.4z m345.6 0H640V213.333333h213.333333v213.333334h-85.333333V354.133333l-132.266667 132.266667-59.733333-59.733333 128-128z"
+                fill="#666666"
+                p-id="8944"
+              ></path>
+            </svg>
+            <svg
+              v-else
+              t="1724396479520"
+              class="icon"
+              viewBox="0 0 1024 1024"
+              version="1.1"
+              xmlns="http://www.w3.org/2000/svg"
+              p-id="9141"
+              width="128"
+              height="128"
+            >
+              <path
+                d="M298.666667 631.466667H226.133333v-81.066667h217.6v204.8h-85.333333v-68.266667l-128 128L170.666667 759.466667l128-128z m422.4 0l128 128-59.733334 59.733333-128-128v68.266667h-85.333333V554.666667h217.6v81.066666h-72.533333zM298.666667 341.333333L187.733333 230.4 243.2 170.666667l115.2 115.2V217.6h85.333333v204.8H226.133333V341.333333H298.666667z m430.933333 0h64v81.066667h-217.6V217.6h85.333333v72.533333L780.8 170.666667l59.733333 59.733333L729.6 341.333333z"
+                fill="#666666"
+                p-id="9142"
+              ></path>
+            </svg>
+          </span>
+        </div>
+
+        <div class="flex flex-1" style="padding-right: 50px">
+          <div class="flex-1">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="head-container search-box flex row-between" v-if="false">
+        <div>
+          <el-dropdown @command="changePostPay">
+            <el-button plain type="primary" size="mini">
+              {{ postPay ? "后付费" : "先付费" }}
+              <i class="el-icon-caret-bottom"></i>
+            </el-button>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item :command="false">先付费</el-dropdown-item>
+              <el-dropdown-item :command="true">后付费</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+
+        <div class="flex">
+          <div style="width: 300px">
+            <el-input
+              v-model="goods.query.productId"
+              size="small"
+              clearable
+              placeholder="请输入商品名称"
+              style="width: 100%"
+              class="filter-item"
+              suffix-icon="el-icon-search"
+            />
+            <!-- @keyup.enter.native="getGoods" -->
+          </div>
+          <div
+            style="display: flex; justify-content: flex-end; margin-left: 10px"
+          >
+            <!-- <el-button style="margin-right: 10px" type="primary" @click="getGoods"
+            >查询</el-button
+          >
+          <el-button @click="reset">重置</el-button> -->
+            <div style="width: 100px; margin-left: 20px">
+              <el-select v-model="layout.sel" placeholder="请选择">
+                <el-option
+                  v-for="item in layout.list"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                  :disabled="item.disabled"
+                >
+                </el-option>
+              </el-select>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="diancan" v-loading="loading">
+        <div class="order">
+          <div class="relative u-flex u-flex-col u-row-between">
+            <div class="w-full" style="padding-right: 14px">
+              <div class="choose-user flex u-m-l-20">
+                <el-button
+                  type="primary"
+                  v-if="vipUser.id === ''"
+                  @click="refChooseUserOpen"
+                  >选择用户</el-button
+                >
+                <template v-else>
+                  <div class="flex cur-pointer" @click="refChooseUserOpen">
+                    <img
+                      v-if="vipUser.headImg"
+                      class="headimg"
+                      :src="vipUser.headImg"
+                      alt=""
+                    />
+                    <div v-else class="headimg flex flex-x-y-center">
+                      <i class="el-icon-user"></i>
+                    </div>
+                    <div>
+                      <div class="ft-13 color-000">{{ vipUser.nickName }}</div>
+                      <div style="margin-top: 2px" class="color-666 ft-12">
+                        余额：{{ vipUser.amount }}
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </div>
+              <div class="u-m-l-20 u-p-b-10 meal_box">
+                <el-button-group>
+                  <el-button
+                    :class="{ active: item.value == useTypes.sel }"
+                    :disabled="order.old.list.length > 0"
+                    v-for="(item, index) in useTypes.list"
+                    @click="changeUseType(item.value)"
+                    :key="index"
+                    >{{ item.name }}</el-button
+                  >
+                </el-button-group>
+              </div>
+              <div class="flex row-between table-list u-m-l-20">
+                <!-- <div class="tableId" @click="chooseTableOpen"> -->
+                <el-popover
+                  placement="right"
+                  width="333"
+                  trigger="click"
+                  v-model="tableShow"
+                >
+                  <div style="max-height: 398px; overflow-y: scroll">
+                    <div
+                      class="u-flex u-row-between u-p-t-8 table-item u-p-b-8 u-p-r-30"
+                      v-for="(item, index) in tableList"
+                      :key="index"
+                      @click="changeTable(item, index)"
+                    >
+                      <span> {{ item.name }}</span>
+                      <span :style="{ color: status[item.status].type }">
+                        {{
+                          status[item.status] ? status[item.status].label : ""
+                        }}</span
+                      >
+                    </div>
+                  </div>
+                  <div class="tableId" slot="reference">
+                    {{ table ? "桌台号：" + table.name : "桌台号/取餐号" }}
+                  </div>
+                </el-popover>
+
+                <div class="u-flex">
+                  <div class="u-p-r-14 border-r u-m-r-14">
+                    <template v-if="!shopInfo.isTableFee">
+                      <div
+                        class="u-flex cur-pointer"
+                        @click="
+                          refToggle('refChooseDinersNumber', true, perpole)
+                        "
+                      >
+                        <span>就餐人数：{{ perpole }}位</span>
+                        <span
+                          class="el-icon-arrow-right diningPeople_cell_arrow"
+                        ></span>
+                      </div>
+                    </template>
+                    <template v-else>
+                      <div class="u-flex">
+                        <span>就餐人数：-位</span>
+                        <span
+                          class="el-icon-arrow-right diningPeople_cell_arrow"
+                        ></span>
+                      </div>
+                    </template>
+                  </div>
+                  <el-button
+                    @click="clearCart"
+                    type="text"
+                    size="mini"
+                    :disabled="order.list.length <= 0"
+                    >清空</el-button
+                  >
+                </div>
+              </div>
+            </div>
+
+            <div
+              class="order-list-all u-p-l-20"
+              style="flex: 1; overflow-y: scroll"
+            >
+              <div class="list">
+                <!-- 当前购物车列表 -->
+                <template v-if="order.list.length">
+                  <cart-item
+                    @itemClick="changeOrderSel"
+                    @changeOrderNumber="changeOrderNumber"
+                    @cartGoodsNumberInput="cartGoodsNumberInput"
+                    @cartGoodsNumberChange="cartGoodsNumberChange"
+                    v-for="(item, index) in order.list"
+                    :key="index"
+                    :index="index"
+                    :item="item"
+                    :selPlaceNum="order.selPlaceNum"
+                    :selIndex="order.selIndex"
+                  ></cart-item>
+                </template>
+                <div v-if="order.gift.list.length">
+                  <div class="carts_list_title">以下是优惠菜品</div>
+                </div>
+
+                <div v-if="!order.list.length">
+                  <el-empty
+                    :image-size="50"
+                    description="点餐列表为空"
+                  ></el-empty>
+                </div>
+              </div>
+              <!-- 已下单菜品列表 -->
+              <template v-if="order.old.list.length">
+                <!-- <div class="carts_list_title">已下单菜品</div> -->
+                <div
+                  class="list"
+                  v-for="(orderItem, orderIndex) in order.old.list"
+                  :key="orderIndex"
+                >
+                  <div class="carts_list_title">
+                    第{{ orderItem.placeNum }}次下单
+                  </div>
+                  <cart-item
+                    @itemClick="changeOrderOldSel"
+                    :canChangeNumber="false"
+                    v-for="(item, index) in orderItem.info"
+                    :key="index"
+                    :index="index"
+                    :item="item"
+                    isOld
+                    :selIndex="order.old.selIndex"
+                    :placeNum="orderItem.placeNum"
+                    :selPlaceNum="order.selPlaceNum"
+                  ></cart-item>
+                </div>
+              </template>
+              <!-- 餐位费 -->
+              <template v-if="order.seatFee && order.seatFee.totalAmount > 0">
+                <div class="carts_list_title">餐位费</div>
+                <cart-item
+                  @itemClick="changeOrderOldSel"
+                  :canChangeNumber="false"
+                  key="seatFee"
+                  :index="0"
+                  :item="order.seatFee"
+                  isSeatFee
+                  :selIndex="order.old.selIndex"
+                  :placeNum="-1"
+                  :selPlaceNum="order.selPlaceNum"
+                ></cart-item>
+              </template>
+              <div class="order_remark" v-if="note.content">
+                订单备注： {{ note.content }}
+              </div>
+            </div>
+
+            <div class="w-full bottom">
+              <div class="border-top">
+                <div class="flex row-right youhui" v-if="giftLen">
+                  <span> 已优惠￥{{ allGiftMoney | to2 }} </span>
+                  <i class="el-icon-arrow-right"></i>
+                </div>
+
+                <div class="flex row-between">
+                  <el-button type="text" @click="printOrder"
+                    >打印制作单</el-button
+                  >
+                  <!-- <el-checkbox
+                  v-model="order.allPack"
+                  :disabled="!this.order.list.length"
+                  >打包</el-checkbox
+                > -->
+                  <div class="flex">
+                    <span class="color-666" style="margin-right: 5px"
+                      >共{{ allNumber }}件</span
+                    >
+                    <span class="color-000 ft-18">￥{{ allPrice }} </span>
+                  </div>
+                </div>
+
+                <div class="flex mt-14">
+                  <template v-if="isCreateOrder">
+                    <button
+                      class="my-btn flex-1 default"
+                      @click="createOrderClose"
+                    >
+                      <span>加菜/返回</span>
+                    </button>
+                    <div style="width: 15px"></div>
+                    <button class="my-btn flex-1 primary" @click="payOrder">
+                      <span>立即支付</span>
+                    </button>
+                  </template>
+                  <template v-else>
+                    <template v-if="postPay">
+                      <div class="flex-1">
+                        <el-button
+                          type="primary"
+                          size="medium"
+                          :disabled="!order.list.length"
+                          @click="toCreateOrderDebounce(false)"
+                        >
+                          仅下单
+                        </el-button>
+                      </div>
+                      <div style="width: 15px"></div>
+                    </template>
+                    <div class="flex-1">
+                      <el-button
+                        size="medium"
+                        :disabled="!order.list.length && !order.old.list.length"
+                        @click="toCreateOrderDebounce(true)"
+                      >
+                        去结账
+                      </el-button>
+                    </div>
+                  </template>
+                </div>
+              </div>
+            </div>
+          </div>
+
+          <div class="controls">
+            <div
+              class="numberbox"
+              :class="{ 'cur-pointer': order.old.selIndex < 0 }"
+            >
+              <div class="reduce" @click="changeOrderGoodsNumber('-')">-</div>
+              <div class="input relative">
+                <div
+                  class="disabled-box"
+                  v-if="order.selIndex >= 0"
+                  @click="changeKeyboradShow(true)"
+                ></div>
+                <!-- <input type="number" :disabled="order.selIndex<0" v-model="order.number" /> -->
+                <input
+                  type="number"
+                  disabled
+                  v-model="order.number"
+                  style="display: none"
+                />
+                <input type="number" disabled v-model="order.cacheNumber" />
+              </div>
+              <div class="add" @click="changeOrderGoodsNumber()">+</div>
+            </div>
+            <!-- <div class="btn" v-for="(item, index) in order.btns" :key="index" :class="{ disabled: item.disabled }" @click="orderBtnsClick(index,item)">
+              {{ item.text }}
+            </div> -->
+            <div
+              class="btn"
+              :class="{ disabled: !isSku }"
+              @click="orderBtnsClick('sku')"
+            >
+              规格
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('gift')"
+            >
+              {{ returnGiftText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('pack')"
+            >
+              {{ returnPackText }}
+            </div>
+            <div
+              class="btn"
+              :class="{ disabled: order.selIndex < 0 }"
+              @click="orderBtnsClick('del')"
+            >
+              删除
+            </div>
+
+            <div
+              class="btn"
+              :class="{ disabled: !order.list.length || order.old.list.length }"
+              @click="saveOrder"
+            >
+              存单
+            </div>
+            <div
+              class="btn relative"
+              :class="{
+                disabled: !prveOrder.list.length || order.old.list.length,
+              }"
+              @click="cacheOrderShow"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div>
+
+            <!-- <div
+              class="btn"
+              :class="{ disabled: !order.list.length }"
+              @click="orderBtnsClick('save')"
+            >
+              存单
+            </div>
+
+            <div
+              class="btn relative"
+              :class="{ disabled: !prveOrder.list.length }"
+              @click="orderBtnsClick('getOrder')"
+            >
+              取单
+              <span class="prve-car-len" v-if="prveOrder.list.length">{{
+                prveOrder.list.length
+              }}</span>
+            </div> -->
+
+            <div class="btn" @click="refNoteShow">整单备注</div>
+            <div
+              class="btn"
+              :class="{
+                disabled:
+                  order.placeNum <= 0 ||
+                  order.old.selIndex < 0 ||
+                  order.selGoods.status == 'return',
+              }"
+              @click="orderBtnsClick('returnCart')"
+            >
+              退菜
+            </div>
+            <!-- <div
+              class="btn"
+              :class="{ disabled: order.old.list.length <= 0 }"
+              @click="orderBtnsClick('returnCart')"
+            >
+              撤单
+            </div> -->
+          </div>
+        </div>
+        <div class="goods">
+          <template v-if="!isCreateOrder">
+            <div class="flex categoty">
+              <div
+                class="show_more_btn"
+                :class="{ showAll: category.showAll }"
+                @click="toggleShowAll"
+              >
+                <div class="flex">
+                  <div class="flex">
+                    <i class="el-icon-arrow-down"></i>
+                  </div>
+                  <span>展开</span>
+                </div>
+              </div>
+              <div
+                class="flex categorys"
+                :class="{ 'flex-wrap': category.showAll }"
+              >
+                <div
+                  v-for="(item, index) in category.list"
+                  :key="index"
+                  @click="changeCategoryId(item)"
+                >
+                  <el-tag
+                    size="medium"
+                    type="primary"
+                    effect="dark"
+                    v-if="goods.query.categoryId === item.id"
+                    >{{ item.name }}</el-tag
+                  >
+                  <el-tag size="medium" type="info" v-else effect="plain">{{
+                    item.name
+                  }}</el-tag>
+                </div>
+              </div>
+            </div>
+            <div
+              class="no-search-result"
+              v-if="search.list.length <= 0 && goods.query.productId !== ''"
+            >
+              未找到相关商品
+            </div>
+            <div class="goods-list" v-if="goods.list.length">
+              <div
+                class="goods-item"
+                :class="{
+                  'sell-out':
+                    item.isPauseSale ||
+                    (item.typeEnum !== 'sku' && item.stockNumber <= 0),
+                  'layout-img-and-text': layout.sel === 'img-and-text',
+                  'layout-text': layout.sel === 'text',
+                  none:
+                    (goods.query.categoryId !== '') &
+                    (goods.query.categoryId != item.categoryId),
+                }"
+                @click="goodsClick(item)"
+                v-for="(item, index) in goods.list"
+                :key="index"
+              >
+                <!-- <div class="sell-out flex flex-xy-cnter">
+                  <svg t="1724210152457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6417" width="64" height="64"><path d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z" fill="#ffffff" p-id="6418"></path><path d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z" fill="#ffffff" p-id="6419"></path><path d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z" fill="#ffffff" p-id="6420"></path><path d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z" fill="#ffffff" p-id="6421"></path></svg>
+                </div> -->
+
+                <div class="flex img-box" v-if="layout.sel !== 'text'">
+                  <img class="goods-img" :src="item.coverImg" alt="" />
+                  <template v-if="layout.sel === 'img-and-text'">
+                    <div class="sell-out-svg" v-if="isSellOut(item)">
+                      <svg
+                        t="1724234807994"
+                        class="icon"
+                        viewBox="0 0 1024 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="4356"
+                        width="64"
+                        height="64"
+                      >
+                        <path
+                          d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                          fill="#ffffff"
+                          p-id="4357"
+                        ></path>
+                        <path
+                          d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                          fill="#ffffff"
+                          p-id="4358"
+                        ></path>
+                        <path
+                          d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                          fill="#ffffff"
+                          p-id="4359"
+                        ></path>
+                        <path
+                          d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                          fill="#ffffff"
+                          p-id="4360"
+                        ></path>
+                      </svg>
+                    </div>
+                  </template>
+                </div>
+                <div class="typeEnum">
+                  <span>{{ item | returntypeName }}</span>
+                </div>
+                <div class="info">
+                  <div class="name">{{ item.name }}</div>
+                  <div>
+                    <template v-if="layout.sel === 'text'">
+                      <div class="text-sell-out flex">
+                        <svg
+                          v-if="isSellOut(item)"
+                          t="1724236049267"
+                          class="icon"
+                          viewBox="0 0 1024 1024"
+                          version="1.1"
+                          xmlns="http://www.w3.org/2000/svg"
+                          p-id="4911"
+                          width="64"
+                          height="64"
+                        >
+                          <path
+                            d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                            fill="#c8c8c8"
+                            p-id="4912"
+                          ></path>
+                          <path
+                            d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                            fill="#c8c8c8"
+                            p-id="4913"
+                          ></path>
+                          <path
+                            d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                            fill="#c8c8c8"
+                            p-id="4914"
+                          ></path>
+                          <path
+                            d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                            fill="#c8c8c8"
+                            p-id="4915"
+                          ></path>
+                        </svg>
+                      </div>
+                    </template>
+                    <div class="stockNumber"></div>
+                    <div class="">￥{{ item.lowPrice }}</div>
+                    <template v-if="layout.sel === 'default'">
+                      <div class="flex" v-if="isSellOut(item)">
+                        <div class="timeSale">售罄</div>
+                      </div>
+                    </template>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </template>
+
+          <template v-else>
+            <div class="cashier_box goods_classify_list">
+              <div class="cashier_left">
+                <!-- <div class="title">选择优惠</div> -->
+                <div class="detail_box">
+                  <div class="usercard">
+                    <span
+                      class="el-avatar el-avatar--square"
+                      style="height: 50px; width: 50px; line-height: 50px"
+                      ><img v-if="vipUser.id" :src="vipUser.headImg"
+                    /></span>
+                    <div class="info">
+                      <div class="nickname">
+                        <span class="txt">{{
+                          vipUser.id ? vipUser.nickName : "服务员下单"
+                        }}</span>
+                      </div>
+                      <div class="other_info">
+                        <div class="item">余额：{{ vipUser.amount | to2 }}</div>
+                        <div class="item">积分：{{ vipUser.totalScore }}</div>
+                      </div>
+                    </div>
+                  </div>
+
+                  <!-- <div class="forms">
+                    <el-form
+                      ref="form"
+                      :model="createOrder.form"
+                      label-width="60px"
+                    >
+                      <el-form-item label="优惠券">
+                        <el-select
+                          style="margin-right: 10px"
+                          v-model="createOrder.quan.sel"
+                          placeholder="选择优惠券"
+                        >
+                        </el-select>
+                        <el-button size="medium " type="text">
+                          查看不可用券
+                        </el-button>
+                      </el-form-item>
+                    </el-form>
+                  </div> -->
+                </div>
+                <div class="btn_group">
+                  <el-button size="medium" @click="disCountShow">
+                    整单打折/减免
+                  </el-button>
+                  <!-- <el-button size="medium "> 免单 </el-button> -->
+                </div>
+
+                <pay-type
+                  ref="refPayType"
+                  v-model="order.payType"
+                  @itemClick="payTypeItemClick"
+                >
+                </pay-type>
+                <div style="margin-top: 20px">
+                  <el-button type="primary" size="medium" @click="payOrder">
+                    <span>立即支付</span>
+                  </el-button>
+                </div>
+                <!-- <div class="flex row-right">
+                  <el-button size="medium"  type="primary" @click="payOrder"
+                    >确认支付</el-button
+                  >
+                </div> -->
+                <!-- <div class="title">选择支付方式</div>
+                <div class="btn_group">
+                  <div class="price_select">
+                    <div class="pay_btns">
+                      <el-button size="medium"  type="primary">
+                        微信支付/支付宝
+                      </el-button>
+                      <el-button size="medium"> 余额支付 </el-button>
+                      <el-button size="medium"> 现金支付 </el-button>
+                      <el-button size="medium"> 挂账 </el-button>
+                    </div>
+                  </div>
+                </div> -->
+              </div>
+              <div class="cashier_left cashier_right">
+                <div class="title">账单明细</div>
+                <div class="detail_form">
+                  <!---->
+                  <div class="detail_form_item">
+                    <div class="left">会员优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">门店优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">满减优惠</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">优惠券</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">整单改价</div>
+                    <div class="right">
+                      -￥{{
+                        ((1 - createOrder.discount) * createOrder.data.amount)
+                          | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item" v-if="createOrder.data.packFee">
+                    <div class="left">打包费</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.packFee || "0.00" }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">餐位费/附加费</div>
+                    <div class="right">
+                      ￥{{ order.seatFee.totalAmount | to2 }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">总价</div>
+                    <div class="right">
+                      ￥{{ createOrder.data.amount | to2 }}
+                    </div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">抹零</div>
+                    <div class="right">-￥0.00</div>
+                  </div>
+                  <div class="detail_form_item">
+                    <div class="left">应付金额</div>
+                    <div class="right redfont">
+                      ￥{{
+                        (createOrder.data.amount * createOrder.discount) | to2
+                      }}
+                    </div>
+                  </div>
+                  <div class="line"></div>
+                </div>
+              </div>
+            </div>
+          </template>
+        </div>
+      </div>
+
+      <!-- <slot name="footer">
+        <div style="display: flex; justify-content: flex-end">
+          <el-button style="margin-right: 20px" @click="haocaiCancel">取消</el-button>
+          <el-button type="primary" @click="haocaiConfirm">确定</el-button>
+        </div>
+      </slot> -->
+    </el-dialog>
+
+    <!-- 选择规格 -->
+    <el-dialog
+      width="410px"
+      :title="selGoods.title"
+      :visible.sync="selGoods.show"
+      @close="onSelGoodsSkuClose"
+    >
+      <div class="tag-group">
+        <div
+          class="tag-item"
+          v-for="(item, index) in selGoods.skuList"
+          :key="index"
+        >
+          <div class="tag-name">
+            {{ item.name }}
+            <span v-if="item.values.length >= 2"
+              >({{ item.values.length }}选1)</span
+            >
+          </div>
+          <div>
+            <span
+              style="margin: 0 10px 10px 0"
+              v-for="(val, valIndex) in item.values"
+              :key="valIndex"
+            >
+              <el-button
+                plain
+                :disabled="val.disabled"
+                @click="changeTagSel(index, val)"
+                :type="val.name === item.sel ? 'primary' : ''"
+              >
+                {{ val.name }}
+              </el-button>
+            </span>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer">
+        <div class="flex row-between">
+          <div>
+            <div class="price">￥{{ skuGoods.data.salePrice | to2 }}</div>
+            <div class="sku-group-text">
+              <span> {{ skuText }}</span>
+              <span>库存：{{ skuGoods.data.stockNumber || 0 }}</span>
+            </div>
+          </div>
+          <div class="flex">
+            <i class="icon-remove" @click="skuNumberReduce"></i>
+            <div style="width: 40px" class="number-box">
+              <el-input
+                :min="skuGoods.data.suit"
+                type="number"
+                v-model="skuGoods.number"
+                placeholder="0"
+              ></el-input>
+            </div>
+            <!-- <i class="el-icon-remove"></i> -->
+            <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
+          </div>
+        </div>
+        <div class="flex" style="margin-top: 14px">
+          <button
+            class="my-btn disabled flex-1"
+            v-if="!skuGoods.data.isGrounding"
+            disabled
+          >
+            已下架
+          </button>
+          <template v-else>
+            <button
+              class="my-btn disabled flex-1"
+              v-if="skuGoods.data.stockNumber <= 0"
+              disabled
+            >
+              库存不足
+            </button>
+            <button
+              class="my-btn primary flex-1"
+              v-else
+              :disabled="CanConfirm"
+              @click="chooseSkuConfirm"
+            >
+              确定
+            </button>
+          </template>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 数字键盘 -->
+    <el-dialog width="410px" title="数量" :visible.sync="keyborad.show">
+      <div class="simple-Keyboard-number">
+        <div class="carts">
+          <div class="title font-bold">
+            <span class="color-000">数量</span>
+            <i class="el-icon-close" @click="changeKeyboradShow(false)"></i>
+          </div>
+          <div class="box_status">{{ keyborad.number }}</div>
+          <div class="number_list_box">
+            <div class="yd-keyboard">
+              <div class="mini-number-box1">
+                <div class="mini-number">
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('1')">1</div>
+                    <div class="key" @click="keyboradAdd('2')">2</div>
+                    <div class="key" @click="keyboradAdd('3')">3</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('4')">4</div>
+                    <div class="key" @click="keyboradAdd('5')">5</div>
+                    <div class="key" @click="keyboradAdd('6')">6</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key" @click="keyboradAdd('7')">7</div>
+                    <div class="key" @click="keyboradAdd('8')">8</div>
+                    <div class="key" @click="keyboradAdd('9')">9</div>
+                  </div>
+                  <div class="key-line">
+                    <div class="key"></div>
+                    <div class="key" @click="keyboradAdd('0')">0</div>
+                    <div
+                      class="key"
+                      style="font-size: 31px"
+                      @click="keyboradReduce"
+                    >
+                      <svg
+                        t="1723453480343"
+                        class="icon"
+                        viewBox="0 0 1664 1024"
+                        version="1.1"
+                        xmlns="http://www.w3.org/2000/svg"
+                        p-id="1467"
+                        width="32"
+                        height="32"
+                      >
+                        <path
+                          d="M1526.08 1.6H459.84L41.28 416c-53.76 53.248-53.76 139.52 0 192.64l418.624 414.592v-0.064h1066.176a136.96 136.96 0 0 0 137.6-136.256V137.792a136.96 136.96 0 0 0-137.6-136.192z m-331.392 631.168c26.816 26.624 26.816 69.76 0 96.384-26.88 26.56-70.4 26.56-97.28 0l-121.28-120.128-123.328 122.112a69.76 69.76 0 0 1-97.92 0 68.096 68.096 0 0 1 0-96.96L878.208 512l-121.28-120.064a67.648 67.648 0 0 1 0-96.32c26.88-26.624 70.4-26.624 97.28 0l121.216 120.064 122.24-120.96a69.696 69.696 0 0 1 97.92 0 68.032 68.032 0 0 1 0 96.96l-122.24 120.96 121.344 120.064z"
+                          fill="#333333"
+                          p-id="1468"
+                        ></path>
+                      </svg>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div>
+            <div class="submit" @click="keyboradConfirm">确认</div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!-- 取单 -->
+    <el-dialog width="550px" title="取单" :visible.sync="prveOrder.show">
+      <div class="take_order_list">
+        <div class="tol_left_list">
+          <div
+            class="tolll_item"
+            :class="{ active: prveOrder.sel === index }"
+            @click="changePrveOrder(index)"
+            v-for="(item, index) in prveOrder.list"
+            :key="index"
+          >
+            <div class="tollli_index">{{ index + 1 }}</div>
+            <div class="tollli_price">￥{{ item.totalAmount }}</div>
+            <div class="tollli_time_and_num">
+              <div class="tollli_time">{{ item.created_at || "" }}</div>
+              <div class="tollli_num">({{ item.totalNumber }}件)</div>
+            </div>
+          </div>
+        </div>
+        <div
+          class="tol_right_list"
+          v-if="prveOrder.list.length && prveOrder.sel >= 0"
+        >
+          <div
+            class="tolrl_item"
+            v-for="(item, index) in prveOrder.selCart"
+            :key="index"
+          >
+            <div class="tolrli_img">
+              <img :src="item.coverImg" alt="" />
+            </div>
+            <div class="tolrli_right">
+              <div class="tr_top">
+                <div class="trt_name">{{ item.name }}</div>
+                <div class="trt_num">x{{ item.number }}</div>
+                <div class="trt_price">￥{{ item.totalAmount || 0 }}</div>
+              </div>
+              <div class="tr_bottom">
+                <span class="trb_item">
+                  {{ item.specSnap | formatSpecSnap }}
+                </span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div slot="footer" class="flex row-center">
+        <div style="margin-right: 20px">
+          <el-button
+            size="medium"
+            type="primary"
+            @click="confirmChoosePrveOrder"
+            >确认此单</el-button
+          >
+        </div>
+        <el-button size="medium" @click="delPrveOrder">删除此单</el-button>
+      </div>
+    </el-dialog>
+
+    <choose-user
+      ref="refChooseUser"
+      @chooseUser="chooseUserConfirm"
+    ></choose-user>
+    <choose-table
+      ref="refChooseTable"
+      @confirm="chooseTableConfirm"
+    ></choose-table>
+    <order-note ref="refOrderNote" @confirm="refOrderNoteConfirm"></order-note>
+
+    <!-- 支付时的键盘弹窗 -->
+    <money-keyboard ref="refMoneyKeyboard" :title="moneyKeyboard.title">
+    </money-keyboard>
+    <!-- 扫码支付 -->
+    <scan-pay
+      ref="refWxScanCode"
+      defaultTips="请使用扫码枪扫描微信/支付宝收款码"
+      title="扫码支付"
+      :openSwitch="false"
+      :price="createOrder.data.amount * createOrder.discount"
+      @confirm="scanPayConfirm"
+    ></scan-pay>
+    <!-- 储值卡支付 -->
+    <scan-pay
+      ref="refScanCode"
+      title="扫码支付"
+      defaultTips="注意:扫码支付请保证输入框获得焦点"
+      :openSwitch="false"
+      :price="createOrder.data.amount * createOrder.discount"
+      @confirm="scanPayConfirm"
+    ></scan-pay>
+    <!-- 打折 -->
+    <money-discount ref="refDiscount" @confirm="ChangeDiscount">
+    </money-discount>
+    <!-- 选择人数 -->
+    <choose-diners-number
+      ref="refChooseDinersNumber"
+      @confirm="chooseDinersNumberConfirm"
+      :max="table.maxCapacity || 99"
+    ></choose-diners-number>
+
+    <return-cart
+      ref="refReturnCart"
+      @confirm="refReturnCartConfirm"
+    ></return-cart>
+  </div>
+</template>
+
+<script>
+import _ from "lodash";
+import chooseUser from "./choose-user.vue";
+import payType from "./pay-type.vue";
+import chooseTable from "./table-diancan-components/choose-table-master.vue";
+import cartItem from "./table-diancan-components/cart-item.vue";
+import scanPay from "./table-diancan-components/scan-pay.vue";
+import moneyDiscount from "./table-diancan-components/discount.vue";
+import orderNote from "./table-diancan-components/note.vue";
+import chooseDinersNumber from "./table-diancan-components/choose-diners-number.vue";
+import returnCart from "./table-diancan-components/return-cart.vue";
+import moneyKeyboard from "./money-keyboard.vue";
+import dayjs from "dayjs";
+import { tbShopInfo } from "@/api/user";
+
+import {
+  getGoodsLists,
+  addCart,
+  getCart,
+  $clearCart,
+  $removeCart,
+  $updateCart,
+  $allPack,
+  $createOrder,
+  $getMasterId,
+  $cacheOrder,
+  $getCacheOrder,
+  $delOrder,
+  $setUser,
+  $payOrder,
+  $choseTable,
+  $choseCount,
+  $returnCart,
+  $printOrder,
+  tbShopTableGet,
+  $changeUseType,
+} from "@/api/table";
+import { tbShopCategoryGet } from "@/api/shop";
+import {
+  isCanBuy,
+  arrayContainsAll,
+  generateCombinations,
+  returnReverseVal,
+} from "./util.js";
+import $status from "../status.js";
+export default {
+  components: {
+    returnCart,
+    chooseUser,
+    chooseTable,
+    payType,
+    orderNote,
+    moneyKeyboard,
+    scanPay,
+    moneyDiscount,
+    cartItem,
+    chooseDinersNumber,
+  },
+  data() {
+    return {
+      //店铺信息
+      shopInfo: {},
+      //就餐饭方式
+      useTypes: {
+        list: [
+          {
+            name: "堂食",
+            value: "dine-in",
+          },
+          {
+            name: "自取",
+            value: "takeout",
+          },
+        ],
+        sel: "dine-in",
+      },
+      //台桌列表
+      tableList: [],
+      tableShow: false,
+      status: $status,
+      //就餐人数
+      perpole: "",
+      //整体点餐页面loading
+      loading: false,
+      //台桌点餐页面打开时带来的参数 isAddGoods 加菜    isPayOrder结账
+      key: "",
+      //是否是从挂单里取出来的订单
+      isPrverOrder: false,
+      //是否全屏
+      isFullScreen: false,
+      moneyKeyboard: {
+        show: true,
+        title: "支付",
+      },
+      //true后付款false先付款
+      postPay: true,
+      //是否打印
+      isPrint: false,
+      // 备注
+      note: {
+        content: "",
+        isShow: false,
+      },
+      isCreateOrder: false,
+      $goodsData: "",
+      search: {
+        list: [],
+      },
+      skuGoods: {
+        number: 1,
+        data: {
+          stockNumber: 0,
+          salePrice: 0,
+        },
+      },
+      selGoods: {
+        isEdit: false,
+        data: {},
+        skuList: [],
+        skuMap: [],
+        title: "",
+        show: false,
+      },
+      dayjs,
+      dialogshow: false, //弹框显示
+      dialogtitle: "", //文字显示
+      informationdialogshow: false,
+      informationdialogshowedit: false,
+      goods: {
+        list: [],
+        query: {
+          productId: "",
+          categoryId: "",
+          page: 1,
+          size: 300,
+        },
+        loading: false,
+        total: 0,
+      },
+      order: {
+        seatFee: { totalAmount: 0 }, //餐位费
+        orderId: "",
+        payType: "",
+        masterId: "",
+        allPack: false,
+        //当前选中的购物车商品（包含历史订单）
+        selGoods: "",
+        selPlaceNum: -1, //第几次下单 0当前 1以及以上历史订单
+
+        btns: [
+          {
+            text: "规格",
+            disabled: false,
+          },
+          {
+            text: "赠送",
+            disabled: false,
+          },
+          {
+            text: "打包",
+            disabled: false,
+          },
+          {
+            text: "删除",
+            disabled: false,
+          },
+        ],
+        list: [],
+        gift: {
+          list: [],
+          selIndex: -1,
+        },
+        //已下单菜品
+        old: {
+          list: [],
+          selIndex: -1,
+        },
+        query: {
+          page: 1,
+          size: 200,
+        },
+        number: 1,
+        cacheNumber: 1,
+        selIndex: -1,
+        total: 0,
+      },
+      table: "",
+      category: {
+        list: [],
+        showAll: false,
+      },
+      keyborad: {
+        show: false,
+        number: "0",
+      },
+      prveOrder: {
+        list: [],
+        show: false,
+        sel: 0,
+        selCart: [],
+      },
+      layout: {
+        list: [
+          { label: "经典布局", value: "default" },
+          { label: "图文显示", value: "img-and-text" },
+          { label: "文字显示", value: "text" },
+        ],
+        sel: "img-and-text",
+      },
+      // 选择用户
+      vipUser: {
+        id: "",
+      },
+      //餐桌号
+      masterId: "",
+      canUpdate: true,
+      //下单
+      createOrder: {
+        code: "",
+        status: "",
+        discount: 1,
+        form: {},
+        data: {
+          amount: 0,
+        },
+        quan: {
+          list: [],
+          sel: "",
+        },
+      },
+      timer: null,
+    };
+  },
+  computed: {
+    title() {
+      return this.table ? "代客下单" + `(${this.table.name})` : "代客下单";
+    },
+    allGiftMoney() {
+      const price = this.order.list
+        .filter((v) => v.isGift === "true" || v.status == "return")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return price;
+    },
+    giftLen() {
+      return this.order.list.filter((v) => v.isGift === "true").length;
+    },
+    isSku() {
+      if (this.order.selIndex < 0 || this.order.list.length <= 0) {
+        return false;
+      }
+      return this.order.list[this.order.selIndex].specSnap;
+    },
+    returnGiftText() {
+      if (this.order.selIndex < 0) {
+        return "赠送";
+      }
+      return this.order.list[this.order.selIndex].isGift === "true"
+        ? "取消赠送"
+        : "赠送";
+    },
+    returnPackText() {
+      if (this.order.selIndex < 0) {
+        return "打包";
+      }
+      return this.order.list[this.order.selIndex].isPack === "true"
+        ? "取消打包"
+        : "打包";
+    },
+    skuText() {
+      const result = this.selGoods.skuList.reduce((a, b) => {
+        return a + (b.sel ? b.sel + "+" : "");
+      }, "");
+      return result.substring(0, result.length - 1);
+    },
+    allPrice() {
+      const oldPrice = this.order.old.list.reduce((a, b) => {
+        const bTotal = b.info
+          .filter((v) => v.isGift !== "true" && v.status !== "return")
+          .reduce((prve, cur) => {
+            return prve + cur.number * cur.salePrice;
+          }, 0);
+        return a + bTotal;
+      }, 0);
+      const price = this.order.list
+        .filter((v) => v.isGift !== "true")
+        .reduce((a, b) => {
+          return a + b.number * b.salePrice;
+        }, 0);
+      return (oldPrice + price + this.order.seatFee.totalAmount * 1).toFixed(2);
+    },
+    allNumber() {
+      const oldNumber = this.order.old.list.reduce((a, b) => {
+        const bTotal = b.info.reduce((prve, cur) => {
+          return prve + cur.number * 1;
+        }, 0);
+        return a + bTotal;
+      }, 0);
+      const cartNumber = this.order.list.reduce((a, b) => {
+        return a + b.number * 1;
+      }, 0);
+      return oldNumber + cartNumber;
+    },
+    selGoodsHide() {
+      this.selGoods.show = false;
+    },
+    CanConfirm() {
+      if (!this.selGoods.skuList.length) {
+        return true;
+      }
+      return (
+        this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+        this.selGoods.skuList.length
+      );
+    },
+  },
+  filters: {
+    formatSpecSnap(str) {
+      if (str === "" || str === null || str === undefined) {
+        return "";
+      }
+      return str.replaceAll(",", " / ");
+    },
+    to2(n) {
+      if (n === undefined) {
+        return "";
+      }
+      return Number(n).toFixed(2);
+    },
+    returntypeName(item) {
+      return item.typeEnum === "sku" ? "多规格" : "单规格";
+    },
+  },
+  watch: {
+    "useTypes.sel": function (newval, oldval) {
+      console.log(newval);
+      this.setPostPay();
+      this.setUseType();
+    },
+    perpole(newval, oldval) {
+      if (!oldval && newval && this.table.tableId) {
+        // $choseCount({
+        //   masterId: this.masterId,
+        //   tableId: this.table.tableId,
+        //   num: newval,
+        // }).then(res=>{
+        //   this.order.seatFee=res
+        // })
+      }
+    },
+    table(oldval, newval) {
+      if (oldval && newval) {
+        this.onTableChange();
+      }
+      // if (oldval && newval) {
+      //   console.log(oldval, newval);
+      //   $choseTable({
+      //     orderId: 4462,
+      //     oldTableId: oldval.tableId,
+      //     newTableId: newval.tableId,
+      //   });
+      // }
+    },
+    masterId: function (val) {
+      console.log(val);
+    },
+    isCreateOrder: function (val) {
+      if (!val) {
+        this.createOrder.discount = 1;
+      }
+    },
+    "vipUser.id": async function (val) {
+      if (!this.table.tableId) {
+        return;
+      }
+      let masterId = this.order.masterId;
+      if (!masterId) {
+        const res = await this.getMasterId();
+        masterId = res.masterId;
+      }
+      this.masterId = masterId;
+      $setUser({
+        tableId: this.table.tableId,
+        masterId: this.masterId,
+        vipUserId: val,
+        type: val === "" ? 1 : 0,
+      });
+    },
+    "prveOrder.list.length": function (val) {
+      if (val !== 0) {
+        this.prveOrder.selCart =
+          this.prveOrder.list[this.prveOrder.sel].carList;
+      } else {
+        this.prveOrder.selCart = [];
+      }
+      console.log(this.prveOrder.selCart);
+    },
+    "prveOrder.sel": function (val) {
+      this.prveOrder.selCart =
+        this.prveOrder.list.length !== 0
+          ? this.prveOrder.list[val].carList
+          : [];
+      console.log(this.prveOrder.selCart);
+      if (val < 0) {
+        this.prveOrde.show = false;
+      }
+    },
+    "order.allPack": function (val) {
+      console.log(val);
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      $allPack({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        state: val ? 1 : 0,
+      }).then((res) => {
+        this.order.list.map((v) => {
+          v.isPack = `${val}`;
+        });
+      });
+    },
+    "order.selIndex": function (val, oldval) {
+      let goods = this.order.list[val];
+      const isOld = this.selPlaceNum > 0;
+      if (isOld) {
+        const item = this.order.list.find(
+          (v) => v.placeNum == this.selPlaceNum
+        );
+        const selItem = item.info[this.order.old.selIndex];
+        goods = selItem ? selItem : "";
+      }
+      console.log(goods);
+      if (val === -1) {
+        this.order.cacheNumber = 1;
+      } else {
+        this.order.cacheNumber = goods.number;
+      }
+    },
+    "order.list.length": function (val) {
+      if (val <= 0) {
+        this.changeOrderSel(-1);
+      }
+      if (this.order.selIndex >= 0) {
+        this.order.cacheNumber = this.order.list[this.order.selIndex].number;
+        // this.order.number = this.order.list[this.order.selIndex].number;
+      }
+    },
+    "order.number": _.debounce(function (newval) {
+      if (this.order.list.length <= 0 || this.order.selIndex < 0) {
+        return;
+      }
+      this.createOrderClose();
+
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      const oldGoods = this.order.old.list.find((v) => {
+        return v.productId === productId && v.skuId === skuId;
+      });
+      $updateCart({
+        cartId: item.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: this.order.number + (oldGoods ? oldGoods.number : 0), // 0会删除此商品
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+          number: this.order.number,
+        });
+      });
+      return;
+      this.updateOrder({
+        num: newval, // 0会删除此商品
+      });
+    }, 30),
+    "goods.query.productId": function (newval) {
+      if (!this.$goodsData) {
+        return;
+      }
+      if (newval == "") {
+        this.goods.list = this.$goodsData || [];
+      } else {
+        const newarr = this.$goodsData.filter((v) =>
+          v.name.includes(newval.trim())
+        );
+        this.search.list = newarr;
+        this.goods.list = newarr.length ? newarr : this.$goodsData;
+      }
+    },
+  },
+  mounted() {
+    // this.getGoods();
+    // this.getCategory();
+    // this.refToggle('refScanCode',true)
+    // this.refToggle("refDiscount", true);
+    this.getShopInfo();
+  },
+  methods: {
+    changeOrderUseType(useType) {
+      if (useType && this.order.list.length) {
+        $changeUseType({
+          useType,
+          cartIds: this.order.list.map((v) => v.id),
+        });
+      }
+    },
+    //设置用餐类型
+    setUseType() {
+      // 自取
+      let useType = "takeout";
+      if (this.useTypes.sel == "takeout") {
+        localStorage.setItem("useType", "takeout");
+      } else {
+        //堂食
+        useType = `dine-in-${this.postPay ? "after" : "before"}`;
+        localStorage.setItem("useType", useType);
+      }
+      this.changeOrderUseType(useType);
+    },
+    //设置先付后付
+    setPostPay() {
+      // 自取
+      // postPay true 后付 false 先付
+
+      if (this.useTypes.sel == "takeout") {
+        this.postPay = false;
+      } else {
+        //munchies 先付  restaurant 后付
+        this.postPay = this.shopInfo.registerType == "munchies" ? false : true;
+      }
+    },
+    //获取店铺信息
+    async getShopInfo() {
+      try {
+        const shopId = localStorage.getItem("shopId");
+        const res = await tbShopInfo(shopId);
+        this.shopInfo = res;
+        this.setPostPay();
+        this.setUseType();
+      } catch (error) {}
+    },
+    //更改就餐方式
+    changeUseType(type) {
+      if (this.order.old.list.length > 0) {
+        return this.$message("下单后不支持更改就餐方式");
+      }
+      console.log(type);
+      this.useTypes.sel = type;
+    },
+    //更改就餐人数
+    changePerpole() {
+      $choseCount({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        num: this.perpole,
+      }).then((res) => {
+        this.order.seatFee = res;
+      });
+    },
+    //台桌变化时重新获取取餐号、购物车数据，如果是正在结账状态，创建订单到待支付页面
+    async onTableChange() {
+      const res = await this.getMasterId();
+      this.masterId = res.masterId;
+      this.getCart();
+      if (this.isCreateOrder) {
+        this.toCreateOrder(true);
+      }
+    },
+    // 获取台桌详情
+    async getTableDetail() {
+      const res = await tbShopTableGet({
+        qrcode: this.table.tableId,
+      });
+      console.log(res);
+    },
+    //打印制作单
+    printOrder() {
+      this.$confirm("是否打印当前台桌菜品", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          $printOrder({
+            tableId: this.table.tableId,
+          }).then(() => {
+            this.$message({
+              type: "success",
+              message: "已发送打印请求",
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    //退菜
+    async refReturnCartConfirm() {
+      const res = await $returnCart({
+        cartId: this.order.selGoods.id,
+        tableId: this.table.tableId,
+      });
+      this.order.selGoods.status = "return";
+      this.order.old.selIndex = -1;
+      console.log(this.order.selGoods);
+    },
+    // 台桌列表
+    async getTable() {
+      try {
+        const { content, total } = await tbShopTableGet({
+          shopId: localStorage.getItem("shopId"),
+        });
+        this.tableList = content.filter((v) => v.status != "closed");
+      } catch (error) {
+        console.log(error);
+      }
+    },
+    changeTable(item) {
+      this.table = item;
+      this.tableShow = false;
+    },
+    chooseDinersNumberConfirm(e) {
+      this.perpole = e;
+      this.changePerpole();
+    },
+    //扫码支付弹窗确认
+    scanPayConfirm(code) {
+      this.createOrder.code = code;
+      if (!code) {
+        return this.$message.error("请输入或扫付款码");
+      }
+      this.pays();
+    },
+    payTypeItemClick(item) {
+      console.log(item);
+      console.log(this.vipUser.id);
+      if (item.payType == "vipPay") {
+        return this.refChooseUserOpen();
+      }
+      if (item.payType == "deposit") {
+        //储值卡支付
+        return this.refToggle("refScanCode", true);
+      }
+      if (item.payType == "scanCode") {
+        //扫码支付
+        return this.refToggle("refWxScanCode", true);
+      }
+    },
+    ChangeDiscount(discount) {
+      this.createOrder.discount = discount;
+    },
+    disCountShow() {
+      const { amount } = this.createOrder.data;
+      this.refToggle("refDiscount", true, {
+        amount,
+        discount: this.createOrder.discount * 100,
+      });
+    },
+    refToggle(key, isShow, data) {
+      if (!this.$refs[key]) {
+        return;
+      }
+      isShow ? this.$refs[key].open(data) : this.$refs[key].close(data);
+    },
+    //购物车商品输入框数量输入
+    cartGoodsNumberInput(newval, index) {
+      const item = this.order.list[index];
+      console.log(item);
+      this.order.cacheNumber = newval;
+      item.number = newval;
+    },
+    //购物车商品输入框数量改变
+    cartGoodsNumberChange(newval, index) {
+      const item = this.order.list[index];
+      newval = `${newval}`.split(".")[0] * 1;
+      console.log(newval);
+      this.order.cacheNumber = newval;
+      this.order.number = newval;
+    },
+    //判读单规格商品是否售尽
+    isSellOut(item) {
+      return (
+        item.isPauseSale ||
+        (item.typeEnum !== "sku" && item.specList[0].stockNumber <= 0)
+      );
+    },
+    toggleFullScreen() {
+      if (!document.fullscreenElement) {
+        this.enterFullScreen();
+      } else {
+        this.exitFullScreen();
+      }
+    },
+    enterFullScreen() {
+      let element = document.documentElement;
+      if (element.requestFullscreen) {
+        element.requestFullscreen();
+      } else if (element.mozRequestFullScreen) {
+        /* Firefox */
+        element.mozRequestFullScreen();
+      } else if (element.webkitRequestFullscreen) {
+        /* Chrome, Safari & Opera */
+        element.webkitRequestFullscreen();
+      } else if (element.msRequestFullscreen) {
+        /* IE/Edge */
+        element.msRequestFullscreen();
+      }
+      this.isFullScreen = true;
+    },
+    exitFullScreen() {
+      if (document.exitFullscreen) {
+        document.exitFullscreen();
+      } else if (document.mozCancelFullScreen) {
+        /* Firefox */
+        document.mozCancelFullScreen();
+      } else if (document.webkitExitFullscreen) {
+        /* Chrome, Safari and Opera */
+        document.webkitExitFullscreen();
+      } else if (document.msExitFullscreen) {
+        /* IE/Edge */
+        document.msExitFullscreen();
+      }
+      this.isFullScreen = false;
+    },
+    //打开输入钱的键盘
+    openMoneyKeyboard() {
+      this.$refs.refMoneyKeyboard.open();
+    },
+    changePostPay(val) {
+      this.postPay = val;
+    },
+    //改变是否打印
+    changeIsPrint(e) {
+      console.log(e);
+      this.isPrint = e;
+    },
+    refOrderNoteConfirm(note) {
+      this.note.content = note;
+    },
+    refNoteShow() {
+      this.$refs.refOrderNote.open(this.note.content);
+    },
+    // 支付订单前的处理
+    async payOrder() {
+      if (this.order.payType == "vipPay" && !this.vipUser.id) {
+        return this.refChooseUserOpen();
+      }
+      if (this.order.payType == "scanCode") {
+        return this.refToggle("refWxScanCode", true);
+      }
+      if (this.order.payType == "deposit") {
+        return this.refToggle("refScanCode", true);
+      }
+      console.log({
+        orderId: this.createOrder.data.id,
+        payType: this.order.payType,
+      });
+      this.pays();
+    },
+    // 支付订单
+    async pays() {
+      this.loading = true;
+      try {
+        const res = await $payOrder({
+          tableId: this.table.tableId,
+          masterId: this.masterId,
+          orderId: this.createOrder.data.id,
+          payType: this.order.payType,
+          vipUserId: this.vipUser.id,
+          discount: this.createOrder.discount,
+          code: this.createOrder.code,
+        });
+        this.loading = false;
+        this.payOrderSuccess();
+      } catch (error) {
+        this.loading = false;
+      }
+    },
+    payOrderSuccess() {
+      this.$notify({
+        title: "支付成功",
+        type: "success",
+      });
+      this.reset();
+      this.close();
+    },
+    chooseTableConfirm(item) {
+      console.log(item);
+      this.table = item;
+    },
+    chooseTableOpen() {
+      this.$refs.refChooseTable.open();
+    },
+    chooseUserConfirm(user) {
+      console.log(user);
+      if (user) {
+        this.vipUser = user;
+      } else {
+        this.vipUser = { id: "" };
+      }
+    },
+    refChooseUserOpen() {
+      this.$refs.refChooseUser.open();
+    },
+    createOrderClose() {
+      this.isCreateOrder = false;
+    },
+    //生成订单
+    toCreateOrderDebounce(isNowPay) {
+      console.log(this.createOrder.status);
+
+      if (
+        this.createOrder.status != "" &&
+        this.createOrder.status != "success"
+      ) {
+        return;
+      }
+      this.createOrder.status = "loading";
+      this.toCreateOrder(isNowPay);
+    },
+    async toCreateOrder(isNowPay = false) {
+      console.log(this.order);
+      console.log(this.order.orderId);
+      let res=''
+      try {
+         res = await $createOrder({
+        masterId: this.order.masterId || this.masterId,
+        vipUserId: this.vipUser.id,
+        tableId: this.table.tableId,
+        note: this.note.content,
+        postPay: this.postPay,
+        orderld: this.order.orderId,
+      });
+      } catch (error) {
+        
+      }
+      if(!res){
+        this.createOrder.status = "success";
+        return
+      }
+      //后付款
+      console.log(this.postPay);
+      console.log(isNowPay);
+      console.log(this.postPay && isNowPay);
+      this.createOrder.status = "success";
+      this.getCart();
+      if (this.postPay && !isNowPay) {
+        this.$notify({
+          title: "下单成功",
+          type: "success",
+        });
+        return this.close();
+      }
+      this.createOrder.data = res;
+      if (!this.isPrverOrder) {
+        const { masterId } = await this.getMasterId();
+        this.masterId = masterId;
+      }
+      this.isCreateOrder = true;
+    },
+
+    // 获取取餐号
+    getMasterId() {
+      // if(!this.table.tableId){
+      //   return this.$message.error("请选择桌台");
+      // }
+      return $getMasterId({
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+      });
+    },
+    onSelGoodsSkuClose() {
+      this.selGoods.isEdit = false;
+    },
+    changePrveOrder(index) {
+      this.prveOrder.sel = index;
+    },
+    //更新购物车商品数据
+    updateOrder(par = {}) {
+      let item = this.order.list[this.order.selIndex];
+      console.log(item.specSnap);
+      const { productId, skuId, isPack, isGift, number } = item;
+      addCart({
+        masterId: this.masterId,
+        vipUserId: this.vipUser.id,
+        productId,
+        skuId,
+        tableId: this.table.tableId,
+        num: number,
+        isPack: isPack === "true" ? true : false,
+        isGift: isGift === "true" ? true : false,
+        ...par,
+      }).then((res) => {
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: item.specSnap,
+        });
+      });
+    },
+    keyboradAdd(n) {
+      if (Number(this.keyborad.number) === 0) {
+        return (this.keyborad.number = n);
+      }
+      this.keyborad.number += n;
+    },
+    keyboradReduce() {
+      if (this.keyborad.number.length <= 1) {
+        return (this.keyborad.number = "0");
+      }
+      this.keyborad.number = this.keyborad.number.substring(
+        0,
+        this.keyborad.number.length - 1
+      );
+    },
+    keyboradConfirm() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      // 如果设置为0,商品数量减1
+      if (this.keyborad.number == 0) {
+        this.changeOrderNumber(this.order.selIndex, true);
+      } else {
+        orderGoods.number = Number(this.keyborad.number);
+      }
+      this.order.cacheNumber = orderGoods.number;
+      this.order.number = orderGoods.number;
+      this.changeKeyboradShow(false);
+    },
+    changeKeyboradShow(show) {
+      if (show) {
+        this.keyborad.number = `${this.order.list[this.order.selIndex].number}`;
+      }
+      this.keyborad.show = show;
+    },
+    // 获取本地缓存挂单
+    // getPrveCart() {
+    //   const arr = localStorage.getItem("orderList")
+    //     ? JSON.parse(localStorage.getItem("orderList"))
+    //     : [];
+    //   this.prveOrder.list = arr.map((v) => {
+    //     return { ...v, cart: JSON.parse(v.cart) };
+    //   });
+    // },
+
+    //右侧控制按钮点击事件
+    orderBtnsClick(key) {
+      const orderGoods = this.order.list[this.order.selIndex];
+      this.createOrderClose();
+      if (key === "sku") {
+        this.selGoods.title = orderGoods.name;
+        this.selGoods.isEdit = true;
+        const item = this.goods.list.find((v) => v.id == orderGoods.productId);
+        console.log(item);
+        return this.showSelGoods({ ...item, ...orderGoods });
+      }
+      if (key === "gift") {
+        const isGift = orderGoods.isGift === "true" ? "flase" : "true";
+        this.updateOrder({ isGift: isGift === "true" ? true : false });
+        return;
+      }
+      if (key === "pack") {
+        const isPack = orderGoods.isPack === "true" ? "flase" : "true";
+        this.updateOrder({ isPack: isPack === "true" ? true : false });
+        return;
+      }
+      if (key === "del") {
+        return this.removeCart();
+      }
+      if (key === "save") {
+        this.prveOrder.list.push({
+          cart: this.order.list,
+          id: Date.now(),
+          created_at: `${new Date().getHours()}:${new Date().getMinutes()}`,
+          goods_num: this.allNumber,
+          order_total: this.allPrice,
+        });
+        localStorage.setItem(
+          "orderList",
+          JSON.stringify(
+            this.prveOrder.list.map((v) => {
+              return { ...v, cart: JSON.stringify(v.cart) };
+            })
+          )
+        );
+        this.order.list = [];
+        this.order.selIndex = -1;
+
+        this.changeOrderSel(-1);
+        return;
+      }
+      if (key === "getOrder") {
+        this.prveOrder.show = true;
+        this.getPrveCart();
+        return;
+      }
+      if (key === "returnCart") {
+        this.refToggle("refReturnCart", true);
+      }
+    },
+    //选择挂单确认
+    async confirmChoosePrveOrder() {
+      if (this.prveOrder.list.length <= 0) {
+        return;
+      }
+      // const { sel } = this.prveOrder;
+      // const order=this.prveOrder.list[sel];
+      // const res=await $cacheOrder({
+      //   orderId:order.orderId,
+      //   isPending:false,
+      //   tableId:this.table.tableId,
+      //   masterId:order.carList[0].masterId
+      // })
+
+      const { masterId, tableId, userId, remark, id } = await $cacheOrder({
+        orderId: this.prveOrder.list[this.prveOrder.sel].orderId,
+        isPending: false,
+      });
+      this.order.orderId = id;
+      console.log(this.order.orderId);
+
+      this.masterId = masterId;
+      this.isPrverOrder = true;
+      console.log(masterId);
+      const { records } = await getCart({
+        masterId,
+        tableId,
+        vipUserId: userId != "null" ? userId : "",
+      });
+      console.log(records);
+      this.order.list = [];
+      this.order.masterId = masterId;
+      this.order.list = records;
+      this.prveOrder.show = false;
+      this.note.content = remark || "";
+      // this.delPrveOrder(false);
+    },
+    //删除挂单
+    async delPrveOrder(isRequest = true) {
+      const { sel } = this.prveOrder;
+      if (this.prveOrder.list <= 0 || sel < 0) {
+        return;
+      }
+      const order = this.prveOrder.list[sel];
+      const orderMasterId = order.carList[0].masterId;
+      //当前订单是否是当前挂单
+      const nowOrderIsPrverOrder =
+        this.isPrverOrder && orderMasterId === this.masterId;
+      if (nowOrderIsPrverOrder) {
+        const res = await this.$confirm(
+          "您正在删除当前购物车订单,是否删除?",
+          "提示",
+          {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning",
+          }
+        ).catch((err) => {
+          console.log(err);
+        });
+        if (!res) {
+          return;
+        }
+      }
+      if (isRequest) {
+        const res = await $delOrder({
+          orderId: order.orderId,
+        });
+        if (nowOrderIsPrverOrder) {
+          this.note.content = "";
+          this.order.list = [];
+        }
+        this.$notify({
+          message: "删除成功",
+          type: "success",
+        });
+      }
+      this.prveOrder.list.splice(sel, 1);
+      this.prveOrder.sel = sel - 1 <= 0 ? 0 : sel - 1;
+    },
+    //打开挂起订单
+    async cacheOrderShow() {
+      this.prveOrder.show = true;
+      const res = await this.getCacheOrder(true);
+      this.prveOrder.list = res;
+      if (this.prveOrder.list.length && this.prveOrder.sel !== -1) {
+        const item = this.prveOrder.list[this.prveOrder.sel];
+        console.log(item);
+        if (item) {
+          this.prveOrder.selCart = item.carList;
+        }
+      }
+    },
+    //获取挂起订单
+    async getCacheOrder(isReturn = false) {
+      this.createOrderClose();
+      if (isReturn) {
+        return $getCacheOrder({ tableId: this.table.tableId });
+      }
+      const res = await $getCacheOrder({ tableId: this.table.tableId });
+      this.prveOrder.list = res;
+    },
+    //存单
+    async saveOrder() {
+      this.createOrderClose();
+      const res = await $cacheOrder({
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+        vipUserId: this.vipUser.id,
+        isPending: true,
+        note: this.note.content,
+      });
+      this.isPrverOrder = false;
+      this.order.masterId = "";
+      this.order.list = [];
+      this.changeOrderSel(-1);
+      this.note.content = "";
+      this.order.orderId = "";
+      this.$nextTick(() => {
+        this.getCacheOrder();
+      });
+      const masterIdRes = await this.getMasterId();
+      this.masterId = masterIdRes.masterId;
+    },
+    // 删除购物车商品
+    removeCart() {
+      const orderGoods = this.order.list[this.order.selIndex];
+      $removeCart({
+        cartId: orderGoods.id,
+        tableId: this.table.tableId,
+      });
+      this.order.list.splice(this.order.selIndex, 1);
+      const newval = this.order.selIndex - 1;
+      this.changeOrderSel(newval <= 0 ? 0 : newval);
+
+      //  this.$message({
+      //         type: "success",
+      //         message: "清除成功!",
+      //       });
+    },
+    // 点击订单里的加减改变购物车商品数量
+    async changeOrderNumber(index, isReduce) {
+      if (index < 0) {
+        return;
+      }
+      this.changeOrderSel(index);
+      console.log(index);
+      console.log(isReduce);
+      const item = this.order.list[index];
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return this.removeCart();
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      // const res= await addCart({
+      //    productId: item.productId,
+      //     skuId: item.skuId,
+      //     tableId: this.table.tableId,
+      //     num: newval, // 0会删除此商品
+      //     isPack: false, // 是否打包
+      // })
+      this.order.list[index].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    // 点击右侧控制列表上的加减改变购物车商品数量
+    changeOrderGoodsNumber(isReduce) {
+      if (this.order.selIndex < 0) {
+        return;
+      }
+      const item = this.order.list[this.order.selIndex];
+      console.log(item);
+      const mumber = item.number * 1;
+      const newval = mumber + (isReduce ? -1 : 1);
+      if (newval <= 0) {
+        return;
+      }
+      if (newval >= 100000) {
+        return;
+      }
+      console.log(newval);
+
+      // this.order.list[this.order.selIndex].number = newval;
+      this.order.number = newval;
+      this.order.cacheNumber = newval;
+    },
+    //清空购物车
+    clearCart() {
+      if (this.order.list.length <= 0) {
+        return;
+      }
+      this.$confirm("确定要清空点餐列表吗?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          $clearCart({
+            masterId: this.masterId,
+            tableId: this.table.tableId,
+          }).then((res) => {
+            this.order.list = [];
+            this.changeOrderSel(-1);
+            this.$message({
+              type: "success",
+              message: "清除成功!",
+            });
+          });
+        })
+        .catch(() => {});
+    },
+    skuNumberAdd() {
+      const number = Number(this.skuGoods.number);
+      if (number > 10000) {
+        return;
+      }
+      this.skuGoods.number = number + 1;
+    },
+    skuNumberReduce() {
+      if (this.skuGoods.number - 1 <= 0) {
+        return;
+      }
+      this.skuGoods.number -= 1;
+    },
+    toggleShowAll() {
+      this.category.showAll = !this.category.showAll;
+    },
+    changeCategoryId(item) {
+      this.goods.query.categoryId = item.id;
+    },
+    async getCategory() {
+      const { content } = await tbShopCategoryGet({
+        page: 0,
+        size: 100,
+        sort: "id",
+        shopId: localStorage.getItem("shopId"),
+      });
+      this.category.list = content.reduce((prve, cur) => {
+        prve.push(cur);
+        return [...prve, ...cur.childrenList];
+      }, []);
+      this.category.list.unshift({
+        id: "",
+        name: "全部",
+      });
+    },
+    //改变购物车菜品选中
+    changeOrderSel(index) {
+      this.order.selPlaceNum = 0;
+      this.order.selIndex = index;
+      this.order.selGoods = this.order.list[index];
+      this.order.old.selIndex = -1;
+    },
+    //改变已下单菜品选中
+    changeOrderOldSel(index, canChangeNumber, placeNum) {
+      //是否是历史订单商品
+      const isOld = placeNum >= 1;
+      this.order.selIndex = -1;
+      this.order.old.selIndex = index;
+      this.order.selPlaceNum = placeNum;
+      const list = this.order.old.list.find((v) => v.placeNum == placeNum);
+      this.order.selGoods = list.info[index];
+      this.order.cacheNumber = list.info[index].number || 1;
+    },
+    chooseSkuConfirm() {
+      if (this.timer) {
+        return;
+      }
+      this.skuGoodsAdd();
+      this.timer = setTimeout(() => {
+        clearTimeout(this.timer);
+        this.timer = null;
+      }, 500);
+      console.log(this.timer);
+    },
+    async skuGoodsAdd() {
+      let name = this.selGoods.skuList.reduce((prve, cur) => {
+        return prve + cur.sel + ",";
+      }, "");
+      name = name.substring(0, name.length - 1);
+      // const item = this.selGoods.data.specList.find((v) => v.specSnap === name);
+      const item = this.selGoods.skuMap[name];
+      if (!item.isGrounding) {
+        //该商品已经下架
+        return this.$notify({
+          title: "该商品规格已经下架",
+          type: "error",
+        });
+      }
+      let res = "";
+
+      console.log(orderGoods);
+      //更改购物车订单商品规格数量
+      if (this.selGoods.isEdit) {
+        res = await $updateCart({
+          cartId: this.order.list[this.order.selIndex].id,
+          productId: this.selGoods.data.productId,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+        });
+        this.$set(this.order.list, this.order.selIndex, {
+          ...res,
+          specSnap: name,
+        });
+        this.$notify({
+          title: "更新成功",
+          type: "success",
+        });
+        this.selGoods.show = false;
+        this.order.cacheNumber = this.skuGoods.number;
+        return;
+      }
+
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.id && V.productId == this.selGoods.data.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+
+      if (orderGoods) {
+        //更新
+        const newNum =
+          (orderGoods ? orderGoods.number * 1 : 0) + this.skuGoods.number;
+        res = await $updateCart({
+          cartId: orderGoods.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: newNum, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        if (this.key && orderGoodsIndex == -1) {
+          this.orderListPush({
+            ...res,
+            specSnap: name,
+            number: this.skuGoods.number,
+          });
+        } else {
+          orderGoods.number += this.skuGoods.number;
+          this.order.selPlaceNum = 0;
+          this.changeOrderSel(orderGoodsIndex);
+          this.order.cacheNumber = orderGoods.number;
+        }
+      } else {
+        //添加
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: this.selGoods.data.id,
+          skuId: item.id,
+          tableId: this.table.tableId,
+          num: this.skuGoods.number, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush({ ...res, specSnap: name });
+        // this.orderListPush({
+        //   skuId: item.id,
+        //   number: this.skuGoods.number,
+        //   specSnap: name,
+        // });
+      }
+
+      this.$notify({
+        title: orderGoods ? "更新成功" : "添加成功",
+        type: "success",
+      });
+      this.selGoods.show = false;
+    },
+    orderListPush(item) {
+      const { isPack, isGift } = item;
+      // const isPack=item.isPack==='false'?false:true
+      // const isGift=item.isGift==='false'?false:true
+      this.order.list.push({ ...item, isPack, isGift });
+      this.order.selPlaceNum = 0;
+      this.changeOrderSel(this.order.list.length - 1);
+    },
+    //设置规格按钮的禁止状态
+    setTagDisabled() {
+      const selArr = this.selGoods.skuList.reduce((prve, cur) => {
+        if (cur.sel) {
+          prve.push(cur.sel);
+        } else {
+        }
+        return prve;
+      }, []);
+      console.log(selArr);
+      let selArrAllGroup = generateCombinations(selArr, selArr.length - 1);
+      console.log(selArrAllGroup);
+      const matchArr = [];
+      for (let key in this.selGoods.skuMap) {
+        const goods = this.selGoods.skuMap[key];
+        const keyArr = key.split(",");
+        for (let spe of selArrAllGroup) {
+          if (arrayContainsAll(keyArr, spe)) {
+            matchArr.push(goods);
+            break;
+          }
+        }
+      }
+      console.log(matchArr);
+      const skuList = this.selGoods.skuList;
+      console.log(skuList);
+      //全部规格都已下架
+      if (!matchArr.length) {
+        for (let k in skuList) {
+          for (let i in skuList[k].values) {
+            this.$set(skuList[k].values[i], "disabled", true);
+          }
+        }
+        return;
+      }
+      const includeSkuMap = matchArr.reduce((prve, cur) => {
+        const speArr = cur.specSnap.split(",");
+        for (let i of speArr) {
+          if (!prve.hasOwnProperty("i")) {
+            prve[i] = matchArr
+              .filter((v) => v.specSnap.match(i))
+              .every((v) => {
+                // return isCanBuy(v,this.selGoods.data.isStock)
+                return !isCanBuy(v);
+              });
+          }
+        }
+        return prve;
+      }, {});
+      console.log(includeSkuMap);
+      for (let i in includeSkuMap) {
+        for (let k in skuList) {
+          const index = skuList[k].valueArr.findIndex((val) => val === i);
+          if (index !== -1) {
+            this.$set(skuList[k].values[index], "disabled", includeSkuMap[i]);
+          }
+        }
+      }
+    },
+    changeTagSel(index, val) {
+      this.$set(this.selGoods.skuList[index], "sel", val.name);
+      let specSnap = this.selGoods.skuList.reduce((a, b) => {
+        return a + b.sel + ",";
+      }, "");
+      specSnap = specSnap.substring(0, specSnap.length - 1);
+      for (let sku of this.selGoods.skuList) {
+        console.log(sku);
+      }
+      this.setTagDisabled();
+      const canChooseGoods = this.selGoods.skuList.every((v) => v.sel);
+      if (canChooseGoods) {
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+      }
+    },
+    onclose() {
+      this.$emit("close");
+      this.reset();
+    },
+    reset() {
+      // this.goods.list = [];
+      this.loading = false;
+      this.table = "";
+      this.order.list = [];
+      this.order.query.page = 1;
+      this.goods.total = 0;
+      this.order.list = [];
+      this.order.selIndex = -1;
+      this.order.selPlaceNum = -1;
+      this.order.old.list = [];
+      this.order.selGoods = "";
+      this.order.seatFee = { totalAmount: 0 }; //餐位费
+      this.prveOrder.list = [];
+      this.prveOrder.selIndex = -1;
+      this.order.old.selIndex = -1;
+      this.isCreateOrder = false;
+      this.createOrder.status = "";
+      this.createOrder.code = "";
+      this.note.content = "";
+      this.vipUser = { id: "" };
+      this.order.masterId = "";
+      this.allPack = false;
+      this.note.content = "";
+      this.isPrverOrder = false;
+      this.createOrder.discount = 1;
+      this.order.cacheNumber = 1;
+      this.key = "";
+      this.order.orderId = "";
+      this.perpole = "";
+      this.useTypes.sel = "dine-in";
+    },
+    //获取购物车数据
+    async getCart() {
+      console.log(this.table);
+      const res = await getCart({
+        ...this.order.query,
+        masterId: this.masterId,
+        tableId: this.table.tableId,
+      });
+      this.order.seatFee = res.seatFee ? res.seatFee : this.order.seatFee;
+      this.perpole = res.seatFee ? res.seatFee.totalNumber : 1;
+      const nowCart = res.records.find((v) => v.placeNum == 0);
+      this.order.list = nowCart ? nowCart.info : [];
+      const oldCart = res.records.filter((v) => v.placeNum != 0);
+      this.order.old.list = oldCart ? oldCart : [];
+      // if (this.key|| res.records.length) {
+      //   this.order.old.list = res.records;
+      // } else {
+      //   this.order.list = res.records;
+      // }
+    },
+    showSelGoods(item) {
+      console.log(item);
+      this.selGoods.data = item;
+      this.selGoods.skuMap = {};
+      const specList = item.specList;
+      this.setSelGoodsSkuMap(specList);
+      this.setSelGoodsSkuList(
+        JSON.parse(item.skuResult.tagSnap),
+        item.specSnap
+      );
+      this.setTagDisabled();
+      const skuGoods = this.selGoods.skuMap[item.specSnap];
+      this.skuGoods.data = skuGoods;
+      this.skuGoods.number = item.number ? item.number : skuGoods.suit || 1;
+      this.selGoods.title = item.name;
+      this.selGoods.show = true;
+    },
+    // 备份版本，会过滤下架和售尽以为库存小于等于0的商品
+    async goodsClickback(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        for (let i in specList) {
+          this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+        }
+        console.log(this.selGoods.skuMap);
+
+        let specSnap = "";
+        let tagSnap = JSON.parse(item.skuResult.tagSnap).map((v) => {
+          return { ...v, newval: {} };
+        });
+        const canUseSpecSnap = {};
+        const canBudyGoods = specList.filter(
+          (v) => v.isGrounding && v.isPauseSale != 1 && v.stockNumber > 0
+        );
+        canBudyGoods.map((v) => {
+          v.specSnap.split(",").map((spe) => {
+            canUseSpecSnap[spe] = spe;
+          });
+        });
+        console.log(canUseSpecSnap);
+        for (let i in canUseSpecSnap) {
+          const item = tagSnap.find((v) => v.value.match(i));
+          item.newval[i] = i;
+        }
+        tagSnap = tagSnap.map((v) => {
+          const newvals = Object.keys(v.newval);
+          specSnap += newvals[0] + ",";
+          return {
+            ...v,
+            values: newvals,
+            sel: newvals[0],
+          };
+        });
+        console.log(tagSnap);
+        console.log(canUseSpecSnap);
+        console.log(canBudyGoods);
+        this.selGoods.skuList = tagSnap;
+        // this.selGoods.skuList = tagSnap.map((v) => {
+        //   const values = v.value.split(",");
+        //   specSnap += values[0] + ",";
+        //   return {
+        //     ...v,
+        //     values: newval,
+        //     sel: values[0],
+        //   };
+        // });
+        specSnap = specSnap.substring(0, specSnap.length - 1);
+        const skuGoods = this.selGoods.skuMap[specSnap];
+        this.skuGoods.data = skuGoods;
+        console.log(skuGoods);
+        this.skuGoods.number = skuGoods.suit || 1;
+        console.log(this.skuGoods.data);
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.changeOrderSel(orderGoodsIndex);
+      } else {
+        //增加
+        console.log(item);
+        const num = item.specList[0].suit;
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: num <= 0 ? 1 : num, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    //多规格商品弹窗时，找到默认可以下单的规格商品
+    findGoods(skuList = [], goodsListMap = {}) {
+      const skuMapNumber = skuList.reduce((prve, cur) => {
+        for (let i in cur.valueArr) {
+          prve[cur.valueArr[i]] = i;
+        }
+        return prve;
+      }, {});
+      const canBudyGoods = this.selGoods.data.specList
+        .filter((v) => isCanBuy(v))
+        .sort((a, b) => {
+          const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          const bNumber = b.specSnap.split(",").reduce((prve, cur) => {
+            return prve + skuMapNumber[cur];
+          }, 0);
+          return aNumber - bNumber;
+        });
+      return canBudyGoods[0];
+    },
+    //设置商品默认选中,规格禁止以及选中
+    setSkugoodsDefaultInit() {
+      const skuList = this.selGoods.skuList;
+      const goodsListMap = this.selGoods.skuMap;
+      const skuGoods = this.findGoods(skuList, goodsListMap);
+      console.log(skuGoods);
+      if (skuGoods) {
+        this.skuGoods.data = skuGoods;
+        this.skuGoods.number = skuGoods.suit || 1;
+        skuGoods.specSnap.split(",").map((v, index) => {
+          skuList[index].sel = v;
+        });
+      }
+      this.setTagDisabled();
+    },
+    // 设置当前选中商品skuList
+    setSelGoodsSkuList(skuList, specSnap) {
+      const specSnapArr = specSnap ? specSnap.split(",") : [];
+      this.selGoods.skuList = skuList.map((v, index) => {
+        const values = v.value.split(",");
+        return {
+          ...v,
+          valueArr: values,
+          sel: specSnap ? specSnapArr[index] : "",
+          values: values.map((name) => {
+            return { name, disabled: false };
+          }),
+        };
+      });
+    },
+    setSelGoodsSkuMap(specList) {
+      for (let i in specList) {
+        this.selGoods.skuMap[specList[i].specSnap] = specList[i];
+      }
+    },
+    //根据右侧商品单规格多规格做不同处理
+    async goodsClick(item) {
+      if (item.typeEnum === "sku") {
+        this.selGoods.data = item;
+        this.selGoods.skuMap = {};
+        const specList = item.specList;
+        this.setSelGoodsSkuMap(specList);
+        console.log(this.selGoods.skuMap);
+        this.setSelGoodsSkuList(JSON.parse(item.skuResult.tagSnap));
+        this.setSkugoodsDefaultInit();
+        this.selGoods.title = item.name;
+        this.selGoods.show = true;
+        return;
+      }
+      //单规格
+      const orderGoodsIndex = this.order.list.findIndex((V) => {
+        return V.skuId == item.specList[0].id && V.productId == item.id;
+      });
+      const orderGoods =
+        orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
+      // const orderGoods =  this.order.list.find((V) => {
+      //   return V.skuId == item.specList[0].id && V.productId == item.id;
+      // });
+      let res = "";
+      if (orderGoods) {
+        //更新
+        // res = await $updateCart({
+        //   cartId: orderGoods.id,
+        //   productId: item.id,
+        //   skuId: item.specList[0].id,
+        //   tableId: this.table.tableId,
+        //   num: orderGoods.number * 1 + item.specList[0].suit, // 0会删除此商品
+        // });
+        orderGoods.number += item.specList[0].suit;
+        this.order.number = orderGoods.number;
+        this.changeOrderSel(orderGoodsIndex);
+      } else {
+        //增加
+        console.log(item);
+        res = await addCart({
+          masterId: this.masterId,
+          vipUserId: this.vipUser.id,
+          productId: item.id,
+          skuId: item.specList[0].id,
+          tableId: this.table.tableId,
+          num: item.specList[0].suit, // 0会删除此商品
+          isPack: false, // 是否打包
+        });
+        this.orderListPush(res);
+      }
+    },
+    async getGoods() {
+      const res = await getGoodsLists(this.goods.query);
+      const goods = res.records.filter((v) => {
+        if (!v) {
+          return false;
+        }
+        let isShow = true;
+        if (v.typeEnum !== "sku") {
+          isShow = v.specList.length >= 1;
+        }
+        return isShow;
+      });
+      this.goods.list = goods;
+      this.goods.total = res.total;
+      this.$goodsData = goods;
+    },
+    async open(item, key, perpoleNumber) {
+      this.table = item;
+      if(item.useType){
+        localStorage.setItem("useType",item.useType);
+        this.useTypes.sel = item.useType=='takeout'?item.useType:item.useType.replace(/-after|-before/g,'');
+      }
+      this.key = key;
+      if (this.key == "isPayOrder") {
+        this.isCreateOrder = true;
+      }
+      this.informationdialogshow;
+      this.informationdialogshow = true;
+      const res = await this.getMasterId();
+      this.masterId = res.masterId;
+      this.perpole = perpoleNumber;
+      if (this.key == "isPayOrder") {
+        this.toCreateOrder(true);
+      }
+      // if(this.key!=='isPayOrder'){
+      //   this.getCart();
+      // }
+      // this.changePerpole()
+
+      if (!this.shopInfo.isTableFee) {
+        //不免餐位费
+        await $choseCount({
+          masterId: this.masterId,
+          tableId: this.table.tableId,
+          num: this.perpole,
+        });
+      }
+
+      this.getCart();
+      this.getGoods();
+      this.getCategory();
+      // this.getPrveCart();
+      this.getCacheOrder();
+      this.getTable();
+    },
+    close() {
+      this.informationdialogshow = false;
+      this.$emit("close");
+    },
+    resetCommodityArr() {
+      this.commodityArr = [];
+      this.$refs.addSelect.resetFields();
+    },
+    haocaiCancel() {
+      this.informationdialogshow = false;
+    },
+    haocaiConfirm() {
+      console.log(haocaiSelectedMap);
+
+      this.$emit("confirm", haocaiSelectedMap);
+      this.informationdialogshow = false;
+      return;
+    },
+    // 分页回调
+    paginationChange(e) {
+      this.tableData.page = e - 1;
+      this.getTableData();
+    },
+    paginationChangeinformation(e) {
+      this.goods.query.page = e;
+      this.getGoods();
+    },
+  },
+};
+</script>
+
+<style scoped lang="scss">
+/* 针对所有input type="number" */
+input[type="number"]::-webkit-inner-spin-button,
+input[type="number"]::-webkit-outer-spin-button {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.full-screen {
+  margin-left: 10px;
+  svg {
+    width: 24px;
+    height: 24px;
+  }
+  &:hover {
+    path {
+      fill: #1890ff;
+    }
+  }
+}
+
+.icon-add {
+  color: #1890ff;
+  font-size: 22px;
+  cursor: pointer;
+}
+.prve-car-len {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 2px;
+  right: 2px;
+  height: 16px;
+  width: 16px;
+  font-size: 12px;
+  color: rgb(255, 255, 255);
+  border-radius: 50%;
+  background-color: rgb(250, 85, 85);
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+}
+::v-deep .el-button--text {
+  // color: #000;
+}
+::v-deep .meal_box .el-button-group {
+  width: 100%;
+  display: flex;
+}
+::v-deep .meal_box .el-button-group .el-button {
+  flex: 1;
+}
+::v-deep .meal_box .el-button-group .active {
+  border: 1px solid #409eff !important;
+  color: #409eff !important;
+  background: rgba(24, 144, 255, 0.1) !important;
+  z-index: 10;
+}
+::v-deep .number-box .el-input__inner {
+  border: none;
+  padding: 0 4px;
+  text-align: center;
+}
+::v-deep .el-empty {
+  padding: 0;
+}
+::v-deep .el-button--success:not(.is-disabled) {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .el-tag--dark .el-tag--success {
+  background: #22bf64;
+  color: #fff;
+}
+::v-deep .flex-1 .el-button {
+  width: 100%;
+}
+::v-deep .el-button--success.is-plain {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border: 1px solid #22bf64;
+}
+::v-deep .el-button--medium {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+// ::v-deep .el-button.is-plain:hover, .el-button.is-plain:focus{
+//   background: rgba(34, 191, 100, .1);
+//     color: #22bf64;
+//     border: 1px solid #22bf64;
+// }
+
+::v-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 {
+  -webkit-appearance: none;
+  margin: 0;
+}
+.carts_list_title {
+  padding: 16px 0 12px 0;
+  display: flex;
+  align-items: center;
+  font-size: 12px;
+  color: rgba(0, 0, 0, 0.4);
+  &::after {
+    content: "";
+    flex: 1;
+    height: 1px;
+    background-color: #ebebeb;
+    margin-left: 10px;
+  }
+}
+.border-r {
+  border-right: 1px solid #ebebeb;
+}
+.lh-16 {
+  line-height: 16px;
+}
+.good_info_discount {
+  height: 16px;
+  padding: 0 3px;
+  color: #ff3f3f;
+  background-color: rgba(255, 63, 63, 0.1);
+  border-radius: 2px;
+  margin-left: 6px;
+  font-size: 12px;
+  white-space: nowrap;
+}
+.icon-remove {
+  border: 1px solid #d8d8d8;
+  width: 22px;
+  height: 22px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  border-radius: 50%;
+  box-sizing: border-box;
+  cursor: pointer;
+
+  &::after {
+    content: "";
+    display: block;
+    width: 10px;
+    height: 1px;
+    background: #999;
+  }
+}
+.row-center {
+  justify-content: center;
+}
+.sku-group-text {
+  text-align: left;
+  color: #666;
+  font-size: 11px;
+  margin-top: 2px;
+}
+
+.price {
+  font-size: 18px;
+  text-align: left;
+  color: rgb(255, 81, 82);
+  font-weight: 600;
+}
+.youhui {
+  color: #c12a2a;
+  font-size: 13px;
+  line-height: 16px;
+}
+
+::v-deep .el-dialog__footer {
+  border-top: 1px solid #efefef;
+}
+
+.sku-bottom {
+  padding: 14px 12px 5px;
+}
+
+.relative {
+  position: relative;
+}
+.col-baseline {
+  align-items: baseline;
+}
+.cur-pointer {
+  cursor: pointer;
+}
+.flex-x-y-center {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: #efefef;
+}
+::v-deep .el-dialog__body {
+  padding: 0 20px;
+}
+.absolute {
+  position: absolute;
+}
+
+.order-number-box {
+  position: relative;
+
+  .absolute {
+    width: 60px;
+    height: 40px;
+    right: -30px;
+    top: -12px;
+    position: absolute;
+
+    .order-input-number {
+      position: absolute;
+      right: -6px;
+      top: 0;
+      justify-content: center;
+      align-items: center;
+      display: none;
+      background-color: #fff;
+      border: 1px solid #e4e7ed;
+      border-radius: 4px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.06);
+      padding: 9px 6px;
+      background-color: #fff;
+      height: 40px;
+    }
+
+    &:hover .order-input-number {
+      display: flex;
+    }
+  }
+}
+
+.ft-12 {
+  font-size: 12px;
+}
+
+.ft-18 {
+  font-size: 18px;
+}
+
+.transition {
+  transition: all 0.2s ease-in-out;
+}
+
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #efefef;
+}
+
+.tableId {
+  padding: 9px 15px;
+  border: 1px solid #dcdfe6;
+  font-size: 12px;
+  border-radius: 3px;
+  cursor: pointer;
+
+  &:hover {
+    border-color: #409eff;
+    color: #409eff;
+    background-color: rgba(24, 144, 255, 0.1);
+  }
+}
+
+.cur-pointer {
+  cursor: pointer;
+}
+
+.flex-1 {
+  flex: 1;
+}
+
+.flex-wrap {
+  flex-wrap: wrap;
+}
+
+.mt-14 {
+  margin-top: 14px;
+}
+
+.my-btn {
+  outline: none;
+  height: 40px;
+  font-size: 14px;
+  line-height: 40px;
+  color: #000;
+  justify-content: center;
+  align-items: center;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  cursor: pointer;
+  white-space: nowrap;
+  padding: 0 5px;
+  background-color: #fff;
+  position: relative;
+  &.primary {
+    color: #fff;
+    background-color: #1890ff;
+    border-color: #1890ff;
+  }
+  &.disabled {
+    color: #c0c4cc;
+    cursor: not-allowed;
+    background-color: #fff;
+    border-color: #ebeef5;
+  }
+}
+.flex-xy-cnter {
+  justify-content: center;
+  align-items: center;
+}
+.flex-wrap {
+  flex: 1;
+}
+.headimg {
+  width: 34px;
+  height: 34px;
+  display: block;
+  border-radius: 2px;
+  margin-right: 6px;
+}
+.take_order_list {
+  padding: 14px 0;
+  display: flex;
+  justify-content: space-between;
+  .tol_left_list {
+    height: 360px;
+    margin-right: 24px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolll_item {
+      border: 1px solid rgb(247, 247, 250);
+      height: 86px;
+      width: 130px;
+      padding: 10px 14px;
+      margin-bottom: 12px;
+      border-radius: 4px;
+      color: #303133;
+
+      background-color: #f7f7fa;
+      &.active {
+        border: 1px solid rgb(0, 194, 95);
+        background-color: rgba(0, 194, 95, 0.1);
+        color: rgb(0, 194, 95) !important;
+        .tollli_time,
+        .tollli_num {
+          color: rgb(0, 194, 95) !important;
+        }
+      }
+      cursor: pointer;
+      .tollli_index {
+        font-weight: 600;
+        font-size: 18px;
+      }
+      .tollli_price {
+        margin-top: 8px;
+        font-size: 14px;
+      }
+      .tollli_time_and_num {
+        margin-top: 6px;
+        display: flex;
+        justify-content: space-between;
+        .tollli_time,
+        .tollli_num {
+          font-size: 12px;
+          color: #909399;
+        }
+      }
+    }
+  }
+  .tol_right_list {
+    flex: 1;
+    height: 360px;
+    overflow-y: scroll;
+    &::-webkit-scrollbar {
+      width: 0;
+    }
+    .tolrl_item {
+      display: flex;
+      padding: 2px 2px 13px 2px;
+      margin-bottom: 12px;
+      border-bottom: 1px solid #ebebeb;
+      .tolrli_img {
+        img {
+          width: 40px;
+          height: 40px;
+          border-radius: 4px;
+        }
+      }
+      .tolrli_right {
+        display: flex;
+        justify-content: space-between;
+        flex: 1;
+        flex-direction: column;
+        padding: 1px 0 1px 8px;
+        .tr_top {
+          display: flex;
+          justify-content: space-between;
+          .trt_name {
+            width: 150px;
+            font-size: 14px;
+            color: #212121;
+            white-space: nowrap;
+            overflow: hidden;
+            text-overflow: ellipsis;
+          }
+          .trt_num {
+            font-size: 14px;
+            color: #212121;
+          }
+          .trt_price {
+            width: 100px;
+            text-align: right;
+            font-size: 14px;
+            color: #212121;
+          }
+        }
+        .tr_bottom {
+          font-size: 12px;
+          color: #999;
+        }
+      }
+    }
+  }
+}
+
+.success {
+  color: #fff;
+  border-color: #22bf64;
+  background-color: rgb(34, 191, 100);
+}
+
+.categoty {
+  position: sticky;
+  top: 0;
+  background-color: #f7f7fa;
+  z-index: 1;
+  padding-top: 14px;
+  margin-left: 7px;
+
+  .show_more_btn {
+    padding: 0 10px;
+    color: #1890ff;
+    font-size: 16px;
+    display: flex;
+    align-items: center;
+    user-select: none;
+    min-width: 80px;
+    background: #f7f7fa;
+    position: absolute;
+    right: -20px;
+    top: 14px;
+    height: 38px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .el-icon-arrow-down {
+      transition: all 0.2s;
+    }
+
+    &.showAll .el-icon-arrow-down {
+      transform: rotate(180deg);
+    }
+  }
+}
+
+.search-box {
+  display: flex;
+  justify-content: flex-end;
+  margin-left: 12px;
+  border-bottom: 1px solid #ebebeb;
+}
+::v-deep .el-dialog__title {
+  font-size: 20px;
+  font-weight: 600;
+}
+
+::v-deep .categorys .el-tag--plain.el-tag--info {
+  border: 1px solid #dcdfe6;
+  color: #000;
+  font-weight: 600;
+}
+
+::v-deep .el-dialog {
+  user-select: none;
+}
+
+::v-deep .categorys .el-tag {
+  min-width: 80px;
+  height: 38px;
+  line-height: 38px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 14px;
+  font-size: 14px;
+  font-weight: 600;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+}
+
+::v-deep .tag-group .el-tag {
+  min-width: 80px;
+  height: 28px;
+  line-height: 28px;
+  text-align: center;
+  box-sizing: border-box;
+  text-align: center;
+  padding: 0 15px;
+  font-size: 14px;
+  border-radius: 2px;
+  user-select: none;
+  margin: 0 10px 10px 0;
+  cursor: pointer;
+  border-radius: 4px;
+}
+
+::v-deep .tag-group .el-tag--light {
+  color: #000;
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+}
+::v-deep .el-checkbox__input.is-checked .el-checkbox__inner {
+  // background-color: #22bf64;
+  // border-color: #22bf64;
+}
+::v-deep .el-checkbox__input.is-checked + .el-checkbox__label {
+  // color: #22bf64;
+}
+
+::v-deep .tag-group .el-tag--dark {
+  background: rgba(34, 191, 100, 0.1);
+  color: #22bf64;
+  border-color: #22bf64;
+}
+.no-search-result {
+  color: #888;
+  margin: 0 0 10px 7px;
+}
+
+.numberbox {
+  border: 1px solid #dcdfe6;
+  background-color: #fff;
+  color: #000;
+  min-height: 38px;
+  line-height: 38px;
+  text-align: center;
+  border-radius: 4px;
+  position: relative;
+  margin: 0 0 10px;
+
+  .reduce,
+  .add {
+    font-size: 28px;
+    color: #999;
+    height: 38px;
+    line-height: 38px;
+    text-align: center;
+  }
+
+  .input {
+    font-size: 30px;
+    display: flex;
+    overflow: hidden;
+    padding: 0 10px;
+    height: 50px;
+    border-top: 1px solid #dcdfe6;
+    border-bottom: 1px solid #dcdfe6;
+
+    input {
+      height: 100%;
+      width: 100%;
+      box-sizing: border-box;
+      outline: none;
+      justify-content: center;
+      border: none;
+      text-align: center;
+    }
+  }
+}
+.table-item {
+  cursor: pointer;
+  transition: 0.2s ease-in-out;
+  &:hover {
+    background: #f4f9ff;
+  }
+}
+.tag-group {
+  margin-top: 10px;
+
+  .tag-item {
+    margin-bottom: 20px;
+
+    .tag-name {
+      margin-bottom: 10px;
+      font-size: 12px;
+      color: #999;
+    }
+  }
+}
+
+.flex {
+  display: flex;
+  align-items: center;
+}
+
+.row-between {
+  justify-content: space-between;
+}
+
+.row-right {
+  justify-content: flex-end;
+}
+
+.none {
+  display: none !important;
+}
+
+.handle {
+  font-size: 18px;
+  color: #999;
+
+  &:hover {
+    cursor: grab;
+  }
+}
+
+.shop_info {
+  display: flex;
+
+  .info {
+    flex: 1;
+    padding-left: 8px;
+    display: flex;
+    flex-direction: column;
+
+    .tag_wrap {
+      display: flex;
+    }
+  }
+}
+
+.font-bold {
+  font-weight: bold;
+}
+
+.head-container .filter-item {
+  margin: 0 5px 0 0;
+}
+
+.diancan {
+  display: flex;
+  height: calc(100vh - 75px);
+  .choose-user {
+    padding: 10px 0;
+    border-bottom: 1px solid #ebebeb;
+    margin-bottom: 10px;
+  }
+  .order-list-all {
+  }
+  .order {
+    border-radius: 6px;
+    display: flex;
+    .bottom {
+      box-sizing: border-box;
+      padding: 0 14px 14px 14px;
+      background-color: #fff;
+      z-index: 10;
+      .border-top {
+        padding-top: 14px;
+        border-top: 1px solid #ebebeb;
+      }
+    }
+
+    .list {
+      width: 352px;
+      padding: 12px 12px 0 0;
+    }
+
+    .controls {
+      min-width: 106px;
+      width: 106px;
+      border-radius: 4px;
+      background-color: #f7f7fa;
+      padding: 14px 10px;
+      position: relative;
+      overflow-y: auto;
+
+      .btn {
+        border: 1px solid #dcdfe6;
+        background-color: #fff;
+        color: #000;
+        min-height: 38px;
+        line-height: 38px;
+        text-align: center;
+        border-radius: 4px;
+        position: relative;
+        cursor: pointer;
+        margin: 0 0 10px;
+
+        &.disabled {
+          color: #999;
+          pointer-events: none;
+          cursor: no-drop;
+          background-color: rgb(250, 250, 252);
+        }
+      }
+    }
+
+    .order-item {
+      padding: 4px;
+      border-radius: 2px;
+      display: flex;
+      cursor: pointer;
+      align-items: center;
+      justify-content: space-between;
+      background-color: rgba(0, 0, 0, 0);
+      transition: all 0.3s;
+      .pack {
+        right: 100%;
+        width: 18px;
+        height: 18px;
+        background: #35ac6a;
+        border-radius: 4px 0 4px 0;
+        font-size: 12px;
+        color: #fff;
+        text-align: center;
+        line-height: 17px;
+        z-index: 2;
+      }
+      &.active {
+        background-color: rgba(0, 0, 0, 0.04);
+      }
+
+      .total-price {
+        width: 94px;
+        text-align: right;
+      }
+
+      .good-info {
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        min-width: 70px;
+
+        .specSnap {
+          color: #999;
+          font-size: 12px;
+          margin-top: 3px;
+        }
+      }
+
+      .name {
+        font-size: 13px;
+        text-align: left;
+        color: #212121;
+        overflow: hidden;
+      }
+
+      .img {
+        width: 40px;
+        height: 40px;
+        position: relative;
+        margin-right: 10px;
+
+        img {
+          width: 40px;
+          height: 40px;
+        }
+      }
+    }
+  }
+
+  .goods {
+    box-sizing: border-box;
+    flex: 1;
+    background-color: #f7f7fa;
+    margin-left: 20px;
+    padding: 0 15px 14px 15px;
+    overflow-x: hidden;
+    overflow-y: scroll;
+    .goods-list {
+      display: flex;
+      flex-wrap: wrap;
+
+      .goods-item {
+        position: relative;
+        cursor: pointer;
+        min-width: 98px;
+        max-width: 100px;
+        height: 100px;
+        // flex: 1;
+        margin: 0 7px 14px;
+        border-radius: 4px;
+        .timeSale {
+          text-align: center;
+          border-radius: 10px;
+          background-color: hsla(0, 0%, 99.2%, 0.5);
+          color: #fff;
+          font-size: 10px;
+          line-height: 16px;
+          padding: 2px 10px;
+          margin-top: 2px;
+        }
+        .sell-out {
+          width: 100%;
+          height: 100%;
+          padding: 10px;
+          background: rgba(0, 0, 0, 0.4);
+          z-index: 2;
+          position: absolute;
+          top: 0;
+          font-size: 14px;
+          font-weight: 400;
+          text-align: left;
+          color: #fff;
+        }
+        overflow: hidden;
+        position: relative;
+
+        .typeEnum {
+          position: absolute;
+          right: 0;
+          top: 0;
+          border-radius: 0 0 0 10px;
+          background-color: #46a6ff;
+          color: #fff;
+          padding: 2px 10px;
+          display: none;
+        }
+
+        .info {
+          font-size: 14px;
+          position: absolute;
+          inset: 0;
+          background: rgba(0, 0, 0, 0.4);
+          color: #fff;
+          box-sizing: border-box;
+          padding: 10px;
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
+        }
+        .img-box {
+          width: 100%;
+          height: 100%;
+          position: relative;
+        }
+        .text-sell-out {
+          width: 100%;
+          justify-content: center;
+          height: 60px;
+          svg {
+            width: 60px;
+            height: 60px;
+          }
+          // z-index: 1;
+          // position: absolute;
+          // right: 0;
+          // top: 0;
+        }
+        .sell-out-svg {
+          position: absolute;
+          left: 0;
+          right: 0;
+          top: 0;
+          bottom: 0;
+          background: rgba(0, 0, 0, 0.5);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+        }
+        img {
+          width: 100%;
+          height: 100%;
+        }
+        &.layout-img-and-text {
+          min-width: 116px !important;
+          max-width: 136px !important;
+          height: 175px;
+          background-color: #fff;
+          display: flex;
+          flex-direction: column;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.07);
+          .img-box {
+            width: 136px;
+          }
+          img {
+            width: 136px;
+            height: 125px;
+          }
+          .info {
+            position: inherit;
+            background-color: #fff;
+            padding: 4px 4px 8px;
+            color: #000;
+            .name {
+              font-size: 15px;
+              font-weight: 600;
+              height: 20px;
+              line-height: 20px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              margin-bottom: 2px;
+            }
+            .price {
+              font-size: 13px;
+            }
+          }
+        }
+        &.layout-text {
+          margin: 0 5px 10px;
+          box-shadow: 0 4px 12px 0 rgba(0, 0, 0, 0.08);
+          min-width: 128px !important;
+          max-width: 148px !important;
+          background-color: #fff;
+          height: auto;
+          .info {
+            background-color: #fff;
+
+            position: inherit;
+            color: #000;
+            .name {
+              font-weight: 600;
+              font-size: 15px;
+              color: #000;
+              line-height: 22px;
+              overflow: hidden;
+              text-overflow: ellipsis;
+
+              height: 44px;
+            }
+
+            .price {
+              font-weight: 600;
+              font-size: 16px;
+              margin: 6px 0 0;
+            }
+          }
+          img {
+            display: none;
+          }
+        }
+        &.layout-text.sell-out {
+          .info {
+            color: #c8c8c8;
+
+            .name {
+              color: #c8c8c8;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+.carts {
+  flex-direction: column;
+  background: #fff;
+  height: 100%;
+  position: relative;
+  z-index: 10;
+}
+
+.carts .title,
+.carts {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+}
+
+.carts .title {
+  justify-content: space-between;
+  height: 64px;
+  border-bottom: 1px solid #ebebeb;
+  padding: 20px;
+  padding-top: 30px;
+}
+
+.carts .title .left {
+  font-family: PingFangSC-Medium;
+  font-weight: 500;
+  font-size: 18px;
+  color: #000;
+}
+
+.carts .title .right {
+  font-size: 14px;
+  cursor: pointer;
+}
+
+.carts .box_status {
+  width: 370px;
+  height: 58px;
+  background: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-top: 20px;
+  font-family: MicrosoftYaHei;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  letter-spacing: 1.25px;
+  text-align: center;
+}
+
+.carts .box_status span {
+  padding: 0 5px;
+}
+
+.number_list_box {
+  width: 370px;
+  background: #fff;
+  border-radius: 3px;
+  margin: 20px 0;
+}
+
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+
+.yd-keyboard {
+  justify-content: center;
+  margin-top: -8px;
+  margin-left: -8px;
+}
+
+.mini-number-box1 .mini-number,
+.yd-keyboard {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box1 .mini-number {
+  margin-left: 8px;
+  border: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line {
+  margin-top: 0;
+}
+
+.mini-number-box1 .mini-number .key {
+  width: 122px;
+  height: 60px;
+  -webkit-box-shadow: none;
+  box-shadow: none;
+  border-radius: 0;
+  margin-left: 0;
+}
+
+.mini-number-box1 .mini-number .key:not(:last-child) {
+  border-right: 1px solid #dcdfe6;
+}
+
+.mini-number-box1 .mini-number .key-line:not(:last-child) {
+  border-bottom: 1px solid #dcdfe6;
+}
+
+.mini-number-box2 {
+  display: flex;
+
+  justify-content: center;
+}
+
+.mini-number-box2 .key {
+  width: 80px;
+  height: 70px;
+}
+
+.mini-number-box2 .function-button {
+  display: flex;
+
+  flex-direction: column;
+}
+
+.mini-number-box2 .function-button .key {
+  margin-top: 8px;
+}
+
+.key-line {
+  margin-top: 8px;
+}
+
+.key,
+.key-line {
+  display: flex;
+
+  justify-content: center;
+}
+
+.key {
+  width: 64px;
+  height: 64px;
+  background: #fff;
+  -webkit-box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  border-radius: 4px;
+
+  align-items: center;
+  margin-left: 8px;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  font-size: 20px;
+  color: rgba(0, 0, 0, 0.8);
+  text-align: center;
+  line-height: 34px;
+  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.10196078431372549);
+  cursor: pointer;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+.simple-Keyboard-number,
+.simple-Keyboard-weight {
+  min-width: 410px;
+  position: absolute;
+  left: 0;
+  top: 0;
+  z-index: 999;
+  background: #fff;
+  -webkit-box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  box-shadow: 12px 18px 20px 0 rgba(0, 0, 0, 0.23921568627450981);
+  border-radius: 4px;
+  overflow: hidden;
+}
+.submit {
+  width: 366px;
+  height: 44px;
+  background: #1890ff;
+  border-radius: 2px;
+
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  font-size: 14px;
+  color: #fff;
+  font-family: PingFangSC-Regular;
+  font-weight: 400;
+  margin-bottom: 40px;
+  cursor: pointer;
+}
+.disabled-box {
+  position: absolute;
+  inset: 0;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.cashier_box {
+  display: flex;
+  width: 100%;
+  padding-top: 14px;
+  flex: 1;
+  background: #f7f7fa;
+  position: relative;
+  margin: 0 24px 0 0;
+  border-radius: 4px;
+  overflow-y: auto;
+}
+
+.cashier_left .el-form-item {
+  margin-bottom: 0;
+}
+
+.cashier_left {
+  padding: 0 20px 0;
+
+  flex: 1;
+  min-width: 310px;
+}
+
+.cashier_left .title {
+  font-size: 18px;
+  color: #000;
+  font-weight: 600;
+  padding: 20px 0;
+}
+
+.cashier_left .detail_box {
+  background: #fff;
+  border-radius: 4px;
+  padding: 0 14px;
+  margin-bottom: 20px;
+}
+
+.cashier_left .detail_box .forms {
+  padding: 10px 0;
+  border-top: 1px solid #ebebeb;
+}
+
+.cashier_left .detail_box .usercard {
+  display: flex;
+
+  align-items: center;
+  width: 100%;
+  height: 80px;
+  cursor: pointer;
+}
+
+.cashier_left .detail_box .usercard .info {
+  margin-left: 10px;
+
+  display: flex;
+
+  flex-direction: column;
+
+  justify-content: space-around;
+}
+
+.cashier_left .detail_box .usercard .info .nickname {
+  display: flex;
+  align-items: center;
+  font-size: 16px;
+}
+
+.cashier_left .detail_box .usercard .info .nickname .txt {
+  max-width: 120px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  height: 25px;
+  line-height: 25px;
+}
+::v-deep .cashier_left .el-form-item__label {
+  text-align: left;
+}
+.cashier_left .detail_box .usercard .info .nickname .vip_level {
+  font-size: 12px;
+  padding: 0 5px;
+  background: #f7793d;
+  height: 20px;
+  line-height: 20px;
+  color: #fff;
+  border-radius: 4px;
+}
+
+.cashier_left .detail_box .usercard .info .other_info {
+  display: flex;
+  font-size: 14px;
+  color: #666;
+}
+
+.cashier_left .detail_box .usercard .info .other_info .item {
+  margin-right: 10px;
+}
+
+.cashier_right {
+  min-width: 250px;
+  border-left: 1px solid #ebebeb;
+
+  display: flex;
+
+  flex-direction: column;
+  padding-bottom: 20px;
+}
+
+.cashier_right .detail_form {
+  flex: 1;
+  overflow-y: auto;
+}
+
+.cashier_right .detail_form .detail_form_item {
+  display: flex;
+
+  justify-content: space-between;
+  position: relative;
+  margin-bottom: 16px;
+
+  align-items: center;
+}
+
+.cashier_right .detail_form .detail_form_item .left {
+  font-size: 14px;
+  color: #000;
+  letter-spacing: 1px;
+}
+
+.cashier_right .detail_form .detail_form_item .right {
+  font-size: 14px;
+  color: #000;
+
+  display: flex;
+  margin-right: 40px;
+}
+
+.cashier_right .detail_form .detail_form_item .right .btn {
+  font-size: 14px;
+  color: #1890ff;
+  margin-left: 10px;
+  cursor: pointer;
+  position: absolute;
+  right: 0;
+}
+
+.cashier_right .detail_form .detail_form_item .right .dfi_button {
+  display: flex;
+
+  justify-content: center;
+
+  align-items: center;
+  margin-left: 10px;
+  width: 98px;
+  height: 36px;
+  font-size: 14px;
+  color: rgba(0, 0, 0, 0.8);
+  background-color: #fff;
+  border: 1px solid #dcdfe6;
+  border-radius: 6px;
+  cursor: pointer;
+}
+
+.cashier_right .detail_form .detail_form_item .redfont {
+  color: #fa5555;
+  font-size: 20px;
+}
+
+.cashier_right .detail_form .line {
+  width: 100%;
+  height: 1px;
+  background: #ebebeb;
+  margin-top: 4px;
+  margin-bottom: 20px;
+}
+
+.cashier_right .pay_btn {
+  width: 100%;
+  line-height: 44px;
+  height: 44px;
+  background: #22bf64;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  color: #fff;
+  letter-spacing: 1px;
+  cursor: pointer;
+}
+
+.cashier_right .pay_btn:hover {
+  opacity: 0.9;
+}
+
+.btn1 {
+  background: #22bf64;
+  color: #fff;
+  border: none;
+}
+.pay_btns .el-button + .el-button {
+  margin-left: 0;
+}
+
+.pay_btns .el-button {
+  margin-right: 10px;
+  margin-bottom: 10px;
+}
+
+.pay_btns .el-button:disabled {
+  border: 1px solid #dcdfe6;
+}
+</style>
diff --git a/src/views/tool/table/components/table-edit.vue b/src/views/tool/table/components/table-edit.vue
new file mode 100644
index 0000000..76171fc
--- /dev/null
+++ b/src/views/tool/table/components/table-edit.vue
@@ -0,0 +1,141 @@
+<template>
+  <el-dialog :title="form.id ? '编辑台桌' : '添加台桌'" :visible.sync="dialogVisible" @open="tbShopAreaGet" @close="reset">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px" label-position="left">
+          <el-form-item label="选择区域" prop="areaId">
+              <el-select v-model="form.areaId" placeholder="请选择区域">
+                  <el-option :label="item.name" :value="item.id" v-for="item in areaList" :key="item.id"></el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="台桌状态" prop="status" v-if="form.id">
+              <el-select v-model="form.status" placeholder="请选择台桌状态">
+                  <el-option :label="item.label" :value="item.value" v-for="item in status" :key="item.value"></el-option>
+              </el-select>
+          </el-form-item>
+          <el-form-item label="台桌名称">
+              <el-input v-model="form.name" placeholder="请输入台桌名称"></el-input>
+          </el-form-item>
+          <el-form-item label="客座数">
+              <el-input-number v-model="form.maxCapacity" :min="0" controls-position="right"></el-input-number>
+          </el-form-item>
+          <el-form-item label="清台管理">
+        <el-radio-group v-model="form.autoClear">
+          <el-radio-button :label="0">手动清台</el-radio-button>
+          <el-radio-button :label="1">自动清台</el-radio-button>
+        </el-radio-group>
+      </el-form-item>
+          <el-form-item label="网络预定开关">
+              <el-switch v-model="form.isPredate" :active-value="1" :inactive-value="2"></el-switch>
+          </el-form-item>
+          <el-form-item label="类型">
+              <el-radio-group v-model="form.type">
+                  <el-radio-button :label="0">低消</el-radio-button>
+                  <el-radio-button :label="2">计时</el-radio-button>
+              </el-radio-group>
+          </el-form-item>
+          <el-form-item label="最低消费" v-if="form.type == 0">
+              <el-input-number v-model="form.amount" :min="0" controls-position="right"></el-input-number>
+          </el-form-item>
+          <el-form-item label="每小时收费" v-if="form.type == 2">
+              <el-input-number v-model="form.perhour" :min="0" controls-position="right"></el-input-number>
+          </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+          <el-button @click="dialogVisible = false">取 消</el-button>
+          <el-button type="primary" :loading="loading" @click="onSubmitHandle">确 定</el-button>
+      </span>
+  </el-dialog>
+</template>
+
+<script>
+import { tbShopTable, tbShopAreaGet } from '@/api/table'
+import $status from "../status.js";
+
+export default {
+  data() {
+      return {
+          dialogVisible: false,
+          resetForm: '',
+          loading: false,
+          status:[],
+          form: {
+              id: '',
+              name: '',
+              areaId: '',
+              maxCapacity: 0,
+              isPredate: 1,
+              type: 2,
+              perhour: 0,
+              amount: 0,
+        autoClear: 1,
+
+          },
+          rules: {
+              areaId: [
+                  {
+                      required: true,
+                      message: '请选择区域',
+                      trigger: 'blur'
+                  }
+              ]
+          },
+          areaList: []
+      }
+  },
+  mounted() {
+      this.resetForm = { ...this.form }
+      this.status = Object.keys($status).map(key =>{
+        return  {...$status[key],value:key}
+      }); 
+  },
+  methods: {
+      onSubmitHandle() {
+          this.$refs.form.validate(async valid => {
+              if (valid) {
+                  this.loading = true
+                  try {
+                      let res = await tbShopTable({
+                          ...this.form,
+                          qrcode:this.form.tableId,
+                          shopId: localStorage.getItem('shopId')
+                      }, this.form.id ? 'put' : 'post')
+                      this.$emit('success', res)
+                      this.close()
+                      this.$notify({
+                          title: '成功',
+                          message: `${this.form.id ? '编辑' : '添加'}成功`,
+                          type: 'success'
+                      });
+                      this.loading = false
+                  } catch (error) {
+                      this.loading = false
+                      console.log(error)
+                  }
+              }
+          })
+      },
+      show(obj) {
+          this.dialogVisible = true
+          if (obj && obj.id) {
+              this.form = JSON.parse(JSON.stringify(obj))
+          }
+      },
+      close() {
+          this.dialogVisible = false
+      },
+      reset() {
+          this.form = { ...this.resetForm }
+      },
+      // 获取区域
+      async tbShopAreaGet() {
+          try {
+              const { content } = await tbShopAreaGet({
+                  shopId: localStorage.getItem('shopId')
+              })
+              this.areaList = content
+          } catch (error) {
+              console.log(error);
+          }
+      }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/tool/table/components/util.js b/src/views/tool/table/components/util.js
new file mode 100644
index 0000000..2ec3413
--- /dev/null
+++ b/src/views/tool/table/components/util.js
@@ -0,0 +1,47 @@
+//判断商品是否可以下单
+export function isCanBuy(goods,isStock) {
+    return goods.isGrounding && goods.isPauseSale == 0 && (isStock?goods.stockNumber > 0:true) ;
+}
+
+// 一个数组是否包含另外一个数组全部元素
+export function arrayContainsAll(arr1, arr2) {
+    for (let i = 0; i < arr2.length; i++) {
+        if (!arr1.includes(arr2[i])) {
+            return false;
+        }
+    }
+    return true;
+}
+
+//n项 n-1项组合，生成全部结果
+export function generateCombinations(arr, k) {
+    let result = [];
+
+    function helper(index, current) {
+        if (current.length === k) {
+            result.push(current.slice()); // 使用slice()来避免直接修改原始数组
+        } else {
+            for (let i = index; i < arr.length; i++) {
+                current.push(arr[i]); // 将当前元素添加到组合中
+                helper(i + 1, current); // 递归调用，索引增加以避免重复选择相同的元素
+                current.pop(); // 回溯，移除当前元素以便尝试其他组合
+            }
+        }
+    }
+
+    helper(0, []); // 从索引0开始，初始空数组作为起点
+    return result;
+}
+
+export function returnReverseVal(val, isReturnString = true) {
+    const isBol = typeof val === "boolean";
+    const isString = typeof val === "string";
+    let reverseNewval = "";
+    if (isBol) {
+        reverseNewval = !val;
+    }
+    if (isString) {
+        reverseNewval = val === "true" ? "false" : "true";
+    }
+    return reverseNewval;
+}
diff --git a/src/views/tool/table/index.vue b/src/views/tool/table/index.vue
new file mode 100644
index 0000000..41a40c8
--- /dev/null
+++ b/src/views/tool/table/index.vue
@@ -0,0 +1 @@
+<template></template>
\ No newline at end of file
diff --git a/src/views/tool/table/status.js b/src/views/tool/table/status.js
new file mode 100644
index 0000000..ecaf8c8
--- /dev/null
+++ b/src/views/tool/table/status.js
@@ -0,0 +1,10 @@
+export default {
+  pending: { label: '挂单中', type: '#E6A23C' },
+  cleaning: { label: '待清台', type: '#FAAD14' },
+  using: { label: '开台中', type: '#FF4D4F' },
+  idle: { label: '空闲', type: '#3F9EFF' },
+  paying: { label: '结算中', type: '#E6A23C' },
+  closed: { label: '关台', type: '#DDDDDD' },
+  subscribe: { label: '预约', type: '#52C41A ' },
+  unbind: { label: '未绑定', type: 'rgb(221,221,221)' }
+}
diff --git a/src/views/user/active.vue b/src/views/user/active.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/user/active/index.vue b/src/views/user/active/index.vue
new file mode 100644
index 0000000..30653d4
--- /dev/null
+++ b/src/views/user/active/index.vue
@@ -0,0 +1,155 @@
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @edit-click="handleEditClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operat-click="handleOperatClick"
+      @filter-change="handleFilterChange"
+    >
+      <template #status="scope">
+        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+        </el-tag>
+      </template>
+      <template #options="scope">
+        {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
+      </template>
+      <template #bol="scope">
+        {{ scope.row[scope.prop] ? "是" : "否" }}
+      </template>
+      <template #gender="scope">
+        <el-tag
+          :type="
+            scope.row[scope.prop] == null
+              ? 'info'
+              : scope.row[scope.prop] == 1
+              ? 'success'
+              : 'warning'
+          "
+        >
+          {{ scope.row[scope.prop] === null ? "未知" : scope.row[scope.prop] == 1 ? "男" : "女" }}
+        </el-tag>
+      </template>
+      <template #user="scope">
+        <div class="flex align-center">
+          <el-avatar :src="scope.row.headImg" />
+          <el-tag>{{ scope.row.nickName }}</el-tag>
+        </div>
+      </template>
+      <template #link="scope">
+        <el-link>{{ scope.row[scope.prop] }}</el-link>
+      </template>
+      <template #mobile="scope">
+        <el-text>{{ scope.row[scope.prop] }}</el-text>
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+    </page-content>
+
+    <!-- 新增 -->
+    <page-modal
+      ref="addModalRef"
+      :modal-config="addModalConfig"
+      @submit-click="handleSubmitClick"
+      @formDataChange="formDataChange"
+    ></page-modal>
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+      @formDataChange="formDataChange"
+    ></page-modal>
+  </div>
+</template>
+
+<script setup >
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./config/add";
+import contentConfig from "./config/content";
+import editModalConfig from "./config/edit";
+import searchConfig from "./config/search";
+import { returnOptionsLabel } from "./config/config";
+const editMoneyModalRef = ref(null);
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 修改金额表单类型
+function formDataChange(type, val) {
+  console.log(type, val);
+}
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+}
+// 获取优惠券
+async function getCouponList() {}
+// 编辑
+async function handleEditClick(row) {
+  editModalRef.value?.handleDisabled(false);
+  editModalRef.value?.setModalVisible();
+  // 根据id获取数据进行填充
+  // const data = await VersionApi.getFormData(row.id);
+  editModalRef.value?.setFormData({ ...row, headImg: row.headImg ? [row.headImg] : "" });
+}
+
+// 其他工具栏
+function handleToolbarClick(name) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+
+// 其他操作列
+async function handleOperatClick(data) {
+  const row = data.row;
+  if (data.name == "more") {
+    if (data.command === "change-money") {
+      editMoneyModalRef.value.setModalVisible();
+      editMoneyModalRef.value.setFormData({ ...row, headImg: row.headImg ? [row.headImg] : "" });
+      return;
+    }
+    return;
+  }
+}
+
+// 切换示例
+const isA = ref(true);
+</script>
+<style scoped>
+.align-center {
+  align-items: center;
+}
+</style>
diff --git a/src/views/user/index.vue b/src/views/user/index.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/src/views/user/list/config/add.ts b/src/views/user/list/config/add.ts
new file mode 100644
index 0000000..14aaa5b
--- /dev/null
+++ b/src/views/user/list/config/add.ts
@@ -0,0 +1,135 @@
+import shopUserApi, { type addRequest } from "@/api/account/shopUser";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig<addRequest> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "添加用户",
+    width: 800,
+    draggable: true,
+  },
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data: addRequest) {
+    return shopUserApi.add(data.shopid, data);
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "用户头像",
+      prop: "headImg",
+      rules: [{ required: false, message: "请选择用户头像", trigger: "blur" }],
+      type: "UpImage",
+      attrs: {
+        placeholder: "请选择用户头像",
+      },
+
+    },
+    {
+      label: "用户昵称",
+      prop: "nickName",
+      rules: [{ required: true, message: "请输入用户昵称", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入用户昵称",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      type: "input",
+      label: "手机号码",
+      prop: "phone",
+      rules: [
+        {
+          required: true,
+          pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+          message: "请输入正确的手机号码",
+          trigger: "blur",
+        },
+      ],
+      attrs: {
+        placeholder: "请输入手机号码",
+        maxlength: 11,
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      label: "会员生日",
+      prop: "birthDay",
+      rules: [{ required: false, message: "请选择会员生日", trigger: "blur" }],
+      type: "date-picker",
+      attrs: {
+        placeholder: "请选择会员生日",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      type: "radio",
+      label: "性别",
+      prop: "sex",
+      rules: [{ required: false, message: "请选择性别", trigger: "blur" }],
+      attrs: {
+        placeholder: "请选择性别",
+      },
+      initialValue: '',
+      options: [
+        { label: '男', value: 1 },
+        { label: '女', value: 0 },
+      ],
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      label: "账户积分",
+      prop: "accountPoints",
+      rules: [{ required: false, message: "请输入账户积分", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入账户积分",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      label: "钱包余额",
+      prop: "amount",
+      rules: [{ required: false, message: "请输入钱包余额", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入钱包余额",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      type: "radio",
+      label: "是否会员",
+      prop: "isVip",
+      options: [
+        { label: '是', value: 1 },
+        { label: '否', value: 0 },
+      ],
+    },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/user/list/config/config.ts b/src/views/user/list/config/config.ts
new file mode 100644
index 0000000..87d75d4
--- /dev/null
+++ b/src/views/user/list/config/config.ts
@@ -0,0 +1,46 @@
+export const isVipOptions: statusOptions[] = [
+  { label: "全部", value: "" },
+  { label: "非会员", value: "0" },
+  { label: "会员", value: "1" },
+
+];
+
+export type optionsType = "isVip";
+
+export function returnOptions(type: optionsType) {
+  if (type === "isVip") {
+    return isVipOptions;
+  }
+}
+
+export function returnOptionsLabel(optionsType: optionsType, value: string | number) {
+  const options = returnOptions(optionsType);
+  if (!options) {
+    return "";
+  }
+  const option = options.find((item) => item.value === value);
+  return option ? option.label : "";
+}
+
+export interface options {
+  label: string;
+  value: string | number;
+  [property: string]: any;
+}
+export interface statusOptions extends options {
+}
+
+export type payTypeValue =
+  | ""
+  | "cash"
+  | "bank"
+  | "scanCode"
+  | "deposit"
+  | "vipPay"
+  | "arrears"
+  | "virtual"
+  | "arrears";
+
+export interface payTypeOptions extends options {
+  value: payTypeValue;
+}
diff --git a/src/views/user/list/config/content.ts b/src/views/user/list/config/content.ts
new file mode 100644
index 0000000..bd9ed55
--- /dev/null
+++ b/src/views/user/list/config/content.ts
@@ -0,0 +1,106 @@
+import shopUserApi, { type getListRequest } from "@/api/account/shopUser";
+import type { IContentConfig } from "@/components/CURD/types";
+
+const contentConfig: IContentConfig<any> = {
+  pageName: "sys:user",
+  table: {
+    border: true,
+    highlightCurrentRow: true,
+  },
+  pagination: {
+    background: true,
+    layout: "prev,pager,next,jumper,total,sizes",
+    pageSize: 20,
+    pageSizes: [10, 20, 30, 50],
+  },
+  indexAction: function (params: getListRequest) {
+    return shopUserApi.getList(params);
+  },
+  // deleteAction: shopUserApi.delete,
+  // modifyAction: function (data) {
+  //   // return shopUserApi.edit(data);
+  // },
+  pk: "id",
+  toolbar: ["add"],
+  defaultToolbar: ["refresh", "filter", "search"],
+  cols: [
+    { type: "selection", width: 50, align: "center" },
+    { label: "id", align: "center", prop: "id", width: 100, show: true },
+    {
+      label: "用户",
+      align: "center",
+      prop: "user",
+      templet: "custom",
+      slotName: "user",
+    },
+    {
+      label: "性别",
+      align: "center",
+      prop: "sex",
+      templet: "custom",
+      slotName: "gender",
+    },
+    {
+      label: "会员",
+      align: "center",
+      prop: "isVip",
+      templet: "custom",
+      slotName: "bol",
+    },
+    {
+      label: "手机号",
+      align: "center",
+      prop: "phone",
+      width: 140,
+      templet: "custom",
+      slotName: "mobile",
+    },
+    {
+      label: "余额",
+      align: "center",
+      prop: "amount",
+    },
+    {
+      label: "积分",
+      align: "center",
+      prop: "accountPoints",
+    },
+    {
+      label: "消费累计",
+      align: "center",
+      prop: "consumeAmount",
+    },
+    {
+      label: "消费次数累计",
+      align: "center",
+      prop: "consumeAmount",
+    },
+    {
+      label: "注册时间",
+      align: "center",
+      prop: "createTime",
+    },
+    {
+      label: "操作",
+      align: "center",
+      fixed: "right",
+      width: 180,
+      templet: "tool",
+      operat: [
+        {
+          name: "edit",
+          text: "编辑",
+        },
+        {
+          name: "more",
+          text: "更多",
+          options: [
+            { label: '增减余额', command: 'change-money' }
+          ]
+        },
+      ],
+    },
+  ],
+};
+
+export default contentConfig;
diff --git a/src/views/user/list/config/edit-money.ts b/src/views/user/list/config/edit-money.ts
new file mode 100644
index 0000000..6f31cbe
--- /dev/null
+++ b/src/views/user/list/config/edit-money.ts
@@ -0,0 +1,145 @@
+import shopUserApi, { type editMoneyRequest } from "@/api/account/shopUser";
+import type { IModalConfig } from "@/components/CURD/types";
+import { min } from "lodash";
+
+// 增减或者减少余额的类型
+export interface optuions {
+  label: string;
+  value: string | number;
+}
+export const addOptions: optuions[] = [
+  { label: '增加充值', value: 'adminIn' },
+  { label: '增加消费退款', value: 'adminRefund' },
+]
+export const reduceOptions: optuions[] = [
+  { label: '扣除消费', value: 'adminOut' },
+  { label: '扣除充值退款', value: 'adminInOut' },
+]
+
+
+const modalConfig: IModalConfig<editMoneyRequest> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "增减余额",
+    width: 800,
+    draggable: true,
+  },
+  pk: "id",
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data) {
+    return shopUserApi.editMoney(data.shopid, data);
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    {
+      label: "用户昵称",
+      prop: "nickName",
+      rules: [{ required: false, message: "请输入用户昵称", trigger: "blur" }],
+      type: "input",
+      disabled: true,
+      attrs: {
+        placeholder: "请输入用户昵称",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      label: "钱包余额",
+      prop: "amount",
+      disabled: true,
+      rules: [{ required: false, message: "", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      type: "radio",
+      label: "增减余额",
+      prop: "type",
+      rules: [{ required: true, message: "增减余额", trigger: "blur" }],
+      initialValue: 1,
+      options: [
+        { label: '增加', value: 1 },
+        { label: '减少', value: 0 },
+      ],
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+      watch() {
+
+      }
+    },
+    {
+      label: "金额",
+      prop: "money",
+      rules: [{ required: false, message: "请输入要增加或者减少的金额", trigger: "blur" }],
+      type: "input-number",
+      attrs: {
+        placeholder: "请输入要增加或者减少的金额",
+        min: 0,
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+      initialValue: 0
+    },
+    {
+      label: "类型",
+      prop: "bizEnum",
+      rules: [{ required: true, message: "请选择类型", trigger: "blur" }],
+      type: "radio-button",
+      attrs: {
+        placeholder: "请选择类型",
+      },
+      options: addOptions,
+    },
+    {
+      label: "备注",
+      prop: "remark",
+      rules: [{ required: false, message: "请输入备注", trigger: "blur" }],
+      type: "textarea",
+      attrs: {
+        placeholder: "请输入备注",
+      },
+    },
+    // {
+    //   label: "钱包余额",
+    //   prop: "amount",
+    //   rules: [{ required: false, message: "请输入钱包余额", trigger: "blur" }],
+    //   type: "input-number",
+    //   attrs: {
+    //     placeholder: "请输入钱包余额",
+    //   },
+    //   col: {
+    //     xs: 24,
+    //     sm: 12,
+    //   },
+    // },
+    // {
+    //   type: "radio",
+    //   label: "是否会员",
+    //   prop: "isVip",
+    //   options: [
+    //     { label: '是', value: 1 },
+    //     { label: '否', value: 0 },
+    //   ],
+    // },
+  ],
+};
+
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/user/list/config/edit.ts b/src/views/user/list/config/edit.ts
new file mode 100644
index 0000000..0407712
--- /dev/null
+++ b/src/views/user/list/config/edit.ts
@@ -0,0 +1,136 @@
+import shopUserApi, { type editRequest } from "@/api/account/shopUser";
+import type { IModalConfig } from "@/components/CURD/types";
+
+const modalConfig: IModalConfig<editRequest> = {
+  pageName: "sys:user",
+  dialog: {
+    title: "修改用户",
+    width: 800,
+    draggable: true,
+  },
+  pk: "id",
+  form: {
+    labelWidth: 140,
+  },
+  formAction: function (data: editRequest) {
+    return shopUserApi.edit(data.shopid, data);
+  },
+  beforeSubmit(data) {
+    console.log("提交之前处理", data);
+  },
+  formItems: [
+    // {
+    //   label: "用户头像",
+    //   prop: "headImg",
+    //   rules: [{ required: false, message: "请选择用户头像", trigger: "blur" }],
+    //   type: "UpImage",
+    //   attrs: {
+    //     placeholder: "请选择用户头像",
+    //   },
+
+    // },
+    {
+      label: "用户昵称",
+      prop: "nickName",
+      rules: [{ required: false, message: "请输入用户昵称", trigger: "blur" }],
+      type: "input",
+      attrs: {
+        placeholder: "请输入用户昵称",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    // {
+    //   type: "input",
+    //   label: "手机号码",
+    //   prop: "phone",
+    //   rules: [
+    //     {
+    //       required: true,
+    //       pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+    //       message: "请输入正确的手机号码",
+    //       trigger: "blur",
+    //     },
+    //   ],
+    //   attrs: {
+    //     placeholder: "请输入手机号码",
+    //     maxlength: 11,
+    //   },
+    //   col: {
+    //     xs: 24,
+    //     sm: 12,
+    //   },
+    // },
+    {
+      label: "会员生日",
+      prop: "birthDay",
+      rules: [{ required: false, message: "请选择会员生日", trigger: "blur" }],
+      type: "date-picker",
+      attrs: {
+        placeholder: "请选择会员生日",
+      },
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    {
+      type: "radio",
+      label: "性别",
+      prop: "sex",
+      rules: [{ required: false, message: "请选择性别", trigger: "blur" }],
+      attrs: {
+        placeholder: "请选择性别",
+      },
+      initialValue: '',
+      options: [
+        { label: '男', value: 1 },
+        { label: '女', value: 0 },
+      ],
+      col: {
+        xs: 24,
+        sm: 12,
+      },
+    },
+    // {
+    //   label: "账户积分",
+    //   prop: "accountPoints",
+    //   rules: [{ required: false, message: "请输入账户积分", trigger: "blur" }],
+    //   type: "input-number",
+    //   attrs: {
+    //     placeholder: "请输入账户积分",
+    //   },
+    //   col: {
+    //     xs: 24,
+    //     sm: 12,
+    //   },
+    // },
+    // {
+    //   label: "钱包余额",
+    //   prop: "amount",
+    //   rules: [{ required: false, message: "请输入钱包余额", trigger: "blur" }],
+    //   type: "input-number",
+    //   attrs: {
+    //     placeholder: "请输入钱包余额",
+    //   },
+    //   col: {
+    //     xs: 24,
+    //     sm: 12,
+    //   },
+    // },
+    // {
+    //   type: "radio",
+    //   label: "是否会员",
+    //   prop: "isVip",
+    //   options: [
+    //     { label: '是', value: 1 },
+    //     { label: '否', value: 0 },
+    //   ],
+    // },
+  ],
+};
+
+// 如果有异步数据会修改配置的，推荐用reactive包裹，而纯静态配置的可以直接导出
+export default reactive(modalConfig);
diff --git a/src/views/user/list/config/search.ts b/src/views/user/list/config/search.ts
new file mode 100644
index 0000000..7986e8d
--- /dev/null
+++ b/src/views/user/list/config/search.ts
@@ -0,0 +1,35 @@
+import type { ISearchConfig } from "@/components/CURD/types";
+import { isVipOptions } from "./config";
+const searchConfig: ISearchConfig = {
+  pageName: "sys:user",
+  inline: true,
+  isExpandable: false,
+  formItems: [
+    {
+      type: "radio-button",
+      label: "是否会员",
+      prop: "isVip",
+      attrs: {
+        placeholder: "请选择",
+        clearable: true,
+      },
+      options: isVipOptions,
+    },
+
+    {
+      type: "input",
+      label: "昵称或手机号",
+      prop: "key",
+      attrs: {
+        placeholder: "请输入昵称或手机号",
+        clearable: true,
+        style: {
+          width: "200px",
+        },
+      },
+    },
+
+  ],
+};
+
+export default searchConfig;
diff --git a/src/views/user/list/index.vue b/src/views/user/list/index.vue
new file mode 100644
index 0000000..dae1f6f
--- /dev/null
+++ b/src/views/user/list/index.vue
@@ -0,0 +1,169 @@
+<template>
+  <div class="app-container">
+    <!-- 列表 -->
+    <!-- 搜索 -->
+    <page-search
+      ref="searchRef"
+      :search-config="searchConfig"
+      @query-click="handleQueryClick"
+      @reset-click="handleResetClick"
+    />
+    <!-- 列表 -->
+    <page-content
+      ref="contentRef"
+      :content-config="contentConfig"
+      @add-click="handleAddClick"
+      @edit-click="handleEditClick"
+      @export-click="handleExportClick"
+      @search-click="handleSearchClick"
+      @toolbar-click="handleToolbarClick"
+      @operat-click="handleOperatClick"
+      @filter-change="handleFilterChange"
+    >
+      <template #status="scope">
+        <el-tag :type="scope.row[scope.prop] == 1 ? 'success' : 'info'">
+          {{ scope.row[scope.prop] == 1 ? "启用" : "禁用" }}
+        </el-tag>
+      </template>
+      <template #options="scope">
+        {{ returnOptionsLabel(scope.prop, scope.row[scope.prop]) }}
+      </template>
+      <template #bol="scope">
+        {{ scope.row[scope.prop] ? "是" : "否" }}
+      </template>
+      <template #gender="scope">
+        <el-tag
+          :type="
+            scope.row[scope.prop] == null
+              ? 'info'
+              : scope.row[scope.prop] == 1
+              ? 'success'
+              : 'warning'
+          "
+        >
+          {{ scope.row[scope.prop] === null ? "未知" : scope.row[scope.prop] == 1 ? "男" : "女" }}
+        </el-tag>
+      </template>
+      <template #user="scope">
+        <div class="flex align-center">
+          <el-avatar :src="scope.row.headImg" />
+          <el-tag>{{ scope.row.nickName }}</el-tag>
+        </div>
+      </template>
+      <template #link="scope">
+        <el-link>{{ scope.row[scope.prop] }}</el-link>
+      </template>
+      <template #mobile="scope">
+        <el-text>{{ scope.row[scope.prop] }}</el-text>
+        <copy-button
+          v-if="scope.row[scope.prop]"
+          :text="scope.row[scope.prop]"
+          style="margin-left: 2px"
+        />
+      </template>
+    </page-content>
+
+    <!-- 新增 -->
+    <page-modal
+      ref="addModalRef"
+      :modal-config="addModalConfig"
+      @submit-click="handleSubmitClick"
+    ></page-modal>
+
+    <!-- 编辑 -->
+    <page-modal
+      ref="editModalRef"
+      :modal-config="editModalConfig"
+      @submit-click="handleSubmitClick"
+    ></page-modal>
+    <!-- 用户余额修改 -->
+    <page-modal
+      ref="editMoneyModalRef"
+      :modal-config="editMoneyModalConfig"
+      @formDataChange="formDataChange"
+      @submit-click="handleSubmitClick"
+    ></page-modal>
+  </div>
+</template>
+
+<script setup >
+import usePage from "@/components/CURD/usePage";
+import addModalConfig from "./config/add";
+import contentConfig from "./config/content";
+import editModalConfig from "./config/edit";
+import editMoneyModalConfig, { addOptions, reduceOptions } from "./config/edit-money";
+import searchConfig from "./config/search";
+import { returnOptionsLabel } from "./config/config";
+const editMoneyModalRef = ref(null);
+const {
+  searchRef,
+  contentRef,
+  addModalRef,
+  editModalRef,
+  handleQueryClick,
+  handleResetClick,
+  // handleAddClick,
+  // handleEditClick,
+  handleSubmitClick,
+  handleExportClick,
+  handleSearchClick,
+  handleFilterChange,
+} = usePage();
+
+// 修改金额表单类型
+function formDataChange(type, val) {
+  if (type == "type") {
+    if (val == 1) {
+      editMoneyModalConfig.formItems[4].options = addOptions;
+    } else {
+      editMoneyModalConfig.formItems[4].options = reduceOptions;
+    }
+  }
+}
+
+// 新增
+async function handleAddClick() {
+  addModalRef.value?.setModalVisible();
+  // 加载部门下拉数据源
+  // addModalConfig.formItems[2]!.attrs!.data = await DeptAPI.getOptions();
+  // 加载角色下拉数据源
+  // addModalConfig.formItems[4]!.options = await RoleAPI.getOptions();
+}
+// 编辑
+async function handleEditClick(row) {
+  editModalRef.value?.handleDisabled(false);
+  editModalRef.value?.setModalVisible();
+  // 根据id获取数据进行填充
+  // const data = await VersionApi.getFormData(row.id);
+  editModalRef.value?.setFormData({ ...row, headImg: row.headImg ? [row.headImg] : "" });
+}
+
+// 其他工具栏
+function handleToolbarClick(name) {
+  console.log(name);
+  if (name === "custom1") {
+    ElMessage.success("点击了自定义1按钮");
+  }
+}
+
+// 其他操作列
+async function handleOperatClick(data) {
+  const row = data.row;
+  if (data.name == "more") {
+    if (data.command === "change-money") {
+      editMoneyModalRef.value.setModalVisible();
+      editMoneyModalRef.value.setFormData({ ...row, headImg: row.headImg ? [row.headImg] : "" });
+      return;
+    }
+    return;
+  }
+}
+
+// 切换示例
+const isA = ref(true);
+</script>
+<style scoped>
+.align-center {
+  align-items: center;
+}
+</style>