From e1b6a9e9fa281249084508de9c21e3637b49a6c9 Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Sun, 27 Sep 2026 20:27:00 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=89=8D=E5=8F=B0):=20=E9=A2=98=E5=8D=95?=
 =?UTF-8?q?=E5=8D=A1=E7=89=87=E6=98=BE=E7=A4=BA=E5=AE=8C=E6=88=90=E8=BF=9B?=
 =?UTF-8?q?=E5=BA=A6=EF=BC=8C=E6=89=8B=E6=9C=BA=E4=B8=8A=E9=A2=98=E7=9B=AE?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E5=86=8D=E6=A8=AA=E5=90=91=E6=BA=A2?=
 =?UTF-8?q?=E5=87=BA=EF=BC=8C=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=8E=92=E5=BE=97=E6=9B=B4=E7=B4=A7=E5=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 题单卡片：完成进度条和「已完成 x / y 题」，「已完成」改成绿色，未获得的徽章置灰；
  进度按加入时的快照算，题单后来加了题就注明「新加了 N 题」，不再出现「已完成」却是 5 / 6
- 题目列表：手机上只留状态、编号、题目、难度四列；标签默认收起，选中的标签显示在按钮旁
- 个人主页：六项数据保留，改成三列两行的小卡片，头像缩小

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
---
 apps/web/src/oj/problem/list.vue    |  29 +++-
 apps/web/src/oj/problemset/list.vue | 236 ++++++++++++++++++----------
 apps/web/src/oj/user/index.vue      | 131 ++++++++-------
 3 files changed, 254 insertions(+), 142 deletions(-)

diff --git a/apps/web/src/oj/problem/list.vue b/apps/web/src/oj/problem/list.vue
index db7d193..9674be7 100644
--- a/apps/web/src/oj/problem/list.vue
+++ b/apps/web/src/oj/problem/list.vue
@@ -63,12 +63,11 @@ const router = useRouter()
 
 const userStore = useUserStore()
 
-const { isDesktop } = useBreakpoints()
+const { isDesktop, isMobile } = useBreakpoints()
 
 const problems = ref<ProblemRow[]>([])
 const total = ref(0)
 const tags = ref<Tag[]>([])
