From 600627863001dbe67dd94ae5cd42cd203d47a6c2 Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Tue, 25 Mar 2025 21:21:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=A3=E5=AE=A2=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tool/Instead/components/carts/list.vue    |  8 ++--
 src/views/tool/Instead/index.vue              | 39 ++++++++++++-------
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/src/views/tool/Instead/components/carts/list.vue b/src/views/tool/Instead/components/carts/list.vue
index ccc33e7..8fdbc74 100644
--- a/src/views/tool/Instead/components/carts/list.vue
+++ b/src/views/tool/Instead/components/carts/list.vue
@@ -75,7 +75,7 @@
             <div class="u-flex color-000 u-font-14 u-row-between">
               <span class="font-bold">会员优惠</span>
               <span class="u-m-l-30">
-                {{ customTruncateToTwoDecimals(carts.giftMoney(carts.vipDiscount)) }}
+                {{ customTruncateToTwoDecimals(carts.vipDiscount) }}
               </span>
             </div>
             <div class="u-flex color-000 u-font-14 u-row-between">
@@ -102,7 +102,7 @@
         <el-button
           type="primary"
           size="large"
-          :disabled="!carts.isLinkFinshed || carts.isEmpty"
+          :disabled="!carts.isLinkFinshed"
           @click="createOrder('wx-aiplay')"
         >
           微信/支付宝
@@ -110,7 +110,7 @@
         <el-button
           type="primary"
           size="large"
-          :disabled="!carts.isLinkFinshed || carts.isEmpty"
+          :disabled="!carts.isLinkFinshed"
           @click="createOrder('cash')"
         >
           现金
@@ -118,7 +118,7 @@
         <el-button
           type="primary"
           size="large"
-          :disabled="!carts.isLinkFinshed || showOrder || carts.isEmpty"
+          :disabled="!carts.isLinkFinshed || showOrder"
           @click="createOrder('more-pay')"
         >
           更多支付
diff --git a/src/views/tool/Instead/index.vue b/src/views/tool/Instead/index.vue
index 8364ef6..49c3582 100644
--- a/src/views/tool/Instead/index.vue
+++ b/src/views/tool/Instead/index.vue
@@ -367,23 +367,34 @@ let loadingTimer = null;
 let loading = undefined;
 
 async function createOrder(key) {
-  if (key == "wx-aiplay" && oldOrder.value.id) {
-    refOrder.value.nowPayClick("scanCode");
+  // if (key == "wx-aiplay" && oldOrder.value.id && carts.isEmpty) {
+  //   nextTick(() => {
+  //     refOrder.value.nowPayClick("scanCode");
+  //   });
+  //   return;
+  // }
+  // if (key == "cash" && oldOrder.value.id && carts.isEmpty) {
+  //   nextTick(() => {
+  //     refOrder.value.nowPayClick("cash");
+  //   });
+  //   return;
+  // }
+  // if (key == "to-pay" && carts.isEmpty && oldOrder.value.id) {
+  //   showOrder.value = true;
+  //   nextTick(() => {
+  //     refOrder.value.nowPayClick();
+  //   });
+  //   return;
+  // }
+  const payArr = ["wx-aiplay", "cash", "to-pay"];
+  if (payArr.includes(key) && carts.isEmpty && oldOrder.value.id) {
+    showOrder.value = true;
+    nextTick(() => {
+      refOrder.value.nowPayClick(key || "");
+    });
     return;
   }
-  if (key == "cash" && oldOrder.value.id) {
-    refOrder.value.nowPayClick("cash");
-    return;
-  }
-
   try {
-    if (key == "to-pay" && carts.list.length <= 0 && oldOrder.value.id) {
-      showOrder.value = true;
-      nextTick(() => {
-        refOrder.value.nowPayClick();
-      });
-      return;
-    }
     clearTimeout(loadingTimer);
     loading = ElLoading.service({
       lock: true,