From b69a95c92c71e45010ae2f73048a51f56d39fac4 Mon Sep 17 00:00:00 2001
From: wwz <114797966@qq.com>
Date: Thu, 19 Dec 2024 14:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=A0=E9=80=81=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/Instead/components/cart-item.vue     |    1 -
 .../tool/Instead/components/dialogpackage.vue |    2 -
 .../Instead/components/transfertoPinpin.vue   |   24 +-
 src/views/tool/Instead/index.vue              | 1090 ++++-------------
 4 files changed, 263 insertions(+), 854 deletions(-)

diff --git a/src/views/tool/Instead/components/cart-item.vue b/src/views/tool/Instead/components/cart-item.vue
index 6942436..8f269d4 100644
--- a/src/views/tool/Instead/components/cart-item.vue
+++ b/src/views/tool/Instead/components/cart-item.vue
@@ -187,7 +187,6 @@ export default {
     isActive() {
       const isSel =
         this.selIndex === this.index && this.placeNum === this.selPlaceNum;
-      console.log(isSel);
       return isSel ? "active" : "";
     },
   },
diff --git a/src/views/tool/Instead/components/dialogpackage.vue b/src/views/tool/Instead/components/dialogpackage.vue
index 755f04a..d482124 100644
--- a/src/views/tool/Instead/components/dialogpackage.vue
+++ b/src/views/tool/Instead/components/dialogpackage.vue
@@ -65,7 +65,6 @@ export default {
             this.$set(this.listdata.proGroupVo, index, { ...this.listdata.proGroupVo[index], alertshow: this.listdata.proGroupVo[index].number != this.multipleSelection[index].length ? true : false });
         },
         confirm() {
-            console.log(listdata.proGroupVo)
             this.$emit("dialogpackageconfirm", this.listdata, this.multipleSelection);
             this.show = false;
 
@@ -84,7 +83,6 @@ export default {
                 return false;
             }
             this.disabledshow = true
-            console.log(this.listdata, this.multipleSelection);
             this.show = true;
         },
     },
diff --git a/src/views/tool/Instead/components/transfertoPinpin.vue b/src/views/tool/Instead/components/transfertoPinpin.vue
index 7ef5a7d..c180b11 100644
--- a/src/views/tool/Instead/components/transfertoPinpin.vue
+++ b/src/views/tool/Instead/components/transfertoPinpin.vue
@@ -10,7 +10,7 @@
                 <el-checkbox v-model="isFull">并桌</el-checkbox>
                 <el-select v-model="targetTableId" placeholder="请选择目标台桌">
                     <el-option v-for="item in originTableList" :key="item.tableId" :label="item.name"
-                        :value="item.tableId" @click="changeTable(item, index)">
+                        :value="item.tableId">
                     </el-option>
                 </el-select>
             </div>
@@ -78,7 +78,12 @@ export default {
         return {
             selectalllist: [],
             show: false,
-            itemdata: {},
+            itemdata: {
+                list: [],
+                old: {
+                    list: [],
+                }
+            },
             list: [],
             masterId: "",
             currentTableId: "",
@@ -110,7 +115,6 @@ export default {
             this.refcartSelection = val;
         },
         async confirm() {
-            console.log(this.itemdata, this.multipleSelection);
             if (!this.targetTableId) {
                 this.$message({
                     message: "请选择目标台桌！",
@@ -134,11 +138,10 @@ export default {
                 });
             }
             let cartIds = [...this.multipleSelection, [...this.refcartSelection]];
-            console.log(cartIds)
             await placeswitch({
                 masterId: this.masterId,
                 orderId: this.itemdata.orderId, //当前台桌订单id 可选
-                cartIds: this.isFull ? "" : [...cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)),...tzf] , //转单的购物车商品  并桌时可不传 可选
+                cartIds: this.isFull ? "" : [...cartIds.flatMap((subArray) => subArray.map((item) => item.cartId)), ...tzf], //转单的购物车商品  并桌时可不传 可选
                 isFull: this.isFull, //并台会将全部购物车商品转入，默认为false 可选
                 currentTableId: this.currentTableId,
                 targetTableId: this.targetTableId,
@@ -149,7 +152,7 @@ export default {
         },
         open(item, masterId, currentTableId, originTableList) {
             // 订单信息，取餐码，用餐类型,桌台号id，台桌列表
-            console.log(item, masterId, currentTableId, originTableList);
+            // console.log(item, masterId, currentTableId, originTableList);
             this.itemdata = item;
             this.masterId = masterId; //取餐码
             this.currentTableId = currentTableId; //当前桌台id
@@ -171,15 +174,6 @@ export default {
             const item = $status[key];
             return item ? item.type : "";
         },
-        changeTable(item, index) {
-            console.log(item, index);
-        },
-        searchInput(e) {
-            console.log(e);
-            // this.tableList = $originTableList.filter((v) =>
-            //     $strMatch(v.name, e.trim())
-            // );
-        },
     },
 };
 </script>
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 908fcc6..d1b9d12 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -2,32 +2,18 @@
 <template>
   <div class="el-dialog">
     <div class="bg-fff u-relative">
-      <div
-        class="u-fixed position-all"
-        style="z-index: 999"
-        v-if="!canXiadan"
-        @click="xiadanClick"
-      ></div>
+      <div class="u-fixed position-all" style="z-index: 999" v-if="!canXiadan" @click="xiadanClick"></div>
       <div class="flex head row-between flex-y-center u-m-l-20">
         <div class="flex" style="width: 500px">
           <div class="u-font-16 color-333 font-bold" style="margin-right: 10px">
             {{ title }}
           </div>
           <div class="choose-user flex u-m-l-24">
-            <el-button
-              type="primary"
-              v-if="vipUser.id === ''"
-              @click="refChooseUserOpen"
-              >选择用户</el-button
-            >
+            <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 && vipUser.headImg != 'null'"
-                  class="headimg"
-                  :src="vipUser.headImg"
-                  alt=""
-                />
+                <img v-if="vipUser.headImg && vipUser.headImg != 'null'" class="headimg" :src="vipUser.headImg"
+                  alt="" />
                 <div v-else class="headimg flex flex-x-y-center">
                   <i class="el-icon-user"></i>
                 </div>
@@ -45,37 +31,19 @@
               </div>
             </template>
           </div>
-          <el-popover
-            placement="right"
-            width="333"
-            trigger="click"
-            v-model="tableShow"
-          >
-            <el-input
-              placeholder="请输入内容"
-              prefix-icon="el-icon-search"
-              v-model="tableSearchText"
-              @input="searchInput"
-            >
+          <el-popover placement="right" width="333" trigger="click" v-model="tableShow">
+            <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="tableSearchText" @input="searchInput">
             </el-input>
             <div style="max-height: 398px; overflow-y: scroll" class="u-m-t-12">
-              <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)"
-              >
+              <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: returnTableColor(item.status) }">
                   {{
                     status[item.status] ? status[item.status].label : ""
-                  }}</span
-                >
+                  }}</span>
               </div>
-              <div
-                class="color-999 u-p-30 u-text-center"
-                v-if="!tableList.length"
-              >
+              <div class="color-999 u-p-30 u-text-center" v-if="!tableList.length">
                 无可用桌台
               </div>
             </div>
@@ -85,9 +53,7 @@
           </el-popover>
 
           <div class="u-m-l-28">
-            <el-button type="warning" @click="refQuanHexiaoOpen"
-              >扫码验券</el-button
-            >
+            <el-button type="warning" @click="refQuanHexiaoOpen">扫码验券</el-button>
           </div>
           <!-- 先付后付start -->
           <!-- <el-dropdown @command="changePostPay">
