Merge branch 'master' of http://47.112.200.206:3000/aijia/kmt

# Conflicts:
#	src/components/MenuComponent.vue

src/pages/Home.vue

@@ -185,7 +185,7 @@
 
 <style scoped>
   .main_conter{
-    height: 1000px;
+    min-height: 1000px;
   }
   .out{
     margin-left:10px;