Преглед на файлове

Merge branch 'master' of https://git.coding.net/aft/AFT.git

albertshaw преди 8 години
родител
ревизия
4c63675923

+ 1 - 1
src/main/resources/props/config_local.properties

@@ -69,7 +69,7 @@ template.cacheable=false
 
 mobileCodeTemplate=SMS_37845022
 
-portal.host=//aftts.hnzhiming.com/portal/1.0.7
+portal.host=//aftts.hnzhiming.com/portal/1.0.8
 
 patentTemplate=SMS_72005286
 

+ 3 - 0
src/main/webapp/WEB-INF/views/common.html

@@ -206,6 +206,9 @@
 			<a href="#">Copyright © 2016-2017 科德 版权所有 湘ICP备15019731号-2</a>
 			<a href="#">技术支持:湖南智明科技有限公司</a>
 		</div>
+		<div class="msg">
+			<span></span>
+		</div>
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">

+ 3 - 2
src/main/webapp/WEB-INF/views/user/msignIn.html

@@ -34,7 +34,7 @@
 			    <div class="form-group">
 				      <label for="password" class="col-xs-3 control-label text-right"><span class="for_text">密</span>码:</label>
 				      <div class="col-xs-9">
-				         <input type="text" class="form-control" id="password" name='password' placeholder="请输入以字母开头的6-12位密码"  required="required" pattern="^[a-zA-Z]\w{5,11}$" >		           
+				         <input type="text" class="form-control" id="password1" name='password' placeholder="请输入6-12位密码"  required="required" pattern="^\w{5,11}$" >		           
 				      </div>
 			    </div>
 			    <div class="form-group">
@@ -78,7 +78,8 @@
 				      <div class="col-xs-9">
 				         <input type="text" class="form-control" id="people"  placeholder="请输入您的名字" required="required">			           
 				      </div>
-			    </div>			    			  
+			    </div>	
+			    <div class="msg form-group"><span class="col-xs-6 col-xs-push-3"></span></div>		    			  
 			    <div class="form-group">		
 			         <div class="checkbox col-xs-9 col-xs-push-3">
 			            <label for="aft" class="op"></label>