首页接口更新&&支付页面调试

src/components/composites/recharge/index.tsx

@@ -14,7 +14,7 @@ import FormOption from '@/components/composites/purchase/option'
 import {RadioGroup} from '@/components/ui/radio-group'
 import {zodResolver} from '@hookform/resolvers/zod'
 import {toast} from 'sonner'
-import {useMemo, useState} from 'react'
+import {useState} from 'react'
 import {RechargePrepare} from '@/actions/user'
 import {useProfileStore} from '@/components/stores-provider'
 import {merge} from '@/lib/utils'
@@ -75,6 +75,7 @@ export default function RechargeModal(props: RechargeModelProps) {
       console.log(req, '请求参数')
 
       const result = await RechargePrepare(req)
+      console.log(result, 'result返回结果')
 
       if (result.success) {
         setTrade({
@@ -98,15 +99,22 @@ export default function RechargeModal(props: RechargeModelProps) {
   }
 
   const handlePaymentSuccess = async () => {
+    if (!trade) return
     try {
-      await refreshProfile()
+      const resp = await RechargeComplete({trade_no: trade.inner_no})
+      if (!resp.success) {
+        throw new Error(resp.message)
+      }
+
       toast.success('充值成功')
       setTrade(undefined) // 清除交易状态
       setOpen(false) // 关闭弹窗
       form.reset() // 重置表单
+
+      await refreshProfile()
     }
     catch (e) {
-      toast.error('刷新账户信息失败')
+      toast.error('支付验证失败', {description: (e as Error).message})
     }
   }
 
@@ -217,7 +225,7 @@ export default function RechargeModal(props: RechargeModelProps) {
         ) : (
           <PaymentModal
             {...trade}
-            onSuccess={handlePaymentSuccess}
+            onConfirm={handlePaymentSuccess}
             onClose={handleClose}
           />
         )}