@@ -107,43 +73,18 @@
 
           <!-- 先付后付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"
-            >
+          <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>
+                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"
-            >
+            <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>
+                fill="#666666" p-id="9142"></path>
             </svg>
           </span>
         </div>
@@ -151,15 +92,8 @@
         <div class="flex flex-1">
           <div class="flex-1"></div>
           <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"
-            />
+            <el-input v-model="goods.query.productId" size="small" clearable placeholder="请输入商品名称" style="width: 100%"
+              class="filter-item" suffix-icon="el-icon-search" />
           </div>
 
           <!-- <div
@@ -196,29 +130,15 @@
 
         <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"
-            />
+            <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"
-          >
+          <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 v-for="item in layout.list" :key="item.value" :label="item.label" :value="item.value"
+                  :disabled="item.disabled">
                 </el-option>
               </el-select>
             </div>
@@ -231,14 +151,9 @@
             <div class="w-full" style="padding-right: 14px">
               <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 || item.disabled"
-                    v-for="(item, index) in useTypes.list"
-                    @click="changeUseType(item.value)"
-                    :key="index"
-                    >{{ item.name }}</el-button
-                  >
+                  <el-button :class="{ active: item.value == useTypes.sel }"
+                    :disabled="order.old.list.length > 0 || item.disabled" 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">
@@ -247,143 +162,79 @@
                 <div class="u-flex">
                   <div class="u-p-r-14 border-r u-m-r-14">
                     <template v-if="!shopInfo.isTableFee && table.tableId">
-                      <div
-                        class="u-flex cur-pointer"
-                        @click="
-                          refToggle('refChooseDinersNumber', true, perpole)
-                        "
-                      >
+                      <div class="u-flex cur-pointer" @click="
+                        refToggle('refChooseDinersNumber', true, perpole)
+                        ">
                         <span>就餐人数：{{ perpole }}位</span>
-                        <span
-                          class="el-icon-arrow-right diningPeople_cell_arrow"
-                        ></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>
+                        <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
-                  >
+                  <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="order-list-all u-p-l-20" style="flex: 1; overflow-y: scroll">
               <div class="list">
                 <!-- 当前购物车列表 -->
                 <template v-if="order.list.length">
-                  <cart-item
-                    :isShowVipPrice="isShowVipPrice"
-                    @itemClick="changeOrderSel"
-                    @changeOrderNumber="changeOrderNumber"
-                    @cartGoodsNumberInput="cartGoodsNumberInput"
-                    @cartGoodsNumberChange="cartGoodsNumberChange"
-                    @editNote="refNoteShow(true)"
-                    v-for="(item, index) in order.list"
-                    :key="index"
-                    :index="index"
-                    :item="item"
-                    :selPlaceNum="order.selPlaceNum"
-                    :selIndex="order.selIndex"
-                  ></cart-item>
+                  <cart-item :isShowVipPrice="isShowVipPrice" @itemClick="changeOrderSel"
+                    @changeOrderNumber="changeOrderNumber" @cartGoodsNumberInput="cartGoodsNumberInput"
+                    @cartGoodsNumberChange="cartGoodsNumberChange" @editNote="refNoteShow(true)"
+                    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.list.length">
-                  <el-empty
-                    :image-size="50"
-                    description="点餐列表为空"
-                  ></el-empty>
+                  <el-empty :image-size="50" description="点餐列表为空"></el-empty>
                 </div>
                 <!-- 优惠菜品 -->
                 <div v-if="order.gift.list.length">
                   <div class="carts_list_title">以下是优惠菜品</div>
                   <template v-if="order.gift.list.length">
-                    <cart-item
-                      @itemClick="changeOrderSel"
-                      @changeOrderNumber="changeOrderNumber"
-                      @cartGoodsNumberInput="cartGoodsNumberInput"
-                      @cartGoodsNumberChange="cartGoodsNumberChange"
-                      v-for="(item, index) in order.gift.list"
-                      :key="index"
-                      :index="index"
-                      :item="item"
-                      :selPlaceNum="order.selPlaceNum"
-                      :selIndex="order.selIndex"
-                    ></cart-item>
+                    <cart-item @itemClick="changeOrderSel" @changeOrderNumber="changeOrderNumber"
+                      @cartGoodsNumberInput="cartGoodsNumberInput" @cartGoodsNumberChange="cartGoodsNumberChange"
+                      v-for="(item, index) in order.gift.list" :key="index" :index="index" :item="item"
+                      :selPlaceNum="order.selPlaceNum" :selIndex="order.selIndex"></cart-item>
                   </template>
                 </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="list" v-for="(orderItem, orderIndex) in order.old.list" :key="orderIndex">
                   <div class="carts_list_title">
                     第{{ orderItem.placeNum }}次下单
                   </div>
-                  <cart-item
-                    :isShowVipPrice="isShowVipPrice"
-                    @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>
+                  <cart-item :isShowVipPrice="isShowVipPrice" @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="list">
                   <div class="carts_list_title">餐位费</div>
-                  <cart-item
-                    @itemClick="changeOrderExtraSel"
-                    :canChangeNumber="false"
-                    key="seatFee"
-                    :index="0"
-                    :item="order.seatFee"
-                    isSeatFee
-                    :selIndex="order.extra.selIndex"
-                    :placeNum="-10"
-                    :selPlaceNum="order.selPlaceNum"
-                  ></cart-item>
+                  <cart-item @itemClick="changeOrderExtraSel" :canChangeNumber="false" key="seatFee" :index="0"
+                    :item="order.seatFee" isSeatFee :selIndex="order.extra.selIndex" :placeNum="-10"
+                    :selPlaceNum="order.selPlaceNum"></cart-item>
                 </div>
               </template>
               <!-- 打包费 -->
               <template v-if="allPackMoney > 0">
                 <div class="list">
                   <div class="carts_list_title">打包费</div>
-                  <cart-item
-                    @itemClick="changeOrderExtraSel"
-                    :canChangeNumber="false"
-                    key="seatFee"
-                    :index="0"
-                    :item="order.packFee"
-                    isSeatFee
-                    :selIndex="order.extra.selIndex"
-                    :placeNum="-10"
-                    :selPlaceNum="order.selPlaceNum"
-                  ></cart-item>
+                  <cart-item @itemClick="changeOrderExtraSel" :canChangeNumber="false" key="seatFee" :index="0"
+                    :item="order.packFee" isSeatFee :selIndex="order.extra.selIndex" :placeNum="-10"
+                    :selPlaceNum="order.selPlaceNum"></cart-item>
                 </div>
               </template>
 
@@ -395,26 +246,15 @@
             <div class="w-full bottom">
               <div class="border-top">
                 <div class="flex row-right youhui" v-if="youhuiAllPrice > 0">
-                  <el-tooltip
-                    placement="top"
-                    effect="light"
-                    popper-class="youhui-tips"
-                    :popper-options="{
-                      'background-color': '#fff',
-                    }"
-                  >
+                  <el-tooltip placement="top" effect="light" popper-class="youhui-tips" :popper-options="{
+                    'background-color': '#fff',
+                  }">
                     <div slot="content">
-                      <div
-                        class="u-flex color-000 u-font-14 u-row-between"
-                        v-if="vipDiscountPrice * 1 > 0"
-                      >
+                      <div class="u-flex color-000 u-font-14 u-row-between" v-if="vipDiscountPrice * 1 > 0">
                         <span class="font-bold">会员优惠 </span>
                         <span class="">{{ vipDiscountPrice }} </span>
                       </div>
