From af56d05847df8c17a5cc01aa0d854167b86be9a3 Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 21 Sep 2020 13:38:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=95=8C=E9=9D=A2=20user.log?=
 =?UTF-8?q?inByValidCode=20=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/views/modules/sys/sysLogin.html   | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/modules/core/src/main/resources/views/modules/sys/sysLogin.html b/modules/core/src/main/resources/views/modules/sys/sysLogin.html
index 4fea1d28..d54244de 100644
--- a/modules/core/src/main/resources/views/modules/sys/sysLogin.html
+++ b/modules/core/src/main/resources/views/modules/sys/sysLogin.html
@@ -9,13 +9,18 @@
 			<small>${@Global.getConfig('productVersion')}</small></a>
 	</div>
 	<div class="login-box-body">
-		<ul id="loginTab" class="nav nav-tabs ${@Global.getConfigToBoolean('user.loginByValidCode','true')?'':'hide'}">
-			<li class="active"><a href="#tab-1" data-toggle="tab" action="${ctx}/login">${text('账号登录')}</a></li>
-			<li><a href="#tab-2" data-toggle="tab" action="${ctxPath}/account/loginByValidCode">${text('手机登录')}</a></li>
-		</ul>
+		<% var isLoginByValidCode = @Global.getConfigToBoolean('user.loginByValidCode', 'true'); %>
+		<% if(isLoginByValidCode){ %>
+			<ul id="loginTab" class="nav nav-tabs">
+				<li class="active"><a href="#tab-1" data-toggle="tab" action="${ctx}/login">${text('账号登录')}</a></li>
+				<li><a href="#tab-2" data-toggle="tab" action="${ctxPath}/account/loginByValidCode">${text('手机登录')}</a></li>
+			</ul>
+		<% } %>
 		<#form:form id="loginForm" model="${user!}" action="${ctx}/login" method="post" class="tab-content">
-			<% if(isNotBlank(message!)){ %>
-				<h5 class="login-box-msg text-red">${message}</h5>
+			<% if(!isLoginByValidCode && isBlank(message!)){ %>
+				<h4 class="login-box-msg">${text('欢迎回来')+'！'}</h4>
+			<% }else if(isNotBlank(message!)){ %>
+				<h4 class="login-box-msg text-red">${message}</h4>
 			<% } %>
 			<div class="form-group has-feedback">
 				<span class="icon-user form-control-feedback" title="${text('登录账号')}"></span>