合并分支 'lihong' 到 'master'

修改



查看合并请求 !190

@@ -17,6 +17,12 @@
 			overflow: hidden;
 			overflow: hidden;
 			margin: 0;
 			margin: 0;
 			/*background-attachment: fixed;*/
 			/*background-attachment: fixed;*/
+			position: relative;
+			width: 100%;
+			/* height: 100%; */
+			padding: 0;
+			margin: 0;
+			background-color: #F8F8F8;
 		}
 		}
 		.container {
 		.container {
 			display: flex;
 			display: flex;
@@ -90,9 +96,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")
+    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')}";