-                      <div
-                        class="u-flex color-000 u-font-14 u-row-between"
-                        v-if="discountSaleAmount * 1 > 0"
-                      >
+                      <div class="u-flex color-000 u-font-14 u-row-between" v-if="discountSaleAmount * 1 > 0">
                         <span class="font-bold">单品改价优惠 </span>
                         <span class="">{{ discountSaleAmount }} </span>
                       </div>
@@ -425,9 +265,7 @@
                 </div>
 
                 <div class="flex row-between">
-                  <el-button type="text" @click="printOrder"
-                    >打印制作单</el-button
-                  >
+                  <el-button type="text" @click="printOrder">打印制作单</el-button>
                   <!-- <span v-if="youhuiAllPrice>0" class="youhuiAllPrice">已优惠：{{youhuiAllPrice}} ></span> -->
                   <!-- <el-checkbox
                     v-model="order.allPack"
@@ -435,9 +273,7 @@
                     >打包</el-checkbox
                   > -->
                   <div class="flex">
-                    <span class="color-666" style="margin-right: 5px"
-                      >共{{ allNumber }}件</span
-                    >
+                    <span class="color-666" style="margin-right: 5px">共{{ allNumber }}件</span>
                     <span class="color-000 ft-18">￥{{ allPrice }} </span>
                   </div>
                 </div>
@@ -445,39 +281,25 @@
                 <div class="flex mt-14">
                   <template v-if="table">
                     <template v-if="!payAfter">
-                      <template
-                        v-if="
-                          payAfter && isCreateOrder && table && table.tableId
-                        "
-                      >
+                      <template v-if="
+                        payAfter && isCreateOrder && table && table.tableId
+                      ">
                         <!-- <template v-if="false"> -->
-                        <button
-                          class="my-btn flex-1 default"
-                          @click="createOrderClose"
-                        >
+                        <button class="my-btn flex-1 default" @click="createOrderClose">
                           <span>点菜/返回</span>
                         </button>
                       </template>
                       <template v-else>
                         <template v-if="key != 'isJieZhang'">
-                          <button
-                            class="my-btn flex-1 primary"
-                            @click="scanPayClick"
-                          >
+                          <button class="my-btn flex-1 primary" @click="scanPayClick">
                             <span>微信/支付宝</span>
                           </button>
                           <div style="width: 15px"></div>
-                          <button
-                            class="my-btn flex-1 primary"
-                            @click="cashPayClick"
-                          >
+                          <button class="my-btn flex-1 primary" @click="cashPayClick">
                             <span>现金</span>
                           </button>
                           <div style="width: 15px"></div>
-                          <button
-                            class="my-btn flex-1 default"
-                            @click="morePayClick"
-                          >
+                          <button class="my-btn flex-1 default" @click="morePayClick">
                             <span>更多支付</span>
                           </button>
                         </template>
@@ -485,10 +307,7 @@
                     </template>
                     <template v-else>
                       <template v-if="isCreateOrder">
-                        <button
-                          class="my-btn flex-1 default"
-                          @click="createOrderClose"
-                        >
+                        <button class="my-btn flex-1 default" @click="createOrderClose">
                           <span>加菜/返回</span>
                         </button>
                         <div style="width: 15px"></div>
@@ -499,25 +318,16 @@
                       <template v-else>
                         <template v-if="payAfter">
                           <div class="flex-1">
-                            <el-button
-                              type="primary"
-                              size="medium"
-                              :disabled="!order.list.length"
-                              @click="toCreateOrderDebounce(false)"
-                            >
+                            <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 <= 0
-                            "
-                            @click="toCreateOrderDebounce(true)"
-                          >
+                          <el-button size="medium" :disabled="!order.list.length && order.old.list.length <= 0
+                            " @click="toCreateOrderDebounce(true)">
                             去结账
                           </el-button>
                         </div>
@@ -543,24 +353,12 @@
           </div>
 
           <div class="controls">
-            <div
-              class="numberbox"
-              :class="{ 'cur-pointer': order.old.selIndex < 0 }"
-            >
+            <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>
+                <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.number" style="display: none" />
                 <input type="number" disabled v-model="order.cacheNumber" />
               </div>
               <div class="add" @click="changeOrderGoodsNumber()">+</div>
@@ -568,32 +366,17 @@
             <!-- <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 class="btn" :class="{ disabled: !isSku }" @click="orderBtnsClick('sku')">
               规格
             </div>
-            <div
-              class="btn"
-              :class="{ disabled: order.selIndex < 0 }"
-              @click="orderBtnsClick('gift')"
-            >
+            <div class="btn" :class="{ disabled: order.selIndex < 0 }" @click="orderBtnsClick('gift')"
+              v-if="returnGiftTextshow">
               {{ returnGiftText }}
             </div>
-            <div
-              class="btn"
-              :class="{ disabled: order.selIndex < 0 }"
-              @click="orderBtnsClick('pack')"
-            >
+            <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 class="btn" :class="{ disabled: order.selIndex < 0 }" @click="orderBtnsClick('del')">
               删除
             </div>
 
@@ -627,57 +410,32 @@
                   prveOrder.list.length
                 }}</span>
               </div> -->
-            <div
-              class="btn"
-              :class="{ disabled: order.selIndex < 0 && key != 'isJieZhang' }"
-              @click="refNoteShow(true)"
-            >
+            <div class="btn" :class="{ disabled: order.selIndex < 0 && key != 'isJieZhang' }"
+              @click="refNoteShow(true)">
               单品备注
             </div>
 
             <div class="btn" @click="refNoteShow(false)">整单备注</div>
-            <div
-              class="btn"
-              :class="{
-                disabled: disableTuicai,
-              }"
-              @click="orderBtnsClick('returnCart')"
-            >
+            <div class="btn" :class="{
+              disabled: disableTuicai,
+            }" @click="orderBtnsClick('returnCart')">
               退菜
             </div>
-            <div
-              @click="orderBtnsClick('print')"
-              :class="{ disabled: order.selIndex < 0 }"
-              class="btn"
-            >
+            <div @click="orderBtnsClick('print')" :class="{ disabled: order.selIndex < 0 }" class="btn">
               {{ returnPrintText }}
             </div>
-            <div
-              @click="refPopChangePriceShow"
-              :class="{ disabled: order.selIndex < 0 }"
-              class="btn"
-            >
+            <div @click="refPopChangePriceShow" :class="{ disabled: order.selIndex < 0 }" class="btn">
               单品改价
             </div>
-            <div
-              class="btn"
-              @click="orderBtnsClick('isWaitCall')"
-              :class="{ disabled: order.selIndex < 0 }"
-            >
+            <div class="btn" @click="orderBtnsClick('isWaitCall')" :class="{ disabled: order.selIndex < 0 }">
               {{ returnWaingText }}
             </div>
-            <div
-              class="btn no-wrap u-font-12"
-              @click="orderBtnsClick('AllWaitCall')"
-              :class="{ disabled: isCreateOrder }"
-            >
+            <div class="btn no-wrap u-font-12" @click="orderBtnsClick('AllWaitCall')"
+              :class="{ disabled: isCreateOrder }">
               {{ returnWaingAllText }}
             </div>
-            <div
-              class="btn no-wrap u-font-12"
-              @click="clicktransfertoPinpin()"
-              v-if="table.name && useTypes.sel == 'dine-in' && payAfter && cktableList"
-            >
+            <div class="btn no-wrap u-font-12" @click="clicktransfertoPinpin()"
+              v-if="table.name && useTypes.sel == 'dine-in' && payAfter && cktableList">
               转桌/并桌
             </div>
             <!--  -->
