This commit is contained in:
root
2026-06-07 12:48:17 +08:00
parent 9ee203c221
commit 283d65d1d1
46 changed files with 1205 additions and 2579 deletions

View File

@@ -59,28 +59,28 @@ export default function JoinPage() {
const [authOpen, setAuthOpen] = useState(false);
const [pendingSubmit, setPendingSubmit] = useState(false);
const [isAlreadyRecorded, setIsAlreadyRecorded] = useState(false);
const [checkingStatus, setCheckingStatus] = useState(true);
useEffect(() => {
if (typeof window !== "undefined" && new URLSearchParams(window.location.search).get("paid") === "1") {
setSubmitted(true);
setCheckingStatus(false);
return;
}
const checkExisting = async () => {
const meRes = await fetch(apiUrl("/api/auth/me"), { credentials: "include" });
const meData = await meRes.json();
if (!meData?.user) {
setCheckingStatus(false);
return;
try {
const meRes = await fetch(apiUrl("/api/auth/me"), { credentials: "include" });
const meData = await meRes.json().catch(() => ({}));
if (!meRes.ok || !meData?.user) {
return;
}
const statusRes = await fetch(apiUrl("/api/join/status"), { credentials: "include", cache: "no-store" });
const statusData = await statusRes.json().catch(() => ({}));
if (statusRes.ok && statusData?.hasRecord && statusData?.isComplete) {
setIsAlreadyRecorded(true);
setSubmitted(true);
}
} catch {
// Keep the form usable when the API proxy/backend is temporarily unavailable.
}
const statusRes = await fetch(apiUrl("/api/join/status"), { credentials: "include", cache: "no-store" });
const statusData = await statusRes.json();
if (statusData?.hasRecord && statusData?.isComplete) {
setIsAlreadyRecorded(true);
setSubmitted(true);
}
setCheckingStatus(false);
};
checkExisting();
}, []);
@@ -200,14 +200,6 @@ export default function JoinPage() {
);
}
if (checkingStatus) {
return (
<div className="flex min-h-screen items-center justify-center bg-[#f0f4f8] dark:bg-gray-950 px-4">
<div className="text-slate-500 dark:text-slate-400"></div>
</div>
);
}
return (
<div className="min-h-screen bg-[#f0f4f8] dark:bg-gray-950">
<div className="mx-auto max-w-2xl px-0 py-0 sm:px-6 sm:py-10 lg:py-14">

View File

@@ -4,8 +4,6 @@ import { useState, useEffect } from "react";
import { Link } from "@/i18n/navigation";
import { apiUrl } from "@/app/lib/api-client";
const DEFAULT_PASSWORD = "12345678";
function clearPendingOrder(): void {
try {
localStorage.removeItem("join_pay_order");
@@ -16,16 +14,8 @@ function clearPendingOrder(): void {
/**
* 支付完成回跳页
* Z-Pay 的 return_url 不支持带查询参数,故使用 /join/paid 作为专用成功页
* 新用户支付成功后弹窗显示默认密码 12345678并提供修改密码选项
*/
export default function JoinPaidPage() {
const [needPasswordChange, setNeedPasswordChange] = useState<boolean | null>(null);
const [showPasswordModal, setShowPasswordModal] = useState(false);
const [newPassword, setNewPassword] = useState("");
const [passwordConfirm, setPasswordConfirm] = useState("");
const [changeError, setChangeError] = useState<string | null>(null);
const [changing, setChanging] = useState(false);
const [showChangeForm, setShowChangeForm] = useState(false);
const [completeStatus, setCompleteStatus] = useState<"pending" | "success" | "error">("pending");
const [errorDetail, setErrorDetail] = useState<string | null>(null);
const [countdown, setCountdown] = useState<number | null>(null);
@@ -59,20 +49,6 @@ export default function JoinPaidPage() {
window.dispatchEvent(new CustomEvent("auth:updated"));
window.dispatchEvent(new CustomEvent("vip:updated"));
}, 400);
if (d.is_new) {
await fetch(apiUrl("/api/meetup/set-needs-password-change"), { method: "POST", credentials: "include" });
if (!cancelled) {
setNeedPasswordChange(true);
setShowPasswordModal(true);
}
} else {
const needRes = await fetch(apiUrl("/api/meetup/need-password-change"), { credentials: "include" });
const needData = await needRes.json().catch(() => ({}));
if (!cancelled && needData?.need === true) {
setNeedPasswordChange(true);
setShowPasswordModal(true);
}
}
return { ok: true };
};
@@ -121,15 +97,6 @@ export default function JoinPaidPage() {
setCompleteStatus("error");
setErrorDetail(lastError);
}
fetch(apiUrl("/api/meetup/need-password-change"))
.then((res) => res.json())
.then((d) => {
if (cancelled) return;
setNeedPasswordChange(d?.need === true);
if (d?.need === true) setShowPasswordModal(true);
})
.catch(() => { if (!cancelled) setNeedPasswordChange(false); });
};
run();
@@ -138,7 +105,7 @@ export default function JoinPaidPage() {
const COUNTDOWN_SECONDS = 5;
useEffect(() => {
if (completeStatus !== "success" || showPasswordModal) return;
if (completeStatus !== "success") return;
setCountdown(COUNTDOWN_SECONDS);
const timer = setInterval(() => {
setCountdown((prev) => {
@@ -152,46 +119,7 @@ export default function JoinPaidPage() {
});
}, 1000);
return () => clearInterval(timer);
}, [completeStatus, showPasswordModal]);
const handleChangePassword = async (e: React.FormEvent) => {
e.preventDefault();
setChangeError(null);
if (newPassword.length < 8) {
setChangeError("密码至少 8 位");
return;
}
if (newPassword !== passwordConfirm) {
setChangeError("两次密码不一致");
return;
}
setChanging(true);
try {
const res = await fetch(apiUrl("/api/auth/change-password"), {
method: "POST",
headers: { "Content-Type": "application/json" },
body: JSON.stringify({ newPassword, passwordConfirm }),
credentials: "include",
});
const data = await res.json();
if (!res.ok || !data?.ok) {
throw new Error(data?.error || "修改失败");
}
setShowPasswordModal(false);
} catch (err) {
setChangeError(err instanceof Error ? err.message : "修改失败");
} finally {
setChanging(false);
}
};
const handleCopyPassword = async () => {
try {
await navigator.clipboard.writeText(DEFAULT_PASSWORD);
} catch {
/* ignore */
}
};
}, [completeStatus]);
return (
<>
@@ -232,83 +160,6 @@ export default function JoinPaidPage() {
</Link>
</div>
</div>
{showPasswordModal && (
<div className="fixed inset-0 z-[9999] flex items-center justify-center bg-black/50 p-4">
<div className="w-full max-w-sm rounded-2xl bg-white dark:bg-gray-900 p-6 shadow-xl border border-gray-100 dark:border-gray-800">
<h3 className="text-lg font-bold text-slate-800 dark:text-slate-100"></h3>
<p className="mt-1 text-sm text-slate-500 dark:text-slate-400">
</p>
<div className="mt-4 flex items-center gap-2 rounded-lg bg-slate-100 dark:bg-slate-800 px-4 py-3">
<code className="flex-1 font-mono text-lg font-semibold text-slate-800 dark:text-slate-100">
{DEFAULT_PASSWORD}
</code>
<button
type="button"
onClick={handleCopyPassword}
className="rounded-lg px-3 py-1.5 text-sm font-medium text-[#ff4d4f] hover:bg-slate-200 dark:hover:bg-slate-700 transition-colors"
>
</button>
</div>
{!showChangeForm ? (
<button
type="button"
onClick={() => setShowChangeForm(true)}
className="mt-4 w-full rounded-lg border border-[#ff4d4f] py-2.5 text-sm font-medium text-[#ff4d4f] hover:bg-[#ff4d4f]/10 transition-colors"
>
</button>
) : (
<form onSubmit={handleChangePassword} className="mt-4 space-y-3">
<input
type="password"
value={newPassword}
onChange={(e) => { setNewPassword(e.target.value); setChangeError(null); }}
placeholder="新密码(至少 8 位)"
minLength={8}
required
className="w-full rounded-lg border border-gray-200 dark:border-gray-600 px-4 py-2.5 text-slate-800 dark:text-slate-100 bg-white dark:bg-gray-800"
/>
<input
type="password"
value={passwordConfirm}
onChange={(e) => { setPasswordConfirm(e.target.value); setChangeError(null); }}
placeholder="确认新密码"
minLength={8}
required
className="w-full rounded-lg border border-gray-200 dark:border-gray-600 px-4 py-2.5 text-slate-800 dark:text-slate-100 bg-white dark:bg-gray-800"
/>
{changeError && <p className="text-sm text-red-600 dark:text-red-400">{changeError}</p>}
<div className="flex gap-2">
<button
type="button"
onClick={() => setShowChangeForm(false)}
className="flex-1 rounded-lg border border-gray-300 dark:border-gray-600 py-2.5 text-sm font-medium text-slate-600 dark:text-slate-400 hover:bg-slate-50 dark:hover:bg-slate-800"
>
</button>
<button
type="submit"
disabled={changing}
className="flex-1 rounded-lg bg-[#ff4d4f] py-2.5 font-semibold text-white disabled:opacity-70"
>
{changing ? "提交中…" : "确认修改"}
</button>
</div>
</form>
)}
<button
type="button"
onClick={() => setShowPasswordModal(false)}
className="mt-3 w-full text-sm text-slate-500 dark:text-slate-400 hover:text-slate-700 dark:hover:text-slate-300"
>
</button>
</div>
</div>
)}
</>
);
}