合并分支 'fk-dev' 到 'pre'

src/views/home/index.vue

@@ -3,7 +3,7 @@
 		<div class="pro-wrapper">
 			<div class="home-page">
 				<ModuleHeader v-if="isShowHeader" />
-				<div class="main-container">
+				<div class="main-container" :class="{'main-container1': isShowHeader}">
 					<router-view />
 				</div>
 			</div>
@@ -548,7 +548,14 @@ body {
 
 		.main-container {
 			width: 100%;
-			height: calc(100vh - 64px);
+			// height: calc(100vh - 64px);
+			height: 100vh;
+			position: relative;
+			overflow: hidden;
+		}
+		.main-container1 {
+			width: 100%;
+			height: calc(100vh - 64px) !important;
 			position: relative;
 			overflow: hidden;
 		}