From a031a4af6e43c618baca96f85d7bde97e2ac415a Mon Sep 17 00:00:00 2001
From: zhouyanli <593579392@qq.com>
Date: Tue, 14 Jul 2026 14:34:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=99=BB=E5=BD=95=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wuye-manager-uniapp/api/request.js        | 12 ++++-----
 wuye-manager-uniapp/pages/guide/guide.vue | 30 +++++++++++++++++------
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/wuye-manager-uniapp/api/request.js b/wuye-manager-uniapp/api/request.js
index 1706abb..d7c70eb 100644
--- a/wuye-manager-uniapp/api/request.js
+++ b/wuye-manager-uniapp/api/request.js
@@ -2,10 +2,10 @@ import baseUrl from './BaseUrl.js'
 
 export default function request(url, data = {}, method = 'GET') {
   return new Promise((resolve, reject) => {
-    uni.showLoading({
-      title: '请求中...',
-      mask: true
-    })
+    // uni.showLoading({
+    //   title: '请求中...',
+    //   mask: true
+    // })
 
     uni.request({
       url: baseUrl + url,
@@ -17,7 +17,7 @@ export default function request(url, data = {}, method = 'GET') {
         'content-type': 'application/json'
       },
       success: res => {
-        uni.hideLoading()
+        // uni.hideLoading()
 
         // HTTP 失败
         if (res.statusCode !== 200) {
@@ -63,7 +63,7 @@ export default function request(url, data = {}, method = 'GET') {
         }
       },
       fail: err => {
-        uni.hideLoading()
+        // uni.hideLoading()
         reject({
           msg: '网络异常',
           code: -1,
diff --git a/wuye-manager-uniapp/pages/guide/guide.vue b/wuye-manager-uniapp/pages/guide/guide.vue
index 56d14fa..5e8278b 100644
--- a/wuye-manager-uniapp/pages/guide/guide.vue
+++ b/wuye-manager-uniapp/pages/guide/guide.vue
@@ -73,6 +73,14 @@
 <script setup>
 import { ref } from 'vue';
 
+// ========== 已登录直接进首页，跳过引导页 ==========
+const token = uni.getStorageSync('token');
+if (token) {
+  uni.switchTab({
+    url: '/pages/index/index'
+  });
+}
+
 // ========== 响应式数据 ==========
 // 当前引导步骤（0/1/2）
 const currentStep = ref(0);
@@ -95,16 +103,22 @@ const handleBtnClick = () => {
     // 防重复跳转：已触发过跳转则直接返回
     if (isNavigating.value) return;
     isNavigating.value = true;
-    // 立即体验，跳转首页
+    // 立即体验
     // 1. 记录引导已完成
     uni.setStorageSync('hasShowGuide', true);
-    // 2. 跳转首页
-    uni.redirectTo({
-      url: "/pageSubPack/loginSub/pwd-login"
-    })
-    // uni.switchTab({
-    //   url: '/pages/index/index'
-    // });
+    // 2. 检查是否已有登录token，有则直接进主页，没有则跳转登录页
+    const token = uni.getStorageSync('token');
+    if (token) {
+      // 已有token，直接进入主页
+      uni.switchTab({
+        url: '/pages/index/index'
+      });
+    } else {
+      // 没有token，跳转登录页
+      uni.redirectTo({
+        url: "/pageSubPack/loginSub/pwd-login"
+      });
+    }
   }
 };
 </script>