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] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BF=AE=E5=A4=8D=E6=9C=AA?=
 =?UTF-8?q?=E8=B0=83=E7=94=A8=E9=80=89=E5=8F=96=E6=A1=8C=E5=8F=B0=E6=8E=A5?=
 =?UTF-8?q?=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);