feat: 增强投注结果弹窗与投注网格功能

更新 HallBetResultDialog:根据成功与失败数量显示不同的结果图标与标题。
优化 HallBettingGrid:新增 place trace ID 管理机制,更好地处理投注提交流程,并防止重复扣费。
增强注单详情页面:针对临时状态中的注单自动刷新,提升用户体验。
新增多语言翻译:补充投注结果与状态相关文案,支持更完善的用户反馈。
This commit is contained in:
2026-05-26 14:50:21 +08:00
parent d768a3f6ba
commit 51b2a36cc5
11 changed files with 257 additions and 90 deletions

View File

@@ -1,7 +1,7 @@
"use client"; "use client";
import Link from "next/link"; import Link from "next/link";
import { CheckCircle2, ClipboardList, Ticket, XIcon } from "lucide-react"; import { AlertTriangle, CheckCircle2, ClipboardList, Ticket, XCircle, XIcon } from "lucide-react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
@@ -14,6 +14,7 @@ import {
} from "@/components/ui/dialog"; } from "@/components/ui/dialog";
import { formatMinorAsCurrency } from "@/lib/money"; import { formatMinorAsCurrency } from "@/lib/money";
import { playLabel } from "@/lib/play-labels"; import { playLabel } from "@/lib/play-labels";
import { cn } from "@/lib/utils";
import type { TicketPlaceData } from "@/types/api/ticket"; import type { TicketPlaceData } from "@/types/api/ticket";
type HallBetResultDialogProps = { type HallBetResultDialogProps = {
@@ -38,6 +39,15 @@ export function HallBetResultDialog({
const failedItems = data?.items.filter((item) => item.status === "failed") ?? []; const failedItems = data?.items.filter((item) => item.status === "failed") ?? [];
const totalSuccess = data?.summary.success_count ?? successItems.length; const totalSuccess = data?.summary.success_count ?? successItems.length;
const totalFailure = data?.summary.failure_count ?? failedItems.length; const totalFailure = data?.summary.failure_count ?? failedItems.length;
const isPartial = totalSuccess > 0 && totalFailure > 0;
const isAllFailed = totalFailure > 0 && totalSuccess === 0;
const ResultIcon = isAllFailed ? XCircle : isPartial ? AlertTriangle : CheckCircle2;
const iconWrapClass = isAllFailed
? "border-rose-100 text-rose-600 shadow-[0_10px_24px_rgba(225,29,72,0.12)]"
: isPartial
? "border-amber-100 text-amber-600 shadow-[0_10px_24px_rgba(217,119,6,0.12)]"
: "border-emerald-100 text-emerald-600 shadow-[0_10px_24px_rgba(22,163,74,0.12)]";
return ( return (
<Dialog open={open} onOpenChange={onOpenChange}> <Dialog open={open} onOpenChange={onOpenChange}>
@@ -54,12 +64,21 @@ export function HallBetResultDialog({
> >
<XIcon className="size-5" /> <XIcon className="size-5" />
</button> </button>
<div className="mx-auto flex size-16 items-center justify-center rounded-full border-4 border-emerald-100 bg-white text-emerald-600 shadow-[0_10px_24px_rgba(22,163,74,0.12)]"> <div
<CheckCircle2 className="size-11" strokeWidth={2.5} /> className={cn(
"mx-auto flex size-16 items-center justify-center rounded-full border-4 bg-white",
iconWrapClass,
)}
>
<ResultIcon className="size-11" strokeWidth={2.5} />
</div> </div>
<DialogHeader className="mt-3 items-center gap-2"> <DialogHeader className="mt-3 items-center gap-2">
<DialogTitle className="text-2xl font-black text-slate-950"> <DialogTitle className="text-2xl font-black text-slate-950">
{t("hall.result.title")} {isAllFailed
? t("hall.result.titleAllFailed")
: isPartial
? t("hall.result.titlePartial")
: t("hall.result.title")}
</DialogTitle> </DialogTitle>
{data ? ( {data ? (
<DialogDescription className="text-sm leading-relaxed text-slate-500"> <DialogDescription className="text-sm leading-relaxed text-slate-500">

View File

@@ -450,6 +450,17 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
number: null, number: null,
longPress: false, longPress: false,
}); });
/** 单次预览→确认共用,重试 place 复用,避免重复扣款 */
const placeTraceIdRef = useRef<string | null>(null);
const newPlaceTraceId = (): string =>
typeof crypto !== "undefined" && crypto.randomUUID
? crypto.randomUUID()
: `pl-${Date.now()}-${Math.random().toString(36).slice(2, 9)}`;
const clearPlaceTraceId = () => {
placeTraceIdRef.current = null;
};
const loadCatalog = useCallback(async () => { const loadCatalog = useCallback(async () => {
setCatalogState((s) => (s.kind === "ok" ? s : { kind: "loading" })); setCatalogState((s) => (s.kind === "ok" ? s : { kind: "loading" }));
try { try {
@@ -466,7 +477,7 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
const wallet = await getWalletBalance({ currency: currencyParam }); const wallet = await getWalletBalance({ currency: currencyParam });
setAvailableMinor(Number(wallet.available_balance ?? 0)); setAvailableMinor(Number(wallet.available_balance ?? 0));
} catch { } catch {
setAvailableMinor(0); // 保留上次可用余额,避免短暂失败导致误报余额不足
} }
}, [currencyParam]); }, [currencyParam]);
@@ -892,16 +903,17 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
return; return;
} }
if (previewLoading || placeLoading) {
return;
}
setPreviewLoading(true); setPreviewLoading(true);
try { try {
placeTraceIdRef.current = newPlaceTraceId();
const data = await postTicketPreview({ const data = await postTicketPreview({
draw_id: display.draw_no, draw_id: display.draw_no,
currency_code: currencyCode, currency_code: currencyCode,
client_trace_id: `pv-${ client_trace_id: placeTraceIdRef.current,
typeof crypto !== "undefined" && crypto.randomUUID
? crypto.randomUUID()
: String(Date.now())
}`,
lines, lines,
}); });
setPreviewData(data); setPreviewData(data);
@@ -925,6 +937,9 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
const handlePlace = async () => { const handlePlace = async () => {
if (!display || !previewData) return; if (!display || !previewData) return;
if (placeLoading) {
return;
}
if (!isBettable) { if (!isBettable) {
toast.error(t("hall.closedSubmit")); toast.error(t("hall.closedSubmit"));
return; return;
@@ -942,18 +957,19 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
return; return;
} }
const traceId = placeTraceIdRef.current ?? newPlaceTraceId();
placeTraceIdRef.current = traceId;
setPlaceLoading(true); setPlaceLoading(true);
try { try {
const data = await postTicketPlace({ const data = await postTicketPlace({
draw_id: display.draw_no, draw_id: display.draw_no,
currency_code: currencyCode, currency_code: currencyCode,
client_trace_id: client_trace_id: traceId,
typeof crypto !== "undefined" && crypto.randomUUID
? crypto.randomUUID()
: `pl-${Date.now()}`,
lines, lines,
expected_config_versions: previewData.config_versions, expected_config_versions: previewData.config_versions,
}); });
clearPlaceTraceId();
setPreviewOpen(false); setPreviewOpen(false);
setPreviewData(null); setPreviewData(null);
setResultData(data); setResultData(data);
@@ -963,17 +979,26 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
triggerWalletPollingAfterBet(); triggerWalletPollingAfterBet();
void refreshWallet(); void refreshWallet();
void reloadDraw(); void reloadDraw();
toast.success( const failureCount = data.summary.failure_count ?? 0;
t("hall.placeSuccess", { const successCount = data.summary.success_count ?? 0;
orderNo: data.order_no, if (failureCount > 0 && successCount === 0) {
amount: formatMinorAsCurrency(data.summary.total_actual_deduct, currencyCode), toast.error(
}), t("hall.placeAllFailed", {
); failed: failureCount,
if ((data.summary.failure_count ?? 0) > 0) { }),
);
} else if (failureCount > 0) {
toast.warning( toast.warning(
t("hall.placePartialFailed", { t("hall.placePartialFailed", {
success: data.summary.success_count ?? 0, success: successCount,
failed: data.summary.failure_count ?? 0, failed: failureCount,
}),
);
} else {
toast.success(
t("hall.placeSuccess", {
orderNo: data.order_no,
amount: formatMinorAsCurrency(data.summary.total_actual_deduct, currencyCode),
}), }),
); );
} }
@@ -1268,7 +1293,12 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
className="w-[4.5rem] min-w-[4.5rem] max-w-[4.5rem] px-0.5 py-2 text-center font-bold" className="w-[4.5rem] min-w-[4.5rem] max-w-[4.5rem] px-0.5 py-2 text-center font-bold"
> >
<span className="block whitespace-nowrap text-[10px] leading-tight"> <span className="block whitespace-nowrap text-[10px] leading-tight">
{playColumnHeaderLabel(column.play, activeCategory, column.digitSlot, t)} {playColumnHeaderLabel(
column.play,
activeCategory as Exclude<HallCategory, "JACKPOT">,
column.digitSlot,
t,
)}
</span> </span>
<span className="mt-0.5 block text-[9px] font-medium text-[#9aa8bd]"> <span className="mt-0.5 block text-[9px] font-medium text-[#9aa8bd]">
{t("hall.table.amountPlaceholder")} {t("hall.table.amountPlaceholder")}
@@ -1451,7 +1481,12 @@ export function HallBettingGrid({ drawLive }: { drawLive: HallDrawLiveSnapshot }
open={previewOpen} open={previewOpen}
onOpenChange={(open) => { onOpenChange={(open) => {
setPreviewOpen(open); setPreviewOpen(open);
if (!open) setPreviewData(null); if (!open) {
setPreviewData(null);
if (!placeLoading) {
clearPlaceTraceId();
}
}
}} }}
currencyCode={currencyCode} currencyCode={currencyCode}
data={previewData} data={previewData}

View File

@@ -83,8 +83,7 @@ export function HallWalletStrip() {
}; };
}, [mode, refresh]); }, [mode, refresh]);
const lotteryMinor = Number(balance?.balance ?? 0); const availableMinor = Number(balance?.available_balance ?? balance?.balance ?? 0);
const availableMinor = Number(balance?.available_balance ?? 0);
return ( return (
<section className="mb-3 space-y-2.5" aria-label={t("wallet.balance")}> <section className="mb-3 space-y-2.5" aria-label={t("wallet.balance")}>
@@ -110,7 +109,7 @@ export function HallWalletStrip() {
<Skeleton className="mt-2 h-8 w-44 rounded-md bg-white/25" /> <Skeleton className="mt-2 h-8 w-44 rounded-md bg-white/25" />
) : ( ) : (
<p className="mt-1 text-2xl font-black leading-none tabular-nums tracking-normal"> <p className="mt-1 text-2xl font-black leading-none tabular-nums tracking-normal">
{formatMinorAsCurrency(lotteryMinor, currency)} {formatMinorAsCurrency(availableMinor, currency)}
</p> </p>
)} )}
</div> </div>
@@ -124,7 +123,7 @@ export function HallWalletStrip() {
triggerLabel={t("wallet.transferIn")} triggerLabel={t("wallet.transferIn")}
triggerClassName="h-12 rounded-lg text-base font-bold" triggerClassName="h-12 rounded-lg text-base font-bold"
currency={currency} currency={currency}
lotteryMinor={lotteryMinor} lotteryMinor={availableMinor}
onSuccess={refresh} onSuccess={refresh}
/> />
<TransferOutDialog <TransferOutDialog

View File

@@ -85,37 +85,43 @@ export function useHallDrawLive(): HallDrawLiveSnapshot {
(s) => s.setWalletPollingExpiryAt, (s) => s.setWalletPollingExpiryAt,
); );
const latestSnapshotMsRef = useRef(0);
const applySnapshot = useCallback((anchorMs: number, data: DrawCurrentPayload | null) => {
if (anchorMs < latestSnapshotMsRef.current) {
return;
}
latestSnapshotMsRef.current = anchorMs;
setServerNowMs(anchorMs);
setRaw(data);
setEmittedAtMs(anchorMs);
}, []);
const mergeFromWs = useCallback((evt: HallWsEnvelope) => { const mergeFromWs = useCallback((evt: HallWsEnvelope) => {
const anchor = evt.emitted_at_ms ?? Date.now(); const anchor = evt.emitted_at_ms ?? Date.now();
setServerNowMs(anchor); applySnapshot(anchor, evt.data);
setRaw(evt.data); }, [applySnapshot]);
setEmittedAtMs(anchor);
}, []);
const mergeCountdownFromWs = useCallback((evt: HallWsEnvelope) => { const mergeCountdownFromWs = useCallback((evt: HallWsEnvelope) => {
if (evt.data === null) return; if (evt.data === null) return;
const anchor = evt.emitted_at_ms ?? Date.now(); const anchor = evt.emitted_at_ms ?? Date.now();
setServerNowMs(anchor); applySnapshot(anchor, evt.data);
setRaw(evt.data); }, [applySnapshot]);
setEmittedAtMs(anchor);
}, []);
const updateFromResponse = useCallback((resp: DrawCurrentResponse) => { const load = useCallback(async (options?: { force?: boolean }) => {
setServerNowMs(resp.server_now_ms);
setRaw(resp.data);
setEmittedAtMs(resp.server_now_ms);
}, []);
const load = useCallback(async () => {
try { try {
setError(null); setError(null);
const d = await getDrawCurrent(); const d = await getDrawCurrent();
updateFromResponse(d); const wsConnected = useNetworkConnectionStore.getState().isWebSocketConnected;
if (!options?.force && wsConnected && d.server_now_ms < latestSnapshotMsRef.current) {
return;
}
applySnapshot(d.server_now_ms, d.data);
} catch { } catch {
setError("draw.loadFailedRefresh"); setError("draw.loadFailedRefresh");
setRaw(undefined); setRaw(undefined);
} }
}, [updateFromResponse]); }, [applySnapshot]);
// 初始加载 // 初始加载
useEffect(() => { useEffect(() => {
@@ -212,7 +218,9 @@ export function useHallDrawLive(): HallDrawLiveSnapshot {
} }
return () => { return () => {
echo.leave("lottery-hall"); channel.stopListening(".draw.countdown");
channel.stopListening(".draw.status_change");
channel.stopListening(".result.published");
if (echo.connector?.pusher) { if (echo.connector?.pusher) {
echo.connector.pusher.connection.unbind("connected", handleConnected); echo.connector.pusher.connection.unbind("connected", handleConnected);
echo.connector.pusher.connection.unbind( echo.connector.pusher.connection.unbind(
@@ -312,7 +320,7 @@ export function useHallDrawLive(): HallDrawLiveSnapshot {
if (trigger && zeroRefreshKeyRef.current !== trigger) { if (trigger && zeroRefreshKeyRef.current !== trigger) {
zeroRefreshKeyRef.current = trigger; zeroRefreshKeyRef.current = trigger;
void load(); void load({ force: true });
} }
}, [display, nowMs, load]); }, [display, nowMs, load]);
@@ -342,14 +350,17 @@ export function useHallDrawLive(): HallDrawLiveSnapshot {
return () => window.clearInterval(intervalId); return () => window.clearInterval(intervalId);
}, [needsFastDrawPoll, load]); }, [needsFastDrawPoll, load]);
// WebSocket 已连接时的兜底轮询tick 延迟时的保险) // WebSocket 已连接时的兜底轮询tick 延迟时的保险;常态下由 WS 推送,避免 HTTP 覆盖新快照
useEffect(() => { useEffect(() => {
if (isWebSocketConnected && !needsFastDrawPoll) {
return;
}
const intervalMs = needsFastDrawPoll ? 15_000 : 45_000; const intervalMs = needsFastDrawPoll ? 15_000 : 45_000;
const intervalId = window.setInterval(() => { const intervalId = window.setInterval(() => {
void load(); void load();
}, intervalMs); }, intervalMs);
return () => window.clearInterval(intervalId); return () => window.clearInterval(intervalId);
}, [load, needsFastDrawPoll]); }, [load, needsFastDrawPoll, isWebSocketConnected]);
return { raw, display, serverNowMs, nowMs, error, reload: load, isBettable }; return { raw, display, serverNowMs, nowMs, error, reload: load, isBettable };
} }

View File

@@ -52,6 +52,13 @@ type TimelineRow = {
time: string; time: string;
}; };
const TRANSIENT_TICKET_STATUSES = new Set([
"pending_confirm",
"partial_pending_confirm",
"pending_draw",
"pending_payout",
]);
type TicketItemDetailWithExtras = TicketItemDetailPayload & { type TicketItemDetailWithExtras = TicketItemDetailPayload & {
timeline?: TimelineRow[]; timeline?: TimelineRow[];
match_result?: { match_result?: {
@@ -98,17 +105,23 @@ export function TicketOrderDetailScreen({ ticketNo }: { ticketNo: string }) {
}; };
}, [fromGroupKey, groupTickets, t]); }, [fromGroupKey, groupTickets, t]);
const load = useCallback(async () => { const load = useCallback(async (options?: { silent?: boolean }) => {
setLoading(true); if (!options?.silent) {
setLoading(true);
}
setError(null); setError(null);
try { try {
const row = await getTicketItemDetail(ticketNo); const row = await getTicketItemDetail(ticketNo);
setData(row); setData(row);
} catch { } catch {
setData(null); setData(null);
setError(t("orders.notFound")); if (!options?.silent) {
setError(t("orders.notFound"));
}
} finally { } finally {
setLoading(false); if (!options?.silent) {
setLoading(false);
}
} }
}, [ticketNo, t]); }, [ticketNo, t]);
@@ -118,6 +131,21 @@ export function TicketOrderDetailScreen({ ticketNo }: { ticketNo: string }) {
}); });
}, [load]); }, [load]);
useEffect(() => {
if (!data || !TRANSIENT_TICKET_STATUSES.has(data.status)) {
return;
}
const refresh = () => void load({ silent: true });
const intervalId = window.setInterval(refresh, 12_000);
window.addEventListener("lottery-hall-refresh", refresh);
window.addEventListener("lottery-wallet-refresh", refresh);
return () => {
window.clearInterval(intervalId);
window.removeEventListener("lottery-hall-refresh", refresh);
window.removeEventListener("lottery-wallet-refresh", refresh);
};
}, [data?.status, load]);
if (loading) { if (loading) {
return ( return (
<PlayerPanel <PlayerPanel

View File

@@ -30,7 +30,18 @@ import { cn } from "@/lib/utils";
import type { TicketItemListRow } from "@/types/api/ticket-items"; import type { TicketItemListRow } from "@/types/api/ticket-items";
const ORDERS_PAGE_SIZE = 20; const ORDERS_PAGE_SIZE = 20;
const STATUS_OPTIONS = ["pending_draw", "pending_payout", "settled_win", "settled_lose", "failed"] as const; const STATUS_OPTIONS = [
"pending_confirm",
"partial_pending_confirm",
"placed",
"pending_draw",
"partial_failed",
"pending_payout",
"settled_win",
"settled_lose",
"failed",
"refunded",
] as const;
function parseYmd(value: string): Date | undefined { function parseYmd(value: string): Date | undefined {
const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value); const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(value);
@@ -141,6 +152,18 @@ export function TicketOrdersListScreen() {
void fetchPage(1, false); void fetchPage(1, false);
}, [fetchPage, queryDrawNo, queryNumber, queryStatuses, fromDate, toDate]); }, [fetchPage, queryDrawNo, queryNumber, queryStatuses, fromDate, toDate]);
useEffect(() => {
const refreshFromEvents = () => {
void fetchPage(1, false);
};
window.addEventListener("lottery-hall-refresh", refreshFromEvents);
window.addEventListener("lottery-wallet-refresh", refreshFromEvents);
return () => {
window.removeEventListener("lottery-hall-refresh", refreshFromEvents);
window.removeEventListener("lottery-wallet-refresh", refreshFromEvents);
};
}, [fetchPage]);
useEffect(() => { useEffect(() => {
const target = loadMoreRef.current; const target = loadMoreRef.current;
if (!target || loading || loadingMore || page >= lastPage) return; if (!target || loading || loadingMore || page >= lastPage) return;
@@ -238,6 +261,9 @@ export function TicketOrdersListScreen() {
} }
/> />
<PopoverContent align="start" className="w-auto border-[#dce7f7] p-2 shadow-[0_16px_40px_rgba(15,23,42,0.14)]"> <PopoverContent align="start" className="w-auto border-[#dce7f7] p-2 shadow-[0_16px_40px_rgba(15,23,42,0.14)]">
<p className="mb-2 px-1 text-[11px] leading-snug text-muted-foreground">
{t("orders.dateRangeHint")}
</p>
<Calendar <Calendar
mode="range" mode="range"
month={calendarMonth} month={calendarMonth}

View File

@@ -2,7 +2,7 @@
import { isAxiosError } from "axios"; import { isAxiosError } from "axios";
import { Loader2 } from "lucide-react"; import { Loader2 } from "lucide-react";
import { useMemo, useState, type ReactNode } from "react"; import { useMemo, useRef, useState, type ReactNode } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
@@ -149,6 +149,7 @@ export function TransferInPanel({
const [amountText, setAmountText] = useState(""); const [amountText, setAmountText] = useState("");
const [submitting, setSubmitting] = useState(false); const [submitting, setSubmitting] = useState(false);
const [localError, setLocalError] = useState<string | null>(null); const [localError, setLocalError] = useState<string | null>(null);
const idempotentKeyRef = useRef<string | null>(null);
const tid = `${idPrefix}in-amount`; const tid = `${idPrefix}in-amount`;
const parsedMinor = useMemo( const parsedMinor = useMemo(
@@ -159,25 +160,31 @@ export function TransferInPanel({
parsedMinor != null ? lotteryMinor + parsedMinor : lotteryMinor; parsedMinor != null ? lotteryMinor + parsedMinor : lotteryMinor;
const submit = async () => { const submit = async () => {
if (submitting) {
return;
}
setLocalError(null); setLocalError(null);
if (parsedMinor == null || parsedMinor < 1) { if (parsedMinor == null || parsedMinor < 1) {
setLocalError(t("wallet.invalidAmount")); setLocalError(t("wallet.invalidAmount"));
return; return;
} }
if (idempotentKeyRef.current === null) {
idempotentKeyRef.current = randomIdempotentKey();
}
setSubmitting(true); setSubmitting(true);
try { try {
await postWalletTransferIn({ await postWalletTransferIn({
amount: parsedMinor, amount: parsedMinor,
currency, currency,
idempotent_key: randomIdempotentKey(), idempotent_key: idempotentKeyRef.current,
}); });
idempotentKeyRef.current = null;
toast.success(t("wallet.successIn")); toast.success(t("wallet.successIn"));
setAmountText(""); setAmountText("");
await onSuccess(); await onSuccess();
emitWalletRefresh(); emitWalletRefresh();
} catch (e) { } catch (e) {
if (await handleTransferMaybePending(e, onSuccess, t)) { if (await handleTransferMaybePending(e, onSuccess, t)) {
setLocalError(formatWalletClientError(e, t));
return; return;
} }
setLocalError(formatWalletClientError(e, t)); setLocalError(formatWalletClientError(e, t));
@@ -270,6 +277,7 @@ export function TransferOutPanel({
const [amountText, setAmountText] = useState(""); const [amountText, setAmountText] = useState("");
const [submitting, setSubmitting] = useState(false); const [submitting, setSubmitting] = useState(false);
const [localError, setLocalError] = useState<string | null>(null); const [localError, setLocalError] = useState<string | null>(null);
const idempotentKeyRef = useRef<string | null>(null);
const tid = `${idPrefix}out-amount`; const tid = `${idPrefix}out-amount`;
const parsedMinor = useMemo( const parsedMinor = useMemo(
@@ -288,6 +296,9 @@ export function TransferOutPanel({
}; };
const submit = async () => { const submit = async () => {
if (submitting) {
return;
}
setLocalError(null); setLocalError(null);
if (parsedMinor == null || parsedMinor < 1) { if (parsedMinor == null || parsedMinor < 1) {
setLocalError(t("wallet.invalidAmount")); setLocalError(t("wallet.invalidAmount"));
@@ -297,20 +308,23 @@ export function TransferOutPanel({
setLocalError(t("wallet.outExceeds")); setLocalError(t("wallet.outExceeds"));
return; return;
} }
if (idempotentKeyRef.current === null) {
idempotentKeyRef.current = randomIdempotentKey();
}
setSubmitting(true); setSubmitting(true);
try { try {
await postWalletTransferOut({ await postWalletTransferOut({
amount: parsedMinor, amount: parsedMinor,
currency, currency,
idempotent_key: randomIdempotentKey(), idempotent_key: idempotentKeyRef.current,
}); });
idempotentKeyRef.current = null;
toast.success(t("wallet.successOut")); toast.success(t("wallet.successOut"));
setAmountText(""); setAmountText("");
await onSuccess(); await onSuccess();
emitWalletRefresh(); emitWalletRefresh();
} catch (e) { } catch (e) {
if (await handleTransferMaybePending(e, onSuccess, t)) { if (await handleTransferMaybePending(e, onSuccess, t)) {
setLocalError(formatWalletClientError(e, t));
return; return;
} }
setLocalError(formatWalletClientError(e, t)); setLocalError(formatWalletClientError(e, t));

View File

@@ -259,46 +259,55 @@ export function useWebSocketManager(): UseWebSocketManagerReturn {
}; };
}, [mode, reconnect, store]); }, [mode, reconnect, store]);
// 初始化和 WebSocket 监控 // 初始化:绑定 Pusher 真实连接事件(勿仅凭 channel 对象存在判定已连接)
useEffect(() => { useEffect(() => {
const echo = getLotteryEcho(); const echo = getLotteryEcho();
if (!echo) { if (!echo) {
// 没有 Echo 配置,直接启用轮询模式
switchToPollingMode(); switchToPollingMode();
startDrawPolling(); startDrawPolling();
return; return;
} }
// 尝试初始连接 echo.channel("lottery-hall");
const success = connectWebSocket();
if (success) {
handleConnect();
} else {
handleDisconnect();
}
// 设置连接状态监控(通过定期订阅状态) const pusher = echo.connector?.pusher;
const checkConnection = () => { const connection = pusher?.connection;
try {
// 尝试访问频道来测试连接 const syncConnectionState = () => {
const channel = echo.channel("lottery-hall"); const state = connection?.state;
if (channel) { if (state === "connected") {
if (!isWebSocketConnected) { handleConnect();
handleConnect(); } else if (
} state === "disconnected" ||
} state === "unavailable" ||
} catch { state === "failed"
if (isWebSocketConnected) { ) {
handleDisconnect(); handleDisconnect();
}
} }
}; };
// 每 5 秒检查一次连接状态 if (connection) {
const checkInterval = window.setInterval(checkConnection, 5000); connection.bind("connected", handleConnect);
connection.bind("disconnected", handleDisconnect);
connection.bind("unavailable", handleDisconnect);
connection.bind("failed", handleDisconnect);
syncConnectionState();
} else {
const success = connectWebSocket();
if (success) {
handleConnect();
} else {
handleDisconnect();
}
}
return () => { return () => {
window.clearInterval(checkInterval); if (connection) {
connection.unbind("connected", handleConnect);
connection.unbind("disconnected", handleDisconnect);
connection.unbind("unavailable", handleDisconnect);
connection.unbind("failed", handleDisconnect);
}
if (reconnectTimerRef.current) { if (reconnectTimerRef.current) {
window.clearTimeout(reconnectTimerRef.current); window.clearTimeout(reconnectTimerRef.current);
} }
@@ -307,7 +316,6 @@ export function useWebSocketManager(): UseWebSocketManagerReturn {
connectWebSocket, connectWebSocket,
handleConnect, handleConnect,
handleDisconnect, handleDisconnect,
isWebSocketConnected,
startDrawPolling, startDrawPolling,
switchToPollingMode, switchToPollingMode,
]); ]);

View File

@@ -120,6 +120,7 @@
"placeFailed": "Submission failed", "placeFailed": "Submission failed",
"placeSuccess": "Bet submitted. Order {{orderNo}}, deducted {{amount}}.", "placeSuccess": "Bet submitted. Order {{orderNo}}, deducted {{amount}}.",
"placePartialFailed": "{{success}} succeeded, {{failed}} failed", "placePartialFailed": "{{success}} succeeded, {{failed}} failed",
"placeAllFailed": "All {{failed}} lines failed",
"playConfig": { "playConfig": {
"playClosedDraftCleared": "{{playCode}} is closed. Related draft amounts have been cleared.", "playClosedDraftCleared": "{{playCode}} is closed. Related draft amounts have been cleared.",
"playClosed": "{{playCode}} is closed.", "playClosed": "{{playCode}} is closed.",
@@ -244,7 +245,9 @@
"warningsDescription": "The following numbers have high payout pool usage for this issue. Betting is still allowed, but the order may be rejected as sold out if capacity is insufficient." "warningsDescription": "The following numbers have high payout pool usage for this issue. Betting is still allowed, but the order may be rejected as sold out if capacity is insufficient."
}, },
"result": { "result": {
"title": "Bet result", "title": "Bet placed",
"titlePartial": "Partially placed",
"titleAllFailed": "Bet not placed",
"draw": "Issue", "draw": "Issue",
"empty": "No result yet.", "empty": "No result yet.",
"successCount": "Successful lines", "successCount": "Successful lines",
@@ -401,6 +404,7 @@
"betNow": "Bet Now", "betNow": "Bet Now",
"empty": "No bet records yet.", "empty": "No bet records yet.",
"dateRange": "Date range", "dateRange": "Date range",
"dateRangeHint": "Filters by order time in schedule day (UTC)",
"status": "Status", "status": "Status",
"statusFilter": "Status filter", "statusFilter": "Status filter",
"noMore": "No more tickets", "noMore": "No more tickets",
@@ -575,11 +579,16 @@
}, },
"ticketStatus": { "ticketStatus": {
"success": "Awaiting draw", "success": "Awaiting draw",
"placed": "Awaiting draw",
"pending_confirm": "Confirming",
"partial_pending_confirm": "Partially confirming",
"pending_draw": "Awaiting draw", "pending_draw": "Awaiting draw",
"partial_failed": "Partially failed",
"pending_payout": "Won, pending payout", "pending_payout": "Won, pending payout",
"settled_win": "Paid", "settled_win": "Paid",
"settled_lose": "Not won", "settled_lose": "Not won",
"failed": "Failed", "failed": "Failed",
"refunded": "Refunded",
"unknown": "{{status}}" "unknown": "{{status}}"
}, },
"prizeTier": { "prizeTier": {

View File

@@ -120,6 +120,7 @@
"placeFailed": "पेश गर्न असफल", "placeFailed": "पेश गर्न असफल",
"placeSuccess": "बेट पेश भयो। अर्डर {{orderNo}}, कट्टा {{amount}}।", "placeSuccess": "बेट पेश भयो। अर्डर {{orderNo}}, कट्टा {{amount}}।",
"placePartialFailed": "{{success}} सफल, {{failed}} असफल", "placePartialFailed": "{{success}} सफल, {{failed}} असफल",
"placeAllFailed": "सबै {{failed}} लाइन असफल",
"playConfig": { "playConfig": {
"playClosedDraftCleared": "{{playCode}} बन्द छ। सम्बन्धित ड्राफ्ट रकम हटाइएको छ।", "playClosedDraftCleared": "{{playCode}} बन्द छ। सम्बन्धित ड्राफ्ट रकम हटाइएको छ।",
"playClosed": "{{playCode}} बन्द छ।", "playClosed": "{{playCode}} बन्द छ।",
@@ -244,7 +245,9 @@
"warningsDescription": "यी नम्बरहरूमा यस इश्यूमा भुक्तानी पूल प्रयोग उच्च छ। बेट अझै गर्न सकिन्छ, तर क्षमता अपुग भए अर्डर sold out हुन सक्छ।" "warningsDescription": "यी नम्बरहरूमा यस इश्यूमा भुक्तानी पूल प्रयोग उच्च छ। बेट अझै गर्न सकिन्छ, तर क्षमता अपुग भए अर्डर sold out हुन सक्छ।"
}, },
"result": { "result": {
"title": "बेट नतिजा", "title": "बेट सफल",
"titlePartial": "आंशिक सफल",
"titleAllFailed": "बेट असफल",
"draw": "इश्यू", "draw": "इश्यू",
"empty": "नतिजा छैन।", "empty": "नतिजा छैन।",
"successCount": "सफल लाइनहरू", "successCount": "सफल लाइनहरू",
@@ -401,6 +404,7 @@
"betNow": "अहिले बेट", "betNow": "अहिले बेट",
"empty": "अहिलेसम्म बेट रेकर्ड छैन।", "empty": "अहिलेसम्म बेट रेकर्ड छैन।",
"dateRange": "मिति दायरा", "dateRange": "मिति दायरा",
"dateRangeHint": "अर्डर समयलाई तालिका दिन (UTC) अनुसार फिल्टर गर्छ",
"status": "स्थिति", "status": "स्थिति",
"statusFilter": "स्थिति फिल्टर", "statusFilter": "स्थिति फिल्टर",
"noMore": "थप टिकट छैन", "noMore": "थप टिकट छैन",
@@ -575,11 +579,16 @@
}, },
"ticketStatus": { "ticketStatus": {
"success": "ड्र पर्खँदै", "success": "ड्र पर्खँदै",
"placed": "ड्र पर्खँदै",
"pending_confirm": "पुष्टि हुँदै",
"partial_pending_confirm": "आंशिक पुष्टि",
"pending_draw": "ड्र पर्खँदै", "pending_draw": "ड्र पर्खँदै",
"partial_failed": "आंशिक असफल",
"pending_payout": "जितेको, भुक्तानी बाँकी", "pending_payout": "जितेको, भुक्तानी बाँकी",
"settled_win": "भुक्तानी भयो", "settled_win": "भुक्तानी भयो",
"settled_lose": "जितेन", "settled_lose": "जितेन",
"failed": "असफल", "failed": "असफल",
"refunded": "फिर्ता",
"unknown": "{{status}}" "unknown": "{{status}}"
}, },
"prizeTier": { "prizeTier": {

View File

@@ -243,8 +243,11 @@
"warningsTitle": "赔付池预警", "warningsTitle": "赔付池预警",
"warningsDescription": "以下号码本期赔付池占用较高,仍允许下注;若实际占用不足将售罄拒单。" "warningsDescription": "以下号码本期赔付池占用较高,仍允许下注;若实际占用不足将售罄拒单。"
}, },
"placeAllFailed": "本次 {{failed}} 条注项均未成功",
"result": { "result": {
"title": "下注结果", "title": "下注成功",
"titlePartial": "部分注项成功",
"titleAllFailed": "下注未成功",
"draw": "期号", "draw": "期号",
"empty": "暂无结果。", "empty": "暂无结果。",
"successCount": "成功注项", "successCount": "成功注项",
@@ -401,6 +404,7 @@
"betNow": "立即下注", "betNow": "立即下注",
"empty": "暂无下注记录。", "empty": "暂无下注记录。",
"dateRange": "日期范围", "dateRange": "日期范围",
"dateRangeHint": "按彩票排期日UTC筛选下单时间",
"status": "状态", "status": "状态",
"statusFilter": "状态筛选", "statusFilter": "状态筛选",
"noMore": "没有更多注单", "noMore": "没有更多注单",
@@ -575,11 +579,16 @@
}, },
"ticketStatus": { "ticketStatus": {
"success": "待开奖", "success": "待开奖",
"placed": "待开奖",
"pending_confirm": "确认中",
"partial_pending_confirm": "部分确认中",
"pending_draw": "待开奖", "pending_draw": "待开奖",
"partial_failed": "部分失败",
"pending_payout": "已中奖待派彩", "pending_payout": "已中奖待派彩",
"settled_win": "已派彩", "settled_win": "已派彩",
"settled_lose": "未中奖", "settled_lose": "未中奖",
"failed": "失败", "failed": "失败",
"refunded": "已退款",
"unknown": "{{status}}" "unknown": "{{status}}"
}, },
"prizeTier": { "prizeTier": {