refactor: 优化多处组件样式与页面逻辑

1. 重构评论弹窗圆角样式与玻璃弹窗内部样式 2. 更新首页通知入口文案与样式 3. 调整tabbar图标尺寸与样式 4. 优化回到顶部组件布局 5. 重构公告列表页与详情页逻辑，添加加载延迟与数据状态管理
2026-09-12 16:40:40 +08:00 · 2026-09-08 14:13:42 +08:00
parent dbe70e3b49
commit 7b79a2c5a3
8 changed files with 255 additions and 262 deletions
@@ -1,261 +1,253 @@
 <script lang="ts" setup>
-/**
- * 公告中心·列表页(plugin-uni-halo 通知公告,2026-09-03 客户端接入)
- * 公开接口 GET /notices 仅分页(脱敏不含 content);公告量小,页面一次拉取
- * size=100 后本地做「类型筛选 + 排序(最新/最早/按类型分组)」,触底续拉下一页。
- * UIUX 见 .docs/notice-module-client-design.md
- */
-import { computed, ref } from 'vue'
-import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
-import { getNotices } from '@/api/uni-halo'
-import type { INoticeListVo } from '@/api/types/uni-halo'
+	import { computed, ref } from 'vue'
+	import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+	import { getNotices } from '@/api/uni-halo'
+	import { DataLoadingStatusEnum, useDataLoadingStatus } from '@/hooks/useDataLoadingStatus'
+	import { checkImageUrl } from '@/utils/url'
+	import { sleep } from '@/utils/common'
+	import type { INoticeListVo } from '@/api/types/uni-halo'

-definePage({
-  style: {
-    navigationBarTitleText: '公告中心',
-    enablePullDownRefresh: true,
-  },
-})
+	definePage({
+		style: {
+			navigationBarTitleText: '公告中心',
+			navigationStyle: 'custom',
+			enablePullDownRefresh: true,
+		},
+	})

-const PAGE_SIZE = 100
+	const PAGE_SIZE = 100

-const loading = ref(false)
-const allItems = ref<INoticeListVo[]>([])
-const page = ref(1)
-const total = ref(0)
-const activeType = ref('')
-type SortKey = 'latest' | 'earliest' | 'group'
-const sortKey = ref<SortKey>('latest')
+	/** 状态机:首屏/下拉刷新 loading、empty、error;触底加载失败仅提示,不切整页错误态 */
+	const { loadingStatus, updateLoadingStatus } = useDataLoadingStatus()
+	const allItems = ref<INoticeListVo[]>([])
+	const page = ref(1)
+	const total = ref(0)
+	const activeType = ref('')
+	type SortKey = 'latest' | 'earliest' | 'group'
+	const sortKey = ref<SortKey>('latest')
+	/** 请求并发锁(下拉刷新与触底加载互斥) */
+	const fetching = ref(false)
+	/** 触底加载更多底部文案(加载中/上拉加载更多/没有更多/失败提示) */
+	const loadMoreText = ref('')

-const SORT_OPTIONS: Array<{ id: SortKey, label: string }> = [
-  { id: 'latest', label: '最新在前' },
-  { id: 'earliest', label: '最早在前' },
-  { id: 'group', label: '按类型分组' },
-]
+	const SORT_OPTIONS : Array<{ id : SortKey, label : string }> = [
+		{ id: 'latest', label: '最新在前' },
+		{ id: 'earliest', label: '最早在前' },
+		{ id: 'group', label: '按类型分组' },
+	]

-/* ---------------- 类型 chips(从已加载列表聚合) ---------------- */
-const typeOptions = computed(() => {
-  const map = new Map<string, { typeName: string, typeDisplayName: string, typeColor: string }>()
-  for (const item of allItems.value) {
-    const key = item.typeName || ''
-    const display = item.typeDisplayName || '未分类'
-    if (!map.has(key)) {
-      map.set(key, { typeName: key, typeDisplayName: display, typeColor: item.typeColor || '' })
-    }
-  }
-  return Array.from(map.values())
-})
+	/* ---------------- 类型 chips(从已加载列表聚合) ---------------- */
+	const typeOptions = computed(() => {
+		const map = new Map<string, { typeName : string, typeDisplayName : string, typeColor : string }>()
+		for (const item of allItems.value) {
+			const key = item.typeName || ''
+			const display = item.typeDisplayName || '未分类'
+			if (!map.has(key)) {
+				map.set(key, { typeName: key, typeDisplayName: display, typeColor: item.typeColor || '' })
+			}
+		}
+		return Array.from(map.values())
+	})

