合并分支 'lihong' 到 'master'

修改



查看合并请求 !134

@@ -78,7 +78,13 @@
 <include file="public@footer"/>
 <include file="public@footer"/>
 <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">
+    // alert($(document).height())
+    if($(document).height()==455){
+        $(".swiper-container").css("height","95%");
+        $(".video_lool").css("magin-top","-0.4rem");
 
 
+    }
+  // alert( $(".video_lool").css("height"))
     var swiper = new Swiper('.swiper-container', {
     var swiper = new Swiper('.swiper-container', {
         pagination: {
         pagination: {
             el: '.swiper-pagination',
             el: '.swiper-pagination',

@@ -12,11 +12,9 @@
     background: #F5AD17;
     background: #F5AD17;
 }
 }
 .swiper-container {
 .swiper-container {
-	  flex: 1;
+	 flex: 1;
 	/*height:76%;*/
 	/*height:76%;*/
 }
 }
-
-
 .video_lool{
 .video_lool{
 	position: relative;
 	position: relative;
 	/*position: fixed;*/
 	/*position: fixed;*/