From 57ef84aae19a0540350e37c3b28d4959e5fb0b05 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 11:40:52 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A0=E5=8F=B0=E6=A1=8C=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?masterId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                 |   5 +-
 .env.production                  |   4 +-
 src/views/tool/Instead/index.vue | 102 +++++++++++++++++++------------
 3 files changed, 68 insertions(+), 43 deletions(-)

diff --git a/.env.development b/.env.development
index 6ab192b..98c3e63 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,10 @@ ENV = 'development'
 # VUE_APP_BASE_API  = 'http://192.168.2.42:8000'
 # VUE_APP_BASE_API  = 'http://192.168.2.133:8000'
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+#预发布
+VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 # VUE_APP_BASE_API  = 'http://192.168.2.96:8000'
diff --git a/.env.production b/.env.production
index 2a4f841..1db13cc 100644
--- a/.env.production
+++ b/.env.production
@@ -3,13 +3,13 @@ ENV = 'production'
 # 如果使用 Nginx 代理后端接口，那么此处需要改为 '/'，文件查看 Docker 部署篇，Nginx 配置
 # 接口地址，注意协议，如果你没有配置 ssl，需要将 https 改为 http
 # 测试
-VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
+# VUE_APP_BASE_API  = 'https://admintestpapi.sxczgkj.cn'
 
 # 生产
 # VUE_APP_BASE_API  = 'https://cashieradmin.sxczgkj.cn'
 
 # 预发布接口
-# VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
+VUE_APP_BASE_API  = 'https://pre-cashieradmin.sxczgkj.cn'
 
 # VUE_APP_BASE_API  = 'http://192.168.2.98:8000'
 # 如果接口是 http 形式， wss 需要改为 ws
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 0a756d6..6bc212d 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -594,7 +594,7 @@
               </div> -->
           </div>
         </div>
-        <div class="goods">
+        <div class="goods" v-infinite-scroll="loadMoreGoods">
           <template v-if="!isCreateOrder">
             <div class="flex categoty u-col-center">
               <div
@@ -637,6 +637,7 @@
             >
               未找到相关商品
             </div>
+
             <div class="goods-list" v-if="goods.list.length">
               <div
                 class="goods-item"
@@ -659,7 +660,12 @@
                   </div> -->
 
                 <div class="flex img-box" v-if="layout.sel !== 'text'">
-                  <img class="goods-img" :src="item.coverImg" alt="" />
+                  <!-- <img class="goods-img" :src="item.coverImg" alt="" /> -->
+                  <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
@@ -749,6 +755,12 @@
                 </div>
               </div>
             </div>
+            <div
+              class="no-search-result"
+              v-if="goods.list.length <= 0 && goods.query.productId === ''"
+            >
+              未找到相关商品
+            </div>
           </template>
 
           <template v-else>
@@ -1166,7 +1178,7 @@
 
     <return-cart
       ref="refReturnCart"
-      :max="order.selGoods?order.selGoods.number:1"
+      :max="order.selGoods ? order.selGoods.number : 1"
       @confirm="refReturnCartConfirm"
     ></return-cart>
   </div>
@@ -1317,7 +1329,7 @@ export default {
           productId: "",
           categoryId: "",
           page: 1,
-          size: 300,
+          size: 20,
         },
         loading: false,
         total: 0,