-/* ---------------- 时间与排序 ---------------- */
-function formatDate(value?: string): string {
-  if (!value)
-    return ''
-  const date = new Date(value)
-  if (Number.isNaN(date.getTime()))
-    return ''
-  const pad = (n: number) => String(n).padStart(2, '0')
-  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`
-}
+	/* ---------------- 时间与排序 ---------------- */
+	function formatDate(value ?: string) : string {
+		if (!value)
+			return ''
+		const date = new Date(value)
+		if (Number.isNaN(date.getTime()))
+			return ''
+		const pad = (n : number) => String(n).padStart(2, '0')
+		return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())}`
+	}

-function timeOf(item: INoticeListVo): number {
-  const time = item.publishTime ? new Date(item.publishTime).getTime() : NaN
-  return Number.isNaN(time) ? 0 : time
-}
+	function timeOf(item : INoticeListVo) : number {
+		const time = item.publishTime ? new Date(item.publishTime).getTime() : Number.NaN
+		return Number.isNaN(time) ? 0 : time
+	}

-/** 展示列表:先按类型筛选,再按排序键排序(时间倒序/正序/按类型分组) */
-const displayList = computed(() => {
-  let list = allItems.value
-  if (activeType.value !== '') {
-    list = list.filter(item => (item.typeName || '') === activeType.value)
-  }
-  if (sortKey.value === 'latest') {
-    list = [...list].sort((a, b) => timeOf(b) - timeOf(a))
-  }
-  else if (sortKey.value === 'earliest') {
-    list = [...list].sort((a, b) => timeOf(a) - timeOf(b))
-  }
-  else {
-    // 按类型分组:未分类排最后,组内按发布时间倒序
-    const groupOrder = new Map<string, number>()
-    for (const item of allItems.value) {
-      const key = item.typeName || ''
-      if (!groupOrder.has(key)) {
-        groupOrder.set(key, groupOrder.size)
-      }
-    }
-    list = [...list].sort((a, b) => {
-      const ka = a.typeName || ''
-      const kb = b.typeName || ''
-      const ga = groupOrder.get(ka) ?? Number.MAX_SAFE_INTEGER
-      const gb = groupOrder.get(kb) ?? Number.MAX_SAFE_INTEGER
-      if (ga !== gb)
-        return ga - gb
-      return timeOf(b) - timeOf(a)
-    })
-  }
-  return list
-})
+	/** 展示列表:先按类型筛选,再按排序键排序(时间倒序/正序/按类型分组) */
+	const displayList = computed(() => {
+		let list = allItems.value
+		if (activeType.value !== '') {
+			list = list.filter(item => (item.typeName || '') === activeType.value)
+		}
+		if (sortKey.value === 'latest') {
+			list = [...list].sort((a, b) => timeOf(b) - timeOf(a))
+		}
+		else if (sortKey.value === 'earliest') {
+			list = [...list].sort((a, b) => timeOf(a) - timeOf(b))
+		}
+		else {
+			// 按类型分组:未分类排最后,组内按发布时间倒序
+			const groupOrder = new Map<string, number>()
+			for (const item of allItems.value) {
+				const key = item.typeName || ''
+				if (!groupOrder.has(key)) {
+					groupOrder.set(key, groupOrder.size)
+				}
+			}
+			list = [...list].sort((a, b) => {
+				const ka = a.typeName || ''
+				const kb = b.typeName || ''
+				const ga = groupOrder.get(ka) ?? Number.MAX_SAFE_INTEGER
+				const gb = groupOrder.get(kb) ?? Number.MAX_SAFE_INTEGER
+				if (ga !== gb)
+					return ga - gb
+				return timeOf(b) - timeOf(a)
+			})
+		}
+		return list
+	})

