From 25fa3536deaa0acdaec1ff48cfd7e3bdbf64816c Mon Sep 17 00:00:00 2001
From: wjs0509 <wjs0509@163.com>
Date: Fri, 20 Aug 2021 18:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=BA=E5=AE=9Aheader?=
 =?UTF-8?q?=E5=90=8E=E6=B2=A1=E6=9C=89=E5=9B=9E=E5=88=B0=E9=A1=B6=E9=83=A8?=
 =?UTF-8?q?=E7=9A=84bug=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8E=E8=BF=90=E8=A1=8C=E4=B8=8D=E8=B5=B7?=
 =?UTF-8?q?=E6=9D=A5=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/main/columns.vue  | 4 ++--
 src/layout/main/defaults.vue | 6 +++---
 vite.config.ts               | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/layout/main/columns.vue b/src/layout/main/columns.vue
index cf61152..7aed8ae 100644
--- a/src/layout/main/columns.vue
+++ b/src/layout/main/columns.vue
@@ -3,9 +3,9 @@
 		<ColumnsAside />
 		<div class="layout-columns-warp">
 			<Aside />
-			<el-container class="flex-center layout-backtop">
+			<el-container class="flex-center layout-backtop" :class="{'layout-backtop':!isFixedHeader}">
 				<Header v-if="isFixedHeader" />
-				<el-scrollbar>
+				<el-scrollbar :class="{'layout-backtop':isFixedHeader}">
 					<Header v-if="!isFixedHeader" />
 					<Main />
 				</el-scrollbar>
diff --git a/src/layout/main/defaults.vue b/src/layout/main/defaults.vue
index 4362771..40f3d09 100644
--- a/src/layout/main/defaults.vue
+++ b/src/layout/main/defaults.vue
@@ -1,9 +1,9 @@
 <template>
 	<el-container class="layout-container">
 		<Aside />
-		<el-container class="flex-center layout-backtop">
+		<el-container class="flex-center" :class="{'layout-backtop':!isFixedHeader}">
 			<Header v-if="isFixedHeader" />
-			<el-scrollbar ref="layoutDefaultsScrollbarRef">
+			<el-scrollbar ref="layoutDefaultsScrollbarRef" :class="{'layout-backtop':isFixedHeader}">
 				<Header v-if="!isFixedHeader" />
 				<Main />
 			</el-scrollbar>
@@ -23,7 +23,7 @@ export default {
 	name: 'layoutDefaults',
 	components: { Aside, Header, Main },
 	setup() {
-		const { proxy } = getCurrentInstance();
+		const { proxy }:any = getCurrentInstance();
 		const store = useStore();
 		const route = useRoute();
 		const isFixedHeader = computed(() => {
diff --git a/vite.config.ts b/vite.config.ts
index a20b71e..d02ddc6 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -10,7 +10,7 @@ const pathResolve = (dir: string): any => {
 const { VITE_PORT, VITE_OPEN, VITE_PUBLIC_PATH } = loadEnv();
 
 const alias: Record<string, string> = {
-	'/@': pathResolve('/src/'),
+	'/@': pathResolve('./src/'),
 	'vue-i18n': 'vue-i18n/dist/vue-i18n.cjs.js',
 };