diff --git a/src/views/login.vue b/src/views/login.vue index f489410..35970aa 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -1,32 +1,72 @@ @@ -63,9 +105,15 @@ export default { uuid: '' }, loginRules: { - username: [{ required: true, trigger: 'blur', message: '用户名不能为空' }], - password: [{ required: true, trigger: 'blur', message: '密码不能为空' }], - code: [{ required: true, trigger: 'change', message: '验证码不能为空' }] + username: [ + { required: true, trigger: 'blur', message: '用户名不能为空' } + ], + password: [ + { required: true, trigger: 'blur', message: '密码不能为空' } + ], + code: [ + { required: true, trigger: 'change', message: '验证码不能为空' } + ] }, loading: false, redirect: undefined @@ -79,7 +127,8 @@ export default { this.redirect = data.redirect delete data.redirect if (JSON.stringify(data) !== '{}') { - this.redirect = this.redirect + '&' + qs.stringify(data, { indices: false }) + this.redirect = + this.redirect + '&' + qs.stringify(data, { indices: false }) } } }, @@ -96,7 +145,7 @@ export default { }, methods: { getCode() { - getCodeImg().then(res => { + getCodeImg().then((res) => { this.codeUrl = res.img this.loginForm.uuid = res.uuid }) @@ -116,7 +165,7 @@ export default { } }, handleLogin() { - this.$refs.loginForm.validate(valid => { + this.$refs.loginForm.validate((valid) => { const user = { username: this.loginForm.username, password: this.loginForm.password, @@ -130,21 +179,30 @@ export default { if (valid) { this.loading = true if (user.rememberMe) { - Cookies.set('username', user.username, { expires: Config.passCookieExpires }) - Cookies.set('password', user.password, { expires: Config.passCookieExpires }) - Cookies.set('rememberMe', user.rememberMe, { expires: Config.passCookieExpires }) + Cookies.set('username', user.username, { + expires: Config.passCookieExpires + }) + Cookies.set('password', user.password, { + expires: Config.passCookieExpires + }) + Cookies.set('rememberMe', user.rememberMe, { + expires: Config.passCookieExpires + }) } else { Cookies.remove('username') Cookies.remove('password') Cookies.remove('rememberMe') } - this.$store.dispatch('Login', user).then(() => { - this.loading = false - this.$router.push({ path: this.redirect || '/' }) - }).catch(() => { - this.loading = false - this.getCode() - }) + this.$store + .dispatch('Login', user) + .then(() => { + this.loading = false + this.$router.push({ path: this.redirect || '/' }) + }) + .catch(() => { + this.loading = false + this.getCode() + }) } else { console.log('error submit!!') return false @@ -168,47 +226,76 @@ export default {