Merge branch 'main' into pages

This commit is contained in:
xiaoxian521
2026-02-03 19:06:19 +08:00

View File

@@ -24,6 +24,12 @@ const currentNoticeHasData = computed(() => {
return currentNotice && currentNotice.list.length > 0; return currentNotice && currentNotice.list.length > 0;
}); });
const hasAnyNoticeData = computed(() => {
return notices.value.some(
item => Array.isArray(item.list) && item.list.length > 0
);
});
const onWatchMore = () => { const onWatchMore = () => {
dropdownRef.value.handleClose(); dropdownRef.value.handleClose();
}; };
@@ -43,7 +49,7 @@ const onMarkAsRead = () => {
<span <span
:class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-[7px]']" :class="['dropdown-badge', 'navbar-bg-hover', 'select-none', 'mr-[7px]']"
> >
<el-badge is-dot> <el-badge is-dot :hidden="!hasAnyNoticeData">
<span class="header-notice-icon"> <span class="header-notice-icon">
<IconifyIconOffline :icon="BellIcon" /> <IconifyIconOffline :icon="BellIcon" />
</span> </span>