-/* ---------------- 数据加载 ---------------- */
-async function loadNotices(reset: boolean) {
-  if (loading.value)
-    return
-  loading.value = true
-  try {
-    const target = reset ? 1 : page.value + 1
-    const res = await getNotices({ page: target, size: PAGE_SIZE })
-    const body = res.data
-    const items = body?.items || []
-    if (reset) {
-      allItems.value = items
-      page.value = 1
-    }
-    else {
-      allItems.value = [...allItems.value, ...items]
-      page.value = target
-    }
-    total.value = body?.total ?? allItems.value.length
-  }
-  catch (err) {
-    console.error('公告列表加载失败', err)
-    uni.showToast({ icon: 'none', title: '公告加载失败' })
-  }
-  finally {
-    loading.value = false
-  }
-}
+	/* ---------------- 数据加载(状态机:loading/empty/error/success) ---------------- */
+	async function loadNotices(reset : boolean) {
+		if (fetching.value)
+			return
+		fetching.value = true
+		if (reset) {
+			updateLoadingStatus(DataLoadingStatusEnum.Loading)
+			loadMoreText.value = ''
+		}
+		else {
+			loadMoreText.value = '加载中...'
+		}
+		try {
+			const target = reset ? 1 : page.value + 1
+			const res = await getNotices({ page: target, size: PAGE_SIZE })
+			const body = res.data
+			const items = body?.items || []
+			if (reset) {
+				allItems.value = items
+				page.value = 1
+			}
+			else {
+				allItems.value = [...allItems.value, ...items]
+				page.value = target
+			}
+			total.value = body?.total ?? allItems.value.length
+			loadMoreText.value = allItems.value.length >= total.value ? '呜呜，没有更多数据啦~' : '上拉加载更多'
+			await sleep(600)
+			updateLoadingStatus(
+				allItems.value.length === 0 ? DataLoadingStatusEnum.Empty : DataLoadingStatusEnum.Success,
+			)
+		}
+		catch (err) {
+			console.error('公告列表加载失败', err)
+			if (reset) {
+				updateLoadingStatus(DataLoadingStatusEnum.Error)
+			}
+			else {
+				// 触底加载失败:保留已加载列表,仅底部提示,避免整页切错误态
+				loadMoreText.value = '加载失败，请下拉刷新！'
+			}
+		}
+		finally {
+			setTimeout(() => {
+				fetching.value = false
+				uni.stopPullDownRefresh()
+			}, 500)
+		}
+	}

-function loadMore() {
-  if (loading.value || allItems.value.length >= total.value)
-    return
-  loadNotices(false)
-}
+	function loadMore() {
+		if (fetching.value || allItems.value.length >= total.value) { return }
+		loadNotices(false)
+	}

-onLoad(() => {
-  loadNotices(true)
-})
+	onLoad(() => {
+		loadNotices(true)
+	})

-onReachBottom(() => {
-  loadMore()
-})
+	onReachBottom(() => {
+		loadMore()
+	})

-onPullDownRefresh(async () => {
-  await loadNotices(true)
-  uni.stopPullDownRefresh()
-})
+	onPullDownRefresh(() => {
+		if (fetching.value) {
+			uni.stopPullDownRefresh()
+			return
+		}
+		loadNotices(true)
+	})

-/* ---------------- 跳转 ---------------- */
-function handleToDetail(item: INoticeListVo) {
-  if (!item.name)
-    return
-  uni.navigateTo({ url: `/pages-blog/notice/detail?name=${item.name}` })
-}
+	/* ---------------- 跳转 ---------------- */
+	function handleToDetail(item : INoticeListVo) {
+		if (!item.name) { return }
+		uni.navigateTo({ url: `/pages-blog/notice/detail?name=${item.name}` })
+	}
 </script>

 <template>
