From 9fca5fad964cfffc0e3b77bee28df78bbbeb9006 Mon Sep 17 00:00:00 2001
From: wangsongsole <wangsongsole@126.com>
Date: Thu, 29 Jun 2023 13:59:59 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=8A=20fix:=20=E3=80=90=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E3=80=91=E4=BD=9C=E5=BA=9Fkey=EF=BC=8C=E5=85=91?=
 =?UTF-8?q?=E6=8D=A2=E7=A0=81=E6=97=B6=EF=BC=8C=E6=9C=89=E5=BE=85=E9=A2=86?=
 =?UTF-8?q?=E5=8F=96/=E5=BE=85=E5=8F=91=E6=94=BE=E8=AE=A2=E5=8D=95?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8F=90=E7=A4=BA=E5=A2=9E=E5=8A=A0=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E5=BE=85=E5=8F=91=E6=94=BE=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/tools/apiTools.js | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/tools/apiTools.js b/src/tools/apiTools.js
index 3695b420..5ede10d4 100644
--- a/src/tools/apiTools.js
+++ b/src/tools/apiTools.js
@@ -1,9 +1,9 @@
 import {
   searchPendingOrderByObject,
   searchPendingOrderByHash,
-  searchPendingOrderByKeys,
-} from "@/assets/api.js";
-import { Sweetalert } from "zent";
+  searchPendingOrderByKeys
+} from "@/assets/api.js"
+import { Sweetalert } from "zent"
 // === 公用接口函数 ===
 
 /**
@@ -17,13 +17,13 @@ import { Sweetalert } from "zent";
  */
 const commonSearchOrder = (data, apiType = 3) => {
   return new Promise(async (res, rej) => {
-    let searchRes = null;
+    let searchRes = null
     if (apiType === 1) {
-      searchRes = await searchPendingOrderByHash(data);
+      searchRes = await searchPendingOrderByHash(data)
     } else if (apiType === 2) {
-      searchRes = await searchPendingOrderByKeys(data);
+      searchRes = await searchPendingOrderByKeys(data)
     } else {
-      searchRes = await searchPendingOrderByObject(data);
+      searchRes = await searchPendingOrderByObject(data)
     }
     if (searchRes.code === 200) {
       if (searchRes.data.have === true) {
@@ -32,24 +32,26 @@ const commonSearchOrder = (data, apiType = 3) => {
           closeBtn: true,
           title: "确认操作",
           content: (
-            <p>该key批次(key、兑换码)，下面有待领取订单，是否继续作废 ？</p>
+            <p>
+              该key批次(key、兑换码)，下面有{searchRes.data.order.status_text}订单，是否继续作废 ？
+            </p>
           ),
           onConfirm() {
-            res(2);
+            res(2)
           },
           onCancel() {
-            res(0);
+            res(0)
           },
           className: "questModal",
-          parentComponent: this,
-        });
+          parentComponent: this
+        })
       } else {
-        res(1);
+        res(1)
       }
     } else {
-      rej(searchRes);
+      rej(searchRes)
     }
-  });
-};
+  })
+}
 
-export { commonSearchOrder };
+export { commonSearchOrder }