From 4b7a7ce285ba56389dbae2fb90031d6d1c345e67 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 20:42:21 +0800
Subject: [PATCH] =?UTF-8?q?feat(collectCode):=20=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 使用 codeAuthStore 替代 authStore
- 修改支付相关变量和路由
- 在支付成功
---
 .../collectCode/payment/checkoutPage/index.vue      | 13 +++++++------
 app/pages/collectCode/payment/index.vue             |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/pages/collectCode/payment/checkoutPage/index.vue b/app/pages/collectCode/payment/checkoutPage/index.vue
index 08ddea6..08bebd9 100644
--- a/app/pages/collectCode/payment/checkoutPage/index.vue
+++ b/app/pages/collectCode/payment/checkoutPage/index.vue
@@ -1,10 +1,11 @@
 <script setup>
 import { onMounted, ref } from 'vue'
-import {authStore} from "~/stores/auth/index.js";
+import {codeAuthStore} from "@/stores-collect-code/auth/index.js";
 import {useRuntimeConfig} from "#app";
 import {orderQuery} from "~/api/goods/index.js";
-const {checkoutSessionUrl,payUid}= authStore()
+const {codePKey,codePayUid} = codeAuthStore()
 const config = useRuntimeConfig()
+
 definePageMeta({
   layout: 'default',
   title: 'Stripe支付'
@@ -20,7 +21,7 @@ const isLoading = ref(false)
 const showSpinner = ref(false)
 
 async function initialize() {
-  const clientSecret = checkoutSessionUrl.value
+  const clientSecret = codePKey.value
   console.log('clientSecret',clientSecret);
   
   const appearance = {
@@ -46,13 +47,13 @@ async function handleSubmit(e) {
   const startPolling = () => {
     pollTimer = setInterval(async () => {
       const res = await orderQuery({
-        orderNo: payUid.value
+        orderNo: codePayUid.value
       })
       if (res.status === 0) {
         if (res.data.status !== 3) {
           clearInterval(pollTimer)
           clearTimeout(timeoutTimer)
-          window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+          window.location.href = `${baseURL}/collectCode/payment/result?orderNo=${codePayUid.value}`
         }
       }
     }, 1000)
@@ -69,7 +70,7 @@ async function handleSubmit(e) {
   const { error } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
-      return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
+      return_url: `${baseURL}/collectCode/payment/result?orderNo=${codePayUid.value}`,
     },
   })
 
diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index 9223795..c79a8b2 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -19,6 +19,7 @@ const changePayStatus = () => {
   payStatus.value = payStatus.value === 0 ? 1 : 0
 }
 const amount = ref('')
+const router = useRouter()
 const confirmPay = async () => {
   if (payStatus.value === 1 && !amount.value) {
     message.warning(t('collectCode.payment.enterAmount'))
@@ -42,6 +43,7 @@ const confirmPay = async () => {
   if (res.status === 0) {
     codePKey.value=res.data.checkoutSessionUrl
     codePayUid.value=res.data.payUid
+    router.push('/collectCode/payment/checkoutPage')
   //  window.location.href = res.data.checkoutSessionUrl
   console.log('res',res);