Merge branch 'xiaowang' into feature

# Conflicts:
#	src/views/home/index.vue

src/views/home/index.less

@@ -5,13 +5,17 @@
     height: 160px;
 }
 .content{
-    position: fixed;
+    position: absolute
+    ;
     width: 100%;
-    height: 100%;
+    // height: 100%;
     top: 0;
     padding: 0 15px;
     box-sizing: border-box;
-    overflow-y: scroll;
+    // overflow-y: scroll;
+}
+.content1{
+    height: 100%;
 }
 .notice_time{
     padding-right: 5px;

src/views/home/index.vue

@@ -1,5 +1,6 @@
 <template>
     <div class="pages">
+    <div class="content1">
         <div class="blueBg"></div>
         <div class="content">
             <div class="flex flex-end">
@@ -132,6 +133,7 @@
         </div>
         <register-dialog v-if="showRegister" @close="showRegister = false" :registerFlag="registerFlag" :content="tipContent"></register-dialog>
     </div>
+    </div>
 </template>
 
 <script>