Merge branch 'master' of http://39.106.223.11/462269006/cyyy

src/main/resources/static/js/common.js

@@ -139,7 +139,7 @@ var Common = {
 			content: Common.ctxPath+url,
 			title: title,
 			maxmin: false,
-			 area: ['90%', '90%'],
+			 area: ['100%', '100%'],
 			cancel:function(index,layero){
 				//为防止错误关闭子页面做提示
 				var iframeWin = window[layero.find('iframe')[0]['name']];

src/main/resources/templates/login.html

@@ -33,7 +33,7 @@
 							<a href="#" class="menu_4"><img src="img/index/icon/l_d.png"/></a>
 							<a href="#" class="menu_5"><img src="img/index/icon/l_e.png"/></a>
 						</div>
-						<a href="#" class="menu_0"><img src="img/index/icon/l_a.png"/></a>
+						<a href="#" class="menu_0"><img src="img/index/icon/qian.png"/></a>
 					</div>
 					<div class="login">
 						<!-- form action="" method="post"> -->