diff --git a/aurora-vue/aurora-blog/src/App.vue b/aurora-vue/aurora-blog/src/App.vue index 72f6ff2..a794390 100644 --- a/aurora-vue/aurora-blog/src/App.vue +++ b/aurora-vue/aurora-blog/src/App.vue @@ -65,6 +65,9 @@ export default defineComponent({ 'nprogress-custom-parent': false }) const wrapperStyle = ref({ 'min-height': '100vh' }) + const isMobile = computed(() => { + return commonStore.isMobile + }) onMounted(() => { initialApp() }) @@ -75,6 +78,7 @@ export default defineComponent({ const initialApp = async () => { initResizeEvent() intialCopy() + initWindowOnload() fetchWebsiteConfig() let wrapperHeight = screen.height const footerEl = document.getElementById('footer') @@ -108,9 +112,6 @@ export default defineComponent({ const intialCopy = () => { document.addEventListener('copy', copyEventHandler) } - const isMobile = computed(() => { - return commonStore.isMobile - }) const resizeHander = () => { const rect = document.body.getBoundingClientRect() const mobileState = rect.width - 1 < MOBILE_WITH @@ -120,6 +121,15 @@ export default defineComponent({ resizeHander() window.addEventListener('resize', resizeHander) } + const initWindowOnload = () => { + window.onload = () => { + setTimeout(() => { + window.scrollTo({ + top: 0 + }) + }, 10) + } + } return { title: metaStore.title, theme: computed(() => appStore.themeConfig.theme), diff --git a/aurora-vue/aurora-blog/src/components/AuroraNavigator.vue b/aurora-vue/aurora-blog/src/components/AuroraNavigator.vue index 3da96e5..4f070b4 100644 --- a/aurora-vue/aurora-blog/src/components/AuroraNavigator.vue +++ b/aurora-vue/aurora-blog/src/components/AuroraNavigator.vue @@ -86,6 +86,12 @@ export default defineComponent({ let scrollingHandler: any let menuReopenHandler: any let needReopen = ref(false) + onMounted(() => { + document.addEventListener('scroll', scrollHandler) + }) + onUnmounted(() => { + document.removeEventListener('scroll', scrollHandler) + }) const scrollHandler = () => { clearTimeout(scrollingHandler) clearTimeout(menuReopenHandler) @@ -134,12 +140,6 @@ export default defineComponent({ navigatorStore.setOpenNavigator(false) searchStore.setOpenModal(status) } - onMounted(() => { - document.addEventListener('scroll', scrollHandler) - }) - onUnmounted(() => { - document.removeEventListener('scroll', scrollHandler) - }) return { gradient: computed(() => { return { background: appStore.themeConfig.header_gradient_css } diff --git a/aurora-vue/aurora-blog/src/components/Dropdown/src/Dropdown.vue b/aurora-vue/aurora-blog/src/components/Dropdown/src/Dropdown.vue index 1f6c165..6a6e99d 100644 --- a/aurora-vue/aurora-blog/src/components/Dropdown/src/Dropdown.vue +++ b/aurora-vue/aurora-blog/src/components/Dropdown/src/Dropdown.vue @@ -63,5 +63,3 @@ export default defineComponent({ } }) - - diff --git a/aurora-vue/aurora-blog/src/components/Dropdown/src/DropdownItem.vue b/aurora-vue/aurora-blog/src/components/Dropdown/src/DropdownItem.vue index 41b69fe..04fab45 100644 --- a/aurora-vue/aurora-blog/src/components/Dropdown/src/DropdownItem.vue +++ b/aurora-vue/aurora-blog/src/components/Dropdown/src/DropdownItem.vue @@ -24,5 +24,3 @@ export default defineComponent({ } }) - - diff --git a/aurora-vue/aurora-blog/src/components/Footer.vue b/aurora-vue/aurora-blog/src/components/Footer.vue index 16f2951..4b7bdfb 100644 --- a/aurora-vue/aurora-blog/src/components/Footer.vue +++ b/aurora-vue/aurora-blog/src/components/Footer.vue @@ -23,7 +23,7 @@ - - diff --git a/aurora-vue/aurora-blog/src/components/MobileMenu.vue b/aurora-vue/aurora-blog/src/components/MobileMenu.vue index 94a07c9..1750e0f 100644 --- a/aurora-vue/aurora-blog/src/components/MobileMenu.vue +++ b/aurora-vue/aurora-blog/src/components/MobileMenu.vue @@ -156,5 +156,3 @@ export default defineComponent({ } }) - - diff --git a/aurora-vue/aurora-blog/src/components/Sidebar/src/Sidebar.vue b/aurora-vue/aurora-blog/src/components/Sidebar/src/Sidebar.vue index 6a14f0c..08ebc87 100644 --- a/aurora-vue/aurora-blog/src/components/Sidebar/src/Sidebar.vue +++ b/aurora-vue/aurora-blog/src/components/Sidebar/src/Sidebar.vue @@ -16,5 +16,3 @@ export default defineComponent({ } }) - - diff --git a/aurora-vue/aurora-blog/src/components/Sidebar/src/WebsiteInfo.vue b/aurora-vue/aurora-blog/src/components/Sidebar/src/WebsiteInfo.vue index b0a0069..12ad75c 100644 --- a/aurora-vue/aurora-blog/src/components/Sidebar/src/WebsiteInfo.vue +++ b/aurora-vue/aurora-blog/src/components/Sidebar/src/WebsiteInfo.vue @@ -60,4 +60,3 @@ export default defineComponent({ } }) - diff --git a/aurora-vue/aurora-blog/src/components/ToggleSwitch/ThemeToggle.vue b/aurora-vue/aurora-blog/src/components/ToggleSwitch/ThemeToggle.vue index 517397c..2fe6ab8 100644 --- a/aurora-vue/aurora-blog/src/components/ToggleSwitch/ThemeToggle.vue +++ b/aurora-vue/aurora-blog/src/components/ToggleSwitch/ThemeToggle.vue @@ -40,5 +40,3 @@ export default defineComponent({ } }) - - diff --git a/aurora-vue/aurora-blog/src/views/Home.vue b/aurora-vue/aurora-blog/src/views/Home.vue index fa4dcd3..6b1e360 100644 --- a/aurora-vue/aurora-blog/src/views/Home.vue +++ b/aurora-vue/aurora-blog/src/views/Home.vue @@ -206,7 +206,7 @@ export default defineComponent({ const handleTabChange = (categoryId: any) => { pagination.current = 1 activeTab.value = categoryId - toPageTop() + toArticleOffset() nowCategoryId = categoryId if (categoryId === 0) { fetchArticles() @@ -214,7 +214,7 @@ export default defineComponent({ fetchArticlesByCategoryId(categoryId) } } - const toPageTop = () => { + const toArticleOffset = () => { window.scrollTo({ top: articleOffset.value }) @@ -225,7 +225,7 @@ export default defineComponent({ } const pageChangeHanlder = (current: number) => { pagination.current = current - toPageTop() + toArticleOffset() if (nowCategoryId === 0) { fetchArticles() } else {