From af8344c555c77cd6b4af56961e69337d358984d3 Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Wed, 23 Feb 2022 10:03:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E5=A4=A7=E5=86=99=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/assets/js/functions/common.js | 2 +-
 resources/assets/js/pages/login.vue     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/resources/assets/js/functions/common.js b/resources/assets/js/functions/common.js
index 7951cfd7..8e756935 100755
--- a/resources/assets/js/functions/common.js
+++ b/resources/assets/js/functions/common.js
@@ -360,7 +360,7 @@
          * @returns {boolean}
          */
         isEmail(email) {
-            return /^[a-z0-9][a-z\.0-9-_]+@[a-z0-9_-]+(?:\.[a-z]{0,3}\.[a-z]{0,2}|\.[a-z]{0,3}|\.[a-z]{0,2})$/.test(email);
+            return /^[a-z0-9][a-z\.0-9-_]+@[a-z0-9_-]+(?:\.[a-z]{0,3}\.[a-z]{0,2}|\.[a-z]{0,3}|\.[a-z]{0,2})$/i.test(email);
         },
 
         /**
diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue
index b0bd355d..2d7d67a1 100644
--- a/resources/assets/js/pages/login.vue
+++ b/resources/assets/js/pages/login.vue
@@ -81,6 +81,7 @@ export default {
 
             loginType: 'login',
             loginJump: false,
+
             email: $A.getStorageString("cacheLoginEmail") || '',
             password: '',
             password2: '',
@@ -277,6 +278,12 @@ export default {
 
         onLogin() {
             this.chackServerUrl(true).then(() => {
+                this.email = $A.trim(this.email)
+                this.password = $A.trim(this.password)
+                this.password2 = $A.trim(this.password2)
+                this.code = $A.trim(this.code)
+                this.invite = $A.trim(this.invite)
+                //
                 if (!$A.isEmail(this.email)) {
                     $A.messageWarning("请输入正确的邮箱地址");
                     return;