From 59ae2316cdfb6f644ff8bbed5352a6620528502b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=99=E8=BF=B0=E3=80=81=E5=88=AB=E7=A6=BB?=
 <93301500+xushubieli@users.noreply.github.com>
Date: Wed, 31 May 2023 20:50:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E4=BC=98=E5=8C=96=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E6=B3=A8=E5=86=8C=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E4=BB=A5=E5=90=8E=E6=96=B9=E4=BE=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/login.htm         | 10 +++---
 src/user/templets/login.htm          | 16 ++++-----
 src/user/templets/reg-new.htm        | 54 +++++-----------------------
 src/user/templets/resetpassword.htm  | 45 ++++-------------------
 src/user/templets/resetpassword2.htm | 21 ++++++-----
 src/user/templets/resetpassword3.htm |  2 +-
 6 files changed, 42 insertions(+), 106 deletions(-)

diff --git a/src/admin/templets/login.htm b/src/admin/templets/login.htm
index e3896fa3..6ccb20de 100644
--- a/src/admin/templets/login.htm
+++ b/src/admin/templets/login.htm
@@ -39,15 +39,15 @@
 								<input type="hidden" name="dopost" value="login">
 								<input type="hidden" name="adminstyle" value="newDedeBIZ">
 								<div class="form-group">
-									<label for="iptUserid">管理员账号</label>
-									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入管理员账号">
+									<label>管理员账号</label>
+									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入管理员账号" required>
 								</div>
 								<div class="form-group">
-									<label for="iptPassword">管理员密码</label>
-									<input type="password" name="pwd" id="iptPassword" class="form-control" placeholder="请输入管理员密码">
+									<label>管理员密码</label>
+									<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入管理员密码" required>
 								</div>
 								<div id="vdimgck" class="form-group" style="display:none">
-									<label for="iptValidate">验证码</label>
+									<label>验证码</label>
 									<div class="input-group">
 										<input type="text" name="validate" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码">
 										<img src="../apps/vdimgck.php" onclick="this.src='../apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码" id="validateimg">
diff --git a/src/user/templets/login.htm b/src/user/templets/login.htm
index 81279ba2..2acdfe04 100755
--- a/src/user/templets/login.htm
+++ b/src/user/templets/login.htm
@@ -19,27 +19,27 @@
 					<div class="login-from d-inline-block">
 						<div class="login-box shadow-sm rounded text-left">
 							<h2 class="text-center mb-3">会员登录</h2>
-							<form name='form1' method='POST' action='<?php echo $cfg_memberurl;?>/index_do.php'>
+							<form name="form1" method="POST" action="<?php echo $cfg_memberurl;?>/index_do.php">
 								<input type="hidden" name="fmdo" value="login">
 								<input type="hidden" name="dopost" value="login">
 								<input type="hidden" name="keeptime" value="604800">
 								<input type="hidden" name="gourl" value="<?php if (!empty($gourl)) echo $gourl;?>">
 								<div class="form-group">
-									<label for="iptUserid">会员账号</label>
-									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入登录会员账号">
+									<label>会员账号</label>
+									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入登录会员账号" required>
 								</div>
 								<div class="form-group">
-									<label for="iptPwd">会员密码</label>
-									<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码">
+									<label>会员密码</label>
+									<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码" required>
 								</div>
-								<div class="form-group" id="vdimgck" style="display:none">
-									<label for="iptValidate">验证码</label>
+								<div id="vdimgck" class="form-group" style="display:none">
+									<label>验证码</label>
 									<div class="input-group">
 										<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码">
 										<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 									</div>
 								</div>
-								<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php" class="text-dark">忘记会员密码？</a></div>
+								<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php">忘记会员密码？</a></div>
 								<div class="form-group"><button type="submit" class="btn btn-success btn-md btn-block">登录</button></div>
 								<div><a href="<?php echo $cfg_memberurl;?>/index_do.php?fmdo=user&dopost=regnew" class="btn btn-outline-success btn-md btn-block">注册</a></div>
 							</form>
diff --git a/src/user/templets/reg-new.htm b/src/user/templets/reg-new.htm
index 99fabb6b..2980c10f 100755
--- a/src/user/templets/reg-new.htm
+++ b/src/user/templets/reg-new.htm
@@ -18,27 +18,27 @@
 					<div class="login-from d-inline-block">
 						<div class="login-box shadow-sm rounded text-left">
 							<h2 class="text-center mb-3">会员注册</h2>