-  <view class="notice-page min-h-screen w-screen bg-[#f7f8fa]">
-    <!-- 类型筛选(横滑 chips) -->
-    <scroll-view scroll-x class="type-bar sticky top-0 z-10 w-full bg-white px-3 py-2" :show-scrollbar="false">
-      <view class="flex items-center gap-2 whitespace-nowrap">
-        <view
-          class="rounded-full px-4 py-1.5 text-[24rpx]"
-          :class="activeType === '' ? 'bg-[#f83856] text-white' : 'bg-[#f0f0f0] text-[#666]'"
-          @click="activeType = ''"
-        >
-          全部
-        </view>
-        <view
-          v-for="type in typeOptions"
-          :key="type.typeName || '__none__'"
-          class="flex items-center gap-1 rounded-full px-4 py-1.5 text-[24rpx]"
-          :class="activeType === type.typeName ? 'bg-[#f83856] text-white' : 'bg-[#f0f0f0] text-[#666]'"
-          @click="activeType = activeType === type.typeName ? '' : type.typeName"
-        >
-          <view v-if="type.typeColor" class="h-2 w-2 rounded-full" :style="{ backgroundColor: type.typeColor }" />
-          <text>{{ type.typeDisplayName }}</text>
-        </view>
-      </view>
-    </scroll-view>
+	<view class="app-page min-h-screen w-screen flex flex-col bg-page">
+		<!-- 自定义导航 -->
+		<uh-navbar default-title="公告中心" title-color="text-gray-900" />

-    <!-- 排序 -->
-    <view class="sort-bar flex items-center gap-2 px-4 py-2">
-      <view
-        v-for="opt in SORT_OPTIONS"
-        :key="opt.id"
-        class="rounded-full px-3 py-1 text-[22rpx]"
-        :class="sortKey === opt.id ? 'bg-[#fdeef1] text-[#f83856]' : 'text-[#999]'"
-        @click="sortKey = opt.id"
-      >
-        {{ opt.label }}
-      </view>
-    </view>
+		<wd-sticky>
+			<scroll-view scroll-x class="w-full whitespace-nowrap" :show-scrollbar="false">
+				<view class="flex gap-2 px-3 pb-1 pt-2">
+					<view class="uh-global-card-glass uh-shadow-xs inline-block border rounded-2xl px-4 py-1.5 text-sm"
+						:class="activeType === '' ? 'bg-primary font-bold' : 'text-gray-500'" @click="activeType = ''">
+						全部
+					</view>
+					<view v-for="(type) in typeOptions" :key="type.typeName || '__none__'"
+						class="uh-global-card-glass uh-shadow-xs inline-flex items-center gap-1 border rounded-2xl px-4 py-1.5 text-sm"
+						:class="activeType === type.typeName ? 'bg-primary font-bold' : 'text-gray-500'"
+						@click="activeType = activeType === type.typeName ? '' : type.typeName">
+						<view v-if="type.typeColor" class="shrink-0 h-2 w-2 rounded-full"
+							:style="{ backgroundColor: type.typeColor }" />
+						<text class="shrink-0">{{ type.typeDisplayName }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		</wd-sticky>

-    <!-- 列表 -->
-    <view v-if="displayList.length > 0" class="px-3 pb-6">
-      <view
-        v-for="item in displayList"
-        :key="item.name"
-        class="mb-3 flex overflow-hidden rounded-xl bg-white p-4"
-        @click="handleToDetail(item)"
-      >
-        <image
-          v-if="item.cover"
-          class="mr-3 h-[140rpx] w-[180rpx] shrink-0 rounded-lg"
-          :src="item.cover"
-          mode="aspectFill"
-        />
-        <view class="min-w-0 flex-1">
-          <view class="text-[28rpx] font-bold leading-snug text-[#333] line-clamp-2">
-            {{ item.title }}
-          </view>
-          <view v-if="item.summary" class="mt-1 text-[24rpx] leading-relaxed text-[#888] line-clamp-2">
-            {{ item.summary }}
-          </view>
-          <view class="mt-2 flex items-center gap-2">
-            <view
-              v-if="item.typeDisplayName"
-              class="rounded px-1.5 py-0.5 text-[20rpx]"
-              :style="{
-                color: item.typeColor || '#f83856',
-                backgroundColor: item.typeColor ? `${item.typeColor}1a` : '#fdeef1',
-              }"
-            >
-              {{ item.typeDisplayName }}
-            </view>
-            <text class="text-[22rpx] text-[#bbb]">
-              {{ formatDate(item.publishTime) }}
-            </text>
-          </view>
-        </view>
-      </view>
+		<view class="flex items-center gap-2 px-3 py-2">
+			<view v-for="opt in SORT_OPTIONS" :key="opt.id"
+				class="uh-global-card-glass uh-shadow-xs inline-block border rounded-2xl px-4 py-1 text-xs"
+				:class="sortKey === opt.id ? 'bg-primary font-bold' : 'text-gray-500'" @click="sortKey = opt.id">
+				{{ opt.label }}
+			</view>
+		</view>

