From 6673f6eeea5a83a573bda7ff3e9eb54c32c8ef13 Mon Sep 17 00:00:00 2001
From: Guwan <NINI@NINI>
Date: Sat, 7 Dec 2024 22:07:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=B3=A8=E5=86=8C=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.ts         |  2 +-
 src/stores/user.ts      | 11 ++++-------
 src/utils/request.ts    | 12 +++++++-----
 src/views/LoginView.vue |  5 +++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/api/user.ts b/src/api/user.ts
index 6639c95..692acc6 100644
--- a/src/api/user.ts
+++ b/src/api/user.ts
@@ -131,7 +131,7 @@ export const userApi = {
 
   // 更新用户信息
   updateUserInfo(data: Partial<UserInfo>) {
-    return request.put<ApiResponse<UserInfo>>('/user/info', data)
+    return request.put<ApiResponse>('/user/info', data)
   },
 
   // 更新用户头像
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 5d8248b..3520a76 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -3,18 +3,15 @@ import { ref } from 'vue'
 import type { UserInfo } from '@/api/user'
 import { userApi } from '@/api/user'
 
-
-
 export const useUserStore = defineStore('user', () => {
-  let userInfo = ref<UserInfo | null>(null)
+  const userInfo = ref<UserInfo | null>(null)
   const token = ref<string | null>(null)
 
   // 获取用户信息
   const getUserInfo = async () => {
     try {
-      const data = await userApi.getCurrentUser()
-      userInfo = data
-      return data
+      console.log(1111)
+      await userApi.getCurrentUser()
     } catch (error) {
       console.error('获取用户信息失败:', error)
       return null
@@ -38,6 +35,6 @@ export const useUserStore = defineStore('user', () => {
     token,
     getUserInfo,
     setToken,
-    clearUserInfo
+    clearUserInfo,
   }
 })
diff --git a/src/utils/request.ts b/src/utils/request.ts
index 9176ec1..3c241f5 100644
--- a/src/utils/request.ts
+++ b/src/utils/request.ts
@@ -6,7 +6,7 @@ import router from '@/router'
 // 创建 axios 实例
 const service: AxiosInstance = axios.create({
   baseURL: import.meta.env.VITE_API_BASE_URL || '/api', // 从环境变量获取API基础路径
-  timeout: 15000, // 请求超时时间
+  timeout: 30000, // 请求超时时间
   headers: {
     'Content-Type': 'application/json'
   }
@@ -20,8 +20,9 @@ service.interceptors.request.use(
     if (token) {
       config.headers = {
         ...config.headers,
-        Authorization: `Bearer ${token}`
+       // Authorization: `Bearer ${token}`
       }
+
     }
     return config
   },
@@ -45,8 +46,9 @@ service.interceptors.response.use(
     }
   },
   (error) => {
+    console.log(error.response) //undefined
     const { status } = error.response || {}
-    
+
     // 处理常见错误
     switch (status) {
       case 401:
@@ -66,9 +68,9 @@ service.interceptors.response.use(
       default:
         ElMessage.error('网络错误')
     }
-    
+
     return Promise.reject(error)
   }
 )
 
-export default service 
\ No newline at end of file
+export default service
diff --git a/src/views/LoginView.vue b/src/views/LoginView.vue
index b326329..e5d3cd0 100644
--- a/src/views/LoginView.vue
+++ b/src/views/LoginView.vue
@@ -315,9 +315,10 @@ const handleLogin = async () => {
         const token = await userApi.login(formData)
         console.log(token)
         userStore.setToken(token)
-        await userStore.getUserInfo()
+        const res = await userApi.getCurrentUser()
+       //console.log(res)
         ElMessage.success('登录成功')
-        router.push('/')
+        //router.push('/')
       } catch (error) {
         console.error('登录失败:', error)
       } finally {