From ba60a9b1c48c9e9d7188ccd969d75b7d53915741 Mon Sep 17 00:00:00 2001
From: freefire <aarbbs@88.com>
Date: Tue, 1 Sep 2026 01:59:01 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=20Feed=20=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F=E4=B8=BA=E6=96=B0=E8=AF=84=E8=AE=BA/=E6=96=B0?=
 =?UTF-8?q?=E5=B8=96=E5=AD=90/=E6=8E=A8=E8=8D=90=E5=B8=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

默认按新评论；推荐排序优先 featured，并将用户可见「精华」文案改为「推荐」。

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 frontend/src/components/FeaturedIcon.tsx       |  8 ++++----
 frontend/src/components/FeedSortBar.tsx        | 18 ++++++++++--------
 frontend/src/components/PostListItem.tsx       |  4 ++--
 frontend/src/components/PostManageMenu.tsx     |  2 +-
 frontend/src/components/VirtualPostList.tsx    |  2 +-
 frontend/src/layouts/MainLayout.tsx            |  2 +-
 frontend/src/pages/HomePage.tsx                |  2 +-
 .../src/pages/admin/AdminDashboardPage.tsx     |  2 +-
 frontend/src/pages/admin/AdminPostsPage.tsx    |  6 +++---
 frontend/src/styles/global.css                 | 18 +++++++++---------
 handler/api.go                                 |  8 ++++----
 model/models.go                                |  2 +-
 service/post.go                                | 10 ++++++----
 13 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/frontend/src/components/FeaturedIcon.tsx b/frontend/src/components/FeaturedIcon.tsx
