From 328489c6dd9ccda6016092d0fc82a55b59bd6703 Mon Sep 17 00:00:00 2001
From: code <2388224167@qq.com>
Date: Tue, 12 Nov 2024 09:56:21 +0800
Subject: [PATCH] 1111

---
 src/pages/merchant/detail.vue | 2 +-
 src/sheep/api/pay.ts          | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/pages/merchant/detail.vue b/src/pages/merchant/detail.vue
index f5c8d2b..8b10693 100644
--- a/src/pages/merchant/detail.vue
+++ b/src/pages/merchant/detail.vue
@@ -164,7 +164,7 @@ const doPay = async () => {
         if (submitCode != 0) throw new Error()
         uni.hideLoading()
         uni.showToast({ title: '支付成功', icon: "none" });
-        router.jump("/pages/order/detail", { id: createData }, 3)
+        router.jump("/pages/tabbar/order")
     } catch (error) {
         console.error(error);
         uni.hideLoading()
diff --git a/src/sheep/api/pay.ts b/src/sheep/api/pay.ts
index 8576f25..0a10b07 100644
--- a/src/sheep/api/pay.ts
+++ b/src/sheep/api/pay.ts
@@ -23,6 +23,9 @@ export default {
       url: "/hardware/order/create-order",
       method: "POST",
       data,
+      custom: {
+        showLoading: false,
+      },
     });
   },
   // 结算
@@ -31,6 +34,9 @@ export default {
       url: "/hardware/order/submit-order",
       method: "POST",
       data,
+      custom: {
+        showLoading: false,
+      },
     });
   },
 };