登录调整

src/admin/css/login.min.css

@@ -1 +1 @@
-body{line-height:1.6;letter-spacing:.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.login-flex{display:flex;width:100%;height:80vh;align-items:center;justify-content:center}.logo,.form-control{height:36px}.login-from{width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}}
+body{line-height:1.6;letter-spacing:.6px;font-size:14px;font-family:Helvetica Neue,Helvetica,PingFang SC,Tahoma,Arial,sans-serif;color:#545b62;background:#f5f5f5}a{color:#545b62}a:hover{color:#ff8400;text-decoration:none}h2{line-height:1.2;font-size:24px;color:#393d49;font-weight:600}.btn,input,select{font-size:14px!important}.admin-head{padding:1rem 0;background:#fff}.admin-nav{height:36px;line-height:36px}.admin-nav-a{padding-right:30px}.dropdown-menu{min-width:8rem;font-size:14px}.dropdown-item{padding:0 1rem;height:30px;line-height:30px;font-size:14px;color:#545b62!important}.logo,.form-control{height:36px}.login-from{margin:5rem auto;width:500px}.login-box{padding:1.25rem;background:#fff}.login-box,.form-control,.btn-md,.alert,.rounded{border-radius:.5rem!important}.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0!important;border-bottom-right-radius:0!important}.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0!important;border-bottom-left-radius:0!important}#validateimg{border-radius:0 .5rem .5rem 0;cursor:pointer}#browsehappy{padding:1rem 30px;font-size:14px;color:#856404;background:#fff3cd}.browsehappy-close{float:right;font-size:14px;cursor:pointer}@media (max-width:760px){.admin-head{padding:1rem 15px}.admin-nav-a{display:none!important}.login-from{width:100%}}

src/admin/templets/login.htm

@@ -19,7 +19,7 @@
 			<a onclick="document.getElementById('browsehappy').style.display='none';" class="browsehappy-close"><i class="fa fa-times"></i></a>
 		</div>
 		<?php }?>
-		<div class="d-flex flex-md-row align-items-center shadow-sm admin-head">
+		<div class="d-flex flex-md-row align-items-center shadow-sm admin-head mb-3">
 			<div class="container">
 				<div class="row">
 					<div class="col-6 col-md-4"><img src="../static/web/img/logo.png" title="<?php echo $cfg_soft_enname;?>" class="logo"></div>
@@ -30,35 +30,33 @@
 		<div class="container">
 			<div class="row">
 				<div class="col-md-12">
-					<div class="login-flex">
-						<div class="login-from">
-							<?php echo $redmsg;?>
-							<div class="login-box shadow-sm mb-3">
-								<h2 class="text-center mb-3">后台登录</h2>
-								<form name="form1" method="post" action="login.php">
-									<input type="hidden" name="gotopage" value="<?php if (!empty($gotopage)) echo RemoveXSS($gotopage);?>">
-									<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="请输入管理员账号">
+					<div class="login-from">
+						<?php echo $redmsg;?>
+						<div class="login-box shadow-sm mb-3">
+							<h2 class="text-center mb-3">后台登录</h2>
+							<form name="form1" method="post" action="login.php">
+								<input type="hidden" name="gotopage" value="<?php if (!empty($gotopage)) echo RemoveXSS($gotopage);?>">
+								<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="请输入管理员账号">
+								</div>
+								<div class="form-group">
+									<label for="iptPassword">管理员密码</label>
+									<input type="password" name="pwd" id="iptPassword" class="form-control" placeholder="请输入管理员密码">
+								</div>
+								<div id="vdimgck" class="form-group" style="display:none">
+									<label for="iptValidate">验证码</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">
 									</div>
-									<div class="form-group">
-										<label for="iptPassword">管理员密码</label>
-										<input type="password" name="pwd" id="iptPassword" class="form-control" placeholder="请输入管理员密码">
-									</div>
-									<div id="vdimgck" class="form-group" style="display:none">
-										<label for="iptValidate">验证码</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">
-										</div>
-									</div>
-									<div><button type="submit" class="btn btn-success btn-md btn-block">登录</button></div>
-								</form>
-							</div>
-							<p><?php echo $cfg_powerby;?></p>
+								</div>
+								<div><button type="submit" class="btn btn-success btn-md btn-block">登录</button></div>
+							</form>
 						</div>
+						<p><?php echo $cfg_powerby;?></p>
 					</div>
 				</div>
 			</div>

src/static/web/css/admin.css

