Merge remote-tracking branch 'origin/master'

src/view/main/main.vue

@@ -21,7 +21,7 @@
       </el-menu>
     </el-header>
     <router-view/>
-    <el-footer style="height: 100px" class="linear">
+    <el-footer style="height: 100px;flex: 0 0 auto;width: 100%" class="linear">
       <div class="footer">
         <div class="footer-bar">
           <span @click="clickItem(index)"
@@ -236,4 +236,25 @@ export default {
     align-items: center;
     justify-content: center;
 }
+html{
+  height:100%;
+}
+body{
+  min-height:100%;
+  margin:0;
+  padding:0;
+  position:relative;
+}
+.el-container{
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+main{
+  flex: 1 0 auto;
+}
+  footer{
+    flex:0 0 auto;
+  }
 </style>