Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Zixin Zhou 2025-09-20 21:27:56 +08:00
commit 221f7755c0

View File

@ -16,11 +16,10 @@ type InviteRecord = {
user_email: string; user_email: string;
user_id: string; user_id: string;
user_name: string; user_name: string;
reg_time: number; created_at: number;
purchase_status: number;
reward_status: number; reward_status: number;
invite_reward: number; activation_credits: number;
pay_reward: number; first_payment_credits: number;
}; };
/** /**
@ -281,15 +280,15 @@ export default function SharePage(): JSX.Element {
</thead> </thead>
<tbody data-alt="table-body" className="divide-y divide-white/10 bg-black"> <tbody data-alt="table-body" className="divide-y divide-white/10 bg-black">
{pagedRecords.map((r) => { {pagedRecords.map((r) => {
const inviteRewardDisplay = r.reward_status === 1 ? r.invite_reward : 0; const inviteRewardDisplay = r.reward_status === 1 ? r.activation_credits : 0;
const payRewardDisplay = r.purchase_status === 1 ? r.pay_reward : 0; const payRewardDisplay = r.first_payment_credits;
const totalReward = inviteRewardDisplay + payRewardDisplay; const totalReward = inviteRewardDisplay + payRewardDisplay;
const isExpanded = expandedRowIds.has(r.user_id); const isExpanded = expandedRowIds.has(r.user_id);
return ( return (
<React.Fragment key={r.user_id}> <React.Fragment key={r.user_id}>
<tr data-alt="table-row" className="hover:bg-white/5"> <tr data-alt="table-row" className="hover:bg-white/5">
<td className="px-4 py-3 text-sm text-white w-48">{r.user_name}</td> <td className="px-4 py-3 text-sm text-white w-48">{r.user_name}</td>
<td className="px-4 py-3 text-sm text-white/80 w-56 whitespace-nowrap">{formatLocalTime(r.reg_time * 1000)}</td> <td className="px-4 py-3 text-sm text-white/80 w-56 whitespace-nowrap">{formatLocalTime(r.created_at * 1000)}</td>
<td className="px-4 py-3 text-sm text-white/90"> <td className="px-4 py-3 text-sm text-white/90">
<div data-alt="reward-cell" className="flex items-center justify-between gap-3"> <div data-alt="reward-cell" className="flex items-center justify-between gap-3">
<div data-alt="reward-summary" className="flex-1 truncate text-[#FFCC6D]"> <div data-alt="reward-summary" className="flex-1 truncate text-[#FFCC6D]">