From 7e6efd6525610e6c6aab8cf87587b6300ebcd171 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=8E=AB=E5=94=90=E5=B0=BC?= Date: Sun, 13 Sep 2026 04:29:55 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E5=AF=BC=E8=88=AA=E6=A0=8F=E5=90=B8=E9=A1=B6=E5=B8=83?= =?UTF-8?q?=E5=B1=80=E5=81=8F=E7=A7=BB=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 调整useCustomNavbarPlaceholder计算逻辑,仅H5平台额外添加10px偏移 2. 统一多个页面的吸顶导航样式,优化间距和文字大小 3. 为所有使用wd-sticky的页面添加正确的offsetTop参数 4. 重构文章列表页面代码结构,统一代码风格 --- src/hooks/useCustomNavbarPlaceholder.ts | 7 +- src/pages-blog/archives/archives.vue | 18 +- src/pages-blog/articles/articles.vue | 453 +++++++++---------- src/pages-blog/favorites/favorites.vue | 24 +- src/pages-blog/friend-links/friend-links.vue | 22 +- src/pages-blog/love/list.vue | 4 +- src/pages-blog/notice/notice.vue | 30 +- src/pages-blog/search/search.vue | 4 +- src/pages/tabbar/gallery/gallery.vue | 2 +- 9 files changed, 279 insertions(+), 285 deletions(-) diff --git a/src/hooks/useCustomNavbarPlaceholder.ts b/src/hooks/useCustomNavbarPlaceholder.ts index 89a716f..4602a0e 100644 --- a/src/hooks/useCustomNavbarPlaceholder.ts +++ b/src/hooks/useCustomNavbarPlaceholder.ts @@ -10,12 +10,13 @@ export function useCustomNavbarPlaceholder(customNavbarHeight?: number) { const winInfo = uni.getWindowInfo(); const safeAreaTop = winInfo.safeArea.top; - height.value += safeAreaTop + 10; + height.value += safeAreaTop; + // #ifdef H5 + height.value += 10; + // #endif // #ifndef H5 height.value += customNavbarHeight ?? 46; // #endif - - console.log('最终高度', height.value); } onMounted(init); diff --git a/src/pages-blog/archives/archives.vue b/src/pages-blog/archives/archives.vue index ee9ebb7..4833b3f 100644 --- a/src/pages-blog/archives/archives.vue +++ b/src/pages-blog/archives/archives.vue @@ -5,6 +5,7 @@ import { useAppConfigStore } from '@/store/appConfig' import { useSettingStore } from '@/store/setting' import { usePageScroll } from '@/hooks/usePageScroll' + import { useCustomNavbarPlaceholder } from '@/hooks/useCustomNavbarPlaceholder' import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus' import { sleep } from '@/utils/common' import type { IPost } from '@/api/types/halo' @@ -17,6 +18,7 @@ }, }) + const { height: offsetTop } = useCustomNavbarPlaceholder() const { scrollY, updatePageScrollValue } = usePageScroll() const appConfigStore = useAppConfigStore() @@ -259,15 +261,13 @@ - - - - - {{ tab.label }} - + + + + {{ tab.label }} diff --git a/src/pages-blog/articles/articles.vue b/src/pages-blog/articles/articles.vue index 7d73ee3..535780c 100644 --- a/src/pages-blog/articles/articles.vue +++ b/src/pages-blog/articles/articles.vue @@ -1,259 +1,248 @@ + + + + + + + + \ No newline at end of file diff --git a/src/pages-blog/favorites/favorites.vue b/src/pages-blog/favorites/favorites.vue index 3ee69fb..4eb2676 100644 --- a/src/pages-blog/favorites/favorites.vue +++ b/src/pages-blog/favorites/favorites.vue @@ -5,6 +5,7 @@ import { formatTime } from '@/utils/formatTime' import { useFavoritesStore } from '@/store/favorites' import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus' import { usePageScroll } from '@/hooks/usePageScroll' +import { useCustomNavbarPlaceholder } from '@/hooks/useCustomNavbarPlaceholder' import type { FavoriteKind, IFavoriteItem } from '@/utils/favorite' definePage({ @@ -14,6 +15,7 @@ definePage({ }, }) +const { height: offsetTop } = useCustomNavbarPlaceholder() const { scrollY, updatePageScrollValue } = usePageScroll() const favoritesStore = useFavoritesStore() @@ -81,18 +83,16 @@ onPageScroll((option: Page.PageScrollOption) => { - - - - - {{ tab.label }} - ({{ tab.count }}) - + + + + {{ tab.label }} + ({{ tab.count }}) diff --git a/src/pages-blog/friend-links/friend-links.vue b/src/pages-blog/friend-links/friend-links.vue index 7a148c0..089804f 100644 --- a/src/pages-blog/friend-links/friend-links.vue +++ b/src/pages-blog/friend-links/friend-links.vue @@ -8,6 +8,7 @@ import { useSettingStore } from '@/store/setting' import { sleep } from '@/utils/common' import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus' import { usePageScroll } from '@/hooks/usePageScroll' +import { useCustomNavbarPlaceholder } from '@/hooks/useCustomNavbarPlaceholder' import { checkAvatarUrl, checkImageUrl } from '@/utils/url' import { NeedPluginIds } from '@/hooks/usePluginAvailable' import type { ILink, ILinkGroup } from '@/api/types/halo' @@ -21,6 +22,7 @@ definePage({ }, }) +const { height: offsetTop } = useCustomNavbarPlaceholder() const { scrollY, updatePageScrollValue } = usePageScroll() const appConfigStore = useAppConfigStore() const settingStore = useSettingStore() @@ -416,17 +418,15 @@ onReachBottom(() => { - - - - - {{ tab.label }} - + + + + {{ tab.label }} diff --git a/src/pages-blog/love/list.vue b/src/pages-blog/love/list.vue index 3e5804f..b0489d7 100644 --- a/src/pages-blog/love/list.vue +++ b/src/pages-blog/love/list.vue @@ -9,6 +9,7 @@ import { sleep } from '@/utils/common' import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus' import { usePageScroll } from '@/hooks/usePageScroll' + import { useCustomNavbarPlaceholder } from '@/hooks/useCustomNavbarPlaceholder' import type { ILoveDailyItem } from '@/api/types/uni-halo' definePage({ @@ -19,6 +20,7 @@ }, }) + const { height: offsetTop } = useCustomNavbarPlaceholder() const { scrollY, updatePageScrollValue } = usePageScroll() /* ---------------- 展示层类型 ---------------- */ @@ -331,7 +333,7 @@ - + - - - - - 全部 - - - - {{ type.typeDisplayName }} - + + + + 全部 + + + + {{ type.typeDisplayName }} diff --git a/src/pages-blog/search/search.vue b/src/pages-blog/search/search.vue index 37094ea..34435d4 100644 --- a/src/pages-blog/search/search.vue +++ b/src/pages-blog/search/search.vue @@ -6,6 +6,7 @@ import { useAppConfigStore } from '@/store/appConfig' import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus' import { usePageScroll } from '@/hooks/usePageScroll' + import { useCustomNavbarPlaceholder } from '@/hooks/useCustomNavbarPlaceholder' import { NeedPluginIds } from '@/hooks/usePluginAvailable' import { markdownConfig } from '@/config/markdown' import { debounce } from '@/utils/debounce' @@ -18,6 +19,7 @@ }, }) + const { height: offsetTop } = useCustomNavbarPlaceholder() const { scrollY, updatePageScrollValue } = usePageScroll() const appConfigStore = useAppConfigStore() const calcAuditModeEnabled = computed(() => appConfigStore.auditModeEnabled) @@ -219,7 +221,7 @@