-const [showTag, toggleShowTag] = useToggle(isDesktop.value)
 
 // 使用分页 composable
 const { query, clearQuery } = usePagination<ProblemQuery>({
@@ -79,6 +78,10 @@ const { query, clearQuery } = usePagination<ProblemQuery>({
   sort: useRouteQuery("sort", "").value,
 })
 
+// 标签默认收起：四十多个标签在桌面上要占三行，把题目表格顶到半屏以下。
+// 从带 ?tag= 的链接进来时展开，让人看得见是哪个标签在起作用
+const [showTag, toggleShowTag] = useToggle(!!query.tag)
+
 async function listProblems() {
   if (query.page < 1) query.page = 1
   const offset = (query.page - 1) * query.limit
@@ -208,8 +211,21 @@ const baseColumns: DataTableColumn<ProblemRow>[] = [
   },
 ]
 
+// 手机上只留判断「做不做这题」要的几列，其余的挤进 390 宽的屏幕只会横向溢出
+const MOBILE_WIDTHS: Record<string, { width?: number; minWidth?: number }> = {
+  status: { width: 60 },
+  _id: { width: 72 },
+  title: { minWidth: 120 },
+  difficulty: { width: 72 },
+}
+
 const columns = computed(() =>
-  userStore.isAuthed ? baseColumns : baseColumns.filter((c: any) => c.key !== "status"),
+  baseColumns
+    .filter((c: any) => {
+      if (c.key === "status" && !userStore.isAuthed) return false
+      return !isMobile.value || c.key in MOBILE_WIDTHS
+    })
+    .map((c: any) => (isMobile.value ? { ...c, ...MOBILE_WIDTHS[c.key] } : c)),
 )
 
 function rowProps(row: ProblemRow) {
@@ -263,12 +279,15 @@ function rowProps(row: ProblemRow) {
           <n-form-item>
             <n-button @click="toggleShowTag()" quaternary icon-placement="right">
               <template #icon>
-                <Icon v-if="showTag" icon="ph:caret-down"></Icon>
-                <Icon v-else icon="ph:caret-up"></Icon>
+                <Icon v-if="showTag" icon="ph:caret-up"></Icon>
+                <Icon v-else icon="ph:caret-down"></Icon>
               </template>
               标签
             </n-button>
           </n-form-item>
+          <n-form-item v-if="query.tag && !showTag">
+            <n-tag type="success" closable @close="query.tag = ''">{{ query.tag }}</n-tag>
+          </n-form-item>
         </n-form>
       </n-space>
       <Hitokoto v-if="isDesktop" class="problem-list-hitokoto" />
diff --git a/apps/web/src/oj/problemset/list.vue b/apps/web/src/oj/problemset/list.vue
index b93b333..62a4fc5 100644
--- a/apps/web/src/oj/problemset/list.vue
+++ b/apps/web/src/oj/problemset/list.vue
@@ -1,15 +1,11 @@
 <script setup lang="ts">
-import { Icon } from "@iconify/vue"
 import { useRouteQuery } from "@vueuse/router"
 import { getProblemSetList } from "../api"
-import { parseTime } from "utils/functions"
 import type { ProblemSet } from "utils/types"
 import Pagination from "shared/components/Pagination.vue"
 import { usePagination } from "shared/composables/pagination"
-import { useBreakpoints } from "shared/composables/breakpoints"
 
 const router = useRouter()
-const { isDesktop } = useBreakpoints()
 
 const total = ref(0)
 const problemSets = ref<ProblemSet[]>([])
@@ -61,12 +57,6 @@ function getConditionText(conditionType: string, conditionValue: number): string
   return conditionMap[conditionType] || "未知条件"
 }
 
-function getProgressColor(percentage: number) {
-  if (percentage >= 80) return "#18a058" // 绿色
-  if (percentage >= 50) return "#f0a020" // 橙色
-  return "#d03050" // 红色
-}
-
 onMounted(listProblemSets)
 
 // 监听搜索关键词变化（防抖）
@@ -94,79 +84,99 @@ watch(() => [query.page, query.limit], listProblemSets)
       />
     </n-space>
 
-    <n-grid v-if="problemSets.length > 0" :cols="isDesktop ? 3 : 1" :x-gap="16" :y-gap="16">
-      <n-grid-item v-for="problemSet in problemSets" :key="problemSet.id">
-        <n-card hoverable @click="goToProblemSet(problemSet.id)" style="cursor: pointer">
-          <template #header>
-            <n-flex justify="space-between" align="center">
-              <n-text strong>{{ problemSet.title }}</n-text>
-              <n-tag :type="getDifficultyTag(problemSet.difficulty).type">
-                {{ getDifficultyTag(problemSet.difficulty).text }}
-              </n-tag>
-            </n-flex>
-          </template>
-          <n-flex vertical size="large">
-            <n-flex justify="space-between" align="center">
-              <n-flex>
-                <Icon width="20" icon="streamline-emojis:blossom" />
-                <n-text>{{ problemSet.problemsCount }} 道题目</n-text>
-              </n-flex>
+    <div v-if="problemSets.length > 0" class="set-grid">
+      <div
+        v-for="problemSet in problemSets"
+        :key="problemSet.id"
+        class="set-card"
+        :class="{ completed: problemSet.userProgress?.isCompleted }"
+        @click="goToProblemSet(problemSet.id)"
+      >
+        <n-flex justify="space-between" align="center" :wrap="false" :size="8">
+          <span class="set-title">{{ problemSet.title }}</span>
+          <n-tag v-if="problemSet.userProgress?.isCompleted" type="success" size="small" round>
+            已完成
+          </n-tag>
+          <n-tag v-else-if="problemSet.userProgress?.isJoined" type="info" size="small" round>
+            进行中
+          </n-tag>
+        </n-flex>
 
-              <n-flex align="center" style="height: 28px">
-                <!-- 用户进度显示 -->
-                <n-progress
-                  v-if="problemSet.userProgress?.isJoined && !problemSet.userProgress?.isCompleted"
-                  type="line"
-                  :percentage="Math.round(problemSet.userProgress.progressPercentage)"
-                  :height="4"
-                  :border-radius="2"
-                  style="width: 100px"
-                  :color="getProgressColor(problemSet.userProgress.progressPercentage)"
-                />
-                <n-tag type="warning" v-if="problemSet.status === 'archived'"> 已归档 </n-tag>
-                <n-tag
-                  v-if="problemSet.userProgress?.isJoined && !problemSet.userProgress?.isCompleted"
-                  type="warning"
-                >
-                  已加入
-                </n-tag>
-                <n-tag v-if="problemSet.userProgress?.isCompleted" type="error"> 已完成 </n-tag>
-              </n-flex>
-            </n-flex>
+        <!-- 简介大多就是把标题再抄一遍，一样的就不重复显示 -->
+        <n-text
+          v-if="problemSet.description && problemSet.description !== problemSet.title"
+          depth="3"
+          class="set-desc"
+        >
+          {{ problemSet.description }}
+        </n-text>
 
-            <!-- 奖章显示 -->
-            <n-flex align="center" justify="space-between">
-              <n-text depth="3">
-                创建于
-                {{ parseTime(problemSet.createTime, "YYYY-MM-DD") }}
-              </n-text>
-              <n-flex>
-                <n-tooltip v-for="badge in problemSet.badges" :key="badge.id" trigger="hover">
-                  <template #trigger>
-                    <n-image
-                      :src="badge.icon"
-                      :alt="badge.name"
-                      width="24"
-                      height="24"
-                      object-fit="cover"
-                      :class="{ 'earned-badge': badge.isEarned }"
-                    />
-                  </template>
-                  <n-flex vertical size="small">
-                    <span style="font-weight: bold"> 徽章: {{ badge.name }} </span>
-                    <span>
-                      获取条件:
-                      {{ getConditionText(badge.conditionType, badge.conditionValue) }}
-                    </span>
-                    <n-text type="primary" v-if="badge.isEarned"> ✓ 已获得 </n-text>
-                  </n-flex>
-                </n-tooltip>
-              </n-flex>
-            </n-flex>
+        <div class="set-progress">
+          <n-flex justify="space-between" align="center" class="set-progress-text">
+            <n-text depth="3">
+              <!-- 进度是加入/完成时存下的快照，分母用快照自己的 totalCount：题单后来
+                   加了题的话，拿现在的 problemsCount 去除，就会出现「已完成」却是 5 / 6 -->
+              <template v-if="problemSet.userProgress?.isJoined">
+                已完成 {{ problemSet.userProgress.completedCount }} /
+                {{ problemSet.userProgress.totalCount }} 题
+                <template v-if="problemSet.problemsCount > problemSet.userProgress.totalCount">
+                  · 新加了
+                  {{ problemSet.problemsCount - problemSet.userProgress.totalCount }} 题
+                </template>
+              </template>
+              <template v-else>共 {{ problemSet.problemsCount }} 题 · 还没开始</template>
+            </n-text>
+            <!-- 线上题单全是简单难度，只有不是简单时才值得标出来 -->
+            <n-tag
+              v-if="problemSet.difficulty !== 'Easy'"
+              :type="getDifficultyTag(problemSet.difficulty).type"
+              size="small"
+              :bordered="false"
+            >
+              {{ getDifficultyTag(problemSet.difficulty).text }}
+            </n-tag>
+            <n-tag v-if="problemSet.status === 'archived'" size="small" :bordered="false">
+              已归档
+            </n-tag>
           </n-flex>
-        </n-card>
-      </n-grid-item>
-    </n-grid>
+          <n-progress
+            type="line"
+            :percentage="Math.round(problemSet.userProgress?.progressPercentage ?? 0)"
+            :show-indicator="false"
+            :height="6"
+            status="success"
+          />
+        </div>
+
+        <n-flex v-if="problemSet.badges?.length" align="center" :size="6" class="set-badges">
+          <n-text depth="3" class="set-badges-label">
+            徽章 {{ problemSet.badges.filter((b) => b.isEarned).length }} /
+            {{ problemSet.badges.length }}
+          </n-text>
+          <n-tooltip v-for="badge in problemSet.badges" :key="badge.id" trigger="hover">
+            <template #trigger>
+              <n-image
+                :src="badge.icon"
+                :alt="badge.name"
+                width="24"
+                height="24"
+                object-fit="cover"
+                preview-disabled
+                :class="badge.isEarned ? 'earned-badge' : 'locked-badge'"
+              />
+            </template>
+            <n-flex vertical size="small">
+              <span style="font-weight: bold"> 徽章: {{ badge.name }} </span>
+              <span>
+                获取条件:
+                {{ getConditionText(badge.conditionType, badge.conditionValue) }}
+              </span>
+              <n-text type="primary" v-if="badge.isEarned"> ✓ 已获得 </n-text>
+            </n-flex>
+          </n-tooltip>
+        </n-flex>
+      </div>
+    </div>
 
     <Pagination
       v-if="problemSets.length > 0"
@@ -179,9 +189,75 @@ watch(() => [query.page, query.limit], listProblemSets)
 </template>
 
 <style scoped>
+.set-grid {
+  display: grid;
+  grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+  gap: 16px;
+}
+
+.set-card {
+  display: flex;
+  flex-direction: column;
+  gap: 10px;
+  padding: 16px 18px;
+  border-radius: 8px;
+  border: 1px solid rgba(128, 128, 128, 0.2);
+  cursor: pointer;
+  transition:
+    border-color 0.2s,
+    box-shadow 0.2s;
+}
+
+.set-card:hover {
+  border-color: #18a058;
+  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.06);
+}
+
+.set-card.completed {
+  background-color: rgba(24, 160, 88, 0.05);
+}
+
+.set-title {
+  font-size: 16px;
+  font-weight: 600;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.set-desc {
+  font-size: 13px;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
+}
+
+.set-progress {
+  display: flex;
+  flex-direction: column;
+  gap: 6px;
+  margin-top: auto;
+}
+
+.set-progress-text {
+  font-size: 13px;
+}
+
+.set-badges-label {
+  font-size: 12px;
+  margin-right: 2px;
+}
+
 .earned-badge {
   border: 2px solid #ffd700;
   border-radius: 50%;
   box-shadow: 0 0 8px rgba(255, 215, 0, 0.4);
 }
+
+/* 没拿到的徽章压成灰色：原来拿没拿到只差一圈金边，一排看下去分不清 */
+.locked-badge {
+  filter: grayscale(1);
+  opacity: 0.45;
+}
 </style>
diff --git a/apps/web/src/oj/user/index.vue b/apps/web/src/oj/user/index.vue
index b54bc6e..8732e37 100644
--- a/apps/web/src/oj/user/index.vue
+++ b/apps/web/src/oj/user/index.vue
@@ -1,8 +1,6 @@
 <script setup lang="ts">
 import { Icon } from "@iconify/vue"
-import { NH2, NH3 } from "naive-ui"
 import { getProfile } from "shared/api"
-import { useBreakpoints } from "shared/composables/breakpoints"
 import { durationToDays, parseTime } from "utils/functions"
 import type { AchievementSummary, Profile } from "utils/types"
 import { getAchievementSummary } from "oj/achievement/api"
@@ -23,8 +21,6 @@ const achievementSummary = ref<AchievementSummary | null>(null)
 const [loading, toggle] = useToggle()
 const [show, toggleShow] = useToggle(false)
 
-const { isDesktop } = useBreakpoints()
-
 const isDefaultAvatar = computed(() => profile.value?.avatar.endsWith("default.png") ?? true)
 
 const problemsFlexRef = useTemplateRef<HTMLElement>("problemsFlexRef")
@@ -95,41 +91,45 @@ async function loadAchievementSummary() {
   }
 }
 
+// 六项一格一项、三列两行。日期比数字长得多，字号单独压小一档（.stat-value.date），
+// 不然「2026年9月14日」会把格子撑破
 const metrics = computed(() => {
   if (loading.value) return []
   return [
-    {
-      icon: "fluent-emoji:face-with-peeking-eye",
-      title: learnDuration.value,
-      content: "总共学习天数",
-    },
-    {
-      icon: "fluent-emoji:cheese-wedge",
-      title: toLatestAt.value,
-      content: "距离上次提交",
-    },
-    {
-      icon: "fluent-emoji:dog-face",
-      title: latestSubmissionAt.value,
-      content: "最新一次提交时间",
-    },
-    {
-      icon: "fluent-emoji:cat-with-wry-smile",
-      title: firstSubmissionAt.value,
-      content: "第一次提交时间",
-    },
     {
       icon: "fluent-emoji:candy",
       title: profile.value?.acceptedNumber ?? 0,
-      content: "已解决的题目数量",
+      content: "已解决",
       animate: true,
     },
     {
       icon: "fluent-emoji:thinking-face",
       title: profile.value?.submissionNumber ?? 0,
-      content: "总提交数量",
+      content: "总提交",
       animate: true,
     },
+    {
+      icon: "fluent-emoji:face-with-peeking-eye",
+      title: learnDuration.value,
+      content: "学习天数",
+    },
+    {
+      icon: "fluent-emoji:cheese-wedge",
+      title: toLatestAt.value,
+      content: "距上次提交",
+    },
+    {
+      icon: "fluent-emoji:dog-face",
+      title: latestSubmissionAt.value,
+      content: "最新一次提交时间",
+      date: true,
+    },
+    {
+      icon: "fluent-emoji:cat-with-wry-smile",
+      title: firstSubmissionAt.value,
+      content: "第一次提交时间",
+      date: true,
+    },
   ]
 })
 
@@ -141,8 +141,8 @@ onMounted(() => {
 <template>
   <n-flex class="wrapper" vertical justify="center" align="center" v-if="!loading && profile">
     <n-image
-      :width="140"
-      :height="140"
+      :width="96"
+      :height="96"
       :src="profile.avatar"
       :preview-disabled="isDefaultAvatar"
       object-fit="cover"
@@ -169,30 +169,18 @@ onMounted(() => {
     </n-button>
   </n-flex>
 
-  <n-grid
-    v-if="profile && profile.submissionNumber > 0"
-    class="wrapper"
-    :cols="isDesktop ? 2 : 1"
-    :x-gap="10"
-    :y-gap="10"
-  >
-    <n-gi v-for="item in metrics" :key="item.content">
-      <n-card hoverable>
-        <n-flex align="center">
-          <Icon :icon="item.icon" :width="isDesktop ? 50 : 40" />
-          <div>
-            <Component :is="isDesktop ? NH2 : NH3" class="number">
-              <n-number-animation v-if="item.animate" :to="item.title" />
-              <template v-else>
-                {{ item.title }}
-              </template>
-            </Component>
-            <n-h4 class="number-label">{{ item.content }}</n-h4>
-          </div>
-        </n-flex>
-      </n-card>
-    </n-gi>
-  </n-grid>
+  <div v-if="profile && profile.submissionNumber > 0" class="wrapper">
+    <div class="stats">
+      <div v-for="item in metrics" :key="item.content" class="stat">
+        <Icon :icon="item.icon" :width="28" />
+        <div class="stat-value" :class="{ date: item.date }">
+          <n-number-animation v-if="item.animate" :to="Number(item.title)" />
+          <template v-else>{{ item.title }}</template>
+        </div>
+        <n-text depth="3" class="stat-label">{{ item.content }}</n-text>
+      </div>
+    </div>
+  </div>
 
   <!-- 成就摘要 -->
   <n-card v-if="!loading && profile && achievementSummary" class="wrapper" hoverable>
@@ -262,13 +250,42 @@ onMounted(() => {
   margin: 16px auto 0;
 }
 
-.number {
-  margin-bottom: 0;
-  font-weight: bold;
+.stats {
+  display: grid;
+  grid-template-columns: repeat(3, minmax(0, 1fr));
+  gap: 10px;
 }
 
-.number-label {
-  margin: 0;
+@media (max-width: 600px) {
+  .stats {
+    grid-template-columns: repeat(2, minmax(0, 1fr));
+  }
+}
+
+.stat {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 4px;
+  padding: 14px 8px;
+  border-radius: 8px;
+  border: 1px solid rgba(128, 128, 128, 0.2);
+}
+
+.stat-value {
+  font-size: 22px;
+  font-weight: 700;
+  line-height: 1.2;
+}
+
+.stat-label {
+  font-size: 13px;
+}
+
+.stat-value.date {
+  font-size: 16px;
+  padding: 3px 0;
+  white-space: nowrap;
 }
 
 h2 {