|
@@ -34,7 +34,7 @@
|
|
<el-input
|
|
<el-input
|
|
v-model="loginForm.verifyCode"
|
|
v-model="loginForm.verifyCode"
|
|
auto-complete="off"
|
|
auto-complete="off"
|
|
- placeholder="验证码"
|
|
|
|
|
|
+ placeholder="4位验证码"
|
|
style="width: 63%"
|
|
style="width: 63%"
|
|
tabindex="3"
|
|
tabindex="3"
|
|
maxlength="4"
|
|
maxlength="4"
|
|
@@ -50,7 +50,7 @@
|
|
<el-input
|
|
<el-input
|
|
v-model="loginForm.mailbox"
|
|
v-model="loginForm.mailbox"
|
|
auto-complete="off"
|
|
auto-complete="off"
|
|
- placeholder="邮箱验证码"
|
|
|
|
|
|
+ placeholder="6位邮箱口令"
|
|
style="width: 63%"
|
|
style="width: 63%"
|
|
tabindex="4"
|
|
tabindex="4"
|
|
maxlength="6"
|
|
maxlength="6"
|
|
@@ -108,8 +108,8 @@ export default {
|
|
password: [{ required: true, trigger: 'blur', validator: validatePassword }]*/
|
|
password: [{ required: true, trigger: 'blur', validator: validatePassword }]*/
|
|
username: [{required: true, trigger: 'blur',message: '请输入用户名'}],
|
|
username: [{required: true, trigger: 'blur',message: '请输入用户名'}],
|
|
password: [{required: true, trigger: 'blur',message: '请输入密码'}],
|
|
password: [{required: true, trigger: 'blur',message: '请输入密码'}],
|
|
- verifyCode: [{required: true, trigger: 'blur',message: '请输入验证码'}],
|
|
|
|
- mailbox: [{required: true, trigger: 'blur',message: '请输入邮箱验证码'}]
|
|
|
|
|
|
+ verifyCode: [{required: true, trigger: 'blur',message: '请输入验证码'}, { min: 4, max: 4, message: '请输入4位验证码', trigger: 'blur' }],
|
|
|
|
+ mailbox: [{required: true, trigger: 'blur',message: '请输入邮箱口令'}, { min: 6, max: 6, message: '请输入6位邮箱口令', trigger: 'blur' }]
|
|
},
|
|
},
|
|
loading: false,
|
|
loading: false,
|
|
redirect: undefined
|
|
redirect: undefined
|
|
@@ -199,42 +199,37 @@ export default {
|
|
this.$refs.loginForm.validate(valid => {
|
|
this.$refs.loginForm.validate(valid => {
|
|
if (valid) {
|
|
if (valid) {
|
|
this.loading = true
|
|
this.loading = true
|
|
|
|
+ let verifycodetemp = this.loginForm.verifyCode
|
|
|
|
+ let mailboxtemp = this.loginForm.mailbox
|
|
|
|
+ if (verifycodetemp.length!=4){
|
|
|
|
+ return
|
|
|
|
+
|
|
|
|
+ }
|
|
const param = new URLSearchParams()
|
|
const param = new URLSearchParams()
|
|
param.append('username', this.loginForm.username)
|
|
param.append('username', this.loginForm.username)
|
|
param.append('password', this.loginForm.password)
|
|
param.append('password', this.loginForm.password)
|
|
param.append('code', this.loginForm.verifyCode)
|
|
param.append('code', this.loginForm.verifyCode)
|
|
param.append('verifyuuid', this.verifyuuid)
|
|
param.append('verifyuuid', this.verifyuuid)
|
|
param.append('mailbox', this.loginForm.mailbox)
|
|
param.append('mailbox', this.loginForm.mailbox)
|
|
- this.$axios.post('/user/login', param,
|
|
|
|
- ).then((res) => {
|
|
|
|
|
|
+ this.$axios.post('/user/login', param).then((res) => {
|
|
const {data} = res
|
|
const {data} = res
|
|
// sessionStorage.setItem('token', data)
|
|
// sessionStorage.setItem('token', data)
|
|
|
|
|
|
document.cookie = "token=" + data;
|
|
document.cookie = "token=" + data;
|
|
document.cookie = "user=".concat(this.loginForm.username)
|
|
document.cookie = "user=".concat(this.loginForm.username)
|
|
sessionStorage.setItem('user', this.loginForm.username)
|
|
sessionStorage.setItem('user', this.loginForm.username)
|
|
- // if (this.loginForm.username !== 'admin') {
|
|
|
|
- // document.cookie = "user=yw"
|
|
|
|
- // // sessionStorage.setItem('user', 'yw')
|
|
|
|
- // } else {
|
|
|
|
- // document.cookie = "user=admin"
|
|
|
|
- // // sessionStorage.setItem('user', 'admin')
|
|
|
|
- // }
|
|
|
|
console.log('login user is :' + this.loginForm.username)
|
|
console.log('login user is :' + this.loginForm.username)
|
|
this.$router.push('/')
|
|
this.$router.push('/')
|
|
this.loading = false
|
|
this.loading = false
|
|
}).catch((error) => {
|
|
}).catch((error) => {
|
|
// 登录失败刷新验证码
|
|
// 登录失败刷新验证码
|
|
this.updateCaptcha()
|
|
this.updateCaptcha()
|
|
|
|
+ this.loginForm.verifyCode=''
|
|
|
|
+ this.loginForm.mailbox=''
|
|
|
|
+ this.reset()
|
|
this.loading = false
|
|
this.loading = false
|
|
})
|
|
})
|
|
|
|
|
|
- /* this.$store.dispatch('user/login', this.loginForm).then(() => {
|
|
|
|
- this.$router.push('/')
|
|
|
|
- this.loading = false
|
|
|
|
- }).catch(() => {
|
|
|
|
- this.loading = false
|
|
|
|
- })*/
|
|
|
|
} else {
|
|
} else {
|
|
console.log('error submit!!')
|
|
console.log('error submit!!')
|
|
return false
|
|
return false
|