's'

app/lib/payment/usePayStatusPoll.ts

@@ -54,18 +54,27 @@ function parsePendingOrder(raw: string | null): [string | null, boolean] {
   return [orderId, true];
 }
 
-export function usePayStatusPoll(onPaid: () => void): boolean {
+export function usePayStatusPoll(onPaid: (orderId: string) => void): boolean {
   const [polling, setPolling] = useState(false);
   const onPaidRef = useRef(onPaid);
   onPaidRef.current = onPaid;
 
   useEffect(() => {
+    const urlOrderId =
+      typeof window !== "undefined"
+        ? new URLSearchParams(window.location.search).get("order_id") || ""
+        : "";
     const cookieRaw = getCookie(COOKIE_NAME);
     const [cookieOrderId, cookieValid] = parsePendingOrder(cookieRaw);
     const storageRaw = getStorage(STORAGE_NAME);
     const [storageOrderId, storageValid] = parsePendingOrder(storageRaw);
-    const orderId = cookieValid ? cookieOrderId : storageValid ? storageOrderId : null;
-    const activeRaw = cookieValid ? cookieRaw : storageValid ? storageRaw : null;
+    let orderId = cookieValid ? cookieOrderId : storageValid ? storageOrderId : null;
+    let activeRaw = cookieValid ? cookieRaw : storageValid ? storageRaw : null;
+    if (!orderId && urlOrderId.trim()) {
+      orderId = urlOrderId.trim();
+      activeRaw = `${orderId}|${Date.now()}`;
+      persistPendingOrder(activeRaw);
+    }
 
     if (!orderId) {
       if (cookieRaw || storageRaw) {
@@ -120,7 +129,7 @@ export function usePayStatusPoll(onPaid: () => void): boolean {
           stop();
           clearPendingOrder();
           setPolling(false);
-          onPaidRef.current();
+          onPaidRef.current(orderId);
           return;
         }
       } catch {

app/lib/pocketbase/auth.ts

@@ -67,11 +67,17 @@ export function pbSaveAuth(token: string, record: AuthUser): void {
   localStorage.setItem(PB_STORAGE_KEYS.user, JSON.stringify(record));
 }
 
-/** 登出 - 清除本地存储和根域 Cookie */
+/** 登出 - 清除本地存储、支付订单、根域 Cookie */
 export async function pbLogout(): Promise<void> {
   if (typeof window === "undefined") return;
   localStorage.removeItem(PB_STORAGE_KEYS.token);
   localStorage.removeItem(PB_STORAGE_KEYS.user);
+  localStorage.removeItem("join_pay_order");
+  try {
+    document.cookie = "join_pay_order=; path=/; max-age=0";
+  } catch {
+    /* ignore */
+  }
   try {
     await fetch("/api/auth/logout", { method: "POST", credentials: "include" });
   } catch {
@@ -80,18 +86,24 @@ export async function pbLogout(): Promise<void> {
   window.dispatchEvent(new CustomEvent("auth:updated"));
 }
 
-export function getStoredUserEmail(): string | null {
+export function getStoredUser(): AuthUser | null {
   if (typeof window === "undefined") return null;
   try {
     const raw = localStorage.getItem(PB_STORAGE_KEYS.user);
     if (!raw) return null;
     const user = JSON.parse(raw);
-    return user?.email ?? null;
+    if (!user?.id || !user?.email) return null;
+    return user;
   } catch {
     return null;
   }
 }
 
+export function getStoredUserEmail(): string | null {
+  const user = getStoredUser();
+  return user?.email ?? null;
+}
+
 export function getStoredToken(): string | null {
   if (typeof window === "undefined") return null;
   return localStorage.getItem(PB_STORAGE_KEYS.token);

app/lib/pocketbase/index.ts

@@ -3,6 +3,7 @@ export {
   pbRegister,
   pbSaveAuth,
   pbLogout,
+  getStoredUser,
   getStoredUserEmail,
   getStoredToken,
 } from "./auth";