diff --git a/web/src/layouts/frontend/components/footer.vue b/web/src/layouts/frontend/components/footer.vue
index 99517ed9..6096eaf4 100644
--- a/web/src/layouts/frontend/components/footer.vue
+++ b/web/src/layouts/frontend/components/footer.vue
@@ -15,9 +15,7 @@ const siteConfig = useSiteConfig()
diff --git a/web/src/layouts/frontend/container/default.vue b/web/src/layouts/frontend/container/default.vue
index e7ec1830..125a636a 100644
--- a/web/src/layouts/frontend/container/default.vue
+++ b/web/src/layouts/frontend/container/default.vue
@@ -1,13 +1,15 @@
-
-
-
-
-
-
-
+
+
+
+
@@ -16,11 +18,13 @@ import Header from '/@/layouts/frontend/components/header.vue'
import Aside from '/@/layouts/frontend/components/aside.vue'
import Main from '/@/layouts/frontend/components/main.vue'
import Footer from '/@/layouts/frontend/components/footer.vue'
+import { mainHeight as layoutMainScrollbarStyle } from '/@/utils/layout'
diff --git a/web/src/layouts/frontend/user.vue b/web/src/layouts/frontend/user.vue
index 4d2591ba..84d81189 100644
--- a/web/src/layouts/frontend/user.vue
+++ b/web/src/layouts/frontend/user.vue
@@ -67,4 +67,8 @@ export default {
}
-
+
diff --git a/web/src/utils/common.ts b/web/src/utils/common.ts
index fad66b88..c0a19e21 100644
--- a/web/src/utils/common.ts
+++ b/web/src/utils/common.ts
@@ -53,7 +53,7 @@ export function setTitleFromRoute(t: any = null) {
if (navTabs.state.activeRoute) {
webTitle = navTabs.state.activeRoute.title
} else if (memberCenter.state.activeRoute) {
- webTitle = memberCenter.state.activeRoute.title
+ webTitle = router.currentRoute.value.meta.title as string
} else {
webTitle =
t && router.currentRoute.value.meta.title ? t(router.currentRoute.value.meta.title) : (router.currentRoute.value.meta.title as string)
diff --git a/web/src/utils/layout.ts b/web/src/utils/layout.ts
index 899d4c42..22049169 100644
--- a/web/src/utils/layout.ts
+++ b/web/src/utils/layout.ts
@@ -1,5 +1,6 @@
import { CSSProperties } from 'vue'
import { useNavTabs } from '/@/stores/navTabs'
+import { isAdminApp } from '/@/utils/common'
/**
* main高度
@@ -7,11 +8,14 @@ import { useNavTabs } from '/@/stores/navTabs'
* @returns CSSProperties
*/
export function mainHeight(extra: number = 0): CSSProperties {
- const navTabs = useNavTabs()
-
let height = extra
- if (!navTabs.state.tabFullScreen) {
- height += 75
+ if (isAdminApp()) {
+ const navTabs = useNavTabs()
+ if (!navTabs.state.tabFullScreen) {
+ height += 75
+ }
+ } else {
+ height += 60
}
return {
height: 'calc(100vh - ' + height.toString() + 'px)',
diff --git a/web/src/views/frontend/index.vue b/web/src/views/frontend/index.vue
index 58229f62..0651d26d 100644
--- a/web/src/views/frontend/index.vue
+++ b/web/src/views/frontend/index.vue
@@ -101,6 +101,8 @@ index().then((res) => {
.footer {
color: var(--color-secondary);
background-color: transparent;
+ position: fixed;
+ bottom: 0;
}
@media screen and (max-width: 1024px) {
diff --git a/web/src/views/frontend/user/login.vue b/web/src/views/frontend/user/login.vue
index 9de97908..e28a9e2d 100644
--- a/web/src/views/frontend/user/login.vue
+++ b/web/src/views/frontend/user/login.vue
@@ -2,7 +2,7 @@
-
+