w.id)
+ ? (post.lottery.winners || [])
+ .map((w) => w.comment_id || 0)
+ .filter((id) => id > 0)
: []
}
/>
diff --git a/frontend/components/AcceptedAnswerCard.tsx b/frontend/components/AcceptedAnswerCard.tsx
new file mode 100644
index 0000000..e5b0c87
--- /dev/null
+++ b/frontend/components/AcceptedAnswerCard.tsx
@@ -0,0 +1,86 @@
+import Link from "next/link";
+import { CheckCircle2 } from "lucide-react";
+import type { AcceptedAnswer } from "@/lib/api";
+import Avatar from "@/components/Avatar";
+import MarkdownBody from "@/components/MarkdownBody";
+import AcceptedAnswerReopen from "@/components/AcceptedAnswerReopen";
+
+/** 正文下方的已采纳答案卡：头像 + 昵称 + 全文；问答已解决时并入状态与「重新打开」 */
+export default async function AcceptedAnswerCard({
+ answer,
+ variant = "question",
+ postId,
+ canReopen = false,
+}: {
+ answer: AcceptedAnswer;
+ /** 问答用「最佳答案」，悬赏用「已采纳」 */
+ variant?: "question" | "bounty";
+ postId?: number;
+ canReopen?: boolean;
+}) {
+ const name = answer.user.nickname || answer.user.username || "用户";
+ const label = variant === "bounty" ? "已采纳" : "最佳答案";
+ const showReopen = variant === "question" && canReopen && !!postId;
+
+ return (
+
+
+
+
+ {answer.deleted ? (
+
+ 该答案已被删除
+
+ ) : (
+
+ )}
+
+ );
+}
diff --git a/frontend/components/AcceptedAnswerReopen.tsx b/frontend/components/AcceptedAnswerReopen.tsx
new file mode 100644
index 0000000..5189442
--- /dev/null
+++ b/frontend/components/AcceptedAnswerReopen.tsx
@@ -0,0 +1,36 @@
+"use client";
+
+import { useState } from "react";
+import { useRouter } from "next/navigation";
+import { apiReopenQuestion } from "@/lib/api";
+import { toast } from "@/lib/toast";
+
+/** 已采纳答案卡上的「重新打开」——并入正文下方资料卡，避免与上方状态条重复 */
+export default function AcceptedAnswerReopen({ postId }: { postId: number }) {
+ const router = useRouter();
+ const [busy, setBusy] = useState(false);
+
+ const reopen = async () => {
+ setBusy(true);
+ try {
+ const res = await apiReopenQuestion(String(postId));
+ if (res.post) {
+ toast("已重新打开", "ok");
+ router.refresh();
+ } else toast(res.error || "操作失败", "error");
+ } finally {
+ setBusy(false);
+ }
+ };
+
+ return (
+
+ );
+}
diff --git a/frontend/components/CommentSection.tsx b/frontend/components/CommentSection.tsx
index 0075bba..42a861a 100644
--- a/frontend/components/CommentSection.tsx
+++ b/frontend/components/CommentSection.tsx
@@ -55,8 +55,8 @@ interface CommentSectionProps {
/** 悬赏或问答：可采纳时在评论旁显示采纳按钮（二者按帖子类型二选一） */
acceptMode?: "bounty" | "question" | null;
acceptedCommentId?: number;
- /** 抽奖已开奖：中奖用户 ID，用于楼层旁显示「中奖」徽标 */
- winnerUserIds?: number[];
+ /** 抽奖已开奖：中奖楼层评论 ID（每名中奖者仅其最早主评一条） */
+ winnerCommentIds?: number[];
/** 全站是否开放评论；缺省 true。关闭时隐藏发评/回复入口 */
allowComments?: boolean;
}
@@ -115,10 +115,10 @@ export default function CommentSection({
user,
acceptMode = null,
acceptedCommentId = 0,
- winnerUserIds = [],
+ winnerCommentIds = [],
allowComments: allowCommentsProp = true,
}: CommentSectionProps) {
- const winnerIdSet = new Set(winnerUserIds.filter((id) => id > 0));
+ const winnerCommentIdSet = new Set(winnerCommentIds.filter((id) => id > 0));
const router = useRouter();
const [content, setContent] = useState("");
// 内联回复目标：在该评论下方就地发子评论（同一时间只有一个回复框）
@@ -875,7 +875,7 @@ export default function CommentSection({
{acceptedCommentId === c.id && (
已采纳
)}
- {winnerIdSet.has(c.user.id) && (
+ {winnerCommentIdSet.has(c.id) && (
中奖楼层
)}
{floor && (
diff --git a/frontend/components/PostInteractPanels.tsx b/frontend/components/PostInteractPanels.tsx
index 80c029c..8780a4e 100644
--- a/frontend/components/PostInteractPanels.tsx
+++ b/frontend/components/PostInteractPanels.tsx
@@ -21,23 +21,21 @@ import Avatar from "@/components/Avatar";
export default function PostInteractPanels({
postId,
- question,
poll,
bounty,
lottery,
loggedIn,
}: {
postId: number;
- question?: QuestionState | null;
poll?: PollState | null;
bounty?: BountyState | null;
lottery?: LotteryState | null;
loggedIn: boolean;
}) {
- if (!question && !poll && !bounty && !lottery) return null;
+ // 问答状态改在正文下方展示（未解决 / 已解决资料卡），此处不再放
+ if (!poll && !bounty && !lottery) return null;
return (
-
- {question &&
}
+
{poll &&
}
{bounty &&
}
{lottery &&
}
@@ -54,7 +52,8 @@ function formatEndsAt(iso?: string) {
}
}
-function QuestionPanel({ postId, state }: { postId: number; state: QuestionState }) {
+/** 正文下方的问答状态卡（未解决 / 仅标记已解决）；有采纳答案时改用 AcceptedAnswerCard */
+export function QuestionStatusCard({ postId, state }: { postId: number; state: QuestionState }) {
const router = useRouter();
const [busy, setBusy] = useState(false);
@@ -72,7 +71,10 @@ function QuestionPanel({ postId, state }: { postId: number; state: QuestionState
};
return (
-
+
@@ -319,20 +321,22 @@ function BountyPanel({ postId, state }: { postId: number; state: BountyState })
悬赏 {state.points} 积分
- {state.accepted_comment_id ? (
- <>
- 已采纳{" "}
-
- #{state.accepted_floor || "?"}
-
-
- ) : (
- statusText
- )}
+ {state.accepted_answer
+ ? "悬赏积分已发放给采纳答案"
+ : state.accepted_comment_id
+ ? (
+ <>
+ 已采纳{" "}
+
+ #{state.accepted_floor || "?"}
+
+
+ )
+ : statusText}
{state.ends_at && !state.settled ? ` · 截止 ${formatEndsAt(state.ends_at)}` : ""}
@@ -426,13 +430,20 @@ function LotteryPanel({
{state.winners.map((w) => (
-
-
-
- {w.nickname || w.username}
-
+
+
+
+ {w.nickname || w.username}
+
+ {w.comment_id && w.floor ? (
+
+ #{w.floor}
+
+ ) : null}
+
))}
diff --git a/frontend/lib/api.ts b/frontend/lib/api.ts
index 906ba2e..1175159 100644
--- a/frontend/lib/api.ts
+++ b/frontend/lib/api.ts
@@ -235,10 +235,25 @@ export interface Post {
deleted_at?: string;
}
+export interface AcceptedAnswer {
+ id: number;
+ floor: number;
+ content: string;
+ created_at: string;
+ deleted?: boolean;
+ user: {
+ id: number;
+ username: string;
+ nickname: string;
+ avatar: string;
+ };
+}
+
export interface QuestionState {
solved: boolean;
accepted_comment_id: number;
accepted_floor: number;
+ accepted_answer?: AcceptedAnswer | null;
can_accept: boolean;
can_solve: boolean;
can_reopen: boolean;
@@ -276,6 +291,7 @@ export interface BountyState {
points: number;
accepted_comment_id: number;
accepted_floor: number;
+ accepted_answer?: AcceptedAnswer | null;
escrowed: boolean;
refunded: boolean;
expired?: boolean;
@@ -290,6 +306,9 @@ export interface LotteryEntrant {
nickname: string;
username: string;
avatar: string;
+ /** 中奖楼层评论 ID（该用户最早主评，每人仅一条） */
+ comment_id?: number;
+ floor?: number;
}
export interface LotteryState {