From d814bde01eb91d1544b718463cd31317726bbf6b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 27 十二月 2023 21:52:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/webapp/views/login.html | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index d201660..a559d86 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -3,7 +3,7 @@
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
- <title>涓壃 鈹� login of zoneyung wms</title>
+ <title>wms | 鑷姩鍖栦粨鍌�</title>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1">
<meta name="description" content="study of Instancing with three.js">
<meta name="keywords" content="undefined, Yoichi Kobayashi, WebGL, three.js">
@@ -57,7 +57,7 @@
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
- <p class="p-sketch-outline__date">posted: 2018.01.01 / update: 2022.03.18
+ <p class="p-sketch-outline__date">posted: 2023.05.01 / update: 2023.07.19
</p>
<p class="p-sketch-outline__description">wms made with various simple objects.</p>
</div>
@@ -68,7 +68,7 @@
<div class="login-contain">
<div class="login-box">
<img src="../static/image/logo.png" alt="" style="width: 80%">
- <span class="login100-form-title p-t-20 p-b-45">閫熻吘鐢靛瓙</span>
+<!-- <span class="login100-form-title p-t-20 p-b-45">绫冲鏅鸿兘</span>-->
<span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
<input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">
@@ -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",
@@ -133,14 +139,9 @@
if (res.code === 200){
localStorage.setItem("token", res.data.token);
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