From f212c8f3c70623167dbf786ce407eef53101ca11 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 六月 2023 09:58:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/stasrs_test' into stasrs_test
---
src/main/webapp/views/login.html | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index af1d465..4188369 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -121,6 +121,12 @@
if (password === "") {
layer.tips('璇疯緭鍏ュ瘑鐮�', '#password', {tips: [4, '#ff0000']});
return;
+ }else {
+ if(!checkPassword(password)){
+ //瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛�
+ layer.tips('瀵嗙爜蹇呴』鍖呭惈瀛楃鍜屾暟瀛楅暱搴︿笉鑳藉皯浜�8浣嶏紝涓斾笉鑳藉寘鍚繛缁暟瀛楀拰鍥涗綅閲嶅鏁板瓧', '#password', {tips: [4, '#ff0000']});
+ return ;
+ }
}
$.ajax({
url: baseUrl+"/login.action",
@@ -135,13 +141,7 @@
localStorage.setItem("username", res.data.username);
localStorage.setItem("password", password);
window.location.href = "index.html";
- } else if (res.code === 10001) {
- layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
- } else if (res.code === 10002) {
- layer.tips(res.msg, '#username', {tips: [4, '#ff0000']});
- } else if (res.code === 10003) {
- layer.tips(res.msg, '#password', {tips: [4, '#ff0000']});
- } else {
+ } else {
layer.tips(res.msg, '.login-btn', {tips: [3, '#ff0000']});
}
}
--
Gitblit v1.9.1