diff --git a/web/src/views/Auth/Login.vue b/web/src/views/Auth/Login.vue index 0db9a31..aab476b 100644 --- a/web/src/views/Auth/Login.vue +++ b/web/src/views/Auth/Login.vue @@ -24,21 +24,24 @@ /> - - - 登录 - - - 注册 - + +
+ + 登录 + + + 注册 + +
@@ -51,6 +54,7 @@ import { encryptPassword } from '../../utils/encrypt' import { setupTokenRefresh } from '../../utils/auth' import { setToken, getToken } from '../../utils/storage' import { useRouter } from 'vue-router' +import { useUserStore } from '@/store/modules/user' import type { LoginParams, LoginFormData } from '@/api/auth/types' const router = useRouter() @@ -78,12 +82,20 @@ const handleLogin = async () => { formData.append('password', encryptedPassword) const res = await login(formData as LoginFormData) - console.log('登录成功:', res.access_token) - setToken(res.access_token) // 存储token - setupTokenRefresh() // 启动token自动续期 - console.log('存储的token:', getToken()) // 验证token是否存储成功 - // 使用router.push确保Vue路由正确处理跳转 - router.push('/dashboard') + console.log('登录成功:', res) + + // 确保token存储完成后再跳转 + const token = res.access_token || res.token + setToken(token) + localStorage.setItem('token', token) + setupTokenRefresh() + + // 等待用户信息加载完成 + const userStore = useUserStore() + await userStore.getUserInfo() + + console.log('存储的token:', getToken(), 'localStorage:', localStorage.getItem('token')) + await router.push('/dashboard') } finally { loading.value = false } @@ -93,9 +105,61 @@ const handleLogin = async () => { diff --git a/web/src/views/Auth/Register.vue b/web/src/views/Auth/Register.vue index eb08014..f75945c 100644 --- a/web/src/views/Auth/Register.vue +++ b/web/src/views/Auth/Register.vue @@ -41,21 +41,24 @@ /> - - - 注册 - - - 已有账号，去登录 - + +
+ + 注册 + + + 已有账号，去登录 + +
@@ -65,6 +68,8 @@ import { ref } from 'vue' import { register } from '@/api/auth' import { encryptPassword } from '@/utils/encrypt' +import { useRouter } from 'vue-router' +import { ElMessage } from 'element-plus' import type { RegisterParams, RegisterFormData } from '@/api/auth/types' const registerForm = ref({ @@ -100,6 +105,7 @@ const registerRules = { ], } +const router = useRouter() const loading = ref(false) const registerFormRef = ref() @@ -115,7 +121,8 @@ const handleRegister = async () => { const res = await register(formData) console.log('注册成功:', res.user_id) - // 跳转到登录页或其他处理 + ElMessage.success('注册成功') + await router.push('/login') } finally { loading.value = false } @@ -125,9 +132,74 @@ const handleRegister = async () => {