From 73ac6d02a2223f19201426f3c366661d4a8e41bf Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期二, 25 二月 2025 17:14:37 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/LifePaymentFront

---
 apps/taro/src/utils/request/index.ts |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/taro/src/utils/request/index.ts b/apps/taro/src/utils/request/index.ts
index 5842e65..4d74dc6 100644
--- a/apps/taro/src/utils/request/index.ts
+++ b/apps/taro/src/utils/request/index.ts
@@ -3,6 +3,7 @@
 import qs from 'qs';
 import Taro from '@tarojs/taro';
 import { getToken, Message } from '@/utils';
+import { isWeb, isWeChat } from '@/utils/env';
 import { tokenIsExpired, SensitiveManage } from '@life-payment/utils';
 import { useUserStoreWithOut } from '@/stores/modules/user';
 
@@ -23,7 +24,9 @@
 }
 
 export function endLoading() {
-  Taro.hideNavigationBarLoading();
+  if (isWeChat) {
+    Taro.hideNavigationBarLoading();
+  }
   Taro.hideLoading();
 }
 
@@ -76,7 +79,7 @@
 }
 
 const AxiosOptions: AxiosRequestConfig = {
-  baseURL: process.env.BASE_URL,
+  baseURL: isWeb ? process.env.BASE_URL_H5 : process.env.BASE_URL,
   timeout: 10 * 1000,
   headers: {
     Accept: 'application/json, text/plain, */*',

--
Gitblit v1.9.1