From 2919400d7fb6b094fadd05c16a2016c4d91d4a3b Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 18 Feb 2025 10:29:49 +0800
Subject: [PATCH] =?UTF-8?q?feat(payment):=20=E4=BC=98=E5=8C=96=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E5=B9=B6=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E5=A4=9A=E7=A7=8D=E6=94=AF=E4=BB=98=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增支付结果查询接口并调用该接口获取支付状态
- 根据支付状态动态显示支付结果信息
- 更新国际化文案，增加支付失败、未支付、支付过期等状态的提示
- 调整支付结果页面布局和样式
---
 app/api/goods/index.js              |  8 ++++++++
 app/pages/liveRoom/index.client.vue |  1 -
 app/pages/payment/result/index.vue  | 25 ++++++++++++++++++++-----
 i18n/locales/zh-CN.json             |  7 +++++--
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/app/api/goods/index.js b/app/api/goods/index.js
index 4c0fee7..17ef793 100644
--- a/app/api/goods/index.js
+++ b/app/api/goods/index.js
@@ -77,4 +77,12 @@ export async function createBuyOrder(data) {
         method: 'POST',
         data
     })
+}
+export async function orderQuery(data) {
+
+    return await request( {
+        url:'/api/v1/payment/order/query',
+        method: 'POST',
+        data
+    })
 }
\ No newline at end of file
diff --git a/app/pages/liveRoom/index.client.vue b/app/pages/liveRoom/index.client.vue
index c41276a..d3c0c1a 100644
--- a/app/pages/liveRoom/index.client.vue
+++ b/app/pages/liveRoom/index.client.vue
@@ -21,7 +21,6 @@ const { auctionDetail} = goodStore();
 const player = ref(null)
 const {quoteStatus, show, playerId, show1, auctionData, getSocketData, getLiveLink, fullLive} = liveStore()
 const pullLink = ref('')
-
 const handlePlayerError = (error) => {
   console.error('播放器错误:', error)
   player.value?.play()
diff --git a/app/pages/payment/result/index.vue b/app/pages/payment/result/index.vue
index 7515569..059ca2d 100644
--- a/app/pages/payment/result/index.vue
+++ b/app/pages/payment/result/index.vue
@@ -1,16 +1,31 @@
 <script setup>
+import {orderQuery} from "~/api/goods/index.js";
 definePageMeta({
-  layout: 'default',
   i18n: 'payment.text1',
 })
+const {t}=useI18n();
+const route = useRoute();
+const resData=ref({})
+const res=await orderQuery({
+  orderNo:route.query.orderNo
+})
+if (res.status===0){
+  resData.value=res.data
+}
+const statusLabel={
+  1:t('payment.text2'),
+  2:t('payment.text3'),
+  3:t('payment.text4'),
+  4:t('payment.text5'),
+}
 </script>
 
 <template>
-  <div class="w-[100vw] bg-[url('@/static/images/3532@2x.png')] bg-cover pt-43px flex-grow-1 flex flex-col pt-180px">
-    <div class="flex flex-col items-center">
+  <div class="w-[100vw] bg-[url('@/static/images/3532@2x.png')] bg-cover pt-43px flex-grow-1 flex flex-col">
+    <div class="flex flex-col items-center mt-150px">
       <img class="w-119px h-120px mb-36px" src="@/static/images/5554@2x1.png" alt="">
-      <div class="text-#000 text-16px mb-25px">{{$t('payment.text2')}}!</div>
-      <div class="text-#999 text-16px">RMB5,000</div>
+      <div class="text-#000 text-16px mb-25px">{{statusLabel[resData.status]}}!</div>
+      <div class="text-#999 text-16px">{{resData.currency}}{{resData.money}}</div>
     </div>
 </div>
 </template>
diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json
index 3eb0fe1..e3bc490 100644
--- a/i18n/locales/zh-CN.json
+++ b/i18n/locales/zh-CN.json
@@ -148,8 +148,11 @@
     "next": "下一步"
   },
   "payment": {
-    "text1": "支付",
-    "text2":"付款成功",
+    "text1": "支付结果",
+    "text2":"支付成功",
+    "text3":"支付失败",
+    "text4":"未支付",
+    "text5":"支付过期",
     "next": "下一步"
   }
 }
\ No newline at end of file