支付流程重新设计枚举值更新传参方式

This commit is contained in:
Eamon-meng
2025-06-23 11:20:54 +08:00
parent 50cd4c5760
commit f15cefff4d
13 changed files with 225 additions and 427 deletions

View File

@@ -14,7 +14,7 @@ export function PaymentDialog({trade, open, onOpenChange}: {
trade: {
inner_no: string
method: number
pay_url: string
pay_url?: string
amount?: number
}
open: boolean
@@ -36,7 +36,7 @@ export function PaymentDialog({trade, open, onOpenChange}: {
const canvas = useRef<HTMLCanvasElement>(null)
// 生成微信二维码
useEffect(() => {
if (!open || !canvas.current || trade.method === 1) return
if (!open || !canvas.current || trade.method === 1 || !trade.pay_url) return
qrcode.toCanvas(canvas.current, trade.pay_url, {
width: 200,
margin: 0,
@@ -112,7 +112,11 @@ export function PaymentDialog({trade, open, onOpenChange}: {
<div className="flex flex-col items-center gap-3">
<div className="bg-gray-100 size-50 flex items-center justify-center">
{trade.method === 1 ? (
<iframe src={trade.pay_url} className="w-full h-full"/>
trade.pay_url ? (
<iframe src={trade.pay_url} className="w-full h-full"/>
) : (
<div className="text-center text-gray-500"></div>
)
) : (
<canvas ref={canvas} className="w-full h-full"/>
)}

View File

@@ -8,8 +8,9 @@ import Link from 'next/link'
import Image from 'next/image'
import wechat from '@/components/composites/purchase/_assets/wechat.svg'
import alipay from '@/components/composites/purchase/_assets/alipay.svg'
import {usePlatformType, Platform} from '@/lib/models/trade'
import {usePlatformType, TradePlatform} from '@/lib/models/trade'
import {PaymentDialog} from './payment-dialog'
import {PaymentProps} from '@/components/composites/payment/type'
export function PaymentStatusCell({trade}: {
trade?: {
@@ -29,7 +30,7 @@ export function PaymentStatusCell({trade}: {
e.preventDefault()
if (!trade?.pay_url) return
if (platform === Platform.Desktop) {
if (platform === TradePlatform.Desktop) {
setOpen(true)
}
else {
@@ -69,82 +70,6 @@ export function PaymentStatusCell({trade}: {
)
}
if (paymentFailed) {
return (
<Dialog open={paymentFailed} onOpenChange={setPaymentFailed}>
<DialogContent className="sm:max-w-[425px]">
<div className="text-center mb-6">
<div className="inline-flex items-center justify-center h-16 w-16 rounded-full bg-primary/10 text-primary mb-4">
<i className="fa fa-credit-card text-2xl"></i>
</div>
<h3 className="text-xl font-bold text-neutral-700 mb-2"></h3>
<p className="text-neutral-500">App</p>
</div>
<div className="space-y-3 py-4 text-sm">
<div className="flex justify-between">
<span className="text-gray-500"></span>
<span>{trade.inner_no}</span>
</div>
<div className="flex justify-between">
<span className="text-gray-500"></span>
<span>
{trade.method === 1 ? (
<div className="flex items-center gap-2">
<Image
src={alipay}
alt="支付宝logo"
width={16}
height={16}
className="rounded-md"
/>
<span></span>
</div>
) : (
<div className="flex items-center gap-2">
<Image
src={wechat}
alt="微信支付logo"
width={16}
height={16}
className="rounded-md"
/>
<span></span>
</div>
)}
</span>
</div>
<div className="flex justify-between">
<span className="text-gray-500"></span>
<span className="font-medium text-red-500">
¥
{typeof trade.amount === 'string'
? parseFloat(trade.amount).toFixed(2)
: (trade.amount || 0).toFixed(2)}
</span>
</div>
<div className="flex justify-between">
<span className="text-gray-500"></span>
<span>{format(new Date(), 'yyyy-MM-dd HH:mm:ss')}</span>
</div>
</div>
<div className="flex justify-center mt-4">
<Button className="w-full max-w-[200px]" onClick={() => setPaymentFailed(false)}></Button>
</div>
</DialogContent>
</Dialog>
)
}
if (!trade.inner_no || !trade.method || !trade.pay_url) {
return (
<div className="flex items-center gap-2">
<ClockIcon size={16} className="text-warn"/>
<span></span>
</div>
)
}
return (
<div className="flex items-center gap-2">
<ClockIcon size={16} className="text-warn"/>