index 63e5e9f..61d9f86 100644
--- a/frontend/src/components/FeaturedIcon.tsx
+++ b/frontend/src/components/FeaturedIcon.tsx
@@ -1,4 +1,4 @@
-import { Sparkles } from 'lucide-react';
+import { BadgeCheck } from 'lucide-react';
 import { cn } from '@/lib/utils';
 
 interface Props {
@@ -6,13 +6,13 @@ interface Props {
   size?: number;
 }
 
-/** 精华帖标识 */
+/** 推荐帖标识 */
 export default function FeaturedIcon({ className, size = 16 }: Props) {
   return (
-    <Sparkles
+    <BadgeCheck
       className={cn('post-featured-icon', className)}
       size={size}
-      aria-label="精华"
+      aria-label="推荐"
       role="img"
     />
   );
diff --git a/frontend/src/components/FeedSortBar.tsx b/frontend/src/components/FeedSortBar.tsx
index d7e7e02..1b8abe8 100644
--- a/frontend/src/components/FeedSortBar.tsx
+++ b/frontend/src/components/FeedSortBar.tsx
@@ -1,7 +1,7 @@
 import { useRef } from 'react';
 import { boardPath, type PermalinkOpts } from '../utils/permalink';
 import { getCachedForumLimits } from '../hooks/useForumLimits';
-import { Clock, MessageCircle, Flame } from 'lucide-react';
+import { Clock, MessageCircle, BadgeCheck } from 'lucide-react';
 import { cn } from '@/lib/utils';
 import { moveTabIndex } from '../hooks/useOverlayA11y';
 
@@ -13,9 +13,9 @@ const SORT_OPTIONS: {
   hint: string;
   icon: typeof Clock;
 }[] = [
-  { key: 'latest', label: '最新发帖', hint: '按发布时间', icon: Clock },
-  { key: 'reply', label: '最新回复', hint: '最近有人回复', icon: MessageCircle },
-  { key: 'hot', label: '热门讨论', hint: '按互动热度', icon: Flame },
+  { key: 'reply', label: '新评论', hint: '最近有人评论', icon: MessageCircle },
+  { key: 'latest', label: '新帖子', hint: '按发帖时间', icon: Clock },
+  { key: 'hot', label: '推荐帖', hint: '站内推荐', icon: BadgeCheck },
 ];
 
 interface Props {
@@ -24,14 +24,15 @@ interface Props {
   postTotal?: number;
 }
 
+/** 解析 URL sort；缺省为新评论（reply） */
 export function parseFeedSort(raw: string | null): FeedSort {
-  if (raw === 'reply' || raw === 'hot') return raw;
-  return 'latest';
+  if (raw === 'latest' || raw === 'hot') return raw;
+  return 'reply';
 }
 
 export function buildHomeUrl(
   boardId: number,
-  sort: FeedSort = 'latest',
+  sort: FeedSort = 'reply',
   opts?: { keyword?: string; tag?: string; author?: string; titleOnly?: boolean; permalink?: PermalinkOpts },
 ) {
   const p = new URLSearchParams();
@@ -47,7 +48,8 @@ export function buildHomeUrl(
   } else if (author) {
     p.set('author', author);
   }
-  if (sort !== 'latest') p.set('sort', sort);
+  // 默认 reply 不写进 URL；latest / hot 显式带上
+  if (sort !== 'reply') p.set('sort', sort);
   const qs = p.toString();
 
   if (boardId) {
diff --git a/frontend/src/components/PostListItem.tsx b/frontend/src/components/PostListItem.tsx
index d75a087..6fed018 100644
--- a/frontend/src/components/PostListItem.tsx
+++ b/frontend/src/components/PostListItem.tsx
@@ -70,9 +70,9 @@ function PostListItem({ post, sort = 'latest', boardId = 0, onSelect }: Props) {
         <span className="post-pin-badge post-pin-badge--board" title="板块置顶">板块置顶</span>
       )}
       {post.featured && (
-        <span className="post-feature-badge" title="精华">
+        <span className="post-feature-badge" title="推荐">
           <FeaturedIcon size={12} />
-          精华
+          推荐
         </span>
       )}
       {post.status === 'pending' && (
diff --git a/frontend/src/components/PostManageMenu.tsx b/frontend/src/components/PostManageMenu.tsx
index 46e2e16..f058729 100644
--- a/frontend/src/components/PostManageMenu.tsx
+++ b/frontend/src/components/PostManageMenu.tsx
@@ -147,7 +147,7 @@ export default function PostManageMenu({
             <DropdownMenuLabel>展示</DropdownMenuLabel>
             <DropdownMenuItem onSelect={onFeature}>
               <Sparkles size={14} aria-hidden />
-              {post.featured ? '取消精华' : '设为精华'}
+              {post.featured ? '取消推荐' : '设为推荐'}
             </DropdownMenuItem>
             <DropdownMenuItem onSelect={onPin}>
               <Pin size={14} aria-hidden />
diff --git a/frontend/src/components/VirtualPostList.tsx b/frontend/src/components/VirtualPostList.tsx
index b607107..6d8b9d6 100644
--- a/frontend/src/components/VirtualPostList.tsx
+++ b/frontend/src/components/VirtualPostList.tsx
@@ -56,7 +56,7 @@ function getMobileFeedScrollEl(): HTMLElement | null {
 
 export default function VirtualPostList({
   posts,
-  sort = 'latest',
+  sort = 'reply',
   loading,
   hasMore,
   showPagination,
diff --git a/frontend/src/layouts/MainLayout.tsx b/frontend/src/layouts/MainLayout.tsx
index 76c15c7..ac39070 100644
--- a/frontend/src/layouts/MainLayout.tsx
+++ b/frontend/src/layouts/MainLayout.tsx
@@ -216,7 +216,7 @@ export default function MainLayout() {
     };
   }, [refreshUnreadMessages]);
 
-  // 标签云：进页/离开发帖页时拉取；不跟 posts-refresh 联动（置顶/精华等不改标签）
+  // 标签云：进页/离开发帖页时拉取；不跟 posts-refresh 联动（置顶/推荐等不改标签）
   useEffect(() => {
     if (isCompose || !showTagCloud) return;
     let cancelled = false;
diff --git a/frontend/src/pages/HomePage.tsx b/frontend/src/pages/HomePage.tsx
index b9eb43c..8f24fda 100644
--- a/frontend/src/pages/HomePage.tsx
+++ b/frontend/src/pages/HomePage.tsx
@@ -230,7 +230,7 @@ export default function HomePage() {
         tag: tag || '',
         author: tag ? '' : author,
         title_only: !tag && titleOnly ? '1' : '',
-        sort: sort === 'latest' ? '' : sort,
+        sort,
       });
       const batch = Array.isArray(data.posts) ? data.posts : [];
       const total = data.total ?? 0;
diff --git a/frontend/src/pages/admin/AdminDashboardPage.tsx b/frontend/src/pages/admin/AdminDashboardPage.tsx
index 4e4f594..10f929f 100644
--- a/frontend/src/pages/admin/AdminDashboardPage.tsx
+++ b/frontend/src/pages/admin/AdminDashboardPage.tsx
@@ -245,7 +245,7 @@ export default function AdminDashboardPage() {
                   ) : '—'}
                 </td>
                 <td className="space-x-1">
-                  {p.featured ? <Badge variant="orange">精华</Badge> : null}
+                  {p.featured ? <Badge variant="orange">推荐</Badge> : null}
                   {p.pinned ? <Badge variant="green">全局置顶</Badge> : null}
                   {p.board_pinned ? <Badge variant="green">板块置顶</Badge> : null}
                   {!p.featured && !p.pinned && !p.board_pinned ? '—' : null}
diff --git a/frontend/src/pages/admin/AdminPostsPage.tsx b/frontend/src/pages/admin/AdminPostsPage.tsx
index b785130..a0e1a6d 100644
--- a/frontend/src/pages/admin/AdminPostsPage.tsx
+++ b/frontend/src/pages/admin/AdminPostsPage.tsx
@@ -218,7 +218,7 @@ export default function AdminPostsPage() {
             ? '回收站中的帖子可恢复或永久删除；永久删除后不可撤销'
             : tab === 'pending'
               ? '审核普通用户提交的帖子；通过后公开，拒绝后仅作者可见并私信通知'
-              : '精华、全局置顶、板块置顶、锁定编辑/讨论、删除（移入回收站）；支持按标题、标签或正文搜索'}
+              : '推荐、全局置顶、板块置顶、锁定编辑/讨论、删除（移入回收站）；支持按标题、标签或正文搜索'}
         </p>
       </div>
 
@@ -337,7 +337,7 @@ export default function AdminPostsPage() {
                   <th>作者</th>
                   <th>标签</th>
                   <th>评论</th>
-                  <th>精华</th>
+                  <th>推荐</th>
                   <th>全局置顶</th>
                   <th>板块置顶</th>
                   <th>编辑锁</th>
@@ -396,7 +396,7 @@ export default function AdminPostsPage() {
                           </Button>
                         )}
                         <Button size="sm" variant="outline" onClick={() => toggleFeature(p)}>
-                          {p.featured ? '取消精华' : '精华'}
+                          {p.featured ? '取消推荐' : '推荐'}
                         </Button>
                         <Button size="sm" variant="outline" onClick={() => togglePin(p)}>
                           {p.pinned ? '取消全局置顶' : '全局置顶'}
diff --git a/frontend/src/styles/global.css b/frontend/src/styles/global.css
index e995018..cfdf880 100644
--- a/frontend/src/styles/global.css
+++ b/frontend/src/styles/global.css
@@ -2775,7 +2775,7 @@ body:has(.admin-topbar) .ptr-indicator {
   }
 
   /*
-   * 手机 Feed：主栏整页滚动，板块条 / 最新发帖·回复排序栏随列表滚走，
+   * 手机 Feed：主栏整页滚动，板块条 / 新评论·新帖子排序栏随列表滚走，
    * 避免它们占住视口上半，给帖子列表更多空间。
    */
   .main-content--feed-mobile-scroll {
@@ -3468,15 +3468,15 @@ body:has(.admin-topbar) .ptr-indicator {
 
 .post-feature-badge {
   padding: 0 7px 0 5px;
-  color: #b45309;
-  background: rgba(245, 158, 11, 0.12);
-  border: 1px solid rgba(245, 158, 11, 0.22);
+  color: var(--j13-green);
+  background: var(--j13-green-bg);
+  border: 1px solid color-mix(in srgb, var(--j13-green) 28%, transparent);
 }
 
 .dark .post-feature-badge {
-  color: #fbbf24;
-  background: rgba(251, 191, 36, 0.14);
-  border-color: rgba(251, 191, 36, 0.22);
+  color: var(--j13-green);
+  background: var(--j13-green-bg);
+  border-color: color-mix(in srgb, var(--j13-green) 35%, transparent);
 }
 
 .post-feature-badge .post-featured-icon {
@@ -3611,12 +3611,12 @@ a.post-title:visited {
   display: inline-block;
   vertical-align: -0.15em;
   flex-shrink: 0;
-  color: #d97706;
+  color: var(--j13-green);
   stroke-width: 1.75;
 }
 
 .dark .post-featured-icon {
-  color: #fbbf24;
+  color: var(--j13-green);
 }
 
 .post-meta {
diff --git a/handler/api.go b/handler/api.go
index aee9e2a..bf1b697 100644
--- a/handler/api.go
+++ b/handler/api.go
@@ -286,7 +286,7 @@ func (h *Handlers) APIAdminBoardPinPost(c *gin.Context) {
 	c.JSON(http.StatusOK, gin.H{"message": msg, "board_pinned": req.BoardPinned})
 }
 
-// APIAdminFeaturePost 设为精华/取消精华（JSON）
+// APIAdminFeaturePost 设为推荐/取消推荐（JSON）
 func (h *Handlers) APIAdminFeaturePost(c *gin.Context) {
 	id, _ := strconv.ParseUint(c.Param("id"), 10, 64)
 	var req struct {
@@ -300,9 +300,9 @@ func (h *Handlers) APIAdminFeaturePost(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
 		return
 	}
-	msg := "已取消精华"
+	msg := "已取消推荐"
 	if req.Featured {
-		msg = "已设为精华"
+		msg = "已设为推荐"
 	}
 	c.JSON(http.StatusOK, gin.H{"message": msg, "featured": req.Featured})
 }
@@ -976,7 +976,7 @@ func (h *Handlers) APIPosts(c *gin.Context) {
 		Tag:           tag,
 		Author:        author,
 		TitleOnly:     titleOnly,
-		Sort:          c.DefaultQuery("sort", "latest"),
+		Sort:          c.DefaultQuery("sort", "reply"),
 		ViewerID:      h.currentUserID(c),
 		ViewerIsAdmin: h.isAdmin(c),
 	}
diff --git a/model/models.go b/model/models.go
index 3229731..ab4051b 100644
--- a/model/models.go
+++ b/model/models.go
@@ -115,7 +115,7 @@ type Post struct {
 	LotteryStatus      string         `gorm:"size:16;default:'';index" json:"lottery_status"` // open|drawn
 	Pinned             bool           `gorm:"default:false" json:"pinned"`                    // 全局置顶
 	BoardPinned        bool           `gorm:"default:false" json:"board_pinned"`              // 板块内置顶
-	Featured           bool           `gorm:"default:false;index" json:"featured"`            // 精华帖
+	Featured           bool           `gorm:"default:false;index" json:"featured"`            // 推荐帖（原精华）
 	EditLocked         bool           `gorm:"default:false" json:"edit_locked"`
 	CommentsLocked     bool           `gorm:"default:false" json:"comments_locked"`          // 禁止评论（结贴）
 	Status             string         `gorm:"size:16;default:published;index" json:"status"` // pending|published|rejected
diff --git a/service/post.go b/service/post.go
index 2caf45d..560f7f8 100644
--- a/service/post.go
+++ b/service/post.go
@@ -47,7 +47,7 @@ type PostListQuery struct {
 	Tag           string // 精确标签筛选（整枚匹配，不走 keyword LIKE）
 	Author        string // 作者用户名或昵称（解析为 UserID）
 	TitleOnly     bool   // 关键词仅匹配标题
-	Sort          string // latest | reply | hot
+	Sort          string // reply | latest | hot（hot=推荐优先）
 	ViewerID      uint   // 当前查看者（用于 pending 仅作者可见）
 	ViewerIsAdmin bool
 	Status        string // 管理端筛选：pending|published|rejected|all；空则按可见性规则
@@ -365,7 +365,8 @@ func (s *PostService) List(q PostListQuery) ([]model.Post, int64, error) {
 		) DESC`)
 		db = db.Order("posts.created_at DESC")
 	case "hot":
-		db = db.Order("like_count desc, view_count desc")
+		// 推荐帖：人工推荐（featured）优先，再按互动
+		db = db.Order("featured desc, like_count desc, view_count desc")
 	default:
 		db = db.Order("id desc")
 	}
@@ -375,10 +376,11 @@ func (s *PostService) List(q PostListQuery) ([]model.Post, int64, error) {
 
 func normalizePostSort(sort string) string {
 	switch sort {
-	case "reply", "hot":
+	case "latest", "hot":
 		return sort
 	default:
-		return "latest"
+		// 含空串 / reply：默认新评论
+		return "reply"
 	}
 }