@@ -1581,6 +1593,11 @@ export default {
     },
   },
   watch: {
+    "goods.query.categoryId": function (newval) {
+      this.goods.query.page = 1;
+      this.goods.list = [];
+      this.getGoods();
+    },
     "useTypes.sel": function (newval, oldval) {
       console.log(newval);
       this.setPostPay();
@@ -1740,15 +1757,20 @@ export default {
     this.open(this.$route.query.tableId ? this.$route.query : "");
   },
   methods: {
+    loadMoreGoods() {
+      if (this.goods.query.page * this.goods.query.size < this.goods.total) {
+        this.goods.query.page = this.goods.query.page + 1;
+        this.getGoods();
+      }
+    },
     async shoukuanClick() {
       this.canShoukuan = await hasPermission("允许收款");
-      return  this.canShoukuan;
+      return this.canShoukuan;
     },
     // 打开页面
     async xiadanClick() {
       this.canXiadan = await hasPermission("允许下单");
-      return  this.canXiadan;
-
+      return this.canXiadan;
     },
     changeOrderExtraSel(index, canChangeNumber, placeNum) {
       // console.log(index,canChangeNumber,placeNum)
@@ -1856,7 +1878,7 @@ export default {
         return;
       }
       await this.returnCreateOrderData();
-      console.log( this.createOrder.data )
+      console.log(this.createOrder.data);
       this.order.payType = "scanCode";
       this.payTypeItemClick({ payType: "scanCode" });
       this.payBeforeClear();
@@ -2048,7 +2070,7 @@ export default {
       }
       if (item.payType == "scanCode") {
         //扫码支付
-        return this.refToggle("refWxScanCode", true,this.createOrder.data);
+        return this.refToggle("refWxScanCode", true, this.createOrder.data);
       }
     },
     ChangeDiscount(discount) {
@@ -2182,7 +2204,7 @@ export default {
         return this.refChooseUserOpen();
       }
       if (this.order.payType == "scanCode") {
-        return this.refToggle("refWxScanCode", true,this.createOrder.data);
+        return this.refToggle("refWxScanCode", true, this.createOrder.data);
       }
       if (this.order.payType == "deposit") {
         return this.refToggle("refScanCode", true);
@@ -2250,7 +2272,7 @@ export default {
         if (!canXiadan) {
           return;
         }
-      }else{
+      } else {
         //去结算
         const canJiesuan = await this.shoukuanClick();
         if (!canJiesuan) {
@@ -2273,14 +2295,15 @@ export default {
       console.log(this.order.orderId);
       let res = "";
       try {
-        const seatFee = await $choseCount({
-          masterId: this.masterId,
-          tableId: this.table.tableId,
-          num: this.perpole,
-        });
-        this.order.seatFee = seatFee;
-
-        this.order.seatFee = res;
+        if (!this.shopInfo.isTableFee) {
+          const seatFee = await $choseCount({
+            masterId: this.masterId,
+            tableId: this.table.tableId,
+            num: this.perpole,
+          });
+          this.order.seatFee = seatFee;
+          this.order.seatFee = res;
+        }
         res = await $createOrder({
           masterId: this.order.masterId || this.masterId,
           vipUserId: this.vipUser.id,
@@ -2316,23 +2339,15 @@ export default {
     },
 
     // 获取取餐号
-    getMasterId() {
-      // if(!this.table.tableId){
-      //   return this.$message.error("请选择桌台");
-      // }
-      if (this.table.tableId) {
-        return $getMasterId({
+    async getMasterId() {
+        const res=await $getMasterId({
           tableId: this.table.tableId,
           orderId: this.table.orderId,
           vipUserId: this.vipUser.id,
-          useType: this.useTypes.sel == "takeout" ? "takeout" : "",
-        });
-      } else {
-        // return $getMasterId({
-        //   useType:'takeout',
-        //   vipUserId: this.vipUser.id,
-        // });
-      }
+          useType: this.useTypes.sel == "takeout" ? "takeout" : ""
+        })
+        this.masterId=res.masterId;
+        return res
     },
     onSelGoodsSkuClose() {
       this.selGoods.isEdit = false;
@@ -3057,9 +3072,9 @@ export default {
     },
     //根据右侧商品单规格多规格做不同处理
     async goodsClick(item) {
-      if (!this.table) {
-        return this.$message.error("暂不支持无桌台下单，请先选择桌台");
-      }
+      // if (!this.table) {
+      //   return this.$message.error("暂不支持无桌台下单，请先选择桌台");
+      // }
       if (item.typeEnum === "sku") {
         this.selGoods.data = item;
         this.selGoods.skuMap = {};
@@ -3125,8 +3140,9 @@ export default {
         });
         return isShow;
       });
-      console.log($goodsMap);
-      this.goods.list = goods;
+      for (let i in goods) {
+        this.goods.list.push(goods[i]);
+      }
       this.goods.total = res.total;
       this.$goodsData = goods;
     },
@@ -3976,11 +3992,12 @@ input[type="number"]::-webkit-outer-spin-button {
     .goods-list {
       display: flex;
       flex-wrap: wrap;
-
+      min-height: 10px;
       .goods-item {
         position: relative;
         cursor: pointer;
-        min-width: 98px;
+        // min-width: 98px;
+        min-width: 100px;
         max-width: 100px;
         height: 100px;
         // flex: 1;
@@ -4448,6 +4465,11 @@ input[type="number"]::-webkit-outer-spin-button {
 ::v-deep .cashier_left .el-form-item__label {
   text-align: left;
 }
+::v-deep .goods .el-image {
+  display: flex;
+  width: 100%;
+  justify-content: center;
+}
 .cashier_left .detail_box .usercard .info .nickname .vip_level {
   font-size: 12px;
   padding: 0 5px;

From c473f30a37692bf360b956138dc8629a2f885034 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Thu, 24 Oct 2024 14:52:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E5=AE=A2?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=95=E5=95=86=E5=93=81=E6=98=AF=E5=90=A6=E8=83=BD?=
 =?UTF-8?q?=E5=A4=9F=E4=B8=8B=E5=8D=95=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 352 ++++++++++++++++++-------------
 src/views/tool/Instead/util.js   |  13 +-
 2 files changed, 211 insertions(+), 154 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 6bc212d..0ad93a2 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -594,7 +594,11 @@
               </div> -->
           </div>
         </div>
-        <div class="goods" v-infinite-scroll="loadMoreGoods">
+        <div
+          class="goods"
+          v-infinite-scroll="loadMoreGoods"
+          infinite-scroll-distance="40"
+        >
           <template v-if="!isCreateOrder">
             <div class="flex categoty u-col-center">
               <div
@@ -637,124 +641,128 @@
             >
               未找到相关商品
             </div>
-
-            <div class="goods-list" v-if="goods.list.length">
-              <div
-                class="goods-item"
-                :class="{
-                  'sell-out':
-                    item.isPauseSale ||
-                    (item.typeEnum !== 'sku' && item.stockNumber <= 0),
-                  'layout-img-and-text': layout.sel === 'img-and-text',
-                  'layout-text': layout.sel === 'text',
-                  none:
-                    (goods.query.categoryId !== '') &
-                    (goods.query.categoryId != item.categoryId),
-                }"
-                @click="goodsClick(item)"
-                v-for="(item, index) in goods.list"
-                :key="index"
-              >
-                <!-- <div class="sell-out flex flex-xy-cnter">
+            <template v-if="goods.list.length">
+              <div class="goods-list">
+                <div
+                  class="goods-item"
+                  :class="{
+                    'sell-out':
+                      item.isPauseSale ||
+                      (item.typeEnum !== 'sku' && item.stockNumber <= 0),
+                    'layout-img-and-text': layout.sel === 'img-and-text',
+                    'layout-text': layout.sel === 'text',
+                    none:
+                      (goods.query.categoryId !== '') &
+                      (goods.query.categoryId != item.categoryId),
+                  }"
+                  @click="goodsClick(item)"
+                  v-for="(item, index) in goods.list"
+                  :key="index"
+                >
+                  <!-- <div class="sell-out flex flex-xy-cnter">
                     <svg t="1724210152457" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6417" width="64" height="64"><path d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z" fill="#ffffff" p-id="6418"></path><path d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z" fill="#ffffff" p-id="6419"></path><path d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z" fill="#ffffff" p-id="6420"></path><path d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z" fill="#ffffff" p-id="6421"></path></svg>
                   </div> -->
 
-                <div class="flex img-box" v-if="layout.sel !== 'text'">
-                  <!-- <img class="goods-img" :src="item.coverImg" alt="" /> -->
-                  <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"
-                      >
-                        <path
-                          d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
-                          fill="#ffffff"
-                          p-id="4357"
-                        ></path>
-                        <path
-                          d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
-                          fill="#ffffff"
-                          p-id="4358"
-                        ></path>
-                        <path
-                          d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
-                          fill="#ffffff"
-                          p-id="4359"
-                        ></path>
-                        <path
-                          d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
-                          fill="#ffffff"
-                          p-id="4360"
-                        ></path>
-                      </svg>
-                    </div>
-                  </template>
-                </div>
-                <div class="typeEnum">
-                  <span>{{ item | returntypeName }}</span>
-                </div>
-                <div class="info">
-                  <div class="name">{{ item.name }}</div>
-                  <div>
-                    <template v-if="layout.sel === 'text'">
-                      <div class="text-sell-out flex">
+                  <div class="flex img-box" v-if="layout.sel !== 'text'">
+                    <!-- <img class="goods-img" :src="item.coverImg" alt="" /> -->
+                    <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
-                          v-if="isSellOut(item)"
-                          t="1724236049267"
+                          t="1724234807994"
                           class="icon"
                           viewBox="0 0 1024 1024"
                           version="1.1"
                           xmlns="http://www.w3.org/2000/svg"
-                          p-id="4911"
+                          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="#c8c8c8"
-                            p-id="4912"
+                            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="#c8c8c8"
-                            p-id="4913"
+                            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="#c8c8c8"
-                            p-id="4914"
+                            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="#c8c8c8"
-                            p-id="4915"
+                            fill="#ffffff"
+                            p-id="4360"
                           ></path>
                         </svg>
                       </div>
                     </template>
-                    <div class="stockNumber"></div>
-                    <div class="">￥{{ item.lowPrice }}</div>
-                    <template v-if="layout.sel === 'default'">
-                      <div class="flex" v-if="isSellOut(item)">
-                        <div class="timeSale">售罄</div>
-                      </div>
-                    </template>
+                  </div>
+                  <div class="typeEnum">
+                    <span>{{ item | returntypeName }}</span>
+                  </div>
+                  <div class="info">
+                    <div class="name">{{ item.name }}</div>
+                    <div>
+                      <template v-if="layout.sel === 'text'">
+                        <div class="text-sell-out flex">
+                          <svg
+                            v-if="isSellOut(item)"
+                            t="1724236049267"
+                            class="icon"
+                            viewBox="0 0 1024 1024"
+                            version="1.1"
+                            xmlns="http://www.w3.org/2000/svg"
+                            p-id="4911"
+                            width="64"
+                            height="64"
+                          >
+                            <path
+                              d="M498.61856 0h25.483584c136.270651 3.58203 270.187397 63.197242 362.296737 163.954625 84.894108 90.267153 133.046824 212.209685 137.038229 335.687372v22.873819c-3.684374 123.83589-51.785918 246.341312-136.884714 336.915497-91.955824 100.450352-225.258508 159.96322-361.119784 164.005797h-25.739443c-140.722603-3.684374-278.681925-67.342162-371.047124-173.72845C46.87342 758.366898 2.76328 636.936085 0 514.942382v-10.74609C3.837889 381.435011 49.534356 259.697167 132.944481 168.867123 225.05382 65.499975 360.556894 4.042577 498.61856 0M435.574834 52.195293c-183.860477 28.042177-340.702214 177.463995-378.160012 359.584628-31.828894 141.49018 7.317575 296.643246 103.264804 405.536955a465.152166 465.152166 0 0 0 689.489581 14.328119c89.857778-93.951527 136.52651-226.896007 125.678077-356.463145-9.415621-133.149168-80.339813-259.953026-188.056569-338.757683-99.580431-74.19919-229.761631-105.004647-352.215881-84.280046z"
+                              fill="#c8c8c8"
+                              p-id="4912"
+                            ></path>
+                            <path
+                              d="M423.088901 64.732397c118.974564-23.794913 247.006546 1.995702 346.535805 71.43591 104.390585 71.231223 176.798761 187.647194 193.224927 313.069412a455.941232 455.941232 0 0 1-79.623407 326.169407c-71.384738 101.422618-185.958523 171.52806-309.078008 187.596022a454.661936 454.661936 0 0 1-325.964719-79.98161c-101.115586-71.43591-170.913997-185.805007-187.033132-308.61746a455.787717 455.787717 0 0 1 361.938534-509.671681m20.67343 12.12773c-162.112438 23.590225-304.063165 146.402679-351.448304 303.142072-41.449203 130.1812-17.705462 279.142472 63.197242 389.41782 75.376143 105.516366 199.365549 174.496027 329.035031 181.4554 126.394483 8.801559 255.194043-41.091 342.902603-132.535106a439.719754 439.719754 0 0 0 123.733547-324.736595c-4.247264-130.744091-71.384738-257.240917-176.440558-334.766279-93.337464-70.514817-215.535855-100.39918-330.979561-81.977312z"
+                              fill="#c8c8c8"
+                              p-id="4913"
+                            ></path>
+                            <path
+                              d="M630.488431 283.594423c31.214832-15.351557 62.583179-30.498426 93.183949-47.078107 9.876168 14.788666 18.575384 37.048423 39.504673 21.850382l9.978511 19.649993c-17.961321 7.16406-35.462096 21.287492-55.777322 18.166009a306.110039 306.110039 0 0 1-18.933587-20.008196l-20.212882 10.49023c7.266403 28.809755-15.70976 47.845685-37.867174 60.587477a33.875768 33.875768 0 0 1 1.535156-34.541002c-3.889061-9.722653-7.675778-19.445305-11.411324-29.116786z m-66.421068 37.611314l56.442557-27.888661 10.439058 20.98046c-20.980461 11.155464-46.05467 18.063665-60.382789 38.430064 20.67343 1.023437 38.174204-10.592574 56.084353-19.189446l11.667183 18.575384c-44.519514 21.338664-87.657388 45.747639-133.149168 64.732397l-10.132027-18.268353c14.07226-12.792964 55.777322-12.639448 45.338264-39.095297-20.980461 10.234371-42.012093 20.622258-63.14607 30.754285l-9.722652-20.980461c19.957024-9.876168 39.914047-19.85468 59.922242-29.679676a969.757833 969.757833 0 0 0-5.935935-14.32812c11.667183-5.628904 23.283194-11.411324 34.950377-17.040227l7.624607 12.997651z m85.252311 30.191395c42.216781-20.826945 84.12653-42.012093 126.496827-62.58318 12.844136 25.688271 2.967968 53.474589-7.16406 78.088252 19.138274-1.791015 45.23592-19.85468 55.41912 5.628904-23.9996 9.978512-49.483184 14.942182-74.250363 22.413273-21.492179 15.249213-40.937484 33.261706-63.862475 46.668732-16.221478-23.897257 16.426166-33.875768 29.52616-48.050373-15.812103-5.577732-31.573035-11.30898-47.282794-17.244915 12.946479-6.549998 25.841787-13.099995 38.89061-19.547649 10.592574 3.121483 21.185148 6.294138 31.828894 9.159763 2.712108-12.792964 5.475389-25.483584 8.392184-38.225377-29.577332 14.225776-58.898806 29.065614-88.373794 43.444906-2.405077-4.96367-7.16406-14.839838-9.620309-19.752336z m-139.033931 76.757783c44.007796-22.003898 88.169107-43.751936 132.228074-65.755834 7.675778 22.669132 35.820299 49.841387 17.500775 72.664034-27.376943 18.217181-58.540603 29.679676-87.248014 45.594124a123.631203 123.631203 0 0 1-27.376942 50.557793 249.360452 249.360452 0 0 0-35.103893-103.060117m92.211683-20.315227c4.093748 9.057418 8.238669 18.063665 12.281246 27.121084l20.724601-12.12773-9.876168-24.869522-23.129679 9.876168m-51.837089 26.404678l10.746089 24.408975 24.460147-8.443356c-4.503123-8.852731-8.903903-17.858978-13.304682-26.814053l-21.901554 10.848434z"
+                              fill="#c8c8c8"
+                              p-id="4914"
+                            ></path>
+                            <path
+                              d="M638.010694 474.107241c53.883964-26.76288 107.767928-53.525761 161.703063-80.186298l11.56484 23.43671c-30.856629 15.351557-61.662086 30.703113-92.518715 45.901155l9.057418 18.677727c40.476938-19.957024 80.80036-40.323422 121.379642-60.075758 2.76328 5.833592 8.494528 17.603118 11.411323 23.436709-40.221078 20.008195-80.442157 40.016391-120.765578 59.871071l10.336714 24.511319c18.319524-11.30898 57.824197-14.174604 49.6367-43.29139 13.407026-6.805857 26.916396-13.458198 40.476938-20.008195 5.577732 15.249213 16.784369 36.997252-2.149218 48.050372-69.082005 39.402329-142.411274 71.333567-213.130778 107.870271l-19.547649-39.402328c12.895308-6.652341 25.841787-13.202339 38.737095-19.803508 2.916796 3.633202 8.648044 11.001949 11.411323 14.686322 17.0914-8.443356 34.131628-16.886712 51.2742-25.227725l-10.694918-24.408975c-41.551547 18.063665-81.414422 39.760532-122.300735 59.410525a2827.0915 2827.0915 0 0 1-11.616011-23.334366c40.27225-20.366398 81.056219-39.862875 121.174954-60.689821l-9.313278-17.910149c-40.52811 14.839838-72.305832 43.700765-106.028084 69.286692-1.791015-4.503123-5.475389-13.458198-7.266404-18.063665 13.969917-15.146869 27.376943-31.16366 30.191395-52.502324 10.74609-5.935935 21.594523-11.769527 32.442956-17.705462l14.532807 7.471091z m-311.124881-22.720304l87.452701-43.496077 12.895307 25.995303c-29.372645 14.635151-58.796462 29.065614-88.169107 43.905452l9.722653 16.784368a12302.737494 12302.737494 0 0 1 77.115986-38.430063l12.997651 25.841787c-26.302334 12.946479-52.604667 25.944131-78.446454 39.760531 2.405077 4.093748 7.266403 12.12773 9.722653 16.119135 25.6371-12.946479 51.478887-25.688271 77.269501-38.430064 4.196092 8.699215 8.443356 17.398431 12.741792 25.995303a20601.789016 20601.789016 0 0 0-77.78122 38.634751l8.852731 17.296087c30.34491-15.351557 60.740992-30.34491 91.188246-45.389436l13.458198 27.172256c-83.103093 41.398031-166.30853 82.386687-249.360451 123.887062-15.198041-29.884364-29.986707-59.973415-44.826546-90.113638l-25.125381 24.25546-12.792964-26.507021c18.370696-29.423817 24.255459-64.169507 19.803508-98.403479 14.532807-7.266403 29.167958-14.430463 43.803109-21.696866l4.503123 23.948428 46.412873-23.027335-8.903903-18.728899c15.965619-7.982809 31.931238-15.863275 47.948029-23.794913 2.302733 4.605467 7.061716 13.765229 9.517965 18.421868m-99.478087 84.228874l8.801559 14.839838c21.696867-11.001949 43.496077-21.696867 65.141772-32.749987l-8.852731-12.281245c-23.794913 1.023437-44.365999 19.138274-65.0906 30.191394m19.189446 42.370297l13.407026 13.355854c21.338664-8.085153 41.295687-19.547649 61.662086-29.884364-2.353905-4.093748-6.9082-12.485933-9.210934-16.682025-22.003898 10.950777-44.110139 21.79921-65.858178 33.210535m23.334366 41.909749l8.648043 17.142572c21.185148-10.49023 42.370296-20.929289 63.657788-31.317176l-7.675778-17.910149c-21.492179 10.643746-43.137874 21.338664-64.630053 32.084753z m-16.221479 82.079656c78.548798-39.248813 157.302284-78.03708 235.902254-117.285892 11.87187 29.014442 48.306232 70.924192 13.765229 97.226525-67.035131 38.788266-138.624556 69.696067-207.501874 105.311679l-42.165609-85.252312m59.973415 3.479687c4.912498 11.564839 10.132027 23.027335 15.351557 34.48983 47.078107-25.074209 97.482385-44.212483 141.950727-73.994503-5.117186-10.183199-9.92734-20.468742-14.583979-30.805457-47.640997 23.43671-94.770276 47.692169-142.769477 70.31013z"
+                              fill="#c8c8c8"
+                              p-id="4915"
+                            ></path>
+                          </svg>
+                        </div>
+                      </template>
+                      <div class="stockNumber"></div>
+                      <div class="">￥{{ item.lowPrice }}</div>
+                      <template v-if="layout.sel === 'default'">
+                        <div class="flex" v-if="isSellOut(item)">
+                          <div class="timeSale">售罄</div>
+                        </div>
+                      </template>
+                    </div>
                   </div>
                 </div>
               </div>
-            </div>
+              <div class="u-m-t-20 color-999 text-center">{{ 
+              goods.status=='end'?'没有更多了':'加载中'
+              }}</div>
+            </template>
             <div
               class="no-search-result"
               v-if="goods.list.length <= 0 && goods.query.productId === ''"
@@ -957,54 +965,80 @@
       </div>
 
       <div slot="footer">
-        <div class="flex row-between">
-          <div>
-            <div class="price">￥{{ skuGoods.data.salePrice | to2 }}</div>
-            <div class="sku-group-text">
-              <span> {{ skuText }}</span>
-              <span>库存：{{ skuGoods.data.stockNumber || 0 }}</span>
+        <template v-if="skuGoods.data">
+          <div class="flex row-between">
+            <div>
+              <div class="price">￥ {{ skuGoods.data.salePrice | to2 }}</div>
+              <div class="sku-group-text">
+                <span> {{ skuText }}</span>
+                <span>库存：{{ skuGoods.data.stockNumber || 0 }}</span>
+              </div>
+            </div>
+            <div class="flex">
+              <i class="icon-remove" @click="skuNumberReduce"></i>
+              <div style="width: 40px" class="number-box">
+                <el-input
+                  :min="skuGoods.data.suit"
+                  type="number"
+                  v-model="skuGoods.number"
+                  placeholder="0"
+                ></el-input>
+              </div>
+              <!-- <i class="el-icon-remove"></i> -->
+              <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
             </div>
           </div>
-          <div class="flex">
-            <i class="icon-remove" @click="skuNumberReduce"></i>
-            <div style="width: 40px" class="number-box">
-              <el-input
-                :min="skuGoods.data.suit"
-                type="number"
-                v-model="skuGoods.number"
-                placeholder="0"
-              ></el-input>
-            </div>
-            <!-- <i class="el-icon-remove"></i> -->
-            <i class="el-icon-circle-plus icon-add" @click="skuNumberAdd"></i>
-          </div>
-        </div>
-        <div class="flex" style="margin-top: 14px">
-          <button
-            class="my-btn disabled flex-1"
-            v-if="!skuGoods.data.isGrounding"
-            disabled
-          >
-            已下架/库存不足
-          </button>
-          <template v-else>
+          <div class="flex" style="margin-top: 14px">
             <button
               class="my-btn disabled flex-1"
-              v-if="skuGoods.data.stockNumber <= 0"
+              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>
-            <button
-              class="my-btn primary flex-1"
-              v-else
-              :disabled="CanConfirm"
-              @click="chooseSkuConfirm"
-            >
-              确定
-            </button>
-          </template>
-        </div>
+            <template v-else>
+              <button class="my-btn primary flex-1" @click="chooseSkuConfirm">
+                确定
+              </button>
+            </template>
+          </div>
+        </template>
+        <template v-else>
+          <div class="flex row-between">
+            <div>
+              <div class="price">￥</div>
+              <div class="sku-group-text">
+                <span> </span>
+                <span>库存：</span>
+              </div>
+            </div>
+            <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>
+              </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" disabled>已下架/售罄</button>
+          </div>
+        </template>
       </div>
     </el-dialog>
 
@@ -1305,10 +1339,7 @@ export default {
       },
       skuGoods: {
         number: 1,
-        data: {
-          stockNumber: 0,
-          salePrice: 0,
-        },
+        data: undefined,
       },
       selGoods: {
         isEdit: false,
@@ -1324,12 +1355,13 @@ export default {
       informationdialogshow: false,
       informationdialogshowedit: false,
       goods: {
+        status:'loadmore',//loadmore end
         list: [],
         query: {
           productId: "",
           categoryId: "",
           page: 1,
-          size: 20,
+          size: 66,
         },
         loading: false,
         total: 0,
@@ -1566,13 +1598,22 @@ export default {
       this.selGoods.show = false;
     },
     CanConfirm() {
-      if (!this.selGoods.skuList.length) {
-        return true;
-      }
-      return (
-        this.selGoods.skuList.filter((v) => v.sel !== "").length !==
-        this.selGoods.skuList.length
-      );
+      // if (!this.skuGoods.data) {
+      //   return;
+      // }
+      // if (!this.selGoods.skuList.length) {
+      //   return true;
+      // }
+      // const canBuyArr = this.selGoods.skuList.filter((v) =>
+      //   isCanBuy(v, this.selGoods.isStock)
+      // );
+      // if (canBuyArr.length <= 0) {
+      //   return true;
+      // }
+      // return (
+      //   this.selGoods.skuList.filter((v) => v.sel !== "").length !==
+      //   this.selGoods.skuList.length
+      // );
     },
   },
   filters: {
@@ -1596,6 +1637,7 @@ export default {
     "goods.query.categoryId": function (newval) {
       this.goods.query.page = 1;
       this.goods.list = [];
+      this.goods.status='loadmore'
       this.getGoods();
     },
     "useTypes.sel": function (newval, oldval) {
@@ -2340,14 +2382,14 @@ export default {
 
     // 获取取餐号
     async getMasterId() {
-        const res=await $getMasterId({
-          tableId: this.table.tableId,
-          orderId: this.table.orderId,
-          vipUserId: this.vipUser.id,
-          useType: this.useTypes.sel == "takeout" ? "takeout" : ""
-        })
-        this.masterId=res.masterId;
-        return res
+      const res = await $getMasterId({
+        tableId: this.table.tableId,
+        orderId: this.table.orderId,
+        vipUserId: this.vipUser.id,
+        useType: this.useTypes.sel == "takeout" ? "takeout" : "",
+      });
+      this.masterId = res.masterId;
+      return res;
     },
     onSelGoodsSkuClose() {
       this.selGoods.isEdit = false;
@@ -2900,7 +2942,7 @@ export default {
               .filter((v) => v.specSnap.match(i))
               .every((v) => {
                 // return isCanBuy(v,this.selGoods.data.isStock)
-                return !isCanBuy(v, true);
+                return !isCanBuy(v, this.selGoods.data);
               });
           }
         }
@@ -3023,7 +3065,7 @@ export default {
         return prve;
       }, {});
       const canBudyGoods = this.selGoods.data.specList
-        .filter((v) => isCanBuy(v, true))
+        .filter((v) => isCanBuy(v, this.selGoods.data))
         .sort((a, b) => {
           const aNumber = a.specSnap.split(",").reduce((prve, cur) => {
             return prve + skuMapNumber[cur];
@@ -3037,6 +3079,7 @@ export default {
     },
     //设置商品默认选中,规格禁止以及选中
     setSkugoodsDefaultInit() {
+      this.skuGoods.data = undefined;
       const skuList = this.selGoods.skuList;
       const goodsListMap = this.selGoods.skuMap;
       const skuGoods = this.findGoods(skuList, goodsListMap);
@@ -3125,6 +3168,10 @@ export default {
       }
     },
     async getGoods() {
+      if(this.goods.status=='end'){
+        return
+      }
+      this.goods.status='loadmore'
       const res = await getGoodsLists(this.goods.query);
       let $goodsMap = {};
       const goods = res.records.filter((v) => {
@@ -3143,6 +3190,7 @@ export default {
       for (let i in goods) {
         this.goods.list.push(goods[i]);
       }
+      this.goods.status= this.goods.list.length>=res.total ? 'end' : 'loadmore'
       this.goods.total = res.total;
       this.$goodsData = goods;
     },
diff --git a/src/views/tool/Instead/util.js b/src/views/tool/Instead/util.js
index 3b7bd4d..6967221 100644
--- a/src/views/tool/Instead/util.js
+++ b/src/views/tool/Instead/util.js
@@ -1,6 +1,13 @@
 //判断商品是否可以下单
-export function isCanBuy(goods,isStock) {
-    return goods.isGrounding && goods.isPauseSale == 0 && (isStock?goods.stockNumber > 0:true) ;
+export function isCanBuy(skuGoods,goods) {
+    if(goods.typeEnum=='normal'){
+        //单规格
+        return goods.isGrounding&&goods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+    }else{
+        //多规格
+        return  goods.isGrounding&&goods.isPauseSale==0&&skuGoods.isGrounding&&skuGoods.isPauseSale==0&&(goods.isStock?goods.stockNumber>0:true);
+
+    }
 }
 
 // 一个数组是否包含另外一个数组全部元素
@@ -15,6 +22,8 @@ export function arrayContainsAll(arr1, arr2) {
 
 //n项 n-1项组合，生成全部结果
 export function generateCombinations(arr, k) {
+    console.log(arr)
+    console.log(k)
     let result = [];
 
     function helper(index, current) {

From 709036c05022f96b7d412d9c6bbc63e8555df2bb Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 25 Oct 2024 14:50:52 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=97=A0=E5=8F=B0?=
 =?UTF-8?q?=E6=A1=8C=E4=B8=8B=E5=8D=95=E5=88=87=E6=8D=A2=E5=8F=B0=E6=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/table.js                              | 11 +++
 .../tool/Instead/components/scan-pay.vue      | 35 ++++----
 src/views/tool/Instead/index.vue              | 84 ++++++++++++++-----
 3 files changed, 97 insertions(+), 33 deletions(-)

diff --git a/src/api/table.js b/src/api/table.js
index 57bf688..1a691c3 100644
--- a/src/api/table.js
+++ b/src/api/table.js
@@ -450,3 +450,14 @@ export function $returnOrder(data) {
     }
   });
 }
+//获取台桌详情状态
+export function $returnTableDetail(data) {
+  return request({
+    url: '/api/tbShopTable/state',
+    method: "get",
+    params:{
+      shopId: localStorage.getItem("shopId"),
+      ...data
+    }
+  });
+}
diff --git a/src/views/tool/Instead/components/scan-pay.vue b/src/views/tool/Instead/components/scan-pay.vue
index fd68e0e..a4c7099 100644
--- a/src/views/tool/Instead/components/scan-pay.vue
+++ b/src/views/tool/Instead/components/scan-pay.vue
@@ -118,6 +118,7 @@ export default {
       number: "0",
       show: false,
       timer: null,
+      payPar:{}
     };
   },
   watch: {
@@ -136,18 +137,10 @@ export default {
           this.$refs.refInputCode.focus();
         });
       } else {
+        this.getPayUrl()
         this.tips = "请用户使用微信/支付宝扫描付款码";
         this.startGetOrderInfo();
-        this.$nextTick(() => {
-          QRCode.toCanvas(
-            this.$refs.canvas,
-            this.paymentQrcode,{width: 160,
-              height: 160,},
-            function (error) {
-              console.log(error);
-            }
-          );
-        });
+        
       }
     },
     number(newval) {
@@ -193,14 +186,28 @@ export default {
       this.close();
       this.$emit("confirm", this.form.code);
     },
+    getPayUrl(){
+      $getOrderPayUrl(this.payPar).then((res) => {
+          console.log(res);
+          this.paymentQrcode = res;
+          this.$nextTick(() => {
+          QRCode.toCanvas(
+            this.$refs.canvas,
+            this.paymentQrcode,{width: 160,
+              height: 160,},
+            function (error) {
+              console.log(error);
+            }
+          );
+        });
+        });
+    },
     open(data) {
       this.show = true;
       this.form.money = Number(this.price).toFixed(2);
+      this.payPar=data
       if (this.openSwitch) {
-        $getOrderPayUrl({ orderId: this.order.id||data.id,payAmount:this.form.money||data.settlementAmount }).then((res) => {
-          console.log(res);
-          this.paymentQrcode = res;
-        });
+        // this.getPayUrl();
       }
       this.$nextTick(() => {
         this.$refs.refInputCode.focus();
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 0ad93a2..38864c5 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -54,7 +54,7 @@
                 @click="changeTable(item, index)"
               >
                 <span> {{ item.name }}</span>
-                <span :style="{ color: status[item.status].type }">
+                <span :style="{ color: returnTableColor(item.status) }">
                   {{
                     status[item.status] ? status[item.status].label : ""
                   }}</span
@@ -759,9 +759,9 @@
                   </div>
                 </div>
               </div>
-              <div class="u-m-t-20 color-999 text-center">{{ 
-              goods.status=='end'?'没有更多了':'加载中'
-              }}</div>
+              <div class="u-m-t-20 color-999 text-center">
+                {{ goods.status == "end" ? "没有更多了" : "加载中" }}
+              </div>
             </template>
             <div
               class="no-search-result"
@@ -1255,6 +1255,7 @@ import {
   $printOrder,
   tbShopTableGet,
   $changeUseType,
+  $returnTableDetail,
 } from "@/api/table";
 import { tbShopCategoryGet } from "@/api/shop";
 import {
@@ -1307,6 +1308,11 @@ export default {
       },
       //台桌列表
       tableList: [],
+      //台桌参数
+      tableQuery: {
+        page: 1,
+        size: 20,
+      },
       tableShow: false,
       status: $status,
       //就餐人数
@@ -1355,7 +1361,7 @@ export default {
       informationdialogshow: false,
       informationdialogshowedit: false,
       goods: {
-        status:'loadmore',//loadmore end
+        status: "loadmore", //loadmore end
         list: [],
         query: {
           productId: "",
@@ -1637,7 +1643,7 @@ export default {
     "goods.query.categoryId": function (newval) {
       this.goods.query.page = 1;
       this.goods.list = [];
-      this.goods.status='loadmore'
+      this.goods.status = "loadmore";
       this.getGoods();
     },
     "useTypes.sel": function (newval, oldval) {
@@ -1799,6 +1805,10 @@ export default {
     this.open(this.$route.query.tableId ? this.$route.query : "");
   },
   methods: {
+    returnTableColor(key) {
+      const item = $status[key];
+      return item ? item.type : "";
+    },
     loadMoreGoods() {
       if (this.goods.query.page * this.goods.query.size < this.goods.total) {
         this.goods.query.page = this.goods.query.page + 1;
@@ -1919,10 +1929,10 @@ export default {
       if (!canJiesuan) {
         return;
       }
-      await this.returnCreateOrderData();
+      const order= await this.returnCreateOrderData();
       console.log(this.createOrder.data);
       this.order.payType = "scanCode";
-      this.payTypeItemClick({ payType: "scanCode" });
+      this.payTypeItemClick({ payType: "scanCode",order });
       this.payBeforeClear();
     },
     async changeOrderUseType(useType) {
@@ -2075,6 +2085,7 @@ export default {
     async getTable() {
       try {
         const { content, total } = await tbShopTableGet({
+          ...this.tableQuery,
           shopId: localStorage.getItem("shopId"),
         });
         this.tableList = content.filter(
@@ -2084,7 +2095,40 @@ export default {
         console.log(error);
       }
     },
-    changeTable(item) {
+    async changeTable(item) {
+      if(this.table||this.order.list.length<=0){
+        this.table = item;
+        this.tableShow = false;
+        return 
+      }
+      if(item.status!='idle'){
+        return this.$message.error("该台桌已在使用中");
+      }
+      const res = await $returnTableDetail({
+        tableId: item.tableId,
+      });
+      let res1 = null;
+      if (res.cartCount > 0) {
+        try {
+          res1 = await this.$confirm(
+            "该台桌购物车里有商品，是否清除该台桌里的商品?",
+            "提示",
+            {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning",
+            }
+          );
+        } catch (e) {
+          console.log(e);
+        }
+        await $choseTable({
+          masterId: this.masterId,
+          tableId: item.tableId,
+          isClear: res1 == "confirm" ? true : false,
+        });
+      }
+
       this.table = item;
       this.tableShow = false;
     },
@@ -2100,9 +2144,10 @@ export default {
       }
       this.pays();
     },
-    payTypeItemClick(item) {
-      console.log(item);
-      console.log(this.vipUser.id);
+    payTypeItemClick(item,order) {
+      order=order?order:this.createOrder.data;
+      console.log('--------order------')
+      console.log(order)
       if (item.payType == "vipPay") {
         return this.refChooseUserOpen();
       }
@@ -2112,7 +2157,7 @@ export default {
       }
       if (item.payType == "scanCode") {
         //扫码支付
-        return this.refToggle("refWxScanCode", true, this.createOrder.data);
+        return this.refToggle("refWxScanCode", true, {orderId:order.id,payAmount: (this.createOrder.data.amount * order.discount).toFixed(2)});
       }
     },
     ChangeDiscount(discount) {
@@ -2246,7 +2291,7 @@ export default {
         return this.refChooseUserOpen();
       }
       if (this.order.payType == "scanCode") {
-        return this.refToggle("refWxScanCode", true, this.createOrder.data);
+        return this.refToggle("refWxScanCode", true, {orderId:this.createOrder.data.id,payAmount: (this.createOrder.data.amount * this.createOrder.discount).toFixed(2)});
       }
       if (this.order.payType == "deposit") {
         return this.refToggle("refScanCode", true);
@@ -3168,10 +3213,10 @@ export default {
       }
     },
     async getGoods() {
-      if(this.goods.status=='end'){
-        return
+      if (this.goods.status == "end") {
+        return;
       }
-      this.goods.status='loadmore'
+      this.goods.status = "loadmore";
       const res = await getGoodsLists(this.goods.query);
       let $goodsMap = {};
       const goods = res.records.filter((v) => {
@@ -3190,7 +3235,8 @@ export default {
       for (let i in goods) {
         this.goods.list.push(goods[i]);
       }
-      this.goods.status= this.goods.list.length>=res.total ? 'end' : 'loadmore'
+      this.goods.status =
+        this.goods.list.length >= res.total ? "end" : "loadmore";
       this.goods.total = res.total;
       this.$goodsData = goods;
     },
@@ -3246,7 +3292,7 @@ export default {
     },
     close() {
       if (this.table.tableId) {
-        this.$router.replace({ path: "/table/table_list" });
+        this.$router.replace({ path: "/tool/table_list" });
       } else {
         this.$router.go(0);
         // this.reset();

From ca827999b8de0c510ae3bdd9de500c2e3ac469f8 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Fri, 25 Oct 2024 15:25:16 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9C=AA=E8=B0=83=E7=94=A8=E9=80=89=E5=8F=96=E6=A1=8C=E5=8F=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tool/Instead/index.vue | 40 ++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 38864c5..b60aa75 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -1929,10 +1929,10 @@ export default {
       if (!canJiesuan) {
         return;
       }
-      const order= await this.returnCreateOrderData();
+      const order = await this.returnCreateOrderData();
       console.log(this.createOrder.data);
       this.order.payType = "scanCode";
-      this.payTypeItemClick({ payType: "scanCode",order });
+      this.payTypeItemClick({ payType: "scanCode", order });
       this.payBeforeClear();
     },
     async changeOrderUseType(useType) {
@@ -2096,12 +2096,13 @@ export default {
       }
     },
     async changeTable(item) {
-      if(this.table||this.order.list.length<=0){
+      console.log(this.table);
+      if (this.table || this.order.list.length <= 0) {
         this.table = item;
         this.tableShow = false;
-        return 
+        return;
       }
-      if(item.status!='idle'){
+      if (item.status != "idle") {
         return this.$message.error("该台桌已在使用中");
       }
       const res = await $returnTableDetail({
@@ -2122,13 +2123,12 @@ export default {
         } catch (e) {
           console.log(e);
         }
-        await $choseTable({
-          masterId: this.masterId,
-          tableId: item.tableId,
-          isClear: res1 == "confirm" ? true : false,
-        });
       }
-
+      await $choseTable({
+        masterId: this.masterId,
+        tableId: item.tableId,
+        isClear: res1 == "confirm" ? true : false,
+      });
       this.table = item;
       this.tableShow = false;
     },
@@ -2144,10 +2144,8 @@ export default {
       }
       this.pays();
     },
-    payTypeItemClick(item,order) {
-      order=order?order:this.createOrder.data;
-      console.log('--------order------')
-      console.log(order)
+    payTypeItemClick(item, order) {
+      order = order ? order : this.createOrder.data;
       if (item.payType == "vipPay") {
         return this.refChooseUserOpen();
       }
@@ -2157,7 +2155,10 @@ export default {
       }
       if (item.payType == "scanCode") {
         //扫码支付
-        return this.refToggle("refWxScanCode", true, {orderId:order.id,payAmount: (this.createOrder.data.amount * order.discount).toFixed(2)});
+        return this.refToggle("refWxScanCode", true, {
+          orderId: order.id,
+          payAmount: (this.createOrder.data.amount * order.discount).toFixed(2),
+        });
       }
     },
     ChangeDiscount(discount) {
@@ -2291,7 +2292,12 @@ export default {
         return this.refChooseUserOpen();
       }
       if (this.order.payType == "scanCode") {
-        return this.refToggle("refWxScanCode", true, {orderId:this.createOrder.data.id,payAmount: (this.createOrder.data.amount * this.createOrder.discount).toFixed(2)});
+        return this.refToggle("refWxScanCode", true, {
+          orderId: this.createOrder.data.id,
+          payAmount: (
+            this.createOrder.data.amount * this.createOrder.discount
+          ).toFixed(2),
+        });
       }
       if (this.order.payType == "deposit") {
         return this.refToggle("refScanCode", true);