-      <view v-if="loading" class="py-6 text-center text-[24rpx] text-[#bbb]">
-        加载中...
-      </view>
-      <view v-else-if="allItems.length >= total.value" class="py-6 text-center text-[24rpx] text-[#bbb]">
-        没有更多了
-      </view>
-    </view>
+		<uh-data-loading v-if="loadingStatus !== DataLoadingStatusEnum.Success" :loading-status="loadingStatus"
+			empty-text="暂无公告" empty-sub-text="" @refresh="loadNotices(true)" />

-    <!-- 空态 -->
-    <view v-else class="flex flex-col items-center justify-center py-32">
-      <text class="text-[40rpx]">📢</text>
-      <text class="mt-4 text-[26rpx] text-[#999]">
-        {{ loading ? '加载中...' : '暂无公告' }}
-      </text>
-    </view>
-  </view>
-</template>
+		<view v-else class="box-border pt-4">
+			<template v-if="displayList.length > 0">
+				<view class="box-border flex flex-col gap-3 px-3">
+					<view v-for="item in displayList" :key="item.name"
+						class="box-border uh-global-card-glass uh-shadow-xs flex overflow-hidden rounded-xl p-3"
+						@click="handleToDetail(item)">
+						<image v-if="item.cover" class="mr-3 h-18 w-24 shrink-0 rounded-lg"
+							:src="checkImageUrl(item.cover)" mode="aspectFill" />
+						<view class="min-w-0 flex-1 flex flex-col justify-between">
+							<view class="truncate text-sm text-gray-900 font-bold leading-snug">
+								{{ item.title }}
+							</view>
+							<view v-if="item.summary" class="truncate mt-1 text-[24rpx] text-gray-500 leading-relaxed">
+								{{ item.summary }}
+							</view>
+							<view class="mt-2 flex items-center gap-2">
+								<view v-if="item.typeDisplayName" class="rounded px-1.5 py-0.5 text-[20rpx]" :style="{
+									color: item.typeColor || '#f83856',
+									backgroundColor: item.typeColor ? `${item.typeColor}1a` : '#fdeef1',
+								  }">
+									{{ item.typeDisplayName }}
+								</view>
+								<text class="text-[22rpx] text-gray-500">
+									{{ formatDate(item.publishTime) }}
+								</text>
+							</view>
+						</view>
+					</view>
+					<view class="load-text py-5 text-center text-[24rpx] text-gray-500">
+						{{ loadMoreText }}
+					</view>
+				</view>
+			</template>

-<style scoped lang="scss">
-.type-bar {
-  white-space: nowrap;
-}
-
-.line-clamp-2 {
-  display: -webkit-box;
-  -webkit-box-orient: vertical;
-  -webkit-line-clamp: 2;
-  overflow: hidden;
-}
-</style>
+			<!-- 类型筛选后无匹配 -->
+			<uh-data-loading v-else :loading-status="DataLoadingStatusEnum.Empty"></uh-data-loading>
+		</view>
+	</view>
+</template>