@@ -690,18 +448,10 @@
               </div> -->
           </div>
         </div>
-        <div
-          class="goods"
-          v-infinite-scroll="loadMoreGoods"
-          infinite-scroll-distance="40"
-        >
+        <div class="goods" v-infinite-scroll="loadMoreGoods" infinite-scroll-distance="40">
           <template v-if="!isCreateOrder">
             <div class="flex categoty u-col-center">
-              <div
-                class="show_more_btn"
-                :class="{ showAll: category.showAll }"
-                @click="toggleShowAll"
-              >
+              <div class="show_more_btn" :class="{ showAll: category.showAll }" @click="toggleShowAll">
                 <div class="flex">
                   <div class="flex showmore">
                     <i class="el-icon-caret-bottom color-fff"></i>
@@ -709,101 +459,56 @@
                   <span>{{ category.showAll ? "收起" : "展开" }}</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
-                  >
+              <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 class="no-search-result" v-if="search.list.length <= 0 && goods.query.productId !== ''">
               未找到相关商品
             </div>
             <template v-if="goods.list.length">
               <div class="goods-list">
-                <div
-                  @click="lingshicaiShow"
-                  class="goods-item lingshicai text-center color-999"
-                  :class="{
-                    'layout-img-and-text': layout.sel === 'img-and-text',
-                    'layout-text': layout.sel === 'text',
-                  }"
-                >
+                <div @click="lingshicaiShow" class="goods-item lingshicai text-center color-999" :class="{
+                  'layout-img-and-text': layout.sel === 'img-and-text',
+                  'layout-text': layout.sel === 'text',
+                }">
                   <span class="el-icon-plus" style="font-size: 26px"></span>
                   <div class="u-m-t-10">临时菜</div>
                 </div>
-                <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="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="flex img-box" v-if="layout.sel !== 'text'">
-                    <el-image
-                      :src="item.coverImg"
-                      scroll-container="goods"
-                      class="goods-img"
-                    ></el-image>
+                    <el-image :src="item.coverImg" scroll-container="goods" class="goods-img"></el-image>
                     <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"
-                        >
+                        <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>
+                            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>
+                            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>
+                            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>
+                            fill="#ffffff" p-id="4360"></path>
                         </svg>
                       </div>
                     </template>
@@ -813,45 +518,26 @@
                   </div>
                   <div class="info">
                     <div class="name u-flex u-flex-wrap">
-                      <span class="weight" v-if="item.type == 'weigh'"
-                        >称重</span
-                      >
+                      <span class="weight" v-if="item.type == 'weigh'">称重</span>
                       <span> {{ item.name }}</span>
                     </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"
-                          >
+                          <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>
+                              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>
+                              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>
+                              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>
+                              fill="#c8c8c8" p-id="4915"></path>
                           </svg>
                         </div>
                       </template>
@@ -870,10 +556,7 @@
                 {{ goods.status == "end" ? "没有更多了" : "加载中" }}
               </div>
             </template>
-            <div
-              class="no-search-result"
-              v-if="goods.list.length <= 0 && goods.query.productId === ''"
-            >
+            <div class="no-search-result" v-if="goods.list.length <= 0 && goods.query.productId === ''">
               未找到相关商品
             </div>
           </template>
@@ -884,13 +567,8 @@
                 <!-- <div class="title">选择优惠</div> -->
                 <div class="detail_box">
                   <div class="usercard" @click="refChooseUserOpen">
