Merge pull request '1' (#162) from pc-master into portal

Reviewed-on: #162

src/views/login.vue

@@ -1,20 +1,32 @@
 <template>
   <div class="login">
     <div class="login-header">
-            <img src="../assets/image/logo.png" alt="">
+      <img src="../assets/image/logo.png" alt="" />
     </div>
     <div class="login-view">
       <div class="login-title">
-                <img src="../assets/image/login-icon.png" alt="">
+        <img src="../assets/image/login-icon.png" alt="" />
         <span>用户登录</span>
       </div>
       <div class="login-input username" :class="usernameAct ? 'active' : ''">
-                <img src="../assets/image/username.png" alt="">
+        <img src="../assets/image/username.png" alt="" />
-                <input v-model="username" @focus="usernameAct=true" @blur="usernameAct=false" type="text" placeholder="用户名">
+        <input
+          v-model="username"
+          @focus="usernameAct = true"
+          @blur="usernameAct = false"
+          type="text"
+          placeholder="用户名"
+        />
       </div>
       <div class="login-input password" :class="passwordAct ? 'active' : ''">
-                <img src="../assets/image/password.png" alt="">
+        <img src="../assets/image/password.png" alt="" />
-                <input v-model="password" @focus="passwordAct=true" @blur="passwordAct=false" type="password" placeholder="密   码">
+        <input
+          v-model="password"
+          @focus="passwordAct = true"
+          @blur="passwordAct = false"
+          type="password"
+          placeholder="密   码"
+        />
       </div>
       <div class="save" @click="save = !save">
         <div>
@@ -22,9 +34,7 @@
           记住密码
         </div>
       </div>
-            <div class="login-btn" @click="login">
+      <div class="login-btn" @keyup.enter="toLogin" @click="login">登 录</div>
-                登  录
-            </div>
     </div>
   </div>
 </template>
@@ -35,72 +45,84 @@
       usernameAct: false,
       passwordAct: false,
       save: false,
-            password:'',
+      password: "",
-            username:'',
+      username: "",
-        }
+    };
   },
   mounted() {
-        if(localStorage.getItem('save')){
+    if (localStorage.getItem("save")) {
-          this.password=localStorage.getItem('password')
+      this.password = localStorage.getItem("password");
-          this.username=localStorage.getItem('username')
+      this.username = localStorage.getItem("username");
-          this.save=true
+      this.save = true;
     } else {
-            this.username=localStorage.getItem('username')
+      this.username = localStorage.getItem("username");
       //   this.save=true
     }
-        if(localStorage.getItem('token')){
+    if (localStorage.getItem("token")) {
-      this.$router.push({ name: 'index' })
+      this.$router.push({ name: "index" });
     }
+    this.toLogin();
   },
   methods: {
+    toLogin() {
+             document.onkeydown = e =>{
+                if (!e.shiftKey && e.keyCode === 13) {
+                e.cancelBubble = true; //ie阻止冒泡行为
+                e.stopPropagation();//Firefox阻止冒泡行为
+                e.preventDefault(); //取消事件的默认动作*换行
+                if (e.srcElement.value) {
+                    this.login()
+                }
+            }
+            }
+    },
     login() {
-            var store=this.$store.state
+      var store = this.$store.state;
 
       // "username": "xiaomeng",
       //     "password": "lihe12345"
       if (!this.username) {
         this.$message.error("用户名未填写");
-                return
+        return;
       }
       if (!this.password) {
         this.$message.error("密码未填写");
-                return
+        return;
       }
 
       var data = {
-                "username": this.username,
+        username: this.username,
-                "password":this.password
+        password: this.password,
       }; // 替换为你要发送的数据
       this.api.login(data).then((res) => {
         if (this.save) {
-                    localStorage.setItem('save',1)
+          localStorage.setItem("save", 1);
-                    localStorage.setItem('username',this.username)
+          localStorage.setItem("username", this.username);
-                    localStorage.setItem('password',this.password)
+          localStorage.setItem("password", this.password);
         } else {
-                    localStorage.setItem('save',0)
+          localStorage.setItem("save", 0);
-                    localStorage.setItem('username',this.username)
+          localStorage.setItem("username", this.username);
-                    if(localStorage.getItem('password')){
+          if (localStorage.getItem("password")) {
-                        localStorage.removeItem('password')
+            localStorage.removeItem("password");
           }
         }
         if (res.data.code == 200) {
           this.$message({
-                        message: '登陆成功',
+            message: "登陆成功",
             type: "success",
           });
-                    store.equipmentIndex=1
+          store.equipmentIndex = 1;
-                    localStorage.setItem('token',res.data.data.token)
+          localStorage.setItem("token", res.data.data.token);
-                    localStorage.setItem('userInfo',JSON.stringify(res.data.data))
+          localStorage.setItem("userInfo", JSON.stringify(res.data.data));
-                    this.$router.push({ name: 'index' })
+          this.$router.push({ name: "index" });
         } else {
-                    localStorage.removeItem('token')
+          localStorage.removeItem("token");
           this.$message.error(res.data.msg);
         }
       });
     },
   },
-  
+};
-  }
 </script>
   <style lang="scss" scoped>
 .login {