Merge branch 'master' of http://114.215.101.231:8099/liuzhen/qiaohu into lihong

@@ -9,6 +9,7 @@
         html,body {
             display: flex;
             flex-flow: column;
+            height: auto;
         }
         .container {
             display: flex;

@@ -44,7 +44,7 @@ html,
 body {
 	position: relative;
 	width: 100%;
-	/*height: 100%;*/
+	height: 100%;
 	padding: 0;
 	margin: 0;
 	background-color: #F8F8F8;
@@ -114,11 +114,12 @@ span.back_href {
 	line-height: .5rem;
 }
 .container{
-	width: 7.5rem; 
-	/*height: 100%;*/	margin: 0 auto;
+	width: 7.5rem;
+	height: 100%;
+	margin: 0 auto;
 	box-sizing: border-box;
-	/*overflow-y: scroll;*/
-	/*overflow-x: hidden;*/
+	overflow-y: scroll;
+	overflow-x: hidden;
 }
 
 
@@ -182,8 +183,8 @@ span.back_href {
 /*.footer*/
 .footer{
 	display: flex;
-	/*position: fixed;*/
-	/*bottom: 0;*/
+	position: fixed;
+	bottom: 0;
 	height: 1rem;
 	color: #BBBBBB;
 	background-color: #FFFFFF;
@@ -242,5 +243,5 @@ span.back_href {
 	left: 0;
 	top: 0;
 	display: none;
-	z-index: 6;
+	z-index: 5;
 }