+
-
+
-
@@ -45,13 +50,14 @@
:placeholder="$t('login.PWPlaceholder')"
size="large"
autocomplete="off"
+ @keyup.enter="login"
>
-
+
-
- ![]()
+ ![]()
@@ -78,7 +80,7 @@
{{ $t('login.forgetPassword') }}？
- {{ $t('login.signIn') }}
@@ -102,12 +104,15 @@
import phoneLoginForm from './phoneLoginForm.vue'
import threeLogin from './threeLogin.vue'
import smCrypto from '@/utils/smCrypto'
+ import { required } from '@/utils/formRules'
export default {
+ name: 'Login',
components: {
phoneLoginForm,
threeLogin
},
+
data() {
return {
activeKey: 'userAccount',
@@ -121,10 +126,10 @@
autologin: false
},
rules: {
- account: [{ required: true, message: this.$t('login.accountError'), trigger: 'blur' }],
- password: [{ required: true, message: this.$t('login.PWError'), trigger: 'blur' }]
+ account: [required(this.$t('login.accountError'), 'blur')],
+ password: [required(this.$t('login.PWError'), 'blur')]
},
- islogin: false,
+ loading: false,
config: {
lang: this.$TOOL.data.get('APP_LANG') || this.$CONFIG.LANG,
theme: this.$TOOL.data.get('APP_THEME') || 'default'
@@ -142,8 +147,8 @@
}
},
computed: {
- sysBaseConfigWatch() {
- return this.$store.state.global.sysBaseConfig
+ captchaOpen() {
+ return this.sysBaseConfig.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN === 'true'
}
},
watch: {
@@ -153,10 +158,6 @@
'config.lang': function (val) {
this.$i18n.locale = val
this.$TOOL.data.set('APP_LANG', val)
- },
- sysBaseConfigWatch(val) {
- this.sysBaseConfig = val
- this.refreshSwitch()
}
},
created() {
@@ -166,27 +167,16 @@
},
mounted() {
this.refreshSwitch()
- // 获取回车键事件
- document.onkeydown = (e) => {
- if (e.defaultPrevented) {
- return;
- }
- const body = document.getElementsByTagName('body')[0];
- // match(浏览器中的地址，不需要包括https、http或者www)，是为了防止其他页面触发
- if (e.keyCode === 13 && e.target.baseURI.match("/login") && e.target === body) {
- this.login()
- }
- }
},
methods: {
// 通过开关加载内容
refreshSwitch() {
// 判断是否开启验证码
- if (this.sysBaseConfig.SNOWY_SYS_DEFAULT_CAPTCHA_OPEN === 'true') {
+ if (this.captchaOpen) {
// 加载验证码
this.loginCaptcha()
// 加入校验
- this.rules.validCode = [{ required: true, message: this.$t('login.validError'), trigger: 'blur' }]
+ this.rules.validCode = [required(this.$t('login.validError'), 'blur')]
}
},
// 获取验证码
@@ -198,45 +188,40 @@
},
// 用户名密码登录
async login() {
- const validate = await this.$refs.loginForm.validate().catch(() => {})
- if (!validate) return false
+ this.$refs.loginForm.validate().then(async () => {
+ this.loading = true
+ const loginData = {
+ account: this.ruleForm.account,
+ // 密码进行SM2加密，传输过程中看到的只有密文，后端存储使用hash
+ password: smCrypto.doSm2Encrypt(this.ruleForm.password),
+ validCode: this.ruleForm.validCode,
+ validCodeReqNo: this.ruleForm.validCodeReqNo
+ }
+ // 获取token
+ try {
+ const loginToken = await loginApi.login(loginData)
+ this.$TOOL.data.set('TOKEN', loginToken)
+ // 获取登录的用户信息
+ const loginUser = await loginApi.getLoginUser()
+ this.$TOOL.data.set('USER_INFO', loginUser)
- this.islogin = true
- const loginData = {
- account: this.ruleForm.account,
- // 密码进行SM2加密，传输过程中看到的只有密文，后端存储使用hash
- password: smCrypto.doSm2Encrypt(this.ruleForm.password),
- validCode: this.ruleForm.validCode,
- validCodeReqNo: this.ruleForm.validCodeReqNo
- }
- // 获取token
- const login = await loginApi.login(loginData).finally(() => {
- this.islogin = false
- })
- this.$TOOL.data.set('TOKEN', login)
- // 获取登录的用户信息
- const loginUser = await loginApi.getLoginUser()
- this.$TOOL.data.set('USER_INFO', loginUser)
-
- // 获取用户的菜单
- const menu = await userCenterApi.userLoginMenu().catch(() => {
- this.islogin = false
- return
- })
- this.islogin = false
- const indexMenu = menu[0].children[0].path
- this.$TOOL.data.set('MENU', menu)
- // 重置系统默认应用
- this.$TOOL.data.set('SNOWY_MENU_MODULE_ID', menu[0].id)
- this.$router.replace({
- path: indexMenu
- })
- this.$message.success('登录成功')
- this.$nextTick(() => {
- dictApi.dictTree().then((data) => {
- // 设置字典到store中
- this.$TOOL.data.set('DICT_TYPE_TREE_DATA', data)
- })
+ // 获取用户的菜单
+ const menu = await userCenterApi.userLoginMenu()
+ const indexMenu = menu[0].children[0].path
+ this.$TOOL.data.set('MENU', menu)
+ // 重置系统默认应用
+ this.$TOOL.data.set('SNOWY_MENU_MODULE_ID', menu[0].id)
+ this.$message.success('登录成功')
+ this.$router.replace({
+ path: indexMenu
+ })
+ dictApi.dictTree().then((data) => {
+ // 设置字典到store中
+ this.$TOOL.data.set('DICT_TYPE_TREE_DATA', data)
+ })
+ } catch (err) {
+ this.loading = false
+ }
})
},
configLang(key) {
@@ -246,156 +231,6 @@
}
-
diff --git a/snowy-admin-web/src/views/auth/login/phoneLoginForm.vue b/snowy-admin-web/src/views/auth/login/phoneLoginForm.vue
index cd484c36..a33b4c35 100644
--- a/snowy-admin-web/src/views/auth/login/phoneLoginForm.vue
+++ b/snowy-admin-web/src/views/auth/login/phoneLoginForm.vue
@@ -3,7 +3,7 @@
-
@@ -16,21 +16,21 @@
size="large"
>
-
- {{
- (!state.smsSendBtn && $t('login.getSmsCode')) || state.time + ' s'
- }}
+
+ {{ (!state.smsSendBtn && $t('login.getSmsCode')) || state.time + ' s' }}
+
- {{
- $t('login.signIn')
- }}
+
+ {{ $t('login.signIn') }}
+
- {{ $t('login.signInOther') }}
-