-                    <span
-                      class="el-avatar el-avatar--square"
-                      style="height: 50px; width: 50px; line-height: 50px"
-                      ><img
-                        v-if="vipUser.id && vipUser.headImg != 'null'"
-                        :src="vipUser.headImg"
-                    /></span>
+                    <span class="el-avatar el-avatar--square" style="height: 50px; width: 50px; line-height: 50px"><img
+                        v-if="vipUser.id && vipUser.headImg != 'null'" :src="vipUser.headImg" /></span>
                     <div class="info">
                       <div class="nickname">
                         <span class="txt">{{
@@ -913,34 +591,17 @@
                     <div class="u-m-b-20 u-m-t-10">
                       <div class="u-flex u-flex-wrap">
                         <span class="font-bold no-wrap u-m-r-20">积分抵扣</span>
-                        <el-radio-group
-                          v-model="points.selected"
-                          :disabled="!points.res.usable"
-                          @input="pointsChange"
-                        >
+                        <el-radio-group v-model="points.selected" :disabled="!points.res.usable" @input="pointsChange">
                           <el-radio :label="1">全部抵扣</el-radio>
                           <el-radio :label="2">部分抵扣</el-radio>
                         </el-radio-group>
                         <div class="u-m-l-20" v-if="points.res.usable">
-                          <el-input-number
-                            @change="pointsValueChange"
-                            v-if="points.selected == 1"
-                            :step="1"
-                            disabled
-                            step-strictly
-                            v-model="points.value"
-                            :min="points.minDeductionPoints"
-                            :max="points.maxUsablePoints"
-                          ></el-input-number>
-                          <el-input-number
-                            :step="1"
-                            step-strictly
-                            @change="pointsValueChange"
-                            v-if="points.selected == 2"
-                            v-model="points.value"
-                            :min="points.minDeductionPoints"
-                            :max="points.maxUsablePoints"
-                          ></el-input-number>
+                          <el-input-number @change="pointsValueChange" v-if="points.selected == 1" :step="1" disabled
+                            step-strictly v-model="points.value" :min="points.minDeductionPoints"
+                            :max="points.maxUsablePoints"></el-input-number>
+                          <el-input-number :step="1" step-strictly @change="pointsValueChange"
+                            v-if="points.selected == 2" v-model="points.value" :min="points.minDeductionPoints"
+                            :max="points.maxUsablePoints"></el-input-number>
                         </div>
                       </div>
                       <div class="color-999 u-m-t-10">
@@ -949,14 +610,10 @@
                           <span v-if="points.res.equivalentPoints">
                             1积分抵扣{{ points.res.equivalentPoints }}元，
                           </span>
-                          <span
-                            >最大抵扣积分{{ points.res.maxUsablePoints }}</span
-                          >
-                          <span
-                            >最小抵扣积分{{
-                              points.res.minDeductionPoints
-                            }}</span
-                          >
+                          <span>最大抵扣积分{{ points.res.maxUsablePoints }}</span>
+                          <span>最小抵扣积分{{
+                            points.res.minDeductionPoints
+                          }}</span>
                         </template>
                         <template v-else>
                           <span class="color-red">*</span>
@@ -968,40 +625,26 @@
                       <span class="font-bold no-wrap">团购代金券</span>
                       <div
                         class="border u-p-l-20 cur-pointer u-m-r-20 u-flex no-wrap u-p-t-10 u-p-b-10 border-r-4 selQuan"
-                        @click="shouwTuanQuan"
-                      >
+                        @click="shouwTuanQuan">
                         <span class="color-999 u-p-r-10">代金券名称</span>
-                        <span
-                          class="el-icon-arrow-down color-999 u-m-r-10"
-                        ></span>
+                        <span class="el-icon-arrow-down color-999 u-m-r-10"></span>
                       </div>
-                      <img
-                        style="width: 30px; height: 30px"
-                        class="cur-pointer"
-                        @click="shouwTuanQuan"
-                        src="@/assets/images/scan.png"
-                      />
+                      <img style="width: 30px; height: 30px" class="cur-pointer" @click="shouwTuanQuan"
+                        src="@/assets/images/scan.png" />
                       <!-- <el-button size="medium " type="text">
                         查看不可用券
                       </el-button> -->
                     </div>
                     <template v-if="tuanQuan">
-                      <tuan-quan-table
-                        :data="tuanQuan.goods"
-                        type="show"
-                        ref="refGoodsTable"
-                      ></tuan-quan-table>
+                      <tuan-quan-table :data="tuanQuan.goods" type="show" ref="refGoodsTable"></tuan-quan-table>
                     </template>
                     <div class="u-flex flex-wrap u-m-t-20">
                       <span class="font-bold no-wrap">优惠券</span>
                       <div
                         class="border u-p-l-20 cur-pointer u-m-r-20 u-flex no-wrap u-p-t-10 u-p-b-10 border-r-4 selQuan"
-                        @click="showQuan"
-                      >
+                        @click="showQuan">
                         <span class="color-999 u-p-r-10">选择优惠券</span>
-                        <span
-                          class="el-icon-arrow-down color-999 u-m-r-10"
-                        ></span>
+                        <span class="el-icon-arrow-down color-999 u-m-r-10"></span>
                       </div>
 
                       <!-- <el-button size="medium " type="text">
@@ -1025,12 +668,8 @@
                         <template v-slot="scope">
                           <div class="u-flex" v-if="scope.row.type == 2">
                             <div class="u-flex">
-                              <el-image
-                                :src="scope.row.productCover"
-                                fit="cover"
-                                style="width: 40px; height: 40px"
-                                :preview-src-list="[scope.row.productCover]"
-                              ></el-image>
+                              <el-image :src="scope.row.productCover" fit="cover" style="width: 40px; height: 40px"
+                                :preview-src-list="[scope.row.productCover]"></el-image>
                             </div>
                             <div class="u-p-l-10">
                               <div class="">{{ scope.row.productName }}</div>
@@ -1053,12 +692,7 @@
                       </el-table-column>
                       <el-table-column prop="useRestrictions" label="">
                         <template v-slot="scope">
-                          <el-button
-                            type="danger"
-                            size="mini"
-                            @click="delQuan(scope.row)"
-                            >删除</el-button
-                          >
+                          <el-button type="danger" size="mini" @click="delQuan(scope.row)">删除</el-button>
                         </template>
                       </el-table-column>
                     </el-table>
@@ -1071,19 +705,11 @@
                   <!-- <el-button size="medium "> 免单 </el-button> -->
                 </div>
 
-                <pay-type
-                  ref="refPayType"
-                  v-model="order.payType"
-                  @itemClick="payTypeItemClick"
-                  :disabledPayType="disabledPayType"
-                >
+                <pay-type ref="refPayType" v-model="order.payType" @itemClick="payTypeItemClick"
+                  :disabledPayType="disabledPayType">
                 </pay-type>
-                <el-button
-                  :disabled="disabledPayType.includes('creditBuyer')"
-                  @click="guazhangShow"
-                  size="medium"
-                  >挂账</el-button
-                >
+                <el-button :disabled="disabledPayType.includes('creditBuyer')" @click="guazhangShow"
+                  size="medium">挂账</el-button>
                 <div style="margin-top: 20px">
                   <el-button type="primary" size="medium" @click="payOrder">
                     <span>立即支付</span>
@@ -1178,36 +804,17 @@
         </slot> -->
     </div>
     <!-- 选择规格 -->
-    <el-dialog
-      width="410px"
-      :title="selGoods.title"
-      :visible.sync="selGoods.show"
-      @close="onSelGoodsSkuClose"
-    >
+    <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-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
-            >
+            <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' : ''"
-              >
+            <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>
@@ -1228,32 +835,19 @@
             <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>
+                <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 class="my-btn disabled flex-1" v-if="!skuGoods.data.isGrounding" disabled>
               已下架
             </button>
-            <button
-              class="my-btn disabled flex-1"
-              v-else-if="
-                selGoods.isStock == 1 && skuGoods.data.stockNumber <= 0
-              "
-              disabled
-            >
+            <button class="my-btn disabled flex-1" v-else-if="
+              selGoods.isStock == 1 && skuGoods.data.stockNumber <= 0
+            " disabled>
               库存不足
             </button>
             <template v-else>
@@ -1275,12 +869,7 @@
             <div class="flex">
               <i class="icon-remove" @click="skuNumberReduce"></i>
               <div style="width: 40px" class="number-box">
-                <el-input
-                  :min="0"
-                  :max="0"
-                  type="number"
-                  placeholder="0"
-                ></el-input>
+                <el-input :min="0" :max="0" type="number" placeholder="0"></el-input>
               </div>
               <!-- <i class="el-icon-remove"></i> -->
               <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
@@ -1326,26 +915,12 @@
                       <span v-if="selGoods.isSku == 'weight'">.</span>
                     </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"
-                      >
+                    <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>
+                          fill="#333333" p-id="1468"></path>
                       </svg>
                     </div>
                   </div>
@@ -1364,13 +939,8 @@
     <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="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">
@@ -1379,15 +949,8 @@
             </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="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>
@@ -1409,116 +972,61 @@
 
       <div slot="footer" class="flex row-center">
         <div style="margin-right: 20px">
-          <el-button
-            size="medium"
-            type="primary"
-            @click="confirmChoosePrveOrder"
-            >确认此单</el-button
-          >
+          <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>
+    <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="true"
-      :price="createOrder.data.amount * createOrder.discount"
-      :order="createOrder.data"
-      @confirm="scanPayConfirm"
-      @paySuccess="payOrderSuccess"
-    ></scan-pay>
+    <scan-pay ref="refWxScanCode" defaultTips="请使用扫码枪扫描微信/支付宝收款码" title="扫码支付" :openSwitch="true"
+      :price="createOrder.data.amount * createOrder.discount" :order="createOrder.data" @confirm="scanPayConfirm"
+      @paySuccess="payOrderSuccess"></scan-pay>
     <!-- 储值卡支付 -->
-    <scan-pay
-      ref="refScanCode"
-      title="扫码支付"
-      defaultTips="注意:扫码支付请保证输入框获得焦点"
-      :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>
     <!-- 优惠券 -->
-    <quans-pop
-      ref="refQuans"
-      :vipUser="vipUser"
-      :orderPrice="yinFuJinE"
-      :goodsArr="createOrder.data.detailList || []"
-      @confirm="quansConfirm"
-    >
+    <quans-pop ref="refQuans" :vipUser="vipUser" :orderPrice="yinFuJinE" :goodsArr="createOrder.data.detailList || []"
+      @confirm="quansConfirm">
     </quans-pop>
 
     <!-- 选择人数 -->
-    <choose-diners-number
-      ref="refChooseDinersNumber"
-      @confirm="chooseDinersNumberConfirm"
-      :max="table ? table.maxCapacity : 99"
-    ></choose-diners-number>
+    <choose-diners-number ref="refChooseDinersNumber" @confirm="chooseDinersNumberConfirm"
+      :max="table ? table.maxCapacity : 99"></choose-diners-number>
 
-    <return-cart
-      ref="refReturnCart"
-      :max="order.selGoods ? order.selGoods.number : 1"
-      @confirm="refReturnCartConfirm"
-    ></return-cart>
+    <return-cart ref="refReturnCart" :max="order.selGoods ? order.selGoods.number : 1"
+      @confirm="refReturnCartConfirm"></return-cart>
 
     <!-- 临时菜 -->
     <cai-add ref="refPopAddCai" @updateCart="getCart"></cai-add>
     <!-- 单品改价 -->
-    <cart-change-price
-      ref="refPopChangePrice"
-      :vipUser="vipUser"
-      @updateCart="updateCartItem"
-    ></cart-change-price>
+    <cart-change-price ref="refPopChangePrice" :vipUser="vipUser" @updateCart="updateCartItem"></cart-change-price>
     <!-- 用户选择团购券 -->
-    <pop-tuan-quan
-      :cartGoods="createOrder.data.detailList || []"
-      ref="refPopTuanQuan"
-      @confirm="tuanQuanConfirm"
-    ></pop-tuan-quan>
+    <pop-tuan-quan :cartGoods="createOrder.data.detailList || []" ref="refPopTuanQuan"
+      @confirm="tuanQuanConfirm"></pop-tuan-quan>
     <!-- 美团/抖音团购券核销 -->
     <pop-quan-hexiao ref="refQuanHexiao"> </pop-quan-hexiao>
     <!-- 挂账 -->
-    <popup-choose-guazhang
-      ref="refGuaZhang"
-      :payMoney="yinFuJinE"
-      @confirm="guazhangPayConfirm"
-    ></popup-choose-guazhang>
+    <popup-choose-guazhang ref="refGuaZhang" :payMoney="yinFuJinE"
+      @confirm="guazhangPayConfirm"></popup-choose-guazhang>
 
     <!-- 称重商品 -->
-    <popup-weight-goods
-      :isShowVipPrice="isShowVipPrice"
-      ref="refWeightGoods"
-      @confirm="refWeightGoodsConfirm"
-    >
+    <popup-weight-goods :isShowVipPrice="isShowVipPrice" ref="refWeightGoods" @confirm="refWeightGoodsConfirm">
     </popup-weight-goods>
     <!-- 可选套餐 -->
-    <dialogpackage
-      ref="refdialogpackage"
-      @dialogpackageconfirm="dialogpackageconfirm"
-    ></dialogpackage>
+    <dialogpackage ref="refdialogpackage" @dialogpackageconfirm="dialogpackageconfirm"></dialogpackage>
     <!-- 并桌/转桌 -->
-    <transfertoPinpin
-      ref="refransfertoPinpin"
-      @transfertoPinpin="reset"
-    ></transfertoPinpin>
+    <transfertoPinpin ref="refransfertoPinpin" @transfertoPinpin="reset"></transfertoPinpin>
   </div>
 </template>
 
@@ -1846,17 +1354,17 @@ export default {
   },
   computed: {
     cktableList() {
-       // 使用 reduce 方法统计指定值出现的次数
+      // 使用 reduce 方法统计指定值出现的次数
       //  const count = this.tableList.reduce((acc, cur) => {
       //   if (cur.status == "using") {
       //     return acc + 1;
       //   }
       //   return acc;
       // }, 0);
-      if(this.tableList){
-       let res =  this.tableList.filter((i)=>i.status == 'using')
-       return res.length >=2 ?true:false
-      }else{
+      if (this.tableList) {
+        let res = this.tableList.filter((i) => i.status == 'using')
+        return res.length >= 2 ? true : false
+      } else {
         return false
       }
     },
@@ -1947,7 +1455,6 @@ export default {
     yinFuJinE() {
       const total =
         this.currentPayMoney - (this.points.selected ? this.points.toMoney : 0);
-      console.log(total);
       if (this.isCreateOrder) {
         return total.toFixed(2);
       } else {
@@ -2036,6 +1543,16 @@ export default {
         ? "取消赠送"
         : "赠送";
     },
+    returnGiftTextshow() {
+      try {
+        // 选中的购物车里面是否已有
+        if (this.order.list.filter((i, v) => i.productId == this.order.list[this.order.selIndex].productId).length >= 2) {
+          return false;
+        } else {
+          return true;
+        }
+      } catch (error) { }
+    },
     returnPackText() {
       if (this.order.selIndex < 0) {
         return "打包";
@@ -2218,7 +1735,6 @@ export default {
       }
     },
     "useTypes.sel": function (newval, oldval) {
-      console.log(newval);
       this.setPostPay();
       this.setUseType();
     },
@@ -2252,7 +1768,6 @@ export default {
     //   }
     // },
     masterId: function (val) {
-      console.log(val);
     },
     isCreateOrder: function (val) {
       if (!val) {
@@ -2269,8 +1784,6 @@ export default {
       //   masterId = res.masterId;
       // }
       // this.masterId = masterId;
-      console.log("this.createOrder.data");
-      console.log(this.createOrder.data);
       if (this.order.status == "finish") {
         return;
       }
@@ -2305,20 +1818,17 @@ export default {
       } 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;
       }
@@ -2342,7 +1852,6 @@ export default {
         const selItem = item.info[this.order.old.selIndex];
         goods = selItem ? selItem : "";
       }
-      console.log(goods);
       if (val === -1) {
         this.order.cacheNumber = 1;
       } else {
@@ -2363,9 +1872,7 @@ export default {
         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;
@@ -2420,8 +1927,6 @@ export default {
     },
     //称重商品确认
     async refWeightGoodsConfirm(item, number) {
-      console.log(item);
-      console.log(number);
       this.goodsClick(item, number, true);
     },
     //套餐下单
@@ -2452,7 +1957,6 @@ export default {
       this.$refs.refPopTuanQuan.open();
     },
     tuanQuanConfirm(e) {
-      console.log(e);
       this.tuanQuan = e;
     },
     //更新单品改价数据
@@ -2468,7 +1972,6 @@ export default {
       this.$refs.refPopChangePrice.open(orderGoods);
     },
     returnProDiscount(row) {
-      console.log(row);
       //相同商品抵扣券数组
       const arr = this.quansSelArr.filter((v) => v.proId == row.proId);
       const index = arr.findIndex((v) => v.id == row.id);
@@ -2497,7 +2000,6 @@ export default {
     },
     delQuan(row) {
       const index = this.quansSelArr.findIndex((v) => v.id == row.id);
-      console.log(index);
       if (index != -1) {
         this.quansSelArr.splice(index, 1);
         this.quansSelArr.map((v, index) => {
@@ -2534,7 +2036,6 @@ export default {
     },
     //根据积分输入值变化计算抵扣金额
     pointsValueChange(e) {
-      console.log(e);
       if (e == 0 || !e) {
         return (this.points.toMoney = 0);
       }
@@ -2548,7 +2049,6 @@ export default {
     },
     //积分抵扣类型改变
     pointsChange(e) {
-      console.log(e);
       if (e == 1) {
         this.points.value = Math.min(
           this.vipUser.accountPoints,
@@ -2569,7 +2069,6 @@ export default {
       );
     },
     quansConfirm(e, goodsPayPriceMap) {
-      console.log(e);
       // this.createOrder.discount = 1;
       this.points.selected = "";
       e.map((v, index) => {
@@ -2583,7 +2082,6 @@ export default {
       $goodsPayPriceMap = goodsPayPriceMap;
     },
     searchInput(e) {
-      console.log(e);
       this.tableList = $originTableList.filter((v) =>
         $strMatch(v.name, e.trim())
       );
@@ -2608,7 +2106,6 @@ export default {
       return this.canXiadan;
     },
     changeOrderExtraSel(index, canChangeNumber, placeNum) {
-      // console.log(index,canChangeNumber,placeNum)
       this.order.selIndex = -1;
       this.order.selGoods = this.order.seatFee;
       this.order.selPlaceNum = placeNum;
@@ -2673,7 +2170,6 @@ export default {
       //   ...this.order.old.list,
       //   { info: this.order.list, placeNum: nowPlaceNum + 1 },
       // ];
-      console.log(this.order.old.list);
       return res;
     },
     async payBeforeClear() {
@@ -2762,8 +2258,6 @@ export default {
         //munchies 先付  restaurant 后付
         this.payAfter = this.shopInfo.registerType == "munchies" ? false : true;
       }
-      console.log("this.payAfter");
-      console.log(this.payAfter);
     },
     //获取店铺信息
     async getShopInfo() {
@@ -2773,14 +2267,13 @@ export default {
         this.shopInfo = res;
         this.setPostPay();
         this.setUseType();
-      } catch (error) {}
+      } catch (error) { }
     },
     //更改就餐方式
     changeUseType(type) {
       if (this.order.old.list.length > 0) {
         return this.$message("下单后不支持更改就餐方式");
       }
-      console.log(type);
       this.useTypes.sel = type;
     },
     //更改就餐人数
@@ -2801,12 +2294,10 @@ export default {
     async onTableChange() {
       this.order.list = [];
       this.order.old.list = [];
-      console.log("onTableChange");
       const perpole = this.perpole || "";
       const tableRes = await $returnTableDetail({
         tableId: this.table.tableId,
       });
-      console.log(tableRes);
       const orderId = tableRes.orderId || this.table.orderId;
       if (orderId) {
         return this.getOrderData({ orderId: orderId });
@@ -2858,7 +2349,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     //退菜
     async refReturnCartConfirm(e) {
@@ -2873,7 +2364,6 @@ export default {
       this.order.old.selIndex = -1;
       // this.getCart();
       this.getOrderData();
-      // console.log(this.order.selGoods);
     },
 
     // 台桌列表
@@ -2891,7 +2381,6 @@ export default {
         );
         $originTableList = this.tableList;
       } catch (error) {
-        console.log(error);
       }
     },
     async getTableDetail(tableId) {
@@ -2902,8 +2391,6 @@ export default {
       return res;
     },
     async changeTable(item) {
-      console.log("changeTable");
-      console.log(this.table, this.table.tableId);
       if (
         (this.table && this.table.tableId) ||
         (!this.table && !this.tableId && this.order.list.length <= 0)
@@ -2920,7 +2407,6 @@ export default {
       if (this.table && this.order.list.length <= 0) {
         this.table = item;
         this.tableShow = false;
-        console.log(this.table);
         this.onTableChange();
         return;
       }
@@ -2943,7 +2429,6 @@ export default {
             }
           );
         } catch (e) {
-          console.log(e);
         }
       }
       this.tableShow = false;
@@ -3020,7 +2505,6 @@ export default {
       const amount = (
         this.createOrder.data.amount - this.productCouponDiscountAmount
       ).toFixed(2);
-      console.log(amount);
       this.refToggle("refDiscount", true, {
         amount,
         discount: this.createOrder.discount * 100,
@@ -3035,7 +2519,6 @@ export default {
     //购物车商品输入框数量输入
     cartGoodsNumberInput(newval, index) {
       const item = this.order.list[index];
-      console.log(item);
       this.order.cacheNumber = newval;
       item.number = newval;
     },
@@ -3043,7 +2526,6 @@ export default {
     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;
     },
@@ -3100,7 +2582,6 @@ export default {
     },
     //改变是否打印
     changeIsPrint(e) {
-      console.log(e);
       this.isPrint = e;
     },
     async refOrderNoteConfirm(note) {
@@ -3151,10 +2632,6 @@ export default {
       if (this.order.payType == "deposit") {
         return this.refToggle("refScanCode", true);
       }
-      console.log({
-        orderId: this.createOrder.data.id,
-        payType: this.order.payType,
-      });
       if (this.order.payType == "cash") {
         return this.$confirm(
           "是否确认已现金收款:" + this.yinFuJinE + "?",
@@ -3223,14 +2700,12 @@ export default {
       //   this.reset();
     },
     chooseTableConfirm(item) {
-      console.log(item);
       this.table = item;
     },
     chooseTableOpen() {
       this.$refs.refChooseTable.open();
     },
     chooseUserConfirm(user) {
-      console.log(user);
       if (user) {
         this.vipUser = user;
       } else {
@@ -3241,7 +2716,6 @@ export default {
       this.$refs.refChooseUser.open();
     },
     createOrderClose() {
-      console.log("createOrderClose");
       this.isCreateOrder = false;
     },
     //生成订单
@@ -3259,8 +2733,6 @@ export default {
           return;
         }
       }
-
-      console.log(this.createOrder.status);
       if (
         this.createOrder.status != "" &&
         this.createOrder.status != "success"
@@ -3290,7 +2762,7 @@ export default {
           res ? { orderId: res.id } : { orderId: this.createOrder.data.id }
         );
         res = true;
-      } catch (error) {}
+      } catch (error) { }
       if (!res) {
         this.createOrder.status = "success";
         return;
@@ -3332,7 +2804,6 @@ export default {
     //更新购物车商品数据
     updateOrder(par = {}) {
       let item = this.order.list[this.order.selIndex];
-      console.log(this.table);
       const {
         productId,
         skuId,
@@ -3413,15 +2884,13 @@ export default {
     //   });
     // },
     clicktransfertoPinpin() {
-     
-        // console.log(this.order, this.masterId, this.table.tableId, this.tableList)
-        // 订单信息，取餐码，用餐类型,桌台号id，台桌列表
-        this.$refs.refransfertoPinpin.open(
-          this.order,
-          this.masterId,
-          this.table.tableId,
-          this.tableList
-        );
+      // 订单信息，取餐码，用餐类型,桌台号id，台桌列表
+      this.$refs.refransfertoPinpin.open(
+        this.order,
+        this.masterId,
+        this.table.tableId,
+        this.tableList
+      );
     },
     //右侧控制按钮点击事件
     async orderBtnsClick(key) {
@@ -3433,7 +2902,6 @@ export default {
         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") {
@@ -3499,17 +2967,15 @@ export default {
         return;
       }
       if (key === "returnCart") {
-        console.log(this.order);
         let selGoods = undefined;
         if (this.order.selPlaceNum == -10) {
           selGoods = { ...this.order.seatFee, num: this.order.seatFee.number };
         } else {
           selGoods =
             this.order.old.list[this.order.selPlaceNum - 1].info[
-              this.order.old.selIndex
+            this.order.old.selIndex
             ];
         }
-        console.log(selGoods);
         this.refToggle("refReturnCart", true, selGoods);
       }
     },
@@ -3532,11 +2998,8 @@ export default {
         isPending: false,
       });
       this.order.orderId = id;
-      console.log(this.order.orderId);
-
       this.masterId = masterId;
       this.isPrverOrder = true;
-      console.log(masterId);
       const res = await getCart({
         masterId,
         tableId,
@@ -3573,7 +3036,6 @@ export default {
             type: "warning",
           }
         ).catch((err) => {
-          console.log(err);
         });
         if (!res) {
           return;
@@ -3602,7 +3064,6 @@ export default {
       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;
         }
@@ -3655,12 +3116,11 @@ export default {
     },
     // 点击订单里的加减改变购物车商品数量
     async changeOrderNumber(index, isReduce) {
+      console.log(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);
@@ -3687,7 +3147,6 @@ export default {
         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) {
@@ -3696,7 +3155,6 @@ export default {
       if (newval >= 100000) {
         return;
       }
-      console.log(newval);
 
       // this.order.list[this.order.selIndex].number = newval;
       this.order.number = newval;
@@ -3725,7 +3183,7 @@ export default {
             });
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     skuNumberAdd() {
       const number = Number(this.skuGoods.number);
@@ -3789,7 +3247,6 @@ export default {
         clearTimeout(this.timer);
         this.timer = null;
       }, 500);
-      console.log(this.timer);
     },
     async skuGoodsAdd() {
       let name = this.selGoods.skuList.reduce((prve, cur) => {
@@ -3798,9 +3255,6 @@ export default {
       name = name.substring(0, name.length - 1);
       // const item = this.selGoods.data.specList.find((v) => v.specSnap === name);
       const item = this.selGoods.skuMap[name];
-      console.log(this.selGoods, "调试1");
-      console.log(name, "调试2");
-      console.log(item, "调试1");
       if (!item.isGrounding) {
         //该商品已经下架
         return this.$notify({
@@ -3809,8 +3263,6 @@ export default {
         });
       }
       let res = "";
-
-      console.log(orderGoods);
       //更改购物车订单商品规格数量
       if (this.selGoods.isEdit) {
         res = await $updateCart({
@@ -3832,13 +3284,11 @@ export default {
         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;
+        return V.skuId == item.id && V.productId == this.selGoods.data.id && V.isGift == 'false';
       });
       const orderGoods =
         orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
-
       if (orderGoods) {
         //更新
         const newNum =
@@ -3865,7 +3315,6 @@ export default {
         }
       } else {
         //添加
-        console.log(this.table);
         res = await addCart({
           masterId: this.masterId,
           vipUserId: this.vipUser.id,
@@ -3907,9 +3356,7 @@ export default {
         }
         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];
@@ -3921,9 +3368,7 @@ export default {
           }
         }
       }
-      console.log(matchArr);
       const skuList = this.selGoods.skuList;
-      console.log(skuList);
       //全部规格都已下架
       if (!matchArr.length) {
         for (let k in skuList) {
@@ -3947,7 +3392,6 @@ export default {
         }
         return prve;
       }, {});
-      console.log(includeSkuMap);
       for (let i in includeSkuMap) {
         for (let k in skuList) {
           const index = skuList[k].valueArr.findIndex((val) => val === i);
@@ -3964,7 +3408,6 @@ export default {
       }, "");
       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);
@@ -4017,19 +3460,17 @@ export default {
     },
     //设置购物车数据
     setCart(res) {
-      console.log(res);
       try {
         const { seatFee } = res;
         this.order.seatFee = seatFee
           ? {
-              ...seatFee,
-              totalNumber: seatFee.num || seatFee.number,
-              num: seatFee.number,
-              name: seatFee.name || seatFee.productName,
-              totalAmount: seatFee.priceAmount || seatFee.totalAmount,
-            }
+            ...seatFee,
+            totalNumber: seatFee.num || seatFee.number,
+            num: seatFee.number,
+            name: seatFee.name || seatFee.productName,
+            totalAmount: seatFee.priceAmount || seatFee.totalAmount,
+          }
           : this.order.seatFee;
-        console.log(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.filter(v=>v.isGift!=='true') : [];
@@ -4037,7 +3478,6 @@ export default {
         const oldCart = res.records.filter((v) => v.placeNum != 0);
         this.order.old.list = oldCart ? oldCart : [];
         // this.order.gift.list = returnGiftArr(res.records);
-        console.log(this.order.old.list);
       } catch (error) {
         //当购物车数据发生错误时会导致页面报错购物车商品不展示
         this.$confirm("购物车数据结构错误，是否清空购物车商品？", "提示", {
@@ -4068,7 +3508,6 @@ export default {
     },
     //获取购物车数据
     async getCart() {
-      console.log(this.table);
       const res = await getCart({
         ...this.order.query,
         masterId: this.masterId,
@@ -4082,7 +3521,6 @@ export default {
       // }
     },
     showSelGoods(item) {
-      console.log(item);
       this.selGoods.data = item;
       this.selGoods.skuMap = {};
       const specList = item.specList;
@@ -4125,7 +3563,6 @@ export default {
       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;
@@ -4156,12 +3593,7 @@ export default {
       }
     },
     //根据右侧商品单规格多规格做不同处理
-    async goodsClick(
-      item,
-      number = 0,
-      isConfirm = false,
-      multipleSelection = ""
-    ) {
+    async goodsClick(item, number = 0, isConfirm = false, multipleSelection = "") {
       // if (!this.table) {
       //   return this.$message.error("暂不支持无桌台下单，请先选择桌台");
       // }
@@ -4178,22 +3610,17 @@ export default {
         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;
+      //单规格 
+      let orderGoodsIndex = this.order.list.findIndex((V) => { //默认选择添加不是赠送 V.isGift == 'false'
+        return V.skuId == item.specList[0].id && V.productId == item.id && V.isGift == 'false';
       });
-      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;
-      // });
+      const orderGoods = orderGoodsIndex != -1 ? this.order.list[orderGoodsIndex] : undefined;
       let res = "";
       if (orderGoods) {
         //更新
@@ -4210,7 +3637,6 @@ export default {
         this.changeOrderSel(orderGoodsIndex);
       } else {
         //增加
-        console.log(item);
         if (item.specList.length <= 0) {
           return this.$message.error("该商品缺少skuID,skuList是空数组");
         }
@@ -4258,13 +3684,13 @@ export default {
     },
     async open(params) {
       const item = {
-          name: params.table_name,
-          tableId: params.tableId,
-          useType: params.useType,
-          maxCapacity: params.maxCapacity * 1,
-          masterId: params.masterId,
-          orderId: params.orderId,
-        },
+        name: params.table_name,
+        tableId: params.tableId,
+        useType: params.useType,
+        maxCapacity: params.maxCapacity * 1,
+        masterId: params.masterId,
+        orderId: params.orderId,
+      },
         key = params.key,
         perpoleNumber = params.num || "";
       this.key = key;
@@ -4295,7 +3721,6 @@ export default {
       this.getGoods();
       this.getCategory();
       this.getTable();
-      console.log(params);
 
       if (key == "isJieZhang") {
         if (params.orderId) {
@@ -4393,7 +3818,6 @@ export default {
         }),
         placeNum: key,
       }));
-      console.log(this.order.old.list);
       return res;
     },
     close() {
@@ -4416,7 +3840,6 @@ export default {
       this.informationdialogshow = false;
     },
     haocaiConfirm() {
-      console.log(haocaiSelectedMap);
 
       this.$emit("confirm", haocaiSelectedMap);
       this.informationdialogshow = false;
@@ -5034,9 +4457,7 @@ input[type="number"]::-webkit-outer-spin-button {
   display: none !important;
 }
 
-::v-deep
-  .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled)
-  .el-radio__inner {
+::v-deep .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner {
   box-shadow: none !important;
 }
 
@@ -5229,8 +4650,7 @@ input[type="number"]::-webkit-outer-spin-button {
     margin-bottom: 10px;
   }
 
-  .order-list-all {
-  }
+  .order-list-all {}
 
   .order {
     border-radius: 6px;
@@ -5729,11 +5149,9 @@ input[type="number"]::-webkit-outer-spin-button {
 
 .weight {
   height: 15px;
-  background: linear-gradient(
-    124deg,
-    rgb(115, 201, 105) 6%,
-    rgb(39, 146, 27) 93%
-  );
+  background: linear-gradient(124deg,
+      rgb(115, 201, 105) 6%,
+      rgb(39, 146, 27) 93%);
   border-radius: 2px;
   font-size: 12px;
   text-align: center;
@@ -5937,7 +5355,7 @@ input[type="number"]::-webkit-outer-spin-button {
   border: none;
 }
 
-.pay_btns .el-button + .el-button {
+.pay_btns .el-button+.el-button {
   margin-left: 0;
 }