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()