Merge branch 'master' of http://114.115.138.98:8900/fukai/vue-gjjs

src/views/Layout/SideMenu.vue

@@ -9,7 +9,7 @@
       <el-button icon="el-icon-s-unfold" v-else @click="openMenu"></el-button>
       <c-search-input v-show="menuOpen"></c-search-input>
     </div>
-    <c-content :height="0">
+    <c-content :height="menusHeight">
       <el-menu
         :default-active="activeMenu"
         class="el-menu-vertical-demo"
@@ -109,6 +109,7 @@ export default {
         { inifrm: "infusr", ininam: "用户信息", pntmiu: "10" },
       ],
       menus: [],
+      menusHeight: 0
     };
   },
   computed: {
@@ -125,6 +126,9 @@ export default {
       })
     }
   },
+  created() {
+    this.menusHeight = 60 + 46 + 8;
+  },
   mounted() {
     const arr = [];
     this.generateMenuTree(arr);

src/views/Layout/index.vue

@@ -61,7 +61,7 @@ export default {
   transition: width 300ms;
   /* overflow: hidden; */
   overflow: unset;
-  padding-bottom: 68px;
+  /* padding-bottom: 68px; */
   box-sizing: border-box;
 }
 </style>