Merge pull request #175 from AshenOneOrz/dev-ashenone

修改页脚版权信息的间距, 修复 login 页面 error alert 关闭后再次输错密码不会显示的问题, 修复登陆后跳转页面错误的问题
This commit is contained in:
iczer 2020-12-18 09:20:21 +08:00 committed by GitHub
commit 1f2977bffe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions

View File

@ -26,6 +26,9 @@ export default {
.copyright{ .copyright{
color: @text-color-second; color: @text-color-second;
font-size: 14px; font-size: 14px;
i {
margin: 0 6px;
}
} }
.links{ .links{
margin-bottom: 8px; margin-bottom: 8px;

View File

@ -11,7 +11,7 @@
<a-form @submit="onSubmit" :form="form"> <a-form @submit="onSubmit" :form="form">
<a-tabs size="large" :tabBarStyle="{textAlign: 'center'}" style="padding: 0 2px;"> <a-tabs size="large" :tabBarStyle="{textAlign: 'center'}" style="padding: 0 2px;">
<a-tab-pane tab="账户密码登录" key="1"> <a-tab-pane tab="账户密码登录" key="1">
<a-alert type="error" :closable="true" v-show="error" :message="error" showIcon style="margin-bottom: 24px;" /> <a-alert type="error" :closable="true" v-if="error" :message="error" @close='onClose' showIcon style="margin-bottom: 24px;" />
<a-form-item> <a-form-item>
<a-input <a-input
autocomplete="autocomplete" autocomplete="autocomplete"
@ -121,12 +121,15 @@ export default {
getRoutesConfig().then(result => { getRoutesConfig().then(result => {
const routesConfig = result.data.data const routesConfig = result.data.data
loadRoutes(routesConfig) loadRoutes(routesConfig)
this.$router.push('/dashboard/workplace') this.$router.push('/demo')
this.$message.success(loginRes.message, 3) this.$message.success(loginRes.message, 3)
}) })
} else { } else {
this.error = loginRes.message this.error = loginRes.message
} }
},
onClose() {
this.error = false
} }
} }
} }