diff --git a/src/layout/component/main.vue b/src/layout/component/main.vue
index 18eba607e209233c22cc5d2d2084873821d848ce..b322fb0c1bf9f81c29df4882f5b9eafcc1397fb9 100644
--- a/src/layout/component/main.vue
+++ b/src/layout/component/main.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-main class="layout-main">
+	<el-main class="layout-main" :style="{ height: 'calc( 100% - ' + setHeaderHeight + ')' }">
 		<el-scrollbar
 			ref="layoutScrollbarRef"
 			:class="{
@@ -61,7 +61,12 @@ export default defineComponent({
 		// 初始化获取当前路由 meta，用于设置 iframes padding
 		const initGetMeta = () => {
 			state.currentRouteMeta = route.meta;
-		};
+		};// 设置 header 的高度
+        const setHeaderHeight = computed(() => {
+            let { isTagsview, layout } = themeConfig.value;
+            if (isTagsview && layout !== 'classic') return '84px';
+            else return '50px';
+        });
 		// 页面加载前
 		onMounted(async () => {
 			await initGetMeta();
@@ -95,6 +100,7 @@ export default defineComponent({
 			themeConfig,
 			isClassicOrTransverse,
 			...toRefs(state),
+            setHeaderHeight
 		};
 	},
 });
diff --git a/src/layout/routerView/parent.vue b/src/layout/routerView/parent.vue
index db22141ab2753949d3bb1510eba35ef447da5386..770d4392b4e63f1dae0b96be5de3e502237e74c3 100644
--- a/src/layout/routerView/parent.vue
+++ b/src/layout/routerView/parent.vue
@@ -3,7 +3,7 @@
 		<router-view v-slot="{ Component }">
 			<transition :name="setTransitionName" mode="out-in">
 				<keep-alive :include="getKeepAliveNames">
-					<component :is="Component" :key="refreshRouterViewKey" class="w100" />
+					<component :is="Component" :key="refreshRouterViewKey" class="w100 h100" />
 				</keep-alive>
 			</transition>
 		</router-view>
diff --git a/src/theme/app.scss b/src/theme/app.scss
index 4c75296b8c5a4945cdcaeba96ca528f53afb8dec..5f883cf9cdfd9ce9146ef1097aae6d4062cc1119 100644
--- a/src/theme/app.scss
+++ b/src/theme/app.scss
@@ -71,6 +71,11 @@ body,
 	.el-scrollbar {
 		width: 100%;
 	}
+	.layout-backtop {
+		.el-scrollbar__view {
+			height: 100%;
+		}
+	}
 	// 此字段多次用到，建议不删除，如需修改，请重写覆盖样式
 	.layout-view-bg-white {
 		background: var(--el-color-white);