wanwu/sub2apipay
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'worktree-agent-afaec22d'

Browse Source
This commit is contained in:
erio
2026-03-07 04:16:38 +08:00
parent 37096de05c d43b04cb5c
commit 698df1ee47
10 changed files with 132 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/globals.css
View File

@@ -8,4 +8,5 @@
body {
background: var(--background);
color: var(--foreground);
font-family: system-ui, -apple-system, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif;
}

11
src/app/pay/page.tsx
View File

@@ -346,7 +346,16 @@ function PayContent() {
) : undefined
}
>
{error && <div className="mb-4 rounded-lg border border-red-200 bg-red-50 p-3 text-sm text-red-600">{error}</div>}
{error && (
<div
className={[
'mb-4 rounded-lg border p-3 text-sm',
isDark ? 'border-red-700 bg-red-900/30 text-red-400' : 'border-red-200 bg-red-50 text-red-600',
].join(' ')}
>
{error}
</div>
)}
{step === 'form' && isMobile && (
<div

29
src/app/pay/result/page.tsx
View File

@@ -9,6 +9,8 @@ function ResultContent() {
const outTradeNo = searchParams.get('out_trade_no') || searchParams.get('order_id');
const tradeStatus = searchParams.get('trade_status') || searchParams.get('status');
const isPopup = searchParams.get('popup') === '1';
const theme = searchParams.get('theme') === 'dark' ? 'dark' : 'light';
const isDark = theme === 'dark';
const [status, setStatus] = useState<string | null>(null);
const [loading, setLoading] = useState(true);
@@ -64,8 +66,8 @@ function ResultContent() {
if (loading) {
return (
<div className="flex min-h-screen items-center justify-center bg-slate-50">
<div className="text-gray-500">查询支付结果中...</div>
<div className={`flex min-h-screen items-center justify-center ${isDark ? 'bg-slate-950' : 'bg-slate-50'}`}>
<div className={isDark ? 'text-slate-400' : 'text-gray-500'}>查询支付结果中...</div>
</div>
);
}
@@ -73,20 +75,27 @@ function ResultContent() {
const isPending = status === 'PENDING';
return (
<div className="flex min-h-screen items-center justify-center bg-slate-50 p-4">
<div className="w-full max-w-md rounded-xl bg-white p-8 text-center shadow-lg">
<div className={`flex min-h-screen items-center justify-center p-4 ${isDark ? 'bg-slate-950' : 'bg-slate-50'}`}>
<div
className={[
'w-full max-w-md rounded-xl p-8 text-center shadow-lg',
isDark ? 'bg-slate-900 text-slate-100' : 'bg-white',
].join(' ')}
>
{isSuccess ? (
<>
<div className="text-6xl text-green-500">✓</div>
<h1 className="mt-4 text-xl font-bold text-green-600">
{status === 'COMPLETED' ? '充值成功' : '充值处理中'}
</h1>
<p className="mt-2 text-gray-500">
<p className={isDark ? 'mt-2 text-slate-400' : 'mt-2 text-gray-500'}>
{status === 'COMPLETED' ? '余额已成功到账！' : '支付成功，余额正在充值中...'}
</p>
{isInPopup && (
<div className="mt-4 space-y-2">
<p className="text-sm text-gray-400">此窗口将在 3 秒后自动关闭</p>
<p className={isDark ? 'text-sm text-slate-500' : 'text-sm text-gray-400'}>
此窗口将在 3 秒后自动关闭
</p>
<button
type="button"
onClick={() => window.close()}
@@ -101,7 +110,7 @@ function ResultContent() {
<>
<div className="text-6xl text-yellow-500">⏳</div>
<h1 className="mt-4 text-xl font-bold text-yellow-600">等待支付</h1>
<p className="mt-2 text-gray-500">订单尚未完成支付</p>
<p className={isDark ? 'mt-2 text-slate-400' : 'mt-2 text-gray-500'}>订单尚未完成支付</p>
{isInPopup && (
<button
type="button"
@@ -118,7 +127,7 @@ function ResultContent() {
<h1 className="mt-4 text-xl font-bold text-red-600">
{status === 'EXPIRED' ? '订单已超时' : status === 'CANCELLED' ? '订单已取消' : '支付异常'}
</h1>
<p className="mt-2 text-gray-500">
<p className={isDark ? 'mt-2 text-slate-400' : 'mt-2 text-gray-500'}>
{status === 'EXPIRED'
? '订单已超时，请重新充值'
: status === 'CANCELLED'
@@ -137,7 +146,9 @@ function ResultContent() {
</>
)}
<p className="mt-4 text-xs text-gray-400">订单号: {outTradeNo || '未知'}</p>
<p className={isDark ? 'mt-4 text-xs text-slate-500' : 'mt-4 text-xs text-gray-400'}>
订单号: {outTradeNo || '未知'}
</p>
</div>
</div>
);

10
src/app/pay/stripe-popup/page.tsx
View File

@@ -177,14 +177,14 @@ function StripePopupContent() {
>
<div className="text-center">
<div className="text-3xl font-bold text-blue-600">
{'\u00A5'}
{'¥'}
{amount.toFixed(2)}
</div>
<p className={`mt-1 text-sm ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>订单号: {orderId}</p>
</div>
{stripeError ? (
<div className="space-y-3">
<div className="rounded-lg border border-red-200 bg-red-50 p-3 text-sm text-red-600">{stripeError}</div>
<div className={`rounded-lg border p-3 text-sm ${isDark ? 'border-red-700 bg-red-900/30 text-red-400' : 'border-red-200 bg-red-50 text-red-600'}`}>{stripeError}</div>
<button
type="button"
onClick={() => window.close()}
@@ -213,7 +213,7 @@ function StripePopupContent() {
>
<div className="text-center">
<div className="text-3xl font-bold text-blue-600">
{'\u00A5'}
{'¥'}
{amount.toFixed(2)}
</div>
<p className={`mt-1 text-sm ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>订单号: {orderId}</p>
@@ -226,7 +226,7 @@ function StripePopupContent() {
</div>
) : stripeSuccess ? (
<div className="py-6 text-center">
<div className="text-5xl text-green-600">{'\u2713'}</div>
<div className="text-5xl text-green-600">{'✓'}</div>
<p className={`mt-3 text-sm ${isDark ? 'text-slate-400' : 'text-gray-500'}`}>
支付成功，窗口即将自动关闭...
</p>
@@ -241,7 +241,7 @@ function StripePopupContent() {
) : (
<>
{stripeError && (
<div className="rounded-lg border border-red-200 bg-red-50 p-3 text-sm text-red-600">{stripeError}</div>
<div className={`rounded-lg border p-3 text-sm ${isDark ? 'border-red-700 bg-red-900/30 text-red-400' : 'border-red-200 bg-red-50 text-red-600'}`}>{stripeError}</div>
)}
<div
ref={stripeContainerRef}