-							<form name="form2" action="reg_new.php" method="post" id="regUser" onsubmit="return CheckSubmit();">
+							<form name="form2" action="reg_new.php" method="post" id="regUser">
 								<input type="hidden" name="dopost" value="regbase">
 								<input type="hidden" name="step" value="1">
 								<input type="hidden" name="mtype" value="个人">
 								<input type="hidden" name="pid" value="<?php echo $pid;?>">
 								<div class="form-group">
-									<label for="iptUserid">会员账号</label>
-									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号">
+									<label>会员账号</label>
+									<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入会员账号" required>
 								</div>
 								<div class="form-group">
-									<label for="iptUserpwd">会员密码</label>
-									<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码">
+									<label>会员密码</label>
+									<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码" required>
 								</div>
 								<div class="form-group">
-									<label for="iptUserpwdok">确认会员密码</label>
-									<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码">
+									<label>确认会员密码</label>
+									<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码" required>
 								</div>
 								<div class="form-group">
-									<label for="iptValidate">验证码</label>
+									<label>验证码</label>
 									<div class="input-group">
-										<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码">
+										<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码" required>
 										<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onClick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 									</div>
 								</div>
@@ -55,41 +55,5 @@
 			</div>
 		</main>
 		<?php obtaintheme('foot.htm');?>
-		<script>
-			//CheckSubmit校验注册提交表单
-			function CheckSubmit() {
-				let formCheck = [{
-						elem: "#iptUserid",
-						condition: $("#iptUserid").val() === "",
-					},
-					{
-						elem: "#iptLicence",
-						condition: !$("#iptLicence").is(':checked'),
-					},
-					{
-						elem: "#iptValidate",
-						condition: $("#iptValidate").val() === "",
-					},
-					{
-						elem: "#iptUserpwd",
-						condition: $("#iptUserpwd").val() === "",
-					},
-					{
-						elem: "#iptUserpwdok",
-						condition: $("#iptUserpwdok").val() !== $("#iptUserpwd").val(),
-					},
-				];
-				for (let i = 0; i < formCheck.length; i++) {
-					const fc = formCheck[i];
-					if (fc.condition) {
-						$(fc.elem).addClass("is-invalid");
-						return false
-					} else {
-						$(fc.elem).removeClass("is-invalid");
-					}
-				}
-				return true
-			}
-		</script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/src/user/templets/resetpassword.htm b/src/user/templets/resetpassword.htm
index ebed0d12..b35c40a7 100755
--- a/src/user/templets/resetpassword.htm
+++ b/src/user/templets/resetpassword.htm
@@ -21,15 +21,15 @@
 						<input type="hidden" name="dopost" value="getpwd">
 						<input type="hidden" name="gourl" value="<?php if (!empty($gourl)) echo $gourl;?>">
 						<div class="form-group">
-							<label for="txtUsername">账号</label>
-							<input type="text" name="userid" id="txtUsername" class="form-control" placeholder="请输入账号">
+							<label>会员账号</label>
+							<input type="text" name="userid" id="iptUserid" class="form-control" placeholder="请输入账号" required>
 						</div>
 						<div class="form-group">
-							<label for="txtMail">邮箱</label>
-							<input type="text" name="mail" id="txtMail" class="form-control" placeholder="请输入邮箱">
+							<label>邮箱</label>
+							<input type="text" name="mail" id="iptMail" class="form-control" placeholder="请输入邮箱" required>
 						</div>
 						<div class="form-group">
-							<label for="iptValidate">找回方式</label>
+							<label>找回方式</label>
 							<div class="input-group">
 								<select name="type" class="form-control">
 									<option value="1" selected>通过邮件取回</option>
@@ -38,9 +38,9 @@
 							</div>
 						</div>
 						<div class="form-group">
-							<label for="iptValidate">验证码</label>
+							<label>验证码</label>
 							<div class="input-group">