@@ -39,7 +39,7 @@ div,form,ul,ol,li {
 	margin:0;
 	padding:0
 }
-div,th,td {
+div,li,span,th,td {
 	word-break:break-all;
 	word-wrap:break-word
 }
@@ -271,7 +271,6 @@ body.hidemenu .body-right {
 	line-height:60px
 }
 .top-admin img {
-	margin-right:10px;
 	width:30px;
 	height:30px;
 	border-radius:50%

src/static/web/css/style.css

@@ -285,14 +285,8 @@ input[type=file] {
 .logo img {
 	height:40px
 }
-.login-flex {
-	display:flex;
-	width:100%;
-	height:70vh;
-	align-items:center;
-	justify-content:center
-}
 .login-from {
+	margin:5rem 0;
 	width:500px
 }
 .login-box {

src/user/templets/login.htm

@@ -15,36 +15,34 @@
 		<?php pasterTempletDiy('top.htm');?>
 		<main class="container">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="login-flex">
-						<div class="login-from">
-							<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'>
-									<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="请输入登录会员账号">
+				<div class="col-md-12 text-center">
+					<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'>
+								<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="请输入登录会员账号">
+								</div>
+								<div class="form-group">
+									<label for="iptPwd">会员密码</label>
+									<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码">
+								</div>
+								<div class="form-group" id="vdimgck" style="display:none">
+									<label for="iptValidate">验证码</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 class="form-group">
-										<label for="iptPwd">会员密码</label>
-										<input type="password" name="pwd" id="iptPwd" class="form-control" placeholder="请输入登录会员密码">
-									</div>
-									<div class="form-group" id="vdimgck" style="display:none">
-										<label for="iptValidate">验证码</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"><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>
-							</div>
+								</div>
+								<div class="form-group"><a href="<?php echo $cfg_memberurl;?>/resetpassword.php" class="text-dark">忘记会员密码？</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>
 						</div>
 					</div>
 				</div>

src/user/templets/reg-new.htm

@@ -14,43 +14,41 @@
 		<?php pasterTempletDiy('top.htm');?>
 		<main class="container">
 			<div class="row">
-				<div class="col-md-12">
-					<div class="login-flex">
-						<div class="login-from">
-							<div class="login-box shadow-sm rounded text-left">
-								<h2 class="text-center mb-3">会员注册</h2>
-								<form method="post" action="reg_new.php" id="regUser" name="form2" onsubmit="return CheckSubmit();">
-									<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="请输入会员账号">
+				<div class="col-md-12 text-center">
+					<div class="login-from d-inline-block">
+						<div class="login-box shadow-sm rounded text-left">
+							<h2 class="text-center mb-3">会员注册</h2>
+							<form method="post" action="reg_new.php" id="regUser" name="form2" onsubmit="return CheckSubmit();">
+								<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="请输入会员账号">
+								</div>
+								<div class="form-group">
+									<label for="iptUserpwd">会员密码</label>
+									<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码">
+								</div>
+								<div class="form-group">
+									<label for="iptUserpwdok">确认会员密码</label>
+									<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码">
+								</div>
+								<div class="form-group">
+									<label for="iptValidate">验证码</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 class="form-group">
-										<label for="iptUserpwd">会员密码</label>
-										<input type="password" name="userpwd" id="iptUserpwd" class="form-control" placeholder="请输入会员密码">
-									</div>
-									<div class="form-group">
-										<label for="iptUserpwdok">确认会员密码</label>
-										<input type="password" name="userpwdok" id="iptUserpwdok" class="form-control" placeholder="请输入确认会员密码">
-									</div>
-									<div class="form-group">
-										<label for="iptValidate">验证码</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 form-check">
-										<input type="checkbox" id="iptLicence" class="form-check-input">
-										<label class="form-check-label licence" for="iptLicence">我已阅读并接受<a href="">《会员注册条款》</a>和<a href="">《隐私保护条例》</a></label>
-									</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;?>/login.php" class="btn btn-outline-success btn-md btn-block">登录</a></div>
-								</form>
-							</div>
+								</div>
+								<div class="form-group form-check">
+									<input type="checkbox" id="iptLicence" class="form-check-input">
+									<label class="form-check-label licence" for="iptLicence">我已阅读并接受<a href="">《会员注册条款》</a>和<a href="">《隐私保护条例》</a></label>
+								</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;?>/login.php" class="btn btn-outline-success btn-md btn-block">登录</a></div>
+							</form>
 						</div>
 					</div>
 				</div>