From 56ffd2073d1ba401e367ca37bacad191ade9d7ea Mon Sep 17 00:00:00 2001
From: changDongFang <2628162102@qq.com>
Date: Mon, 19 May 2025 15:12:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=BB=E5=AE=B6=E6=B5=B7=E5=A4=96=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api-collect-code/abroad/index.js          | 11 ++++
 app/pages/checkoutPage/index.vue              |  1 +
 app/pages/collectCode/payment/index.vue       |  7 ++-
 .../overseasCode/payment/result/index.vue     | 55 +++++++++++++++++++
 app/plugins/http.ts                           |  2 +
 5 files changed, 74 insertions(+), 2 deletions(-)
 create mode 100644 app/pages/overseasCode/payment/result/index.vue

diff --git a/app/api-collect-code/abroad/index.js b/app/api-collect-code/abroad/index.js
index 67d7579..39dd4a4 100644
--- a/app/api-collect-code/abroad/index.js
+++ b/app/api-collect-code/abroad/index.js
@@ -1,9 +1,20 @@
 import { request } from '@/api-collect-code/http-abroad.js'
+// 创建支付订单
 export async function abroadCreateOrder(data) {
+    console.log('data',data);
+    
     return await request({
         url:"/artshow/overseas/show-pay/createOrder",
         method:"POST",
         data
     })
     
+}
+// 获取支付详情
+export async function abroadPayInfo(data) {
+    return await request({
+        url:"/artshow/overseas/show-pay/info",
+        method:"POST",
+        data
+    })
 }
\ No newline at end of file
diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
index db1ce8e..86abe92 100644
--- a/app/pages/checkoutPage/index.vue
+++ b/app/pages/checkoutPage/index.vue
@@ -3,6 +3,7 @@
 import { onMounted, ref } from "vue";
 import { authStore } from "~/stores/auth/index.js";
 import { orderQuery } from "~/api/goods/index.js";
+import {abroadPayInfo} from "~/api-collect-code/abroad/index"
 import { WebSocketClient } from "@/utils/websocket";
 const config = useRuntimeConfig();
 definePageMeta({
diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index 5b3b154..65f204f 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -40,7 +40,7 @@ const getData = async () => {
   }
 };
 // 获取二维码价格
-getData();
+// getData();
 const confirmPay = async () => {
   const res = await createOrder({
     price: qrData.value.price,
@@ -64,6 +64,7 @@ const confirmPay = async () => {
     });
   }
 };
+// 画家海外支付 扫码支付
 const abroadPay=async ()=>{
   if(!route.query.qrUid){
     return 
@@ -78,13 +79,15 @@ const abroadPay=async ()=>{
   }
 
 }
+// 根据是否有type选择执行支付方式，当type=abroad时，属于画家海外支付
 const payment=async ()=>{
   if(type==="abroad"){
     await abroadPay()
   }else{
-    await confirmPay()
+    await getData()
   }
 }
+payment()
 </script>
 
 <template>
diff --git a/app/pages/overseasCode/payment/result/index.vue b/app/pages/overseasCode/payment/result/index.vue
new file mode 100644
index 0000000..c233292
--- /dev/null
+++ b/app/pages/overseasCode/payment/result/index.vue
@@ -0,0 +1,55 @@
+<script setup>
+import { orderQuery } from "~/api/goods/index.js";
+import { abroadCreateOrder } from "~/api-collect-code/abroad";
+definePageMeta({
+  i18n: "payment.text1",
+});
+const router = useRouter();
+const { t } = useI18n();
+const route = useRoute();
+const resData = ref({});
+
+// 获取支付信息
+  const res=await abroadPayInfo({QrUid:route.query.qrUid})
+  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"),
+};
+const goHome = () => {
+  router.push("/");
+};
+</script>
+
+<template>
+  <div
+    class="w-[100vw] h-screen-nav bg-[url('@/static/images/3532@2x.png')] bg-cover grow-1 flex flex-col items-center px-30px"
+  >
+    <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">
+        {{ statusLabel[resData.PaymentStatus] }}!
+      </div>
+      <div class="text-#999 text-16px">
+        {{ resData.CurrencyType===1?'人民币':'美元' }}{{ resData.Amount }}
+      </div>
+    </div>
+    <!--    <div class="w-full mt-auto mb-40px">
+      <van-button type="primary" block @click="goHome">
+        回到首页
+      </van-button>
+    </div>-->
+  </div>
+</template>
+
+<style scoped></style>
diff --git a/app/plugins/http.ts b/app/plugins/http.ts
index 16e2c67..36f2f5d 100644
--- a/app/plugins/http.ts
+++ b/app/plugins/http.ts
@@ -1,6 +1,8 @@
 import { setupHttp } from '@/api/http'
 import { setupHttp as  setupHttp1} from '@/api-collect-code/http'
+import { setupHttp as abroadSetupHttp } from '~/api-collect-code/http-abroad'
 export default defineNuxtPlugin(() => {
   setupHttp()
   setupHttp1()
+  abroadSetupHttp()
 })