-								<input type="text" name="vdcode" class="form-control text-uppercase" id="iptValidate" placeholder="请输入验证码">
+								<input type="text" name="vdcode" id="iptValidate" class="form-control text-uppercase" placeholder="请输入验证码" required>
 								<img src="<?php echo $cfg_cmsurl;?>/apps/vdimgck.php" id="validateimg" onclick="this.src='<?php echo $cfg_cmsurl;?>/apps/vdimgck.php?'+new Date().getTime()+Math.round(Math.random() * 10000)" title="验证码">
 							</div>
 						</div>
@@ -50,36 +50,5 @@
 			</div>
 		</main>
 		<?php obtaintheme('foot.htm');?>
-		<script>
-			function changeAuthCode() {
-				var num = new Date().getTime();
-				var rand = Math.round(Math.random() * 10000);
-				num = num + rand;
-				$('#ver_code').css('visibility', 'visible');
-				if ($("#vdimgck")[0]) {
-					$("#vdimgck")[0].src = "/apps/vdimgck.php?tag=" + num;
-				}
-				return false;
-			}
-			function hideVc() {
-				$('#ver_code').css('visibility', 'hidden');
-			}
-			$(document).ready(function() {
-				$("#vdcode").focus(function() {
-					var leftpos = $("#vdcode").position().left;
-					$('#ver_code').css('left', leftpos + 'px');
-					$('#ver_code').css('visibility', 'visible');
-				});
-				$("input[type='password']").click(function() {
-					hideVc()
-				});
-				$("#txtUsername").click(function() {
-					hideVc()
-				});
-				$("input[type='radio']").focus(function() {
-					hideVc()
-				});
-			})
-		</script>
 	</body>
 </html>
\ No newline at end of file
diff --git a/src/user/templets/resetpassword2.htm b/src/user/templets/resetpassword2.htm
index a9af5f89..fd0157a8 100755
--- a/src/user/templets/resetpassword2.htm
+++ b/src/user/templets/resetpassword2.htm
@@ -22,24 +22,27 @@
 						<input type="hidden" name="setp" value="2">
 						<input type="hidden" name="id" value="<?php echo $id;?>">
 						<div class="form-group">
-							<label>账号</label>
-							<input type="text" name="userid" readonly="readonly" id="txtUsername" class="form-control" value="<?php echo $row['membername']?>">
+							<label>会员账号</label>
+							<input type="text" name="userid" readonly="readonly" id="iptUserid" class="form-control" value="<?php echo $row['membername']?>">
 						</div>
 						<?php if (empty($key)) {?>
 						<div class="form-group">
-							<label>临时密码</label>
-							<input type="password" name="pwdtmp" class="form-control" placeholder="请输入临时密码">
+							<label>会员临时密码</label>
+							<input type="password" name="pwdtmp" id="iptPwdtmp" class="form-control" placeholder="请输入临时密码">
 						</div>
 						<?php } else {?>
-						<input name="key" type="hidden" value="<?php echo $key;?>">
+						<div class="form-group">
+							<label>验证码</label>
+							<input name="key" type="hidden" value="<?php echo $key;?>" placeholder="请输入验证码">
+						</div>
 						<?php }?>
 						<div class="form-group">
-							<label>新密码</label>
-							<input type="password" name="pwd" class="form-control" placeholder="请输入新密码">
+							<label>会员新密码</label>
+							<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入新密码">
 						</div>
 						<div class="form-group">
-							<label>确认密码</label>
-							<input type="password" name="pwdok" class="form-control" placeholder="请输入确认密码">
+							<label>会员确认密码</label>
+							<input type="password" name="pwdok" id="iptPwdok" class="form-control" placeholder="请输入确认密码">
 						</div>
 						<div><button type="submit" class="btn btn-success btn-md btn-block">下一步</button></div>
 					</form>
diff --git a/src/user/templets/resetpassword3.htm b/src/user/templets/resetpassword3.htm
index ad88a4c1..8f08ea42 100755
--- a/src/user/templets/resetpassword3.htm
+++ b/src/user/templets/resetpassword3.htm
@@ -26,7 +26,7 @@
 						</div>
 						<div class="form-group">
 							<label>问题答案</label>
-							<input type="text" name="safeanswer" class="form-control" placeholder="请输入问题答案">
+							<input type="text" name="safeanswer" id="iptSafeanswer" class="form-control" placeholder="请输入问题答案">
 						</div>
 						<div class="form-group">
 							<label>验证码</label>