fix: 修复登录/注册页面标签对齐问题
This commit is contained in:
Xin
parent
96480a27a9
commit
1a60bf94b4
@ -24,21 +24,24 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-form-item style="position: relative; grid-template-columns: 1fr; margin-top: 60px;">
|
||||
<div style="position: absolute; right: 0; display: flex; flex-direction: column; gap: 12px;">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="handleLogin"
|
||||
:loading="loading"
|
||||
style="width: auto;"
|
||||
>
|
||||
登录
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
@click="$router.push('/register')"
|
||||
style="margin-left: 10px"
|
||||
style="margin-top: 10px;"
|
||||
>
|
||||
注册
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@ -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 () => {
|
||||
<style scoped>
|
||||
.login-container {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: #f5f7fa;
|
||||
}
|
||||
|
||||
.el-form {
|
||||
width: 400px;
|
||||
padding: 40px;
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.el-form-item {
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.el-form-item {
|
||||
display: grid;
|
||||
grid-template-columns: 100px 1fr;
|
||||
align-items: start;
|
||||
gap: 12px;
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.el-form-item__content {
|
||||
margin-left: 0 !important;
|
||||
}
|
||||
|
||||
.el-form-item__label {
|
||||
width: 100px !important;
|
||||
text-align: left !important;
|
||||
padding: 0 12px 0 0 !important;
|
||||
margin: 0 !important;
|
||||
display: block !important;
|
||||
box-sizing: border-box;
|
||||
justify-content: flex-start !important;
|
||||
height: auto !important;
|
||||
line-height: normal !important;
|
||||
}
|
||||
|
||||
.el-form-item__content {
|
||||
flex: 1;
|
||||
margin-left: 0 !important;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.el-input {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.el-button--primary {
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -41,21 +41,24 @@
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item>
|
||||
<el-form-item style="position: relative; grid-template-columns: 1fr; margin-top: 60px;">
|
||||
<div style="position: absolute; right: 0; display: flex; flex-direction: column; gap: 12px;">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="handleRegister"
|
||||
:loading="loading"
|
||||
style="width: auto;"
|
||||
>
|
||||
注册
|
||||
</el-button>
|
||||
<el-button
|
||||
link
|
||||
@click="$router.push('/login')"
|
||||
style="margin-left: 10px"
|
||||
style="margin-top: 10px;"
|
||||
>
|
||||
已有账号，去登录
|
||||
</el-button>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
@ -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<RegisterParams>({
|
||||
@ -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 () => {
|
||||
<style scoped>
|
||||
.register-container {
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
height: 100vh;
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
background-color: #f5f7fa;
|
||||
}
|
||||
|
||||
.el-form {
|
||||
width: 400px;
|
||||
padding: 40px;
|
||||
background: #fff;
|
||||
border-radius: 8px;
|
||||
box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
|
||||
}
|
||||
|
||||
.el-form-item {
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.el-form-item {
|
||||
display: grid;
|
||||
grid-template-columns: 100px 1fr;
|
||||
align-items: start;
|
||||
gap: 12px;
|
||||
margin-bottom: 24px;
|
||||
}
|
||||
|
||||
.el-form-item__label {
|
||||
width: 100px;
|
||||
text-align: justify;
|
||||
text-align-last: justify;
|
||||
padding-right: 12px;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
||||
.el-form-item__content {
|
||||
flex: 1;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.el-form-item__label {
|
||||
width: 100px !important;
|
||||
text-align: left !important;
|
||||
padding: 0 12px 0 0 !important;
|
||||
margin: 0 !important;
|
||||
display: block !important;
|
||||
box-sizing: border-box;
|
||||
justify-content: flex-start !important;
|
||||
height: auto !important;
|
||||
line-height: normal !important;
|
||||
}
|
||||
|
||||
.el-form-item__content {
|
||||
flex: 1;
|
||||
margin-left: 0 !important;
|
||||
min-width: 0;
|
||||
}
|
||||
|
||||
.el-input {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.el-button--primary {
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
.el-button--link {
|
||||
margin-left: 10px;
|
||||
}
|
||||
</style>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user