From bfb50546b89dec9d1b45a10ba9ecca525ca642c4 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Tue, 18 Feb 2025 14:10:19 +0800
Subject: [PATCH] =?UTF-8?q?feat(payment):=20=E6=B7=BB=E5=8A=A0=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 payment-result 和 external 页面组件
- 更新 AppHeader 组件，添加支付结果相关路由
- 在 auth store 中添加 checkoutSessionUrl 属性
- 优化支付结果页面布局，增加回到首页按钮
---
 app/components/AppHeader.vue         |  2 +-
 app/config/index.js                  |  2 +-
 app/pages/payment/external/index.vue | 15 +++++++++++++++
 app/pages/payment/index.vue          |  3 ++-
 app/pages/payment/result/index.vue   | 11 ++++++++++-
 app/stores/auth/index.js             |  2 ++
 6 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 app/pages/payment/external/index.vue

diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue
index 86c38dc..3164524 100644
--- a/app/components/AppHeader.vue
+++ b/app/components/AppHeader.vue
@@ -31,7 +31,7 @@ const subTitle = computed(() => {
   return route.meta.subTitle ? t(route.meta.subTitle) : ''
 })
 const showLeftArrow = computed(() => route.name && routeWhiteList.includes(route.name))
-
+console.log('route.name',route.name)
 </script>
 
 <template>
diff --git a/app/config/index.js b/app/config/index.js
index 0958359..a14a5ce 100644
--- a/app/config/index.js
+++ b/app/config/index.js
@@ -1,3 +1,3 @@
 
 export const useAppFooterRouteNames= ['index', 'profile']
-export const useAppHeaderRouteNames= ['index', 'profile','login','collectCode-login','collectCode-mine']
+export const useAppHeaderRouteNames= ['index', 'profile','login','collectCode-login','collectCode-mine','payment-result']
diff --git a/app/pages/payment/external/index.vue b/app/pages/payment/external/index.vue
new file mode 100644
index 0000000..93731e4
--- /dev/null
+++ b/app/pages/payment/external/index.vue
@@ -0,0 +1,15 @@
+<script setup>
+
+</script>
+
+<template>
+<div>
+  <iframe>
+
+  </iframe>
+</div>
+</template>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue
index 931561b..c2ffe17 100644
--- a/app/pages/payment/index.vue
+++ b/app/pages/payment/index.vue
@@ -3,7 +3,8 @@ import {liveStore} from "~/stores/live/index.js";
 import {createBuyOrder} from "~/api/goods/index.js";
 import {goodStore} from "~/stores/goods/index.js";
 import { showLoadingToast ,closeToast} from 'vant';
-
+import {authStore} from "~/stores/auth/index.js";
+const {checkoutSessionUrl}= authStore()
 const payStatus=ref(0)
 const changePayStatus=()=>{
   payStatus.value=payStatus.value===0?1:0
diff --git a/app/pages/payment/result/index.vue b/app/pages/payment/result/index.vue
index 059ca2d..0a5fafc 100644
--- a/app/pages/payment/result/index.vue
+++ b/app/pages/payment/result/index.vue
@@ -3,6 +3,7 @@ import {orderQuery} from "~/api/goods/index.js";
 definePageMeta({
   i18n: 'payment.text1',
 })
+const router = useRouter()
 const {t}=useI18n();
 const route = useRoute();
 const resData=ref({})
@@ -18,15 +19,23 @@ const statusLabel={
   3:t('payment.text4'),
   4:t('payment.text5'),
 }
+const goHome=()=>{
+  router.push('/')
+}
 </script>
 
 <template>
-  <div class="w-[100vw] bg-[url('@/static/images/3532@2x.png')] bg-cover pt-43px flex-grow-1 flex flex-col">
+  <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.status]}}!</div>
       <div class="text-#999 text-16px">{{resData.currency}}{{resData.money}}</div>
     </div>
+    <div class="w-full mt-auto mb-40px">
+      <van-button type="primary" block @click="goHome">
+        回到首页
+      </van-button>
+    </div>
 </div>
 </template>
 
diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js
index f079db1..4fe36c1 100644
--- a/app/stores/auth/index.js
+++ b/app/stores/auth/index.js
@@ -4,7 +4,9 @@ export const authStore = createGlobalState(() => {
     const RefreshToken=useLocalStorage('RefreshToken','')
     const userInfo=useLocalStorage('userInfo',{})
     const fingerprint=useLocalStorage('fingerprint','')
+    const checkoutSessionUrl=useLocalStorage('checkoutSessionUrl','')
     return{
+        checkoutSessionUrl,
         userInfo,
         RefreshToken,
         token,