合并分支 'lihong' 到 'master'

修改



查看合并请求 !112

@@ -12,17 +12,17 @@
     background: #F5AD17;
     background: #F5AD17;
 }
 }
 .swiper-container {
 .swiper-container {
-	  flex: 1;
+	  /*flex: 1;*/
 	/*height:76%;*/
 	/*height:76%;*/
 }
 }
 
 
 
 
 .video_lool{
 .video_lool{
-	position: relative;
-	/*position: fixed;*/
-	bottom:0;
+	/*position: relative;*/
+	position: fixed;
+	bottom:1rem;
 	width: 100%;
 	width: 100%;
-	height: 4.54rem;
+	height: 3.8rem;
 	margin-top: -0.45rem;
 	margin-top: -0.45rem;
 	z-index: 3;
 	z-index: 3;
 	display: flex;
 	display: flex;