fix(trade): on-site pickup pay success marks order COMPLETED

This commit is contained in:
2026-08-02 13:42:15 +08:00
parent 4ba51c502b
commit cb6ecaaba6
5 changed files with 24 additions and 11 deletions
+14 -5
View File
@@ -41,6 +41,7 @@ export default function PayPage() {
const [showBindPhone, setShowBindPhone] = useState(false);
const [wxSessionKey, setWxSessionKey] = useState<string | null>(null);
const [orderNo, setOrderNo] = useState('');
const [deliveryType, setDeliveryType] = useState('');
const refreshPayReadiness = useCallback(async () => {
try {
@@ -78,9 +79,15 @@ export default function PayPage() {
setOrderNo('');
return;
}
request<{ orderNo?: string }>('USER_H5', `/trade/orders/${orderId}`)
.then((order) => setOrderNo(order.orderNo || ''))
.catch(() => setOrderNo(''));
request<{ orderNo?: string; deliveryType?: string }>('USER_H5', `/trade/orders/${orderId}`)
.then((order) => {
setOrderNo(order.orderNo || '');
setDeliveryType(order.deliveryType || '');
})
.catch(() => {
setOrderNo('');
setDeliveryType('');
});
}, [orderId]);
useEffect(() => {
@@ -140,11 +147,13 @@ export default function PayPage() {
if (!paid) {
alert('支付结果确认中,请稍后在订单列表查看');
}
navigate('/orders?tab=paid');
navigate(
deliveryType === 'ON_SITE_PICKUP' ? '/orders?tab=completed' : '/orders?tab=paid',
);
return;
}
navigate('/orders?tab=paid');
navigate(deliveryType === 'ON_SITE_PICKUP' ? '/orders?tab=completed' : '/orders?tab=paid');
} catch (e) {
if (isWechatAuthRequiredError(e)) {
setNeedsWechatAuth(true);