合并分支 'lihong' 到 'master'

Lihong



查看合并请求 !41

@@ -12,8 +12,10 @@
 		html,body {
 		html,body {
 			display: flex;
 			display: flex;
 			flex-flow: column;
 			flex-flow: column;
-			background: #5995cf url("__TMPL__/public/mobile/images/footbei.png") center repeat-x;
-			background-size: cover;
+			background: #5995cf url("__TMPL__/public/mobile/images/login_bg.png") center no-repeat;
+			background-size: 100% 100%;
+			overflow: hidden;
+			margin: 0;
 			/*background-attachment: fixed;*/
 			/*background-attachment: fixed;*/
 		}
 		}
 		.container {
 		.container {
@@ -37,10 +39,10 @@
 			line-height: 1rem;
 			line-height: 1rem;
 			right: 1rem;
 			right: 1rem;
 		}
 		}
-		.footbac{
-			background: url(__TMPL__/public/mobile/images/footbac.png) repeat-x;
-			background-size: 100% 100%;
-		}
+		/*.footbac{*/
+			/*background: url(__TMPL__/public/mobile/images/footbac.png) repeat-x;*/
+			/*background-size: 100% 100%;*/
+		/*}*/
 	</style>
 	</style>
 </head>
 </head>
 
 
@@ -88,7 +90,9 @@
 <script src="__TMPL__/public/mobile/js/swiper-4.3.5.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/swiper-4.3.5.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/common.js" type="text/javascript" charset="utf-8"></script>
 <script src="__TMPL__/public/mobile/js/common.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript">
 <script type="text/javascript">
+    var h=$(window).height();
 
 
+    $("body").height(h+"px")
 
 
 	$('.to_register').click(function(){
 	$('.to_register').click(function(){
         window.location.href = "{:url('user/Register/index')}";
         window.location.href = "{:url('user/Register/index')}";