From 0f58218badea86a5209ae7f1ccd60b7cb4b26eee Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期四, 25 二月 2021 18:10:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

---
 web_src/src/components/Login.vue |   41 +++++++++++++++++++++++------------------
 1 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/web_src/src/components/Login.vue b/web_src/src/components/Login.vue
index 160197a..2a91886 100644
--- a/web_src/src/components/Login.vue
+++ b/web_src/src/components/Login.vue
@@ -29,14 +29,13 @@
   	}
   },
   created(){
-  var that = this;
-  document.onkeydown = function(e) {
-    var key = window.event.keyCode;
-    if (key == 13) {
-      that.login();
+    var that = this;
+    document.onkeydown = function(e) {
+      var key = window.event.keyCode;
+      if (key == 13) {
+        that.login();
+      }
     }
-  }
-
   },
   methods:{
 
@@ -70,6 +69,7 @@
           if (res.data == "success") {
             that.$cookies.set("session", {"username": that.username}) ;
             //鐧诲綍鎴愬姛鍚�
+            that.cancelEnterkeyDefaultAction();
             that.$router.push('/');
           }else{
             that.isLoging = false;
@@ -84,18 +84,23 @@
         that.$message.error(error.response.statusText);
         that.isLoging = false;
       });
-
-
-
     },
-     setCookie: function (cname, cvalue, exdays) {
-                var d = new Date();
-                d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
-                var expires = "expires=" + d.toUTCString();
-                console.info(cname + "=" + cvalue + "; " + expires);
-                document.cookie = cname + "=" + cvalue + "; " + expires;
-                console.info(document.cookie);
-            },
+    setCookie: function (cname, cvalue, exdays) {
+      var d = new Date();
+      d.setTime(d.getTime() + (exdays * 24 * 60 * 60 * 1000));
+      var expires = "expires=" + d.toUTCString();
+      console.info(cname + "=" + cvalue + "; " + expires);
+      document.cookie = cname + "=" + cvalue + "; " + expires;
+      console.info(document.cookie);
+    },
+    cancelEnterkeyDefaultAction: function() {
+        document.onkeydown = function(e) {
+        var key = window.event.keyCode;
+        if (key == 13) {
+          return false;
+        }
+      }
+    }
   }
 }
 </script>

--
Gitblit v1.8.0