Commit 1daefbe1 by 姜雷

Merge branch 'test' into 'master'

Test See merge request !113
parents a36a054c 51fb0e85
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
</h3> </h3>
<el-form-item> <el-form-item>
<el-input <el-input
@keyup.enter.native="handleLogin"
name="username" name="username"
type="text" type="text"
v-model="loginForm.name" v-model="loginForm.name"
...@@ -24,6 +25,7 @@ ...@@ -24,6 +25,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-input <el-input
@keyup.enter.native="handleLogin"
name="password" name="password"
:type="pwdType" :type="pwdType"
v-model="loginForm.password" v-model="loginForm.password"
...@@ -51,6 +53,7 @@ ...@@ -51,6 +53,7 @@
autoComplete="on" autoComplete="on"
placeholder="输入验证码" placeholder="输入验证码"
:maxlength="4" :maxlength="4"
ref="vcode"
></el-input> ></el-input>
<div class="vcode-box"> <div class="vcode-box">
<i class="vcode-img"> <i class="vcode-img">
...@@ -103,7 +106,7 @@ export default { ...@@ -103,7 +106,7 @@ export default {
}; };
}, },
created() { created() {
this.fetchVcode(); this.getVcode();
}, },
methods: { methods: {
...mapActions(['Login']), ...mapActions(['Login']),
...@@ -169,7 +172,13 @@ export default { ...@@ -169,7 +172,13 @@ export default {
} }
}, },
fetchVcode() { fetchVcode() {
fetchVcode() this.getVcode().then(() => {
this.loginForm.vcode = '';
this.$refs.vcode.focus();
});
},
getVcode() {
return fetchVcode()
.then(res => { .then(res => {
console.log(res); console.log(res);
const { saltKey, verifyCode } = res; const { saltKey, verifyCode } = res;
......
...@@ -95,6 +95,7 @@ const createBaseFetch = config => { ...@@ -95,6 +95,7 @@ const createBaseFetch = config => {
logout = false; logout = false;
}); });
} }
console.error('err response: ', response);
return Promise.reject(response.data); return Promise.reject(response.data);
} else { } else {
return response.data; return response.data;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment