From 6ca6c694690e7d44dfc55e61d6860265ab5692b5 Mon Sep 17 00:00:00 2001
From: xiaonuobase <1253070437@qq.com>
Date: Wed, 13 Sep 2023 17:01:19 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=95=B4=E4=BD=93=E5=90=8E=E5=8F=B0=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=AE=B9=E5=99=A8=EF=BC=8C=E8=AE=A9=E8=AF=A5=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=89=8D=E5=8F=B0=E7=95=8C=E9=9D=A2=E4=B8=8D?=
 =?UTF-8?q?=E5=8F=97=E9=AB=98=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/index.html                    |   2 +-
 snowy-admin-web/src/layout/index.vue          | 330 +++++++++---------
 snowy-admin-web/src/style/index.less          |   2 +-
 .../src/views/auth/findPwd/index.vue          |   2 +-
 .../src/views/auth/login/login.less           |   2 +-
 5 files changed, 170 insertions(+), 168 deletions(-)

diff --git a/snowy-admin-web/index.html b/snowy-admin-web/index.html
index 0c18338d..64b7b182 100644
--- a/snowy-admin-web/index.html
+++ b/snowy-admin-web/index.html
@@ -28,7 +28,7 @@
   <strong>We're sorry but Snowy2.0 doesn't work properly without JavaScript
     enabled. Please enable it to continue.</strong>
 </noscript>
-<div id="app" class="aminui">
+<div id="app">
   <div class="app-loading">
     <div class="app-loading__logo">
       <img src="/img/logo.png"/>
diff --git a/snowy-admin-web/src/layout/index.vue b/snowy-admin-web/src/layout/index.vue
index 56f4fd8c..b1d290c8 100644
--- a/snowy-admin-web/src/layout/index.vue
+++ b/snowy-admin-web/src/layout/index.vue
@@ -1,184 +1,186 @@
 <template>
-	<!-- 经典布局 -->
-	<template v-if="layout === 'classical'">
-		<a-layout>
-			<a-layout-sider
-				v-if="!ismobile"
-				v-model:collapsed="menuIsCollapse"
-				:trigger="null"
-				collapsible
-				:theme="sideTheme"
-				width="210"
-			>
-				<header id="snowyHeaderLogo" class="snowy-header-logo">
-					<div class="snowy-header-left">
-						<div class="logo-bar">
-							<img class="logo" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
-							<span>{{ sysBaseConfig.SNOWY_SYS_NAME }}</span>
-						</div>
-					</div>
-				</header>
-				<div :class="menuIsCollapse ? 'aminui-side isCollapse' : 'aminui-side'">
-					<div class="adminui-side-scroll">
-						<a-menu
-							v-model:openKeys="openKeys"
-							v-model:selectedKeys="selectedKeys"
-							:theme="sideTheme"
-							mode="inline"
-							@select="onSelect"
-							@openChange="onOpenChange"
-						>
-							<NavMenu :nav-menus="menu" />
-						</a-menu>
-					</div>
-				</div>
-			</a-layout-sider>
-			<!-- 手机端情况下的左侧菜单 -->
-			<Side-m v-if="ismobile" />
-			<!-- 右侧布局 -->
+	<div class="aminui">
+		<!-- 经典布局 -->
+		<template v-if="layout === 'classical'">
 			<a-layout>
-				<div id="snowyHeader" class="snowy-header">
-					<div class="snowy-header-left" style="padding-left: 0px">
-						<div v-if="!ismobile" class="panel-item hidden-sm-and-down" @click="menuIsCollapseClick">
-							<MenuUnfoldOutlined v-if="menuIsCollapse" />
-							<MenuFoldOutlined v-else />
+				<a-layout-sider
+					v-if="!ismobile"
+					v-model:collapsed="menuIsCollapse"
+					:trigger="null"
+					collapsible
+					:theme="sideTheme"
+					width="210"
+				>
+					<header id="snowyHeaderLogo" class="snowy-header-logo">
+						<div class="snowy-header-left">
+							<div class="logo-bar">
+								<img class="logo" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
+								<span>{{ sysBaseConfig.SNOWY_SYS_NAME }}</span>
+							</div>
+						</div>
+					</header>
+					<div :class="menuIsCollapse ? 'aminui-side isCollapse' : 'aminui-side'">
+						<div class="adminui-side-scroll">
+							<a-menu
+								v-model:openKeys="openKeys"
+								v-model:selectedKeys="selectedKeys"
+								:theme="sideTheme"
+								mode="inline"
+								@select="onSelect"
+								@openChange="onOpenChange"
+							>
+								<NavMenu :nav-menus="menu" />
+							</a-menu>
 						</div>
-						<moduleMenu @switchModule="switchModule" />
-						<Topbar v-if="!ismobile && breadcrumbOpen" />
-					</div>
-					<div class="snowy-header-right">
-						<userbar />
 					</div>
-				</div>
-				<!-- 多标签 -->
-				<Tags v-if="!ismobile && layoutTagsOpen" />
-				<a-layout-content class="main-content-wrapper">
-					<div id="adminui-main" class="adminui-main">
-						<router-view v-slot="{ Component }">
-							<keep-alive :include="keepLiveRoute">
-								<component :is="Component" :key="$route.name" v-if="routeShow" />
-							</keep-alive>
-						</router-view>
-						<iframe-view />
-						<div class="main-bottom-wrapper">
-							<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
-								sysBaseConfig.SNOWY_SYS_COPYRIGHT
-							}}</a>
+				</a-layout-sider>
+				<!-- 手机端情况下的左侧菜单 -->
+				<Side-m v-if="ismobile" />
+				<!-- 右侧布局 -->
+				<a-layout>
+					<div id="snowyHeader" class="snowy-header">
+						<div class="snowy-header-left" style="padding-left: 0px">
+							<div v-if="!ismobile" class="panel-item hidden-sm-and-down" @click="menuIsCollapseClick">
+								<MenuUnfoldOutlined v-if="menuIsCollapse" />
+								<MenuFoldOutlined v-else />
+							</div>
+							<moduleMenu @switchModule="switchModule" />
+							<Topbar v-if="!ismobile && breadcrumbOpen" />
+						</div>
+						<div class="snowy-header-right">
+							<userbar />
 						</div>
 					</div>
-				</a-layout-content>
+					<!-- 多标签 -->
+					<Tags v-if="!ismobile && layoutTagsOpen" />
+					<a-layout-content class="main-content-wrapper">
+						<div id="adminui-main" class="adminui-main">
+							<router-view v-slot="{ Component }">
+								<keep-alive :include="keepLiveRoute">
+									<component :is="Component" :key="$route.name" v-if="routeShow" />
+								</keep-alive>
+							</router-view>
+							<iframe-view />
+							<div class="main-bottom-wrapper">
+								<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
+										sysBaseConfig.SNOWY_SYS_COPYRIGHT
+									}}</a>
+							</div>
+						</div>
+					</a-layout-content>
+				</a-layout>
 			</a-layout>
-		</a-layout>
-	</template>
+		</template>
 
-	<!-- 双排菜单布局 -->
-	<template v-else-if="layout === 'doublerow'">
-		<a-layout>
-			<a-layout-sider v-if="!ismobile" width="80" :theme="sideTheme" :trigger="null" collapsible>
-				<header id="snowyHeaderLogo" class="snowy-header-logo">
-					<div class="snowy-header-left">
-						<div class="logo-bar">
-							<router-link to="/">
-								<img class="logo" :title="sysBaseConfig.SNOWY_SYS_NAME" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
-							</router-link>
-						</div>
-					</div>
-				</header>
-				<a-menu v-model:selectedKeys="doublerowSelectedKey" :theme="sideTheme" class="snowy-doublerow-layout-menu">
-					<a-menu-item
-						v-for="item in menu"
-						:key="item.path"
-						style="
-							text-align: center;
-							border-radius: 2px;
-							height: auto;
-							line-height: 20px;
-							flex: none;
-							display: block;
-							padding: 12px 0 !important;
-						"
-						@click="showMenu(item)"
-					>
-						<a
-							v-if="item.meta && item.meta.type === 'link'"
-							:href="item.path"
-							target="_blank"
-							@click.stop="() => {}"
-						></a>
-						<template #icon>
-							<component :is="item.meta.icon" style="padding-left: 10px" />
-						</template>
-						<div class="snowy-doublerow-layout-menu-item-fort-div">
-							<span class="snowy-doublerow-layout-menu-item-fort-div-span">
-								{{ item.meta.title }}
-							</span>
+		<!-- 双排菜单布局 -->
+		<template v-else-if="layout === 'doublerow'">
+			<a-layout>
+				<a-layout-sider v-if="!ismobile" width="80" :theme="sideTheme" :trigger="null" collapsible>
+					<header id="snowyHeaderLogo" class="snowy-header-logo">
+						<div class="snowy-header-left">
+							<div class="logo-bar">
+								<router-link to="/">
+									<img class="logo" :title="sysBaseConfig.SNOWY_SYS_NAME" :src="sysBaseConfig.SNOWY_SYS_LOGO" />
+								</router-link>
+							</div>
 						</div>
-					</a-menu-item>
-				</a-menu>
-			</a-layout-sider>
-			<a-layout-sider
-				v-if="!ismobile"
-				v-show="layoutSiderDowbleMenu"
-				v-model:collapsed="menuIsCollapse"
-				:trigger="null"
-				width="170"
-				collapsible
-				:theme="secondMenuSideTheme"
-			>
-				<div v-if="!menuIsCollapse" id="snowyDoublerowSideTop" class="snowy-doublerow-side-top">
-					<h2 class="snowy-title">{{ pmenu.meta.title }}</h2>
-				</div>
-				<a-menu
+					</header>
+					<a-menu v-model:selectedKeys="doublerowSelectedKey" :theme="sideTheme" class="snowy-doublerow-layout-menu">
+						<a-menu-item
+							v-for="item in menu"
+							:key="item.path"
+							style="
+								text-align: center;
+								border-radius: 2px;
+								height: auto;
+								line-height: 20px;
+								flex: none;
+								display: block;
+								padding: 12px 0 !important;
+							"
+							@click="showMenu(item)"
+						>
+							<a
+								v-if="item.meta && item.meta.type === 'link'"
+								:href="item.path"
+								target="_blank"
+								@click.stop="() => {}"
+							></a>
+							<template #icon>
+								<component :is="item.meta.icon" style="padding-left: 10px" />
+							</template>
+							<div class="snowy-doublerow-layout-menu-item-fort-div">
+								<span class="snowy-doublerow-layout-menu-item-fort-div-span">
+									{{ item.meta.title }}
+								</span>
+							</div>
+						</a-menu-item>
+					</a-menu>
+				</a-layout-sider>
+				<a-layout-sider
+					v-if="!ismobile"
+					v-show="layoutSiderDowbleMenu"
 					v-model:collapsed="menuIsCollapse"
-					v-model:openKeys="openKeys"
-					v-model:selectedKeys="selectedKeys"
-					mode="inline"
+					:trigger="null"
+					width="170"
+					collapsible
 					:theme="secondMenuSideTheme"
-					@select="onSelect"
 				>
-					<NavMenu :nav-menus="nextMenu" />
-				</a-menu>
-			</a-layout-sider>
-			<!-- 手机端情况下的左侧菜单 -->
-			<Side-m v-if="ismobile" />
-			<a-layout>
-				<div id="snowyHeader" class="snowy-header">
-					<div class="snowy-header-left" style="padding-left: 0px">
-						<div v-if="!ismobile" class="panel-item hidden-sm-and-down" @click="menuIsCollapseClick">
-							<MenuUnfoldOutlined v-if="menuIsCollapse" />
-							<MenuFoldOutlined v-else />
-						</div>
-						<moduleMenu @switchModule="switchModule" />
-						<Topbar v-if="!ismobile && breadcrumbOpen" />
-					</div>
-					<div class="snowy-header-right">
-						<userbar />
+					<div v-if="!menuIsCollapse" id="snowyDoublerowSideTop" class="snowy-doublerow-side-top">
+						<h2 class="snowy-title">{{ pmenu.meta.title }}</h2>
 					</div>
-				</div>
-				<!-- 多标签 -->
-				<Tags v-if="!ismobile && layoutTagsOpen"></Tags>
-				<a-layout-content class="main-content-wrapper">
-					<div id="adminui-main" class="adminui-main">
-						<router-view v-slot="{ Component }">
-							<keep-alive :include="keepLiveRoute">
-								<component :is="Component" v-if="routeShow" :key="$route.name" />
-							</keep-alive>
-						</router-view>
-						<iframe-view />
-						<div class="main-bottom-wrapper">
-							<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
-								sysBaseConfig.SNOWY_SYS_COPYRIGHT
-							}}</a>
+					<a-menu
+						v-model:collapsed="menuIsCollapse"
+						v-model:openKeys="openKeys"
+						v-model:selectedKeys="selectedKeys"
+						mode="inline"
+						:theme="secondMenuSideTheme"
+						@select="onSelect"
+					>
+						<NavMenu :nav-menus="nextMenu" />
+					</a-menu>
+				</a-layout-sider>
+				<!-- 手机端情况下的左侧菜单 -->
+				<Side-m v-if="ismobile" />
+				<a-layout>
+					<div id="snowyHeader" class="snowy-header">
+						<div class="snowy-header-left" style="padding-left: 0px">
+							<div v-if="!ismobile" class="panel-item hidden-sm-and-down" @click="menuIsCollapseClick">
+								<MenuUnfoldOutlined v-if="menuIsCollapse" />
+								<MenuFoldOutlined v-else />
+							</div>
+							<moduleMenu @switchModule="switchModule" />
+							<Topbar v-if="!ismobile && breadcrumbOpen" />
+						</div>
+						<div class="snowy-header-right">
+							<userbar />
 						</div>
 					</div>
-				</a-layout-content>
+					<!-- 多标签 -->
+					<Tags v-if="!ismobile && layoutTagsOpen"></Tags>
+					<a-layout-content class="main-content-wrapper">
+						<div id="adminui-main" class="adminui-main">
+							<router-view v-slot="{ Component }">
+								<keep-alive :include="keepLiveRoute">
+									<component :is="Component" v-if="routeShow" :key="$route.name" />
+								</keep-alive>
+							</router-view>
+							<iframe-view />
+							<div class="main-bottom-wrapper">
+								<a style="color: #a0a0a0" :href="sysBaseConfig.SNOWY_SYS_COPYRIGHT_URL" target="_blank">{{
+										sysBaseConfig.SNOWY_SYS_COPYRIGHT
+									}}</a>
+							</div>
+						</div>
+					</a-layout-content>
+				</a-layout>
 			</a-layout>
-		</a-layout>
-	</template>
+		</template>
 
-	<!-- 退出最大化 -->
-	<div class="main-maximize-exit" @click="exitMaximize">
-		<fullscreen-exit-outlined style="color: #fff" />
+		<!-- 退出最大化 -->
+		<div class="main-maximize-exit" @click="exitMaximize">
+			<fullscreen-exit-outlined style="color: #fff" />
+		</div>
 	</div>
 </template>
 
diff --git a/snowy-admin-web/src/style/index.less b/snowy-admin-web/src/style/index.less
index 368247ce..2d3cdf73 100644
--- a/snowy-admin-web/src/style/index.less
+++ b/snowy-admin-web/src/style/index.less
@@ -35,7 +35,7 @@ a, button, input, textarea {
 /* 大布局样式 */
 .aminui {
 	overflow: hidden;
-	height: 100%;
+	height: 100vh;
 	display: flex;
 	flex-flow: column;
 }
diff --git a/snowy-admin-web/src/views/auth/findPwd/index.vue b/snowy-admin-web/src/views/auth/findPwd/index.vue
index 3a89e15e..0c83bbb4 100644
--- a/snowy-admin-web/src/views/auth/findPwd/index.vue
+++ b/snowy-admin-web/src/views/auth/findPwd/index.vue
@@ -31,7 +31,7 @@
 <style lang="less" scoped>
 	.login_background {
 		width: 100%;
-		height: 100%;
+		min-height: 100vh;
 		overflow: hidden;
 		background-size: cover;
 		background-position: center;
diff --git a/snowy-admin-web/src/views/auth/login/login.less b/snowy-admin-web/src/views/auth/login/login.less
index e2e3cf84..edb95cd0 100644
--- a/snowy-admin-web/src/views/auth/login/login.less
+++ b/snowy-admin-web/src/views/auth/login/login.less
@@ -9,7 +9,7 @@
 }
 .login_background {
   width: 100%;
-  height: 100%;
+	min-height: 100vh;
   overflow: hidden;
   background-size: cover;
   background-position: center;