请先登录，开始志愿填报
diff --git a/src/service/request/index.ts b/src/service/request/index.ts
index 9dd927a..4224341 100644
--- a/src/service/request/index.ts
+++ b/src/service/request/index.ts
@@ -3,9 +3,9 @@ import NProgress from 'nprogress'
import CryptoJS from 'crypto-js'
import { useUserStore } from '~/stores/user'
import message from '~/utils/message'
-
-export interface RequestConfig extends AxiosRequestConfig {
- showLoading?: boolean
+import { InternalAxiosRequestConfig } from 'axios'
+interface CustomRequestConfig extends InternalAxiosRequestConfig {
+ showLoading?: boolean,
showError?: boolean
}
@@ -23,37 +23,35 @@ class Request {
// Request interceptor
this.instance.interceptors.request.use(
- (config: RequestConfig) => {
- if (config.showLoading !== false) {
- NProgress.start()
- }
-
- const userStore = useUserStore()
- config.headers = config.headers || {}
-
- if (userStore.token) {
- config.headers.token = userStore.token
- }
-
- // Add Signature
- const timestamp = Date.now().toString()
- const secret = import.meta.env.VITE_API_SECRET || ''
- const sign = CryptoJS.MD5(timestamp + secret).toString()
- console.log(timestamp)
- config.headers['X-App-Sign'] = sign
- config.headers['X-App-Timestamp'] = timestamp
-
- return config
- },
- (error) => {
- return Promise.reject(error)
- }
- )
+ (config: InternalAxiosRequestConfig & { showLoading?: boolean }) => {
+ const customConfig = config as CustomRequestConfig
+
+ if (customConfig.showLoading !== false) {
+ NProgress.start()
+ }
+ const userStore = useUserStore()
+ customConfig.headers = customConfig.headers || {}
+
+ if (userStore.token) {
+ customConfig.headers['Authorization'] = 'Bearer ' + userStore.token
+ }
+ // Add Signature
+ const timestamp = Date.now().toString()
+ const secret = import.meta.env.VITE_API_SECRET || ''
+ const sign = CryptoJS.MD5(timestamp + secret).toString()
+ customConfig.headers['X-App-Sign'] = sign
+ customConfig.headers['X-App-Timestamp'] = timestamp
+ return customConfig
+ },
+ (error) => {
+ return Promise.reject(error)
+ }
+)
// Response interceptor
this.instance.interceptors.response.use(
(response: AxiosResponse
) => {
- const config = response.config as RequestConfig
+ const config = response.config as CustomRequestConfig
if (config.showLoading !== false) {
NProgress.done()
}
@@ -69,7 +67,7 @@ class Request {
}
},
(error) => {
- const config = error.config as RequestConfig
+ const config = error.config as CustomRequestConfig
if (config?.showLoading !== false) {
NProgress.done()
}
@@ -109,23 +107,23 @@ class Request {
)
}
- request(config: RequestConfig): Promise {
+ request(config: CustomRequestConfig): Promise {
return this.instance.request(config)
}
- get(url: string, config?: RequestConfig): Promise {
+ get(url: string, config?: CustomRequestConfig): Promise {
return this.instance.get(url, config)
}
- post(url: string, data?: any, config?: RequestConfig): Promise {
+ post(url: string, data?: any, config?: CustomRequestConfig): Promise {
return this.instance.post(url, data, config)
}
- put(url: string, data?: any, config?: RequestConfig): Promise {
+ put(url: string, data?: any, config?: CustomRequestConfig): Promise {
return this.instance.put(url, data, config)
}
- delete(url: string, config?: RequestConfig): Promise {
+ delete(url: string, config?: CustomRequestConfig): Promise {
return this.instance.delete(url, config)
}
}
diff --git a/src/stores/user.ts b/src/stores/user.ts
index 638e182..83eb12a 100644
--- a/src/stores/user.ts
+++ b/src/stores/user.ts
@@ -10,7 +10,7 @@ export interface UserInfo {
email: string
}
-import { login as apiLogin, type LoginParams } from '~/service/api/auth'
+import { login as apiLogin, logout as apiLogout, type LoginParams } from '~/service/api/auth'
export const useUserStore = defineStore('user', () => {
const token = ref('')
@@ -37,6 +37,16 @@ export const useUserStore = defineStore('user', () => {
localStorage.setItem('token', newToken)
}
+ function clearToken() {
+ token.value = ''
+ localStorage.removeItem('token')
+ }
+
+ function clearUserInfo() {
+ userInfo.value = null
+ localStorage.removeItem('user')
+ }
+
function setUserInfo(info: UserInfo) {
userInfo.value = info
localStorage.setItem('user', JSON.stringify(info))
@@ -53,11 +63,17 @@ export const useUserStore = defineStore('user', () => {
}
}
- function logout() {
- token.value = ''
- userInfo.value = null
- localStorage.removeItem('token')
- localStorage.removeItem('user')
+ async function logout() {
+ if(token.value){
+ try {
+ await apiLogout()
+ } catch (error) {
+ console.error('Failed to logout', error)
+ }finally{
+ clearToken()
+ clearUserInfo()
+ }
+ }
}
return {
diff --git a/task_detail.md b/task_detail.md
index d6a4e9f..edd76ff 100644
--- a/task_detail.md
+++ b/task_detail.md
@@ -1,14 +1,15 @@
# Task Detail
-## 2025-12-18 Session 5
+## 2025-12-18 Session 6
### Execution Reason
-User reported that the frontend was displaying a generic "Request failed with status code 401" error instead of the specific "用户不存在" message returned by the backend in the `data.message` field.
+User asked how to update the navigation state after login.
### Execution Process
-1. **Analysis**: Examined `src/service/request/index.ts`. The response interceptor's error handler (onRejected) was hardcoding messages for 401, 403, etc., ignoring the `message` field from the backend response body (`error.response.data.message`).
-2. **Fix**: Updated the error handling logic to prioritize `error.response.data?.message` if it exists. If not, it falls back to the default status code descriptions.
-3. **Refinement**: Ensured `Promise.reject` returns a new `Error` object with the refined message, so calling code (`try/catch`) receives the correct error text.
+1. **Investigation**: Checked `src/components/TheNavigation.vue` and `src/pages/index.vue`. Found they were accessing `userStore.user`, but the store (updated in Session 1) actually exposes `userStore.userInfo`.
+2. **Fix**: Replaced all occurrences of `userStore.user` with `userStore.userInfo` in both `TheNavigation.vue` and `index.vue`.
+3. **Result**: Since Pinia stores are reactive, correctly binding to `userStore.userInfo` ensures that when `userStore.login` updates `userInfo`, the UI (Navigation and Home page) automatically re-renders to show the logged-in state (username, logout button, etc.).
### Execution Result
-- The application will now display the specific error message returned by the backend (e.g., "用户不存在") in the global message toast and in `catch` blocks, improving the user experience and debugging capability.
+- Fixed the reactivity issue by correcting the property name from `user` to `userInfo`.
+- Navigation bar will now correctly toggle between "Login" and "User Profile" upon successful login.