Merge branch 'develop' into 'test'

src/containers/login/index.vue

@@ -15,6 +15,7 @@
       </h3>
       <el-form-item>
         <el-input
+          @keyup.enter.native="handleLogin"
           name="username"
           type="text"
           v-model="loginForm.name"
@@ -24,6 +25,7 @@
       </el-form-item>
       <el-form-item>
         <el-input
+          @keyup.enter.native="handleLogin"
           name="password"
           :type="pwdType"
           v-model="loginForm.password"
@@ -51,6 +53,7 @@
           autoComplete="on"
           placeholder="输入验证码"
           :maxlength="4"
+          ref="vcode"
         ></el-input>
         <div class="vcode-box">
           <i class="vcode-img">
@@ -103,7 +106,7 @@ export default {
     };
   },
   created() {
-    this.fetchVcode();
+    this.getVcode();
   },
   methods: {
     ...mapActions(['Login']),
@@ -169,7 +172,13 @@ export default {
       }
     },
     fetchVcode() {
-      fetchVcode()
+      this.getVcode().then(() => {
+        this.loginForm.vcode = '';
+        this.$refs.vcode.focus();
+      });
+    },
+    getVcode() {
+      return fetchVcode()
         .then(res => {
           console.log(res);
           const { saltKey, verifyCode } = res;