From f3956ad6a14c885eec8cdfd753c2b588d2dd4c94 Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Tue, 13 Oct 2026 21:53:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A6=96=E9=A1=B5):=20=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=8F=AA=E6=94=BE=E7=BD=AE=E9=A1=B6=E9=82=A3?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=8C=E6=94=B9=E6=88=90=E6=9C=80=E6=96=B0=E4=B8=89?=
 =?UTF-8?q?=E6=9D=A1=EF=BC=88=E7=BD=AE=E9=A1=B6=E7=9A=84=E6=8E=92=E6=9C=80?=
 =?UTF-8?q?=E5=89=8D=E3=80=81=E5=B8=A6=E6=A0=87=EF=BC=89=EF=BC=8C=E5=8F=B3?=
 =?UTF-8?q?=E8=BE=B9=E5=86=99=E5=8F=91=E5=B8=83=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 apps/web/src/oj/home/dashboard.vue | 46 ++++++++++++++----------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/apps/web/src/oj/home/dashboard.vue b/apps/web/src/oj/home/dashboard.vue
index 69619a2..8cbf353 100644
--- a/apps/web/src/oj/home/dashboard.vue
+++ b/apps/web/src/oj/home/dashboard.vue
@@ -149,10 +149,10 @@ async function loadSubmissions() {
   submissions.value = res.results
 }
 
-/** 首页只放置顶的公告（用户定的），其余从顶栏「公告」进 */
+/** 首页放前三条公告（后端置顶在前、再按发布时间），其余从顶栏「公告」进 */
 async function loadAnnouncements() {
-  const res = await getAnnouncementList(0, 10)
-  announcements.value = res.results.filter((item) => item.top)
+  const res = await getAnnouncementList(0, 3)
+  announcements.value = res.results
 }
 
 async function loadKnowledge() {
@@ -524,20 +524,24 @@ async function openAnnouncement(item: AnnouncementListItem) {
           </router-link>
         </n-card>
 
-        <!-- 公告只放置顶的；别的从顶栏「公告」进 -->
-        <div
-          v-for="item in announcements"
-          :key="item.id"
-          class="card pinned"
-          role="button"
-          tabindex="0"
-          @click="openAnnouncement(item)"
-          @keyup.enter="openAnnouncement(item)"
-        >
-          <n-tag type="warning" size="small" :bordered="false">置顶</n-tag>
-          <span class="row-title">{{ item.title }}</span>
-          <router-link to="/announcement" class="more" @click.stop>公告 →</router-link>
-        </div>
+        <n-card v-if="announcements.length" title="公告" :bordered="false" class="card">
+          <template #header-extra>
+            <router-link to="/announcement" class="more">全部</router-link>
+          </template>
+          <div
+            v-for="item in announcements"
+            :key="item.id"
+            class="row clickable"
+            role="button"
+            tabindex="0"
+            @click="openAnnouncement(item)"
+            @keyup.enter="openAnnouncement(item)"
+          >
+            <n-tag v-if="item.top" type="warning" size="small" :bordered="false">置顶</n-tag>
+            <span class="row-title">{{ item.title }}</span>
+            <n-text depth="3" class="row-meta">{{ dateText(item.createTime) }}</n-text>
+          </div>
+        </n-card>
       </div>
     </div>
 
@@ -581,14 +585,6 @@ async function openAnnouncement(item: AnnouncementListItem) {
   padding-top: 12px;
 }
 
-.pinned {
-  display: flex;
-  align-items: center;
-  gap: 10px;
-  padding: 14px 18px;
-  cursor: pointer;
-}
-
 .grid {
   display: grid;
   grid-template-columns: minmax(0, 3fr) minmax(0, 2fr);