提交 58620d20 authored 作者: junjie's avatar junjie

feat(frontend):登陆页调整

上级 f988c74b
...@@ -82,7 +82,9 @@ export default { ...@@ -82,7 +82,9 @@ export default {
thirdparty: 'Or connect with', thirdparty: 'Or connect with',
thirdpartyTips: 'Can not be simulated on local, so please combine you own business simulation! ! !', thirdpartyTips: 'Can not be simulated on local, so please combine you own business simulation! ! !',
expires: 'Login token expired, please login again', expires: 'Login token expired, please login again',
tokenError: 'Token error, please login again' tokenError: 'Token error, please login again',
username_error: 'Please enter the correct user name',
password_error: 'The password can not be less than 6 digits'
}, },
commons: { commons: {
all: 'All', all: 'All',
......
...@@ -82,7 +82,9 @@ export default { ...@@ -82,7 +82,9 @@ export default {
thirdparty: '第三方登陸', thirdparty: '第三方登陸',
thirdpartyTips: '本地不能模拟,请结合自己业务进行模拟!!!', thirdpartyTips: '本地不能模拟,请结合自己业务进行模拟!!!',
expires: '登陸信息过期,请重新登陸', expires: '登陸信息过期,请重新登陸',
tokenError: '信息错误,请重新登陸' tokenError: '信息错误,请重新登陸',
username_error: '請輸入正確的用戶名',
password_error: '密碼不小於6位'
}, },
commons: { commons: {
all: '全部', all: '全部',
......
...@@ -82,7 +82,9 @@ export default { ...@@ -82,7 +82,9 @@ export default {
thirdparty: '第三方登录', thirdparty: '第三方登录',
thirdpartyTips: '本地不能模拟,请结合自己业务进行模拟!!!', thirdpartyTips: '本地不能模拟,请结合自己业务进行模拟!!!',
expires: '登录token过期,请重新登录', expires: '登录token过期,请重新登录',
tokenError: 'token错误,请重新登录' tokenError: 'token错误,请重新登录',
username_error: '请输入正确的用户名',
password_error: '密码不小于6位'
}, },
commons: { commons: {
all: '全部', all: '全部',
......
...@@ -5,12 +5,12 @@ ...@@ -5,12 +5,12 @@
<el-col :span="12"> <el-col :span="12">
<el-form ref="loginForm" :model="loginForm" :rules="loginRules" size="default"> <el-form ref="loginForm" :model="loginForm" :rules="loginRules" size="default">
<div class="login-logo"> <div class="login-logo">
<img v-if="!loginLogoUrl" src="@/assets/DataEase-black.png" alt=""> <img v-if="!loginLogoUrl" src="@/assets/DataEase-color.png" alt="">
<img v-else :src="loginLogoUrl" alt=""> <img v-else :src="loginLogoUrl" alt="">
</div> </div>
<div class="login-title"> <!-- <div class="login-title">-->
{{ uiInfo && uiInfo['ui.loginTitle'] && uiInfo['ui.loginTitle'].paramValue || $t('login.title') }} <!-- &lt;!&ndash; {{ uiInfo && uiInfo['ui.loginTitle'] && uiInfo['ui.loginTitle'].paramValue || $t('login.title') }}&ndash;&gt;-->
</div> <!-- </div>-->
<div class="login-border" /> <div class="login-border" />
<div class="login-welcome"> <div class="login-welcome">
{{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'DATAEASE') }} {{ $t('login.welcome') + (uiInfo && uiInfo['ui.title'] && uiInfo['ui.title'].paramValue || 'DATAEASE') }}
...@@ -64,10 +64,10 @@ export default { ...@@ -64,10 +64,10 @@ export default {
if (res.data) { if (res.data) {
callback() callback()
} else { } else {
callback(new Error('Please enter the correct user name')) callback(this.$t('login.username_error'))
} }
}).catch(() => { }).catch(() => {
callback(new Error('Please enter the correct user name')) callback(this.$t('login.username_error'))
}) })
// if (!validUsername(value)) { // if (!validUsername(value)) {
// callback(new Error('Please enter the correct user name')) // callback(new Error('Please enter the correct user name'))
...@@ -77,7 +77,7 @@ export default { ...@@ -77,7 +77,7 @@ export default {
} }
const validatePassword = (rule, value, callback) => { const validatePassword = (rule, value, callback) => {
if (value.length < 6) { if (value.length < 6) {
callback(new Error('The password can not be less than 6 digits')) callback(this.$t('login.password_error'))
} else { } else {
callback() callback()
} }
...@@ -178,8 +178,8 @@ export default { ...@@ -178,8 +178,8 @@ export default {
} }
.login-logo { .login-logo {
margin-top: 30px; margin-top: 50px;
margin-left: 30px; text-align: center;
@media only screen and (max-width: 1280px) { @media only screen and (max-width: 1280px) {
margin-top: 20px; margin-top: 20px;
} }
...@@ -208,7 +208,7 @@ export default { ...@@ -208,7 +208,7 @@ export default {
width: 80px; width: 80px;
background: $--color-primary; background: $--color-primary;
@media only screen and (max-width: 1280px) { @media only screen and (max-width: 1280px) {
margin: 10px auto 10px; margin: 20px auto 20px;
} }
} }
...@@ -225,11 +225,11 @@ export default { ...@@ -225,11 +225,11 @@ export default {
} }
.login-form { .login-form {
margin-top: 30px; margin-top: 40px;
padding: 0 40px; padding: 0 40px;
@media only screen and (max-width: 1280px) { @media only screen and (max-width: 1280px) {
margin-top: 10px; margin-top: 20px;
} }
& ::v-deep .el-input__inner { & ::v-deep .el-input__inner {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论