合并分支 'lihong' 到 'master'

修改



查看合并请求 !133

@@ -22,7 +22,7 @@
 	/*position: fixed;*/
 	/*position: fixed;*/
 	bottom:0;
 	bottom:0;
 	width: 100%;
 	width: 100%;
-	height: 454px;
+	height: 4.54rem;
 	margin-top: -0.45rem;
 	margin-top: -0.45rem;
 	z-index: 3;
 	z-index: 3;
 	display: flex;
 	display: flex;