From bed0e6c4be420963fecfc4c15cfcae5fb112d83f Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 15:59:44 +0800
Subject: [PATCH 01/31] =?UTF-8?q?fix(payment):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E7=BB=93=E6=9E=9C=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E8=BD=AE=E8=AF=A2=E9=80=BB=E8=BE=91=E5=92=8C=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 更新了 Checkout 页面的返回 URL，使用动态获取的窗口位置替代硬编码的 IP 地址
- 优化了支付结果页面的轮询逻辑：
  - 增加了对 5 秒轮询时间的检查，避免长时间轮询
  - 调整了轮询停止的条件，只在支付成功时停止轮询
- 对支付结果页面的 HTML 结构进行了轻微的调整，提高了代码的可读性
---
 app/pages/payment/checkoutPage/index.vue |  2 +-
 app/pages/payment/result/index.vue       | 24 ++++++++++++++++--------
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 90da516..39f872a 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -41,7 +41,7 @@ async function handleSubmit(e) {
   const { error } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
-      return_url: "http://192.168.88.68:3000/payment/result?orderNo="+payUid.value,
+      return_url: `${window.location.origin}/payment/result?orderNo=${payUid.value}`,
     },
   })
 
diff --git a/app/pages/payment/result/index.vue b/app/pages/payment/result/index.vue
index a8f412a..db87be4 100644
--- a/app/pages/payment/result/index.vue
+++ b/app/pages/payment/result/index.vue
@@ -14,21 +14,28 @@ let timer = null
 let startTime = Date.now()
 
 const queryOrder = async () => {
+  // 首先检查是否已经超过5秒
+  if (Date.now() - startTime > 5000) {
+    clearInterval(timer)
+    closeToast()
+    return
+  }
+
   showLoadingToast({
     message: '加载中...',
     forbidClick: true,
   });
-  
+
   try {
     const res = await orderQuery({
       orderNo: route.query.orderNo
     })
-    
+
     if (res.status === 0) {
       resData.value = res.data
-      
-      // 如果状态为1或者超过5秒，停止轮询
-      if (resData.value.status === 1 || Date.now() - startTime > 5000) {
+
+      // 只在支付成功时停止轮询
+      if (resData.value.status === 1) {
         clearInterval(timer)
         closeToast()
       }
@@ -68,11 +75,12 @@ const goHome = () => {
 </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="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 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">

From bbb191651eded5c5cd5dff64614de0de36a7adfa Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:15:53 +0800
Subject: [PATCH 02/31] =?UTF-8?q?refactor(payment):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=20URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 引入 useRuntimeConfig() 以获取环境变量- 使用 Nuxt 配置中的 API_BASE_URL 替代 window.location.origin
- 更新 return_url 为绝对路径，确保在不同环境中的一致性
---
 app/pages/payment/checkoutPage/index.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 39f872a..4370fc4 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { onMounted, ref } from 'vue'
 import {authStore} from "~/stores/auth/index.js";
+import {useRuntimeConfig} from "#app";
 const {checkoutSessionUrl,payUid}= authStore()
 const config = useRuntimeConfig()
 definePageMeta({
@@ -10,7 +11,7 @@ definePageMeta({
 console.log('config.public.NUXT_PUBLIC_PKEY',config.public.NUXT_PUBLIC_PKEY);
 const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
 
-
+const baseURL = config.public.NUXT_PUBLIC_API_BASE
 const items = [{ id: "xl-tshirt", amount: 1000 }]
 const elements = ref(null)
 const paymentMessage = ref('')
@@ -41,7 +42,7 @@ async function handleSubmit(e) {
   const { error } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
-      return_url: `${window.location.origin}/payment/result?orderNo=${payUid.value}`,
+      return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
     },
   })
 

From 1ed311c5f92702c820f16149019e38fbc19c6643 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:41:12 +0800
Subject: [PATCH 03/31] 123

---
 app/pages/payment/checkoutPage/index.vue | 34 +++++++++++++++++++-----
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 4370fc4..9398a72 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -39,17 +39,39 @@ async function handleSubmit(e) {
   e.preventDefault()
   setLoading(true)
 
-  const { error } = await stripe.confirmPayment({
+  // 保存当前时间戳，用于检测是否需要手动跳转
+  const paymentStartTime = Date.now()
+  
+  // 检测是否为Android设备
+  const isAndroid = /android/i.test(navigator.userAgent)
+  
+  const { error, paymentIntent } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
       return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
     },
+    redirect: 'if_required',
   })
 
-  if (error.type === "card_error" || error.type === "validation_error") {
-    showMessage(error.message)
-  } else {
-    showMessage("An unexpected error occurred.")
+  if (error) {
+    if (error.type === "card_error" || error.type === "validation_error") {
+      showMessage(error.message)
+    } else {
+      showMessage("An unexpected error occurred.")
+    }
+  } else if (paymentIntent && paymentIntent.status === 'succeeded') {
+    // 支付成功但没有自动跳转，手动跳转到结果页面
+    window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+    return
+  } else if (isAndroid) {
+    // 针对Android设备，添加额外检查
+    // 如果3秒后仍在当前页面，可能是没有自动跳转，尝试手动跳转
+    setTimeout(() => {
+      // 检查是否仍在支付页面
+      if (document.getElementById('payment-form')) {
+        window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+      }
+    }, 3000)
   }
 
   setLoading(false)
@@ -340,4 +362,4 @@ form {
 }
 
 /* 其他样式保持不变... */
-</style> 
\ No newline at end of file
+</style>
\ No newline at end of file

From c32869988c0dd1180d6773341aa4ad30e7f594ee Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:49:06 +0800
Subject: [PATCH 04/31] 123

---
 app/pages/payment/checkoutPage/index.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 9398a72..ea2a57f 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -66,12 +66,9 @@ async function handleSubmit(e) {
   } else if (isAndroid) {
     // 针对Android设备，添加额外检查
     // 如果3秒后仍在当前页面，可能是没有自动跳转，尝试手动跳转
-    setTimeout(() => {
-      // 检查是否仍在支付页面
-      if (document.getElementById('payment-form')) {
-        window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
-      }
-    }, 3000)
+    if (document.getElementById('payment-form')) {
+      window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+    }
   }
 
   setLoading(false)

From 126312817176ad0d70f927829397dbb307e621c1 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:50:45 +0800
Subject: [PATCH 05/31] 12

---
 app/pages/payment/checkoutPage/index.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index ea2a57f..9398a72 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -66,9 +66,12 @@ async function handleSubmit(e) {
   } else if (isAndroid) {
     // 针对Android设备，添加额外检查
     // 如果3秒后仍在当前页面，可能是没有自动跳转，尝试手动跳转
-    if (document.getElementById('payment-form')) {
-      window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
-    }
+    setTimeout(() => {
+      // 检查是否仍在支付页面
+      if (document.getElementById('payment-form')) {
+        window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+      }
+    }, 3000)
   }
 
   setLoading(false)

From da43bb54294f3fe4d344533bed9d4151443ffd3e Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:56:37 +0800
Subject: [PATCH 06/31] 12

---
 app/pages/payment/checkoutPage/index.vue | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 9398a72..accf8c9 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -65,13 +65,9 @@ async function handleSubmit(e) {
     return
   } else if (isAndroid) {
     // 针对Android设备，添加额外检查
-    // 如果3秒后仍在当前页面，可能是没有自动跳转，尝试手动跳转
-    setTimeout(() => {
-      // 检查是否仍在支付页面
-      if (document.getElementById('payment-form')) {
-        window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
-      }
-    }, 3000)
+    if (document.getElementById('payment-form')) {
+      window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+    }
   }
 
   setLoading(false)

From 46d17fb6e60cc66af39276963be019f2e02dacca Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:32:38 +0800
Subject: [PATCH 07/31] 12

---
 app/pages/payment/checkoutPage/index.vue | 28 +++++-------------------
 app/pages/payment/index.vue              |  5 ++++-
 app/stores/auth/index.js                 | 24 ++++++++++++++++++++
 3 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index accf8c9..a087f7c 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -39,35 +39,17 @@ async function handleSubmit(e) {
   e.preventDefault()
   setLoading(true)
 
-  // 保存当前时间戳，用于检测是否需要手动跳转
-  const paymentStartTime = Date.now()
-  
-  // 检测是否为Android设备
-  const isAndroid = /android/i.test(navigator.userAgent)
-  
-  const { error, paymentIntent } = await stripe.confirmPayment({
+  const { error } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
       return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
     },
-    redirect: 'if_required',
   })
 
-  if (error) {
-    if (error.type === "card_error" || error.type === "validation_error") {
-      showMessage(error.message)
-    } else {
-      showMessage("An unexpected error occurred.")
-    }
-  } else if (paymentIntent && paymentIntent.status === 'succeeded') {
-    // 支付成功但没有自动跳转，手动跳转到结果页面
-    window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
-    return
-  } else if (isAndroid) {
-    // 针对Android设备，添加额外检查
-    if (document.getElementById('payment-form')) {
-      window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
-    }
+  if (error.type === "card_error" || error.type === "validation_error") {
+    showMessage(error.message)
+  } else {
+    showMessage("An unexpected error occurred.")
   }
 
   setLoading(false)
diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue
index 6482a70..20f6b08 100644
--- a/app/pages/payment/index.vue
+++ b/app/pages/payment/index.vue
@@ -5,7 +5,7 @@ import {goodStore} from "~/stores/goods/index.js";
 import { showLoadingToast ,closeToast} from 'vant';
 import {authStore} from "~/stores/auth/index.js";
 import {message} from "~/components/x-message/useMessage.js";
-const {checkoutSessionUrl,payment,payUid}= authStore()
+const {checkoutSessionUrl,payment,payUid,openRefreshResults}= authStore()
 const payStatus=ref(0)
 definePageMeta({
   i18n: 'payment.title'
@@ -40,11 +40,14 @@ const confirmPay=async ()=>{
  })
  console.log('res',res);
  if (res.status===0){
+
   // if (res.status===0){
   //   window.location.href=res.data.checkoutSessionUrl
   // }
+
   checkoutSessionUrl.value=res.data.checkoutSessionUrl
   payUid.value=res.data.payUid
+   openRefreshResults()
   router.push('/payment/checkoutPage')
 }
 }
diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js
index a812e23..e8b7580 100644
--- a/app/stores/auth/index.js
+++ b/app/stores/auth/index.js
@@ -1,4 +1,7 @@
 import { createGlobalState,useLocalStorage } from '@vueuse/core'
+import { WebSocketClient } from '@/utils/websocket'
+import {message} from "~/components/x-message/useMessage.js";
+
 export const authStore = createGlobalState(() => {
     const token=useLocalStorage('token','')
     const RefreshToken=useLocalStorage('RefreshToken','')
@@ -12,8 +15,29 @@ export const authStore = createGlobalState(() => {
         buyUid:'',
         auctionArtworkUuid:''
     })
+    const router=useRouter()
+    const config = useRuntimeConfig()
 const payUid=useLocalStorage('payUid','')
+    const openRefreshResults=()=>{
+        const wsClient = new WebSocketClient(
+            config.public.NUXT_PUBLIC_SOCKET_URL,
+            token.value
+        )
+        const ws = wsClient.connect('/api/v1/m/auction/live',{
+            payUid:payUid.value
+        })
+        ws.onMessage((data) => {
+            router.push({
+                path:'/payment/result',
+                query:{
+                    orderNo:payUid.value
+                }
+            })
+        })
+    }
+
     return{
+        openRefreshResults,
         payUid,
         selectedZone,
         payment,

From be60cac47ec5cace8cba05a42945f86ed2b8dd35 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:34:13 +0800
Subject: [PATCH 08/31] 1212

---
 app/stores/auth/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js
index e8b7580..d6be7b9 100644
--- a/app/stores/auth/index.js
+++ b/app/stores/auth/index.js
@@ -23,7 +23,7 @@ const payUid=useLocalStorage('payUid','')
             config.public.NUXT_PUBLIC_SOCKET_URL,
             token.value
         )
-        const ws = wsClient.connect('/api/v1/m/auction/live',{
+        const ws = wsClient.connect('/api/v1/order/ws',{
             payUid:payUid.value
         })
         ws.onMessage((data) => {

From a84e1524b5a09ac63e64f1c3a7c2d7e640e6de06 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:38:00 +0800
Subject: [PATCH 09/31] 1212

---
 app/stores/auth/index.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js
index d6be7b9..22882ca 100644
--- a/app/stores/auth/index.js
+++ b/app/stores/auth/index.js
@@ -27,6 +27,7 @@ const payUid=useLocalStorage('payUid','')
             payUid:payUid.value
         })
         ws.onMessage((data) => {
+            console.log('openRefreshResults',data)
             router.push({
                 path:'/payment/result',
                 query:{

From 38fc5d78ca3c1cc00b19c0232b319458380731d2 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 17:40:57 +0800
Subject: [PATCH 10/31] 1212

---
 app/plugins/vconsole.client.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/plugins/vconsole.client.js b/app/plugins/vconsole.client.js
index 8224b4f..6738ed9 100644
--- a/app/plugins/vconsole.client.js
+++ b/app/plugins/vconsole.client.js
@@ -1,7 +1,5 @@
 import VConsole from 'vconsole'
 
 export default defineNuxtPlugin(() => {
-  if (process.env.NODE_ENV !== 'production') {
-    const vConsole = new VConsole()
-  }
+  const vConsole = new VConsole()
 })
\ No newline at end of file

From 437e74ee869d69a360c6c5e58eb803f33ce2e1ef Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 19:29:43 +0800
Subject: [PATCH 11/31] 1212

---
 app/pages/payment/checkoutPage/index.vue | 42 ++++++++++++++++++++----
 1 file changed, 36 insertions(+), 6 deletions(-)

diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index a087f7c..2ff0fc6 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -2,6 +2,7 @@
 import { onMounted, ref } from 'vue'
 import {authStore} from "~/stores/auth/index.js";
 import {useRuntimeConfig} from "#app";
+import {orderQuery} from "~/api/goods/index.js";
 const {checkoutSessionUrl,payUid}= authStore()
 const config = useRuntimeConfig()
 definePageMeta({
@@ -39,6 +40,32 @@ async function handleSubmit(e) {
   e.preventDefault()
   setLoading(true)
 
+  let pollTimer = null
+  let timeoutTimer = null
+
+  const startPolling = () => {
+    pollTimer = setInterval(async () => {
+      const res = await orderQuery({
+        orderNo: payUid.value
+      })
+      if (res.status === 0) {
+        if (res.data.status !== 3) {
+          clearInterval(pollTimer)
+          clearTimeout(timeoutTimer)
+          window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+        }
+      }
+    }, 1000) // 每3秒轮询一次
+
+    timeoutTimer = setTimeout(() => {
+      clearInterval(pollTimer)
+      showMessage('支付超时，请重试')
+      setLoading(false)
+    }, 180000) // 3分钟超时
+  }
+
+  startPolling()
+
   const { error } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
@@ -46,13 +73,16 @@ async function handleSubmit(e) {
     },
   })
 
-  if (error.type === "card_error" || error.type === "validation_error") {
-    showMessage(error.message)
-  } else {
-    showMessage("An unexpected error occurred.")
+  if (error) {
+    clearInterval(pollTimer)
+    clearTimeout(timeoutTimer)
+    if (error.type === "card_error" || error.type === "validation_error") {
+      showMessage(error.message)
+    } else {
+      showMessage("An unexpected error occurred.")
+    }
+    setLoading(false)
   }
-
-  setLoading(false)
 }
 
 function showMessage(messageText) {

From 09bbd9ae14e82090b57b779eceb136ce46f1b201 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Fri, 28 Feb 2025 20:30:45 +0800
Subject: [PATCH 12/31] 12

---
 app/api-collect-code/goods/index.js           |   2 +-
 app/components/StripeCheckout.vue             | 280 +++++++++++++
 .../payment/checkoutPage/index.vue            | 373 ++++++++++++++++++
 app/pages/collectCode/payment/index.vue       |  12 +-
 app/pages/payment/checkoutPage/index.vue      |   2 +-
 app/stores-collect-code/auth/index.js         |   4 +
 i18n/locales/en-US.json                       |   2 +-
 i18n/locales/ja-JP.json                       |   2 +-
 i18n/locales/zh-CN.json                       |   3 +-
 i18n/locales/zh-TW.json                       |   2 +-
 server/middleware/stripe.ts                   |  26 ++
 11 files changed, 698 insertions(+), 10 deletions(-)
 create mode 100644 app/components/StripeCheckout.vue
 create mode 100644 app/pages/collectCode/payment/checkoutPage/index.vue
 create mode 100644 server/middleware/stripe.ts

diff --git a/app/api-collect-code/goods/index.js b/app/api-collect-code/goods/index.js
index 60a5206..f95a0e3 100644
--- a/app/api-collect-code/goods/index.js
+++ b/app/api-collect-code/goods/index.js
@@ -56,7 +56,7 @@ export async function offlineQrcode(data) {
 export async function createOrder(data) {
 
     return await request( {
-        url:'/api/v1/offlineQrcode/createOrder',
+        url:'/api/v1/offlineQrcode/createOrder/V2',
         method: 'POST',
         data
     })
diff --git a/app/components/StripeCheckout.vue b/app/components/StripeCheckout.vue
new file mode 100644
index 0000000..7af9d93
--- /dev/null
+++ b/app/components/StripeCheckout.vue
@@ -0,0 +1,280 @@
+<template>
+  <div class="stripe-container">
+    <form id="payment-form" @submit.prevent="handleSubmit">
+      <div id="payment-element">
+        <!--Stripe.js injects the Payment Element-->
+      </div>
+      <button id="submit">
+        <div class="spinner hidden" id="spinner"></div>
+        <span id="button-text">Pay now</span>
+      </button>
+      <div id="payment-message" class="hidden"></div>
+    </form>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted } from 'vue'
+
+// The items the customer wants to buy
+const items = [{ id: "xl-tshirt", amount: 1000 }]
+
+const stripe = ref(null)
+const elements = ref(null)
+const isLoading = ref(false)
+
+onMounted(async () => {
+  try {
+    // 初始化 Stripe
+    stripe.value = window.Stripe("pk_test_51QfbSAAB1Vm8VfJq3AWsR4k2mZjnlF7XFrmlbc6XVXrtwXquAUfwzZmOFDbxMIAwqJBgqao8KLt2wmPc4vNOCTeo00WB78KtfV")
+    await initialize()
+  } catch (error) {
+    console.error('Stripe initialization error:', error)
+    showMessage("Failed to initialize payment system")
+  }
+})
+
+// Fetches a payment intent and captures the client secret
+const initialize = async () => {
+  try {
+    const response = await fetch("/create-payment-intent", {
+      method: "POST",
+      headers: { "Content-Type": "application/json" },
+      body: JSON.stringify({ items }),
+    })
+    const { clientSecret } = await response.json()
+
+    const appearance = {
+      theme: 'stripe',
+    }
+
+    // 创建 elements 实例
+    elements.value = stripe.value.elements({ 
+      appearance, 
+      clientSecret,
+    })
+
+    // 创建并挂载 Payment Element
+    const paymentElement = elements.value.create("payment", {
+      layout: "accordion",
+    })
+
+    // 确保挂载到正确的 DOM 元素
+    const mountElement = document.getElementById("payment-element")
+    if (mountElement) {
+      paymentElement.mount(mountElement)
+    } else {
+      throw new Error("Payment element mount point not found")
+    }
+  } catch (error) {
+    console.error('Payment Element initialization error:', error)
+    showMessage("Failed to load payment form")
+  }
+}
+
+const handleSubmit = async () => {
+  if (!stripe.value || !elements.value) {
+    console.error('Stripe or Elements not initialized')
+    showMessage("Payment system not initialized")
+    return
+  }
+
+  setLoading(true)
+
+  try {
+    const { error } = await stripe.value.confirmPayment({
+      elements: elements.value,
+      confirmParams: {
+        return_url: window.location.origin + "/complete.html",
+      },
+    })
+
+    if (error) {
+      if (error.type === "card_error" || error.type === "validation_error") {
+        showMessage(error.message)
+      } else {
+        showMessage("An unexpected error occurred.")
+      }
+    }
+  } catch (e) {
+    console.error('Payment confirmation error:', e)
+    showMessage("Payment processing failed")
+  } finally {
+    setLoading(false)
+  }
+}
+
+const showMessage = (messageText) => {
+  const messageContainer = document.querySelector("#payment-message")
+
+  messageContainer.classList.remove("hidden")
+  messageContainer.textContent = messageText
+
+  setTimeout(() => {
+    messageContainer.classList.add("hidden")
+    messageContainer.textContent = ""
+  }, 4000)
+}
+
+// Show a spinner on payment submission
+const setLoading = (isLoading) => {
+  if (isLoading) {
+    // Disable the button and show a spinner
+    document.querySelector("#submit").disabled = true
+    document.querySelector("#spinner").classList.remove("hidden")
+    document.querySelector("#button-text").classList.add("hidden")
+  } else {
+    document.querySelector("#submit").disabled = false
+    document.querySelector("#spinner").classList.add("hidden")
+    document.querySelector("#button-text").classList.remove("hidden")
+  }
+}
+</script>
+
+<style scoped>
+.stripe-container {
+  font-family: -apple-system, BlinkMacSystemFont, sans-serif;
+  font-size: 16px;
+  -webkit-font-smoothing: antialiased;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-content: center;
+  height: 100vh;
+  width: 100vw;
+}
+
+form {
+  width: 30vw;
+  min-width: 500px;
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+.hidden {
+  display: none;
+}
+
+#payment-message {
+  color: rgb(105, 115, 134);
+  font-size: 16px;
+  line-height: 20px;
+  padding-top: 12px;
+  text-align: center;
+}
+
+#payment-element {
+  margin-bottom: 24px;
+}
+
+button {
+  background: #0055DE;
+  font-family: Arial, sans-serif;
+  color: #ffffff;
+  border-radius: 4px;
+  border: 0;
+  padding: 12px 16px;
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  display: block;
+  transition: all 0.2s ease;
+  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
+  width: 100%;
+}
+
+button:hover {
+  filter: contrast(115%);
+}
+
+button:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+.spinner,
+.spinner:before,
+.spinner:after {
+  border-radius: 50%;
+}
+
+.spinner {
+  color: #ffffff;
+  font-size: 22px;
+  text-indent: -99999px;
+  margin: 0px auto;
+  position: relative;
+  width: 20px;
+  height: 20px;
+  box-shadow: inset 0 0 0 2px;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+}
+
+.spinner:before,
+.spinner:after {
+  position: absolute;
+  content: "";
+}
+
+.spinner:before {
+  width: 10.4px;
+  height: 20.4px;
+  background: #0055DE;
+  border-radius: 20.4px 0 0 20.4px;
+  top: -0.2px;
+  left: -0.2px;
+  -webkit-transform-origin: 10.4px 10.2px;
+  transform-origin: 10.4px 10.2px;
+  -webkit-animation: loading 2s infinite ease 1.5s;
+  animation: loading 2s infinite ease 1.5s;
+}
+
+.spinner:after {
+  width: 10.4px;
+  height: 10.2px;
+  background: #0055DE;
+  border-radius: 0 10.2px 10.2px 0;
+  top: -0.1px;
+  left: 10.2px;
+  -webkit-transform-origin: 0px 10.2px;
+  transform-origin: 0px 10.2px;
+  -webkit-animation: loading 2s infinite ease;
+  animation: loading 2s infinite ease;
+}
+
+@-webkit-keyframes loading {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+
+@keyframes loading {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+
+@media only screen and (max-width: 600px) {
+  form {
+    width: 80vw;
+    min-width: initial;
+  }
+}
+</style> 
\ No newline at end of file
diff --git a/app/pages/collectCode/payment/checkoutPage/index.vue b/app/pages/collectCode/payment/checkoutPage/index.vue
new file mode 100644
index 0000000..08ddea6
--- /dev/null
+++ b/app/pages/collectCode/payment/checkoutPage/index.vue
@@ -0,0 +1,373 @@
+<script setup>
+import { onMounted, ref } from 'vue'
+import {authStore} from "~/stores/auth/index.js";
+import {useRuntimeConfig} from "#app";
+import {orderQuery} from "~/api/goods/index.js";
+const {checkoutSessionUrl,payUid}= authStore()
+const config = useRuntimeConfig()
+definePageMeta({
+  layout: 'default',
+  title: 'Stripe支付'
+})
+console.log('config.public.NUXT_PUBLIC_PKEY',config.public.NUXT_PUBLIC_PKEY);
+const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
+
+const baseURL = config.public.NUXT_PUBLIC_API_BASE
+const items = [{ id: "xl-tshirt", amount: 1000 }]
+const elements = ref(null)
+const paymentMessage = ref('')
+const isLoading = ref(false)
+const showSpinner = ref(false)
+
+async function initialize() {
+  const clientSecret = checkoutSessionUrl.value
+  console.log('clientSecret',clientSecret);
+  
+  const appearance = {
+    theme: 'stripe',
+  }
+  elements.value = stripe.elements({ appearance, clientSecret })
+
+  const paymentElementOptions = {
+    layout: "accordion",
+  }
+
+  const paymentElement = elements.value.create("payment", paymentElementOptions)
+  paymentElement.mount("#payment-element")
+}
+
+async function handleSubmit(e) {
+  e.preventDefault()
+  setLoading(true)
+
+  let pollTimer = null
+  let timeoutTimer = null
+
+  const startPolling = () => {
+    pollTimer = setInterval(async () => {
+      const res = await orderQuery({
+        orderNo: payUid.value
+      })
+      if (res.status === 0) {
+        if (res.data.status !== 3) {
+          clearInterval(pollTimer)
+          clearTimeout(timeoutTimer)
+          window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+        }
+      }
+    }, 1000)
+
+    timeoutTimer = setTimeout(() => {
+      clearInterval(pollTimer)
+      showMessage('支付超时，请重试')
+      setLoading(false)
+    }, 180000) // 3分钟超时
+  }
+
+  startPolling()
+
+  const { error } = await stripe.confirmPayment({
+    elements: elements.value,
+    confirmParams: {
+      return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
+    },
+  })
+
+  if (error) {
+    clearInterval(pollTimer)
+    clearTimeout(timeoutTimer)
+    if (error.type === "card_error" || error.type === "validation_error") {
+      showMessage(error.message)
+    } else {
+      showMessage("An unexpected error occurred.")
+    }
+    setLoading(false)
+  }
+}
+
+function showMessage(messageText) {
+  paymentMessage.value = messageText
+  setTimeout(() => {
+    paymentMessage.value = ''
+  }, 4000)
+}
+
+function setLoading(loading) {
+  isLoading.value = loading
+  showSpinner.value = loading
+}
+
+onMounted(() => {
+  initialize()
+})
+</script>
+
+<template>
+  <form id="payment-form" @submit="handleSubmit">
+    <div id="payment-element">
+    </div>
+    <button id="submit">
+      <div class="spinner" :class="{ hidden: !showSpinner }" id="spinner"></div>
+      <span id="button-text" :class="{ hidden: showSpinner }">Pay now</span>
+    </button>
+    <div id="payment-message" :class="{ hidden: !paymentMessage }">{{ paymentMessage }}</div>
+  </form>
+</template>
+
+<style scoped>
+* {
+  box-sizing: border-box;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, sans-serif;
+  font-size: 16px;
+  -webkit-font-smoothing: antialiased;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-content: center;
+  height: 100vh;
+  width: 100vw;
+}
+
+form {
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+.hidden {
+  display: none;
+}
+
+#payment-message {
+  color: rgb(105, 115, 134);
+  font-size: 16px;
+  line-height: 20px;
+  padding-top: 12px;
+  text-align: center;
+}
+
+#payment-element {
+  margin-bottom: 24px;
+}
+
+/* Buttons and links */
+button {
+  background: #0055DE;
+  font-family: Arial, sans-serif;
+  color: #ffffff;
+  border-radius: 4px;
+  border: 0;
+  padding: 12px 16px;
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  display: block;
+  transition: all 0.2s ease;
+  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
+  width: 100%;
+}
+button:hover {
+  filter: contrast(115%);
+}
+button:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+/* spinner/processing state, errors */
+.spinner,
+.spinner:before,
+.spinner:after {
+  border-radius: 50%;
+}
+.spinner {
+  color: #ffffff;
+  font-size: 22px;
+  text-indent: -99999px;
+  margin: 0px auto;
+  position: relative;
+  width: 20px;
+  height: 20px;
+  box-shadow: inset 0 0 0 2px;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+}
+.spinner:before,
+.spinner:after {
+  position: absolute;
+  content: "";
+}
+.spinner:before {
+  width: 10.4px;
+  height: 20.4px;
+  background: #0055DE;
+  border-radius: 20.4px 0 0 20.4px;
+  top: -0.2px;
+  left: -0.2px;
+  -webkit-transform-origin: 10.4px 10.2px;
+  transform-origin: 10.4px 10.2px;
+  -webkit-animation: loading 2s infinite ease 1.5s;
+  animation: loading 2s infinite ease 1.5s;
+}
+.spinner:after {
+  width: 10.4px;
+  height: 10.2px;
+  background: #0055DE;
+  border-radius: 0 10.2px 10.2px 0;
+  top: -0.1px;
+  left: 10.2px;
+  -webkit-transform-origin: 0px 10.2px;
+  transform-origin: 0px 10.2px;
+  -webkit-animation: loading 2s infinite ease;
+  animation: loading 2s infinite ease;
+}
+
+/* Payment status page */
+#payment-status {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  row-gap: 30px;
+  width: 30vw;
+  min-width: 500px;
+  min-height: 380px;
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  opacity: 0;
+  animation: fadeInAnimation 1s ease forwards;
+}
+
+#status-icon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 40px;
+  width: 40px;
+  border-radius: 50%;
+}
+
+h2 {
+  margin: 0;
+  color: #30313D;
+  text-align: center;
+}
+
+a {
+  text-decoration: none;
+  font-size: 16px;
+  font-weight: 600;
+  font-family: Arial, sans-serif;
+  display: block;
+}
+a:hover {
+  filter: contrast(120%);
+}
+
+#details-table {
+  overflow-x: auto;
+  width: 100%;
+}
+
+table {
+  width: 100%;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+table tbody tr:first-child td {
+  border-top: 1px solid #E6E6E6; /* Top border */
+  padding-top: 10px;
+}
+table tbody tr:last-child td {
+  border-bottom: 1px solid #E6E6E6; /* Bottom border */
+}
+td {
+  padding-bottom: 10px;
+}
+
+.TableContent {
+  text-align: right;
+  color: #6D6E78;
+}
+
+.TableLabel {
+  font-weight: 600;
+  color: #30313D;
+}
+
+#view-details {
+  color: #0055DE;
+}
+
+#retry-button {
+  text-align: center;
+  background: #0055DE;
+  color: #ffffff;
+  border-radius: 4px;
+  border: 0;
+  padding: 12px 16px;
+  transition: all 0.2s ease;
+  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
+  width: 100%;
+}
+
+@-webkit-keyframes loading {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes loading {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes fadeInAnimation {
+  to {
+      opacity: 1;
+  }
+}
+
+@media only screen and (max-width: 600px) {
+  form, #payment-status{
+    width: 80vw;
+    min-width: initial;
+  }
+}
+.hidden {
+  display: none;
+}
+
+form {
+  width:100vw;
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+/* 其他样式保持不变... */
+</style>
\ No newline at end of file
diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index b3b408e..9223795 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -10,7 +10,7 @@ import {codeAuthStore} from "~/stores-collect-code/auth/index.js";
 import {useI18n} from "vue-i18n";
 
 const {t} = useI18n();
-const {checkoutSessionUrl,qrUid,qrData} = codeAuthStore()
+const {checkoutSessionUrl,qrUid,qrData,codePKey,codePayUid} = codeAuthStore()
 const payStatus = ref(0)
 definePageMeta({
   i18n: 'payment.title'
@@ -40,7 +40,11 @@ const confirmPay = async () => {
     testReturnEndPoint: '/collectCode/payment/result'
   })
   if (res.status === 0) {
-    window.location.href = res.data.checkoutSessionUrl
+    codePKey.value=res.data.checkoutSessionUrl
+    codePayUid.value=res.data.payUid
+  //  window.location.href = res.data.checkoutSessionUrl
+  console.log('res',res);
+  
   }
 }
 
@@ -75,8 +79,8 @@ const handleInput = (e) => {
       {{ qrData?.leftPrice }}
     </div>
     <div class="mb-12px" v-else>
-      <input v-model="amount" class="w-272px h-48px bg-#F3F3F3 px-11px text-16px" type="text"
-             :placeholder="$t('collectCode.payment.maxAmount', { currency: qrData.currency, price: qrData?.leftPrice })" @input="handleInput">
+             <input v-model="amount" class="w-272px h-48px bg-#F3F3F3 px-11px text-16px" type="text"
+             :placeholder="`${$t('collectCode.payment.maxAmount')} ${qrData.currency} ${qrData?.leftPrice}`" @input="handleInput">
     </div>
     <div class="text-#2B53AC text-14px" @click="changePayStatus">{{ payStatus === 1 ? $t('collectCode.payment.fullPayment') : $t('collectCode.payment.partialPayment') }}</div>
     <div class="w-full mt-auto mb-40px">
diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 2ff0fc6..08ddea6 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -55,7 +55,7 @@ async function handleSubmit(e) {
           window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
         }
       }
-    }, 1000) // 每3秒轮询一次
+    }, 1000)
 
     timeoutTimer = setTimeout(() => {
       clearInterval(pollTimer)
diff --git a/app/stores-collect-code/auth/index.js b/app/stores-collect-code/auth/index.js
index cad4d3f..987f9d4 100644
--- a/app/stores-collect-code/auth/index.js
+++ b/app/stores-collect-code/auth/index.js
@@ -26,7 +26,11 @@ export const codeAuthStore = createGlobalState(() => {
         currency:''
     })
     const qrData=useLocalStorage('qrData',{})
+    const codePKey=useLocalStorage('codePKey','')
+    const codePayUid=useLocalStorage('codePayUid','')
     return{
+        codePKey,
+        codePayUid,
         qrData,
         qrUid,
         cpayment,
diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json
index 3a2ffbd..a1c81ee 100644
--- a/i18n/locales/en-US.json
+++ b/i18n/locales/en-US.json
@@ -423,7 +423,7 @@
       "fullPayment": "Pay in Full",
       "partialPayment": "Partial Payment",
       "confirmPayment": "Confirm Payment",
-      "maxAmount": "Maximum {currency}{price}",
+      "maxAmount": "most",
       "enterAmount": "Please enter amount",
       "exceedTotal": "Cannot exceed total amount"
     },
diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json
index d6f053a..2309fb0 100644
--- a/i18n/locales/ja-JP.json
+++ b/i18n/locales/ja-JP.json
@@ -423,7 +423,7 @@
       "fullPayment": "全額支払い",
       "partialPayment": "一部支払い",
       "confirmPayment": "支払い確認",
-      "maxAmount": "最大 {currency}{price}",
+      "maxAmount": "ほとんど",
       "enterAmount": "金額を入力してください",
       "exceedTotal": "合計金額を超えることはできません"
     },
diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json
index 60e8d0f..4bdc15a 100644
--- a/i18n/locales/zh-CN.json
+++ b/i18n/locales/zh-CN.json
@@ -426,7 +426,8 @@
       "confirmPayment": "确认支付",
       "text1": "最多",
       "enterAmount": "请输入金额",
-      "exceedTotal": "不得高于全部金额"
+      "exceedTotal": "不得高于全部金额",
+      "maxAmount": "最多"
     },
     "signature": {
       "resultText": "领取您的专属号牌",
diff --git a/i18n/locales/zh-TW.json b/i18n/locales/zh-TW.json
index aa08434..7d7509d 100644
--- a/i18n/locales/zh-TW.json
+++ b/i18n/locales/zh-TW.json
@@ -423,7 +423,7 @@
       "fullPayment": "支付全部",
       "partialPayment": "支付部分",
       "confirmPayment": "確認支付",
-      "maxAmount": "最多{currency}{price}",
+      "maxAmount": "最多",
       "enterAmount": "請輸入金額",
       "exceedTotal": "不得高於全部金額"
     },
diff --git a/server/middleware/stripe.ts b/server/middleware/stripe.ts
new file mode 100644
index 0000000..050c241
--- /dev/null
+++ b/server/middleware/stripe.ts
@@ -0,0 +1,26 @@
+export default defineEventHandler(async (event) => {
+  const url = getRequestURL(event)
+  
+  // 只处理 create-payment-intent 请求
+  if (url.pathname === '/create-payment-intent' && event.method === 'POST') {
+    try {
+      const body = await readBody(event)
+      const { items } = body
+      
+      // 计算总金额
+      const amount = items.reduce((total: number, item: any) => total + item.amount, 0)
+      
+      // 模拟创建支付意向的响应
+      // 注意：clientSecret 格式应该类似于 'pi_xxxxx_secret_xxxxx'
+      return {
+        clientSecret: `pi_${Math.random().toString(36).substring(2)}_secret_${Math.random().toString(36).substring(2)}`
+      }
+    } catch (error) {
+      console.error('Create payment intent error:', error)
+      throw createError({
+        statusCode: 500,
+        message: '创建支付意向失败'
+      })
+    }
+  }
+}) 
\ No newline at end of file

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 13/31] =?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);
   

From 2fdcfc8c3b4eec7b63f81c697dbe6e8bf97cf30c Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 09:54:41 +0800
Subject: [PATCH 14/31] 1212

---
 app/pages/checkoutPage/index.vue | 395 +++++++++++++++++++++++++++++++
 app/pages/payment/index.vue      |   3 +-
 2 files changed, 397 insertions(+), 1 deletion(-)
 create mode 100644 app/pages/checkoutPage/index.vue

diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
new file mode 100644
index 0000000..819febb
--- /dev/null
+++ b/app/pages/checkoutPage/index.vue
@@ -0,0 +1,395 @@
+<script setup>
+import { onMounted, ref } from 'vue'
+import {authStore} from "~/stores/auth/index.js";
+import {orderQuery} from "~/api/goods/index.js";
+import { WebSocketClient } from '@/utils/websocket'
+const {checkoutSessionUrl,payUid}= authStore()
+const config = useRuntimeConfig()
+definePageMeta({
+  layout: 'default',
+  title: 'Stripe支付'
+})
+console.log('config.public.NUXT_PUBLIC_PKEY',config.public.NUXT_PUBLIC_PKEY);
+const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
+
+const baseURL = config.public.NUXT_PUBLIC_API_BASE
+const items = [{ id: "xl-tshirt", amount: 1000 }]
+const elements = ref(null)
+const paymentMessage = ref('')
+const isLoading = ref(false)
+const showSpinner = ref(false)
+let pollTimer = null
+let timeoutTimer = null
+
+const startPolling = () => {
+  pollTimer = setInterval(async () => {
+    const res = await orderQuery({
+      orderNo: payUid.value
+    })
+    if (res.status === 0) {
+      if (res.data.status !== 3) {
+        clearInterval(pollTimer)
+        clearTimeout(timeoutTimer)
+        window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+      }
+    }
+  }, 1000)
+
+/*  timeoutTimer = setTimeout(() => {
+    clearInterval(pollTimer)
+    setLoading(false)
+  }, 180000)*/
+}
+const watchWebSocket = () => {
+  const wsClient = new WebSocketClient(
+    config.public.NUXT_PUBLIC_SOCKET_URL
+  )
+  const ws = wsClient.connect('/api/v1/order/ws/v2', {
+    PayUid: payUid.value,
+  })
+  ws.onOpen(() => {
+            console.log('支付页面的websocket连接成功')
+        })
+        ws.onMessage((event) => {
+            console.log('支付页面的websocket收到消息', event.data)
+        })
+        ws.onClose(() => {
+            console.log('支付页面的websocket连接关闭')
+        })
+}
+async function initialize() {
+  const clientSecret = checkoutSessionUrl.value
+  console.log('clientSecret',clientSecret);
+  
+  const appearance = {
+    theme: 'stripe',
+  }
+  elements.value = stripe.elements({ appearance, clientSecret })
+
+  const paymentElementOptions = {
+    layout: "accordion",
+  }
+
+  const paymentElement = elements.value.create("payment", paymentElementOptions)
+  paymentElement.mount("#payment-element")
+}
+
+async function handleSubmit(e) {
+  e.preventDefault()
+  setLoading(true)
+
+
+
+  const { error } = await stripe.confirmPayment({
+    elements: elements.value,
+    confirmParams: {
+      return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
+    },
+  })
+
+  if (error) {
+ /*   clearInterval(pollTimer)
+    clearTimeout(timeoutTimer)*/
+    if (error.type === "card_error" || error.type === "validation_error") {
+      showMessage(error.message)
+    } else {
+      showMessage("An unexpected error occurred.")
+    }
+    setLoading(false)
+  }
+}
+
+function showMessage(messageText) {
+  paymentMessage.value = messageText
+  setTimeout(() => {
+    paymentMessage.value = ''
+  }, 4000)
+}
+
+function setLoading(loading) {
+  isLoading.value = loading
+  showSpinner.value = loading
+}
+
+
+onUnmounted(()=>{
+  clearTimeout(timeoutTimer)
+  clearInterval(pollTimer)
+
+})
+onMounted(() => {
+  watchWebSocket()
+  initialize()
+  startPolling()
+})
+</script>
+
+<template>
+  <form id="payment-form" @submit="handleSubmit">
+    <div id="payment-element">
+    </div>
+    <button id="submit">
+      <div class="spinner" :class="{ hidden: !showSpinner }" id="spinner"></div>
+      <span id="button-text" :class="{ hidden: showSpinner }">Pay now</span>
+    </button>
+    <div id="payment-message" :class="{ hidden: !paymentMessage }">{{ paymentMessage }}</div>
+  </form>
+</template>
+
+<style scoped>
+* {
+  box-sizing: border-box;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, sans-serif;
+  font-size: 16px;
+  -webkit-font-smoothing: antialiased;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-content: center;
+  height: 100vh;
+  width: 100vw;
+}
+
+form {
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+.hidden {
+  display: none;
+}
+
+#payment-message {
+  color: rgb(105, 115, 134);
+  font-size: 16px;
+  line-height: 20px;
+  padding-top: 12px;
+  text-align: center;
+}
+
+#payment-element {
+  margin-bottom: 24px;
+}
+
+/* Buttons and links */
+button {
+  background: #0055DE;
+  font-family: Arial, sans-serif;
+  color: #ffffff;
+  border-radius: 4px;
+  border: 0;
+  padding: 12px 16px;
+  font-size: 16px;
+  font-weight: 600;
+  cursor: pointer;
+  display: block;
+  transition: all 0.2s ease;
+  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
+  width: 100%;
+}
+button:hover {
+  filter: contrast(115%);
+}
+button:disabled {
+  opacity: 0.5;
+  cursor: default;
+}
+
+/* spinner/processing state, errors */
+.spinner,
+.spinner:before,
+.spinner:after {
+  border-radius: 50%;
+}
+.spinner {
+  color: #ffffff;
+  font-size: 22px;
+  text-indent: -99999px;
+  margin: 0px auto;
+  position: relative;
+  width: 20px;
+  height: 20px;
+  box-shadow: inset 0 0 0 2px;
+  -webkit-transform: translateZ(0);
+  -ms-transform: translateZ(0);
+  transform: translateZ(0);
+}
+.spinner:before,
+.spinner:after {
+  position: absolute;
+  content: "";
+}
+.spinner:before {
+  width: 10.4px;
+  height: 20.4px;
+  background: #0055DE;
+  border-radius: 20.4px 0 0 20.4px;
+  top: -0.2px;
+  left: -0.2px;
+  -webkit-transform-origin: 10.4px 10.2px;
+  transform-origin: 10.4px 10.2px;
+  -webkit-animation: loading 2s infinite ease 1.5s;
+  animation: loading 2s infinite ease 1.5s;
+}
+.spinner:after {
+  width: 10.4px;
+  height: 10.2px;
+  background: #0055DE;
+  border-radius: 0 10.2px 10.2px 0;
+  top: -0.1px;
+  left: 10.2px;
+  -webkit-transform-origin: 0px 10.2px;
+  transform-origin: 0px 10.2px;
+  -webkit-animation: loading 2s infinite ease;
+  animation: loading 2s infinite ease;
+}
+
+/* Payment status page */
+#payment-status {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  flex-direction: column;
+  row-gap: 30px;
+  width: 30vw;
+  min-width: 500px;
+  min-height: 380px;
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  opacity: 0;
+  animation: fadeInAnimation 1s ease forwards;
+}
+
+#status-icon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  height: 40px;
+  width: 40px;
+  border-radius: 50%;
+}
+
+h2 {
+  margin: 0;
+  color: #30313D;
+  text-align: center;
+}
+
+a {
+  text-decoration: none;
+  font-size: 16px;
+  font-weight: 600;
+  font-family: Arial, sans-serif;
+  display: block;
+}
+a:hover {
+  filter: contrast(120%);
+}
+
+#details-table {
+  overflow-x: auto;
+  width: 100%;
+}
+
+table {
+  width: 100%;
+  font-size: 14px;
+  border-collapse: collapse;
+}
+table tbody tr:first-child td {
+  border-top: 1px solid #E6E6E6; /* Top border */
+  padding-top: 10px;
+}
+table tbody tr:last-child td {
+  border-bottom: 1px solid #E6E6E6; /* Bottom border */
+}
+td {
+  padding-bottom: 10px;
+}
+
+.TableContent {
+  text-align: right;
+  color: #6D6E78;
+}
+
+.TableLabel {
+  font-weight: 600;
+  color: #30313D;
+}
+
+#view-details {
+  color: #0055DE;
+}
+
+#retry-button {
+  text-align: center;
+  background: #0055DE;
+  color: #ffffff;
+  border-radius: 4px;
+  border: 0;
+  padding: 12px 16px;
+  transition: all 0.2s ease;
+  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
+  width: 100%;
+}
+
+@-webkit-keyframes loading {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes loading {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes fadeInAnimation {
+  to {
+      opacity: 1;
+  }
+}
+
+@media only screen and (max-width: 600px) {
+  form, #payment-status{
+    width: 80vw;
+    min-width: initial;
+  }
+}
+.hidden {
+  display: none;
+}
+
+form {
+  width:100vw;
+  align-self: center;
+  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
+    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
+  border-radius: 7px;
+  padding: 40px;
+  margin-top: auto;
+  margin-bottom: auto;
+}
+
+/* 其他样式保持不变... */
+</style>
\ No newline at end of file
diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue
index 20f6b08..f58d7d7 100644
--- a/app/pages/payment/index.vue
+++ b/app/pages/payment/index.vue
@@ -4,6 +4,7 @@ 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";
+
 import {message} from "~/components/x-message/useMessage.js";
 const {checkoutSessionUrl,payment,payUid,openRefreshResults}= authStore()
 const payStatus=ref(0)
@@ -48,7 +49,7 @@ const confirmPay=async ()=>{
   checkoutSessionUrl.value=res.data.checkoutSessionUrl
   payUid.value=res.data.payUid
    openRefreshResults()
-  router.push('/payment/checkoutPage')
+  router.push('/checkoutPage')
 }
 }
 const handleInput = (e) => {

From b1d2dc19d22df6a309465b79afa970b3fdf4a010 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 10:36:36 +0800
Subject: [PATCH 15/31] =?UTF-8?q?feat(dev):=20=E6=B7=BB=E5=8A=A0=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=20HTTPS=20=E8=AF=81=E4=B9=A6=E5=B9=B6=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=20Nuxt=20=E6=9C=8D=E5=8A=A1=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增本地 HTTPS 证书文件：localhost.pem 和 localhost-key.pem
- 在 nuxt.config.js 中配置 HTTPS 选项，启用本地 HTTPS
- 优化 checkoutPage 中的支付流程，使用 router.replace 替代 window.location.href
---
 app/pages/checkoutPage/index.vue | 15 +++++++++++++--
 nuxt.config.js                   |  6 ++++++
 ssl/localhost-key.pem            | 28 ++++++++++++++++++++++++++++
 ssl/localhost.pem                | 26 ++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 ssl/localhost-key.pem
 create mode 100644 ssl/localhost.pem

diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
index 819febb..d200f26 100644
--- a/app/pages/checkoutPage/index.vue
+++ b/app/pages/checkoutPage/index.vue
@@ -20,7 +20,7 @@ const isLoading = ref(false)
 const showSpinner = ref(false)
 let pollTimer = null
 let timeoutTimer = null
-
+const router = useRouter()
 const startPolling = () => {
   pollTimer = setInterval(async () => {
     const res = await orderQuery({
@@ -30,7 +30,12 @@ const startPolling = () => {
       if (res.data.status !== 3) {
         clearInterval(pollTimer)
         clearTimeout(timeoutTimer)
-        window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
+        router.replace({
+          path: '/payment/result',
+          query: {
+            orderNo: payUid.value
+          }
+        })
       }
     }
   }, 1000)
@@ -52,6 +57,12 @@ const watchWebSocket = () => {
         })
         ws.onMessage((event) => {
             console.log('支付页面的websocket收到消息', event.data)
+            router.replace({
+          path: '/payment/result',
+          query: {
+            orderNo: payUid.value
+          }
+        })
         })
         ws.onClose(() => {
             console.log('支付页面的websocket连接关闭')
diff --git a/nuxt.config.js b/nuxt.config.js
index 2e45790..04b8a4b 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -1,6 +1,8 @@
 import dotenv from 'dotenv'
 import process from 'node:process'
 import { currentLocales } from './i18n/i18n'
+import fs from 'fs'
+import path from 'path'
 const envFile = process.env.ENV_FILE || '.env.test'
 dotenv.config({ path: `./env/${envFile}` })
 const publicConfig = Object.entries(process.env)
@@ -136,6 +138,10 @@ export default defineNuxtConfig({
   // 指定 Nuxt 应用程序的兼容性日期，确保应用程序在未来的 Nuxt 版本中保持稳定性
   compatibilityDate: '2025-02-28',
   devServer: {
+    https: {
+      key: fs.readFileSync(path.resolve(__dirname, 'ssl/localhost-key.pem')),
+      cert: fs.readFileSync(path.resolve(__dirname, 'ssl/localhost.pem'))
+    },
     host: '0.0.0.0', // Set the host to 'localhost'
     port: 3000,        // Set the port to 3000 or any other port you prefer
   },
diff --git a/ssl/localhost-key.pem b/ssl/localhost-key.pem
new file mode 100644
index 0000000..a475736
--- /dev/null
+++ b/ssl/localhost-key.pem
@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDFtE2AWs1o0X/A
+0+506WAG49xbO3KJQTWKwHl5pfeP0GieVjV3qKXkHXl9Fyhg9oJnCAz2nzxzavAP
+W9NevDbX7KdEiZQjDhpgO+V9IGUqqJKEQnpVk57G3fHBX40nQ4zAQ/S1Vj4Aw9Tk
+iqNFgLRX3HTAT0NO3eXENJbsDdGxtOuLn5h+DWThrqCaUK2Xnkee3eG/VwgKJKVH
+LWuC8xyb1NydtchaRFBjoO9oT6Tb/MGeBOrNH9e7Ndh9mCFepXUhzNxrN1fKjn9s
+107pSEeZb4il2K7GqE0W6r6Y3eeBR2+mEBRqeFnZObT0JkBLI2QIrAwOnFO6ObQC
+ZaEjwHcZAgMBAAECggEASMZB8Ql7qyXS3OwmTqrJSj/+ESck1hlG2DhZfsn1At84
+Y3BgZheSWRHwcndfybFz9vEjtHSRD/tBOqYWfDzUA099kuEBwpWiZ+Ika5bNJpK+
+vCisV2vrelCgeQnvL5DR8sQRA98nG6j6aNYPm7nwqJbh8xg6MoHD3iFtnJ7JnZvQ
+pSa6Z9qq4Po+cp63/U3yEzFeiVVDTMQJMVClANUCX3jLHs8B85WMbb1eKKFe/xCA
+n2BWlFVI7Hld+hxhKWkc71+kafC5hUz1w88FcBaN2W/DAtJgKC0dHYATwLCUGC4Z
+CoCZfB7b3JOzK4mGJ/XxxUcBUk+oweExOrYwCfW4MQKBgQDJbTM4qgW2ca/Xc7cp
+zKvclgtkJ8rWbVZqMYW6fpXoOdhhxjJSx+LfeGk1whz3Xj04EdSZbRI6zYVaHfHa
+HFkA2Na/Wi9hboid4WVXUi5RXzthVTOYi1jAJNmK4R25wuSdcGVoYxSrSLyDcHbx
+MF2cFdQ4A386L+RcoDYzImWCXwKBgQD7RO4DZJgkqDng6YFrYqIdQkJn6keXl4yW
+Hq1FGaa7XDjlun/X2jT0xJJPFcwLQLbWwrkwmUYN/VQEbYwYlyB0MegF9VflfILl
+/leCXC8/9WEknQkPqu8N1JiYhajIKLxfQX35nW/oK+S5prJOBxNw+3Of/S43R5Xe
+60EEI9iphwKBgQCrs/Sn5vd7sKnOpYuLjDcskJMhS3JzGz1AxPpUIbgz/6tenY8k
+VdQl3wUAmHoMvD6/XyO1re6ORcfZLBGQdf3A5RcagwxEp+65dvvmVd256844iGK1
+NIPxNvhilMe8JFCxjLBFLcDeyeA4w1QBAdOqTEldfk2kElM+SiwppraVTQKBgCUP
+O5OgiJgPf8neZsox1/s8xJKTCVAgeAnEKIYijGbh6Tpo0WZCtsDLJVEow9l9B/qQ
+6cNzN9PkYznr9lfCInVAzxnh377nKF9Hrhx6ADYMuPEvgCChc3S0wHTuccBj0bSy
+8iOYxuKVZrzDC1Va0dE+JQWZz/EzS7V/OS2lI9WNAoGBAKujoPDn36/hJ/Zr8XAM
+CEbOi0q0N7I37aRKO8Wm55SCGDYWtBlu+NiIMqk3gzgomtm/cVF+fUNv0BOKc+hx
+x6PQE98AEn5LdGeqLpDY66vhyR8WGUyCBPB+Dn8OFFT+njL2E8NcQi0kS3t/YlR/
+oobyxGhm4M1fM8HtGwqQJX60
+-----END PRIVATE KEY-----
diff --git a/ssl/localhost.pem b/ssl/localhost.pem
new file mode 100644
index 0000000..e173384
--- /dev/null
+++ b/ssl/localhost.pem
@@ -0,0 +1,26 @@
+-----BEGIN CERTIFICATE-----
+MIIEbjCCAtagAwIBAgIRAJjJaJNy+AO5JPuasTslJMQwDQYJKoZIhvcNAQELBQAw
+gZ8xHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9wbWVudCBDQTE6MDgGA1UECwwxREVT
+S1RPUC1DOTVCMVIzXDM3MzYzQERFU0tUT1AtQzk1QjFSMyAo6YKi6Zuo5p2oKTFB
+MD8GA1UEAww4bWtjZXJ0IERFU0tUT1AtQzk1QjFSM1wzNzM2M0BERVNLVE9QLUM5
+NUIxUjMgKOmCoumbqOadqCkwHhcNMjUwMzAyMDIzMzM3WhcNMjcwNjAyMDIzMzM3
+WjBlMScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1lbnQgY2VydGlmaWNhdGUxOjA4
+BgNVBAsMMURFU0tUT1AtQzk1QjFSM1wzNzM2M0BERVNLVE9QLUM5NUIxUjMgKOmC
+oumbqOadqCkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFtE2AWs1o
+0X/A0+506WAG49xbO3KJQTWKwHl5pfeP0GieVjV3qKXkHXl9Fyhg9oJnCAz2nzxz
+avAPW9NevDbX7KdEiZQjDhpgO+V9IGUqqJKEQnpVk57G3fHBX40nQ4zAQ/S1Vj4A
+w9TkiqNFgLRX3HTAT0NO3eXENJbsDdGxtOuLn5h+DWThrqCaUK2Xnkee3eG/VwgK
+JKVHLWuC8xyb1NydtchaRFBjoO9oT6Tb/MGeBOrNH9e7Ndh9mCFepXUhzNxrN1fK
+jn9s107pSEeZb4il2K7GqE0W6r6Y3eeBR2+mEBRqeFnZObT0JkBLI2QIrAwOnFO6
+ObQCZaEjwHcZAgMBAAGjXjBcMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggr
+BgEFBQcDATAfBgNVHSMEGDAWgBQVJpbTujNcXUH/91CnxLerp/gKbDAUBgNVHREE
+DTALgglsb2NhbGhvc3QwDQYJKoZIhvcNAQELBQADggGBAERAae9YDQgjnVtDQUWL
+kIbMowvN6BospgO2srV+aXCDLbB22jnq4cGsTpVjxo80Nl6M0iSRz29K+jy4YFsL
+efTOeks1EpVQB/UnYuo391p5wzevXwa3s7dH7Oc+917y8JDiLNnSVEct+tk4zeOZ
+QbVzx6Gexiii7k1uSG/G1NYrRiXf3ggM93Fyu5NM+u8CzZvWm46ix9reYimVqfPa
+VjHsiQnmKbh+CD6iDWm9y1jUxqBay4cAbo2AVxIvBDdsC9KSCTsbP4hBPx9foy1U
+cLRxUGsWTVPPS2BmP8o6CSa2tNPeVNCWSP89tanY2mzGErfVXLV8t5E4awF0ea+a
+kbjyG3svVC6/rLo8LpFPonr4mQWfGcFntmGUC314d5z1ZCCS5ENEWAGZ3b3XzPsU
+Yh2QQnt4gtvWaTRqwqhSL9DLFp106/tok3hq8MyDFcxTxWKyDZsgaieoRGnF11EW
+tdIqnK9nwVOyAzaO603SuEoMiGBpb9nj/cAFsvm56YUVrg==
+-----END CERTIFICATE-----

From 779dc8435652c8e824d3747c8ec5986b39789883 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 10:58:24 +0800
Subject: [PATCH 16/31] =?UTF-8?q?refactor(websocket):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=20WebSocket=20=E8=BF=9E=E6=8E=A5=E5=92=8C=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 checkoutPage 中添加全局 WebSocket 客户端实例
- 移除 payment 中的 openRefreshResults 函数
- 更新 authStore，移除不再使用的 openRefreshResults
- 优化 WebSocketClient 类，移除冗余的 token 参数
- 在 nuxt.config.js 中添加 SSL 证书加载逻辑
---
 app/pages/checkoutPage/index.vue |  4 +++-
 app/pages/payment/index.vue      |  3 +--
 app/stores/auth/index.js         | 20 --------------------
 app/utils/websocket.ts           |  5 +----
 nuxt.config.js                   | 24 ++++++++++++++++++------
 5 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
index d200f26..7479981 100644
--- a/app/pages/checkoutPage/index.vue
+++ b/app/pages/checkoutPage/index.vue
@@ -45,8 +45,9 @@ const startPolling = () => {
     setLoading(false)
   }, 180000)*/
 }
+let wsClient=null
 const watchWebSocket = () => {
-  const wsClient = new WebSocketClient(
+   wsClient = new WebSocketClient(
     config.public.NUXT_PUBLIC_SOCKET_URL
   )
   const ws = wsClient.connect('/api/v1/order/ws/v2', {
@@ -124,6 +125,7 @@ function setLoading(loading) {
 
 
 onUnmounted(()=>{
+  wsClient.disconnect()
   clearTimeout(timeoutTimer)
   clearInterval(pollTimer)
 
diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue
index f58d7d7..ebe2044 100644
--- a/app/pages/payment/index.vue
+++ b/app/pages/payment/index.vue
@@ -6,7 +6,7 @@ import { showLoadingToast ,closeToast} from 'vant';
 import {authStore} from "~/stores/auth/index.js";
 
 import {message} from "~/components/x-message/useMessage.js";
-const {checkoutSessionUrl,payment,payUid,openRefreshResults}= authStore()
+const {checkoutSessionUrl,payment,payUid}= authStore()
 const payStatus=ref(0)
 definePageMeta({
   i18n: 'payment.title'
@@ -48,7 +48,6 @@ const confirmPay=async ()=>{
 
   checkoutSessionUrl.value=res.data.checkoutSessionUrl
   payUid.value=res.data.payUid
-   openRefreshResults()
   router.push('/checkoutPage')
 }
 }
diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js
index 22882ca..5b1ca8b 100644
--- a/app/stores/auth/index.js
+++ b/app/stores/auth/index.js
@@ -18,27 +18,7 @@ export const authStore = createGlobalState(() => {
     const router=useRouter()
     const config = useRuntimeConfig()
 const payUid=useLocalStorage('payUid','')
-    const openRefreshResults=()=>{
-        const wsClient = new WebSocketClient(
-            config.public.NUXT_PUBLIC_SOCKET_URL,
-            token.value
-        )
-        const ws = wsClient.connect('/api/v1/order/ws',{
-            payUid:payUid.value
-        })
-        ws.onMessage((data) => {
-            console.log('openRefreshResults',data)
-            router.push({
-                path:'/payment/result',
-                query:{
-                    orderNo:payUid.value
-                }
-            })
-        })
-    }
-
     return{
-        openRefreshResults,
         payUid,
         selectedZone,
         payment,
diff --git a/app/utils/websocket.ts b/app/utils/websocket.ts
index f6be471..ed7014e 100644
--- a/app/utils/websocket.ts
+++ b/app/utils/websocket.ts
@@ -1,11 +1,9 @@
 export class WebSocketClient {
     private socket: WebSocket | null = null
     private baseUrl: string
-    private token: string
 
     constructor(baseUrl: string, token: string) {
         this.baseUrl = baseUrl
-        this.token = token
     }
 
     connect(path: string, params: Record<string, any> = {}) {
@@ -14,7 +12,6 @@ export class WebSocketClient {
 
         // 构建参数对象，自动添加 token
         const queryParams = {
-            token: this.token,
             ...params
         }
 
@@ -33,7 +30,7 @@ export class WebSocketClient {
             },
             onMessage: (callback: (data: any) => void) => {
                 this.socket!.onmessage = (event) => {
-
+                    console.log('websocket收到消息', event)
                     try {
                         const data = JSON.parse(event.data)
 
diff --git a/nuxt.config.js b/nuxt.config.js
index 04b8a4b..1c861d7 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -12,6 +12,21 @@ const publicConfig = Object.entries(process.env)
       return config
     }, {})
 
+let httpsOptions = {}
+
+try {
+  // 读取文件并转换为字符串
+  const key = fs.readFileSync(path.resolve(__dirname, 'ssl/localhost-key.pem'), 'utf-8')
+  const cert = fs.readFileSync(path.resolve(__dirname, 'ssl/localhost.pem'), 'utf-8')
+  
+  httpsOptions = { key, cert }
+  console.log('SSL证书加载成功')
+} catch (error) {
+  console.error('SSL证书加载失败:', error)
+  // 失败时使用HTTP
+  httpsOptions = false
+}
+
 export default defineNuxtConfig({
   modules: [
     '@vant/nuxt',
@@ -138,11 +153,8 @@ export default defineNuxtConfig({
   // 指定 Nuxt 应用程序的兼容性日期，确保应用程序在未来的 Nuxt 版本中保持稳定性
   compatibilityDate: '2025-02-28',
   devServer: {
-    https: {
-      key: fs.readFileSync(path.resolve(__dirname, 'ssl/localhost-key.pem')),
-      cert: fs.readFileSync(path.resolve(__dirname, 'ssl/localhost.pem'))
-    },
-    host: '0.0.0.0', // Set the host to 'localhost'
-    port: 3000,        // Set the port to 3000 or any other port you prefer
+    https: httpsOptions,
+    host: '0.0.0.0',
+    port: 3000,
   },
 })
\ No newline at end of file

From a0d3b2b329f5b98d2b28ae19836d4af03ac1f3ed Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 11:09:06 +0800
Subject: [PATCH 17/31] 123

---
 app/components/AppHeader.vue                   |  2 +-
 app/components/StripeCheckout.vue              |  4 ----
 app/components/floatingBubble/floating.js      |  7 ++-----
 .../liveMinWindow/createMinWindow.js           |  1 -
 app/pages/artDetail/index.vue                  |  6 ++----
 app/pages/checkoutPage/index.vue               | 11 ++++-------
 .../mine/components/codeCard/index.vue         |  1 -
 app/pages/collectCode/mine/index.vue           |  1 -
 .../collectCode/payment/checkoutPage/index.vue |  4 ++--
 app/pages/collectCode/payment/index.vue        |  2 +-
 .../collectCode/signature/protocol/index.vue   |  3 +--
 app/pages/countryRegion/index.vue              |  2 --
 .../liveRoom/components/PaymentInput/index.vue |  2 --
 .../liveRoom/components/SideButton/index.vue   |  5 +----
 .../components/SideButton/tangPopup.vue        |  3 +--
 app/pages/liveRoom/index.client.vue            |  7 ++-----
 app/pages/login/index.vue                      |  5 +----
 app/pages/payment/checkoutPage/index.vue       |  4 ++--
 app/pages/payment/index.vue                    |  2 +-
 app/pages/profile/index.vue                    |  3 +--
 app/pages/signature/protocol/index.vue         |  3 +--
 app/stores/goods/index.js                      |  7 ++-----
 app/stores/live/index.js                       | 18 +++++-------------
 app/utils/websocket.ts                         |  4 +---
 nuxt.config.js                                 |  4 +---
 server/middleware/stripe.ts                    |  1 -
 26 files changed, 32 insertions(+), 80 deletions(-)

diff --git a/app/components/AppHeader.vue b/app/components/AppHeader.vue
index 3164524..86c38dc 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/components/StripeCheckout.vue b/app/components/StripeCheckout.vue
index 7af9d93..84d853b 100644
--- a/app/components/StripeCheckout.vue
+++ b/app/components/StripeCheckout.vue
@@ -29,7 +29,6 @@ onMounted(async () => {
     stripe.value = window.Stripe("pk_test_51QfbSAAB1Vm8VfJq3AWsR4k2mZjnlF7XFrmlbc6XVXrtwXquAUfwzZmOFDbxMIAwqJBgqao8KLt2wmPc4vNOCTeo00WB78KtfV")
     await initialize()
   } catch (error) {
-    console.error('Stripe initialization error:', error)
     showMessage("Failed to initialize payment system")
   }
 })
@@ -67,14 +66,12 @@ const initialize = async () => {
       throw new Error("Payment element mount point not found")
     }
   } catch (error) {
-    console.error('Payment Element initialization error:', error)
     showMessage("Failed to load payment form")
   }
 }
 
 const handleSubmit = async () => {
   if (!stripe.value || !elements.value) {
-    console.error('Stripe or Elements not initialized')
     showMessage("Payment system not initialized")
     return
   }
@@ -97,7 +94,6 @@ const handleSubmit = async () => {
       }
     }
   } catch (e) {
-    console.error('Payment confirmation error:', e)
     showMessage("Payment processing failed")
   } finally {
     setLoading(false)
diff --git a/app/components/floatingBubble/floating.js b/app/components/floatingBubble/floating.js
index c68d333..c2eace1 100644
--- a/app/components/floatingBubble/floating.js
+++ b/app/components/floatingBubble/floating.js
@@ -18,7 +18,6 @@ let container = null        // DOM容器元素
  */
 export const showMinWindow1 = (props = {}) => {
     // 服务端渲染时直接返回
-    console.log('!process.client',!process.client)
     if (!process.client) return null
 
     // 如果实例已存在，避免重复创建
@@ -60,7 +59,6 @@ export const showMinWindow1 = (props = {}) => {
         
         return minWindowInstance
     } catch (error) {
-        console.error('创建浮动气泡时发生错误:', error)
         // 发生错误时确保清理资源
         hideMinWindow1()
         return null
@@ -72,7 +70,7 @@ export const showMinWindow1 = (props = {}) => {
  * 清理所有相关资源和DOM元素
  */
 export const hideMinWindow1 = () => {
-    console.log('!minWindowApp && !container', !minWindowApp && !container);
+    
     
     if (!minWindowApp && !container) return
 
@@ -93,8 +91,7 @@ export const hideMinWindow1 = () => {
             document.body.removeChild(existingContainer)
         }
     } catch (error) {
-        console.error('清理浮动气泡时发生错误:', error)
-    } finally {
+        } finally {
         // 重置所有状态
         minWindowApp = null
         minWindowInstance = null
diff --git a/app/components/liveMinWindow/createMinWindow.js b/app/components/liveMinWindow/createMinWindow.js
index 00b0e6d..ece21af 100644
--- a/app/components/liveMinWindow/createMinWindow.js
+++ b/app/components/liveMinWindow/createMinWindow.js
@@ -28,7 +28,6 @@ export const showMinWindow = (snapshot, props = {}) => {
   })
 
   app.config.errorHandler = (err) => {
-    console.error('MinWindow Error:', err)
     hideMinWindow()
   }
 
diff --git a/app/pages/artDetail/index.vue b/app/pages/artDetail/index.vue
index bda1817..7039a28 100644
--- a/app/pages/artDetail/index.vue
+++ b/app/pages/artDetail/index.vue
@@ -15,8 +15,7 @@ const initData = async () => {
   const res = await userArtwork({uuid})
   if (res.status === 0) {
     detail.value = res.data
-    console.log('detail',detail.value)
-  }
+    }
 }
 const router = useRouter();
 const position = ref({x: window?.innerWidth - 120 || 0, y: 240})
@@ -59,8 +58,7 @@ const goPay=()=>{
   }else if (detail.value.status===4){
     router.push('/payment')
   }
-  console.log('detail',detail.value)
-//router.push('/payment')
+  //router.push('/payment')
 }
 onMounted(() => {
   document.addEventListener('mousemove', onDrag)
diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
index 7479981..6e085ca 100644
--- a/app/pages/checkoutPage/index.vue
+++ b/app/pages/checkoutPage/index.vue
@@ -9,7 +9,7 @@ definePageMeta({
   layout: 'default',
   title: 'Stripe支付'
 })
-console.log('config.public.NUXT_PUBLIC_PKEY',config.public.NUXT_PUBLIC_PKEY);
+
 const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
 
 const baseURL = config.public.NUXT_PUBLIC_API_BASE
@@ -54,10 +54,8 @@ const watchWebSocket = () => {
     PayUid: payUid.value,
   })
   ws.onOpen(() => {
-            console.log('支付页面的websocket连接成功')
-        })
+            })
         ws.onMessage((event) => {
-            console.log('支付页面的websocket收到消息', event.data)
             router.replace({
           path: '/payment/result',
           query: {
@@ -66,12 +64,11 @@ const watchWebSocket = () => {
         })
         })
         ws.onClose(() => {
-            console.log('支付页面的websocket连接关闭')
-        })
+            })
 }
 async function initialize() {
   const clientSecret = checkoutSessionUrl.value
-  console.log('clientSecret',clientSecret);
+
   
   const appearance = {
     theme: 'stripe',
diff --git a/app/pages/collectCode/mine/components/codeCard/index.vue b/app/pages/collectCode/mine/components/codeCard/index.vue
index b90325f..b8c851b 100644
--- a/app/pages/collectCode/mine/components/codeCard/index.vue
+++ b/app/pages/collectCode/mine/components/codeCard/index.vue
@@ -33,7 +33,6 @@ const getQRBase64 = async () => {
       errorCorrectionLevel: 'H'
     })
   } catch (err) {
-    console.error('生成二维码失败:', err)
     return null
   }
 }
diff --git a/app/pages/collectCode/mine/index.vue b/app/pages/collectCode/mine/index.vue
index 0e7cd78..194cb13 100644
--- a/app/pages/collectCode/mine/index.vue
+++ b/app/pages/collectCode/mine/index.vue
@@ -30,7 +30,6 @@ const initData = async () => {
 }
 const show=ref(false)
 const close=()=>{
-  console.log('show',show.value)
   show.value=false
 }
 const logOut=()=>{
diff --git a/app/pages/collectCode/payment/checkoutPage/index.vue b/app/pages/collectCode/payment/checkoutPage/index.vue
index 08bebd9..fe50217 100644
--- a/app/pages/collectCode/payment/checkoutPage/index.vue
+++ b/app/pages/collectCode/payment/checkoutPage/index.vue
@@ -10,7 +10,7 @@ definePageMeta({
   layout: 'default',
   title: 'Stripe支付'
 })
-console.log('config.public.NUXT_PUBLIC_PKEY',config.public.NUXT_PUBLIC_PKEY);
+
 const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
 
 const baseURL = config.public.NUXT_PUBLIC_API_BASE
@@ -22,7 +22,7 @@ const showSpinner = ref(false)
 
 async function initialize() {
   const clientSecret = codePKey.value
-  console.log('clientSecret',clientSecret);
+
   
   const appearance = {
     theme: 'stripe',
diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index c79a8b2..f830004 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -45,7 +45,7 @@ const confirmPay = async () => {
     codePayUid.value=res.data.payUid
     router.push('/collectCode/payment/checkoutPage')
   //  window.location.href = res.data.checkoutSessionUrl
-  console.log('res',res);
+
   
   }
 }
diff --git a/app/pages/collectCode/signature/protocol/index.vue b/app/pages/collectCode/signature/protocol/index.vue
index 0da1337..4af944b 100644
--- a/app/pages/collectCode/signature/protocol/index.vue
+++ b/app/pages/collectCode/signature/protocol/index.vue
@@ -39,8 +39,7 @@ const fetchPmblPdf = async () => {
     })
     pmblUrl.value = res.data?.viewUrl // 假设接口返回的PDF URL在data字段中
   } catch (error) {
-    console.error('获取拍卖笔录失败:', error)
-  }
+    }
 }
 
 // 监听折叠面板变化
diff --git a/app/pages/countryRegion/index.vue b/app/pages/countryRegion/index.vue
index 8edf7ef..36f42bf 100644
--- a/app/pages/countryRegion/index.vue
+++ b/app/pages/countryRegion/index.vue
@@ -8,7 +8,6 @@ definePageMeta({
   i18n: 'countryRegion.title',
 })
 const router = useRouter()
-console.log('router',router)
 const { t, locale } = useI18n()
 const value = ref('');
 const alphabet = computed(() => {
@@ -144,7 +143,6 @@ const handleCountrySelect = (country) => {
 }
 
 initData()
-console.log('searchCountry',searchCountry.value)
 // 监听语言变化，重新初始化数据
 watch(locale, () => {
   initData()
diff --git a/app/pages/liveRoom/components/PaymentInput/index.vue b/app/pages/liveRoom/components/PaymentInput/index.vue
index 01848d2..bd41f06 100644
--- a/app/pages/liveRoom/components/PaymentInput/index.vue
+++ b/app/pages/liveRoom/components/PaymentInput/index.vue
@@ -30,7 +30,6 @@ const captureVideoFrame = () => {
   try {
     const video = document.querySelector('#J_prismPlayer video')
     if (!video) {
-      console.error('未找到视频元素')
       return null
     }
 
@@ -42,7 +41,6 @@ const captureVideoFrame = () => {
     ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
     return canvas.toDataURL('image/jpeg', 0.9)
   } catch (error) {
-    console.error('获取视频截图失败:', error)
     return null
   }
 }
diff --git a/app/pages/liveRoom/components/SideButton/index.vue b/app/pages/liveRoom/components/SideButton/index.vue
index 9438ac4..06c1c34 100644
--- a/app/pages/liveRoom/components/SideButton/index.vue
+++ b/app/pages/liveRoom/components/SideButton/index.vue
@@ -118,7 +118,6 @@ const captureVideoFrame = () => {
   try {
     const video = document.querySelector('#J_prismPlayer video')
     if (!video) {
-      console.error('未找到视频元素')
       return null
     }
 
@@ -130,7 +129,6 @@ const captureVideoFrame = () => {
     ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
     return canvas.toDataURL('image/jpeg', 0.9)
   } catch (error) {
-    console.error('获取视频截图失败:', error)
     return null
   }
 }
@@ -144,8 +142,7 @@ const handleCapture = () => {
       onClick:()=>{
         router.replace('/')
         fullLive.value=true
-        console.log('执行')
-      }
+        }
     })*!/
   }*/
   showMinWindow1({
diff --git a/app/pages/liveRoom/components/SideButton/tangPopup.vue b/app/pages/liveRoom/components/SideButton/tangPopup.vue
index 4aaaa00..873fff9 100644
--- a/app/pages/liveRoom/components/SideButton/tangPopup.vue
+++ b/app/pages/liveRoom/components/SideButton/tangPopup.vue
@@ -66,8 +66,7 @@ const loadMore = async () => {
 watch(()=>{
   return auctionData.value?.artwork?.index
 },(newValue)=>{
-  console.log('newValue',newValue)
-})
+  })
 watch(()=>props.show,(newValue)=>{
   if (newValue){
  nextTick(()=>{
diff --git a/app/pages/liveRoom/index.client.vue b/app/pages/liveRoom/index.client.vue
index 3ffdfb7..161761b 100644
--- a/app/pages/liveRoom/index.client.vue
+++ b/app/pages/liveRoom/index.client.vue
@@ -19,7 +19,6 @@ const player = ref(null)
 const {quoteStatus, show, playerId, show1, auctionData, getSocketData, getLiveLink, fullLive} = liveStore()
 const pullLink = ref('')
 const handlePlayerError = (error) => {
-  console.error('播放器错误:', error)
   showConfirmDialog({
     message: t('live_room.error_mess'),
     showCancelButton: true
@@ -81,8 +80,7 @@ const initializePlayer = async () => {
 
     })
     player.value.on('loading', () => {
-      console.log('loading')
-    })
+      })
     player.value.on('error', handlePlayerError)
   } catch (error) {
     showConfirmDialog({
@@ -92,8 +90,7 @@ const initializePlayer = async () => {
      initializePlayer()
     }).catch(() => {
     })
-    console.error('播放器初始化失败:', error)
-  }
+    }
 }
 
 
diff --git a/app/pages/login/index.vue b/app/pages/login/index.vue
index b6ee53a..0fba9fd 100644
--- a/app/pages/login/index.vue
+++ b/app/pages/login/index.vue
@@ -44,7 +44,6 @@ const showKeyboard = ref(false);
 // 根据语言获取默认国家
 const getDefaultCountry = () => {
   let defaultCode = 'CN' // 默认中国大陆
-  console.log('locale.value',locale.value)
   switch (locale.value) {
     case 'zh-CN':
       defaultCode = 'CN'
@@ -74,7 +73,6 @@ const defaultCountry = getDefaultCountry()
 
 
 const selectedCountry = ref(route.query.countryName || defaultCountry.name)
-console.log('selectedCountry',selectedCountry.value)
 onMounted(()=>{
   selectedZone.value=route.query.zone || defaultCountry.zone
 })
@@ -136,8 +134,7 @@ const goLogin =async () => {
       if (res1.status===0){
         window.location.href=res1.data.h5Url
       }
-      console.log('123')
-    }else {
+      }else {
       await router.push('/');
     }
   }
diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
index 08ddea6..f4251e3 100644
--- a/app/pages/payment/checkoutPage/index.vue
+++ b/app/pages/payment/checkoutPage/index.vue
@@ -9,7 +9,7 @@ definePageMeta({
   layout: 'default',
   title: 'Stripe支付'
 })
-console.log('config.public.NUXT_PUBLIC_PKEY',config.public.NUXT_PUBLIC_PKEY);
+
 const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
 
 const baseURL = config.public.NUXT_PUBLIC_API_BASE
@@ -21,7 +21,7 @@ const showSpinner = ref(false)
 
 async function initialize() {
   const clientSecret = checkoutSessionUrl.value
-  console.log('clientSecret',clientSecret);
+
   
   const appearance = {
     theme: 'stripe',
diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue
index ebe2044..2e4e4a2 100644
--- a/app/pages/payment/index.vue
+++ b/app/pages/payment/index.vue
@@ -39,7 +39,7 @@ const confirmPay=async ()=>{
    testReturnHost:window.location.origin,
    testReturnEndPoint:'/payment/result'
  })
- console.log('res',res);
+
  if (res.status===0){
 
   // if (res.status===0){
diff --git a/app/pages/profile/index.vue b/app/pages/profile/index.vue
index 9cd81b8..20cdfbd 100644
--- a/app/pages/profile/index.vue
+++ b/app/pages/profile/index.vue
@@ -37,8 +37,7 @@ const fetchData = async () => {
       showMyList.value = groupByDate(res.data.data)
     }
   } catch (error) {
-    console.error('获取数据失败:', error)
-  }
+    }
 }
 
 const onRefresh = async () => {
diff --git a/app/pages/signature/protocol/index.vue b/app/pages/signature/protocol/index.vue
index 27e1dc8..b95a797 100644
--- a/app/pages/signature/protocol/index.vue
+++ b/app/pages/signature/protocol/index.vue
@@ -33,8 +33,7 @@ const fetchPmblPdf = async () => {
     })
     pmblUrl.value = res.data?.viewUrl // 假设接口返回的PDF URL在data字段中
   } catch (error) {
-    console.error('获取拍卖笔录失败:', error)
-  }
+    }
 }
 
 // 监听折叠面板变化
diff --git a/app/stores/goods/index.js b/app/stores/goods/index.js
index 3c1373c..ae0d219 100644
--- a/app/stores/goods/index.js
+++ b/app/stores/goods/index.js
@@ -34,8 +34,7 @@ export const goodStore = createGlobalState(() => {
                 auctionDetail.value = res.data
             }
         } catch (err) {
-            console.error('获取拍卖详情错误:', err)
-        } finally {
+            } finally {
             loading.value = false
         }
     }
@@ -69,7 +68,6 @@ export const goodStore = createGlobalState(() => {
             }
             return { finished: true, items: [] }
         } catch (err) {
-            console.error('获取艺术品列表错误:', err)
             return { finished: true, items: [] }
         } finally {
             loading.value = false
@@ -85,8 +83,7 @@ export const goodStore = createGlobalState(() => {
                 artWorkDetail.value = res.data
             }
         } catch (err) {
-            console.error('获取艺术品详情错误:', err)
-        } finally {
+            } finally {
             loading.value = false
         }
     }
diff --git a/app/stores/live/index.js b/app/stores/live/index.js
index 2eefb0f..131b580 100644
--- a/app/stores/live/index.js
+++ b/app/stores/live/index.js
@@ -197,12 +197,10 @@ export const liveStore = createGlobalState(() => {
 
         // WebSocket 事件处理
         ws.onOpen(() => {
-            console.log('WebSocket connected')
-        })
+            })
 
         ws.onMessage((data) => {
             auctionData.value = data.data
-            console.log(' auctionData.value', auctionData.value)
             const { wsType, tip } = data.data || {}
 
             switch (wsType) {
@@ -210,13 +208,11 @@ export const liveStore = createGlobalState(() => {
                     handleTipMessage(tip?.tipType)
                     break
                 case WS_TYPES.STOP_ARTWORK:
-                    console.log('changeQuote',quoteStatus.value)
                     //quoteStatus.value = false
                     break
                 case WS_TYPES.OVER:
 
                     quoteStatus.value = false
-                    console.log('changeQuote',quoteStatus.value)
                     message.success(createMessageConfig(
                         t('live_room.text10'),
                         '#575757',
@@ -230,16 +226,13 @@ export const liveStore = createGlobalState(() => {
                     break
             }
 
-            console.log('onmessage', data)
-        })
+            })
 
         ws.onClose(() => {
-            console.log('WebSocket disconnected')
-        })
+            })
 
         ws.onError((error) => {
-            console.error('WebSocket error:', error)
-        })
+            })
     }
     const changeStatus = () => {
         if (auctionData.value.artwork?.isSelling&&!auctionData.value.artwork.isSoled){
@@ -249,8 +242,7 @@ export const liveStore = createGlobalState(() => {
                 quoteStatus.value = false
             }
         }
-        console.log('changeQuote',quoteStatus.value)
-    }
+        }
     return{
         fullLive,
         isMinWindow,
diff --git a/app/utils/websocket.ts b/app/utils/websocket.ts
index ed7014e..e8d907e 100644
--- a/app/utils/websocket.ts
+++ b/app/utils/websocket.ts
@@ -30,14 +30,12 @@ export class WebSocketClient {
             },
             onMessage: (callback: (data: any) => void) => {
                 this.socket!.onmessage = (event) => {
-                    console.log('websocket收到消息', event)
                     try {
                         const data = JSON.parse(event.data)
 
                         callback(data)
                     } catch (error) {
-                        console.error('解析消息失败:', error)
-                    }
+                        }
                 }
             },
             onClose: (callback: () => void) => {
diff --git a/nuxt.config.js b/nuxt.config.js
index 1c861d7..ad8ace6 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -20,9 +20,7 @@ try {
   const cert = fs.readFileSync(path.resolve(__dirname, 'ssl/localhost.pem'), 'utf-8')
   
   httpsOptions = { key, cert }
-  console.log('SSL证书加载成功')
-} catch (error) {
-  console.error('SSL证书加载失败:', error)
+  } catch (error) {
   // 失败时使用HTTP
   httpsOptions = false
 }
diff --git a/server/middleware/stripe.ts b/server/middleware/stripe.ts
index 050c241..ab6612d 100644
--- a/server/middleware/stripe.ts
+++ b/server/middleware/stripe.ts
@@ -16,7 +16,6 @@ export default defineEventHandler(async (event) => {
         clientSecret: `pi_${Math.random().toString(36).substring(2)}_secret_${Math.random().toString(36).substring(2)}`
       }
     } catch (error) {
-      console.error('Create payment intent error:', error)
       throw createError({
         statusCode: 500,
         message: '创建支付意向失败'

From e7cd4ff9ba10aca5baef9c4310d19cdd60372198 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 11:19:45 +0800
Subject: [PATCH 18/31] =?UTF-8?q?refactor(payment):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E6=94=AF=E4=BB=98=E6=B5=81=E7=A8=8B=E5=92=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除 authStore 中的 payUid 和 checkoutSessionUrl
- 更新 checkoutPage 组件，使用路由参数传递支付相关信息- 修改 payment 页面逻辑，适应新的支付流程
- 删除未使用的 payment/checkoutPage 组件
---
 app/pages/checkoutPage/index.vue         |  21 +-
 app/pages/collectCode/payment/index.vue  |  12 +-
 app/pages/payment/checkoutPage/index.vue | 373 -----------------------
 app/pages/payment/index.vue              |  14 +-
 app/stores/auth/index.js                 |   2 -
 5 files changed, 27 insertions(+), 395 deletions(-)
 delete mode 100644 app/pages/payment/checkoutPage/index.vue

diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
index 6e085ca..4b871c7 100644
--- a/app/pages/checkoutPage/index.vue
+++ b/app/pages/checkoutPage/index.vue
@@ -3,7 +3,6 @@ import { onMounted, ref } from 'vue'
 import {authStore} from "~/stores/auth/index.js";
 import {orderQuery} from "~/api/goods/index.js";
 import { WebSocketClient } from '@/utils/websocket'
-const {checkoutSessionUrl,payUid}= authStore()
 const config = useRuntimeConfig()
 definePageMeta({
   layout: 'default',
@@ -11,7 +10,7 @@ definePageMeta({
 })
 
 const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
-
+const route = useRoute()
 const baseURL = config.public.NUXT_PUBLIC_API_BASE
 const items = [{ id: "xl-tshirt", amount: 1000 }]
 const elements = ref(null)
@@ -24,16 +23,16 @@ const router = useRouter()
 const startPolling = () => {
   pollTimer = setInterval(async () => {
     const res = await orderQuery({
-      orderNo: payUid.value
+      orderNo: route.query.payUid
     })
     if (res.status === 0) {
       if (res.data.status !== 3) {
         clearInterval(pollTimer)
         clearTimeout(timeoutTimer)
         router.replace({
-          path: '/payment/result',
+          path: route.query.returnUrl,
           query: {
-            orderNo: payUid.value
+            orderNo: route.query.payUid
           }
         })
       }
@@ -51,15 +50,15 @@ const watchWebSocket = () => {
     config.public.NUXT_PUBLIC_SOCKET_URL
   )
   const ws = wsClient.connect('/api/v1/order/ws/v2', {
-    PayUid: payUid.value,
+    PayUid: route.query.payUid,
   })
   ws.onOpen(() => {
             })
         ws.onMessage((event) => {
             router.replace({
-          path: '/payment/result',
+          path: route.query.returnUrl,
           query: {
-            orderNo: payUid.value
+            orderNo: route.query.payUid
           }
         })
         })
@@ -67,9 +66,7 @@ const watchWebSocket = () => {
             })
 }
 async function initialize() {
-  const clientSecret = checkoutSessionUrl.value
-
-  
+  const clientSecret = route.query.stripeKey
   const appearance = {
     theme: 'stripe',
   }
@@ -92,7 +89,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}/payment/result?orderNo=${route.query.payUid}`,
     },
   })
 
diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index f830004..28f5b91 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -43,8 +43,16 @@ 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
+    checkoutSessionUrl.value=res.data.checkoutSessionUrl
+    payUid.value=res.data.payUid
+    router.push({
+      path:'/checkoutPage',
+      query:{
+        payUid:res.data.payUid,
+        returnUrl:'/collectCode/payment/result',
+        stripeKey:res.data.checkoutSessionUrl
+      }
+    })
 
   
   }
diff --git a/app/pages/payment/checkoutPage/index.vue b/app/pages/payment/checkoutPage/index.vue
deleted file mode 100644
index f4251e3..0000000
--- a/app/pages/payment/checkoutPage/index.vue
+++ /dev/null
@@ -1,373 +0,0 @@
-<script setup>
-import { onMounted, ref } from 'vue'
-import {authStore} from "~/stores/auth/index.js";
-import {useRuntimeConfig} from "#app";
-import {orderQuery} from "~/api/goods/index.js";
-const {checkoutSessionUrl,payUid}= authStore()
-const config = useRuntimeConfig()
-definePageMeta({
-  layout: 'default',
-  title: 'Stripe支付'
-})
-
-const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
-
-const baseURL = config.public.NUXT_PUBLIC_API_BASE
-const items = [{ id: "xl-tshirt", amount: 1000 }]
-const elements = ref(null)
-const paymentMessage = ref('')
-const isLoading = ref(false)
-const showSpinner = ref(false)
-
-async function initialize() {
-  const clientSecret = checkoutSessionUrl.value
-
-  
-  const appearance = {
-    theme: 'stripe',
-  }
-  elements.value = stripe.elements({ appearance, clientSecret })
-
-  const paymentElementOptions = {
-    layout: "accordion",
-  }
-
-  const paymentElement = elements.value.create("payment", paymentElementOptions)
-  paymentElement.mount("#payment-element")
-}
-
-async function handleSubmit(e) {
-  e.preventDefault()
-  setLoading(true)
-
-  let pollTimer = null
-  let timeoutTimer = null
-
-  const startPolling = () => {
-    pollTimer = setInterval(async () => {
-      const res = await orderQuery({
-        orderNo: payUid.value
-      })
-      if (res.status === 0) {
-        if (res.data.status !== 3) {
-          clearInterval(pollTimer)
-          clearTimeout(timeoutTimer)
-          window.location.href = `${baseURL}/payment/result?orderNo=${payUid.value}`
-        }
-      }
-    }, 1000)
-
-    timeoutTimer = setTimeout(() => {
-      clearInterval(pollTimer)
-      showMessage('支付超时，请重试')
-      setLoading(false)
-    }, 180000) // 3分钟超时
-  }
-
-  startPolling()
-
-  const { error } = await stripe.confirmPayment({
-    elements: elements.value,
-    confirmParams: {
-      return_url: `${baseURL}/payment/result?orderNo=${payUid.value}`,
-    },
-  })
-
-  if (error) {
-    clearInterval(pollTimer)
-    clearTimeout(timeoutTimer)
-    if (error.type === "card_error" || error.type === "validation_error") {
-      showMessage(error.message)
-    } else {
-      showMessage("An unexpected error occurred.")
-    }
-    setLoading(false)
-  }
-}
-
-function showMessage(messageText) {
-  paymentMessage.value = messageText
-  setTimeout(() => {
-    paymentMessage.value = ''
-  }, 4000)
-}
-
-function setLoading(loading) {
-  isLoading.value = loading
-  showSpinner.value = loading
-}
-
-onMounted(() => {
-  initialize()
-})
-</script>
-
-<template>
-  <form id="payment-form" @submit="handleSubmit">
-    <div id="payment-element">
-    </div>
-    <button id="submit">
-      <div class="spinner" :class="{ hidden: !showSpinner }" id="spinner"></div>
-      <span id="button-text" :class="{ hidden: showSpinner }">Pay now</span>
-    </button>
-    <div id="payment-message" :class="{ hidden: !paymentMessage }">{{ paymentMessage }}</div>
-  </form>
-</template>
-
-<style scoped>
-* {
-  box-sizing: border-box;
-}
-
-body {
-  font-family: -apple-system, BlinkMacSystemFont, sans-serif;
-  font-size: 16px;
-  -webkit-font-smoothing: antialiased;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-content: center;
-  height: 100vh;
-  width: 100vw;
-}
-
-form {
-  align-self: center;
-  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
-    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
-  border-radius: 7px;
-  padding: 40px;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-.hidden {
-  display: none;
-}
-
-#payment-message {
-  color: rgb(105, 115, 134);
-  font-size: 16px;
-  line-height: 20px;
-  padding-top: 12px;
-  text-align: center;
-}
-
-#payment-element {
-  margin-bottom: 24px;
-}
-
-/* Buttons and links */
-button {
-  background: #0055DE;
-  font-family: Arial, sans-serif;
-  color: #ffffff;
-  border-radius: 4px;
-  border: 0;
-  padding: 12px 16px;
-  font-size: 16px;
-  font-weight: 600;
-  cursor: pointer;
-  display: block;
-  transition: all 0.2s ease;
-  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
-  width: 100%;
-}
-button:hover {
-  filter: contrast(115%);
-}
-button:disabled {
-  opacity: 0.5;
-  cursor: default;
-}
-
-/* spinner/processing state, errors */
-.spinner,
-.spinner:before,
-.spinner:after {
-  border-radius: 50%;
-}
-.spinner {
-  color: #ffffff;
-  font-size: 22px;
-  text-indent: -99999px;
-  margin: 0px auto;
-  position: relative;
-  width: 20px;
-  height: 20px;
-  box-shadow: inset 0 0 0 2px;
-  -webkit-transform: translateZ(0);
-  -ms-transform: translateZ(0);
-  transform: translateZ(0);
-}
-.spinner:before,
-.spinner:after {
-  position: absolute;
-  content: "";
-}
-.spinner:before {
-  width: 10.4px;
-  height: 20.4px;
-  background: #0055DE;
-  border-radius: 20.4px 0 0 20.4px;
-  top: -0.2px;
-  left: -0.2px;
-  -webkit-transform-origin: 10.4px 10.2px;
-  transform-origin: 10.4px 10.2px;
-  -webkit-animation: loading 2s infinite ease 1.5s;
-  animation: loading 2s infinite ease 1.5s;
-}
-.spinner:after {
-  width: 10.4px;
-  height: 10.2px;
-  background: #0055DE;
-  border-radius: 0 10.2px 10.2px 0;
-  top: -0.1px;
-  left: 10.2px;
-  -webkit-transform-origin: 0px 10.2px;
-  transform-origin: 0px 10.2px;
-  -webkit-animation: loading 2s infinite ease;
-  animation: loading 2s infinite ease;
-}
-
-/* Payment status page */
-#payment-status {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  row-gap: 30px;
-  width: 30vw;
-  min-width: 500px;
-  min-height: 380px;
-  align-self: center;
-  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
-    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
-  border-radius: 7px;
-  padding: 40px;
-  opacity: 0;
-  animation: fadeInAnimation 1s ease forwards;
-}
-
-#status-icon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 40px;
-  width: 40px;
-  border-radius: 50%;
-}
-
-h2 {
-  margin: 0;
-  color: #30313D;
-  text-align: center;
-}
-
-a {
-  text-decoration: none;
-  font-size: 16px;
-  font-weight: 600;
-  font-family: Arial, sans-serif;
-  display: block;
-}
-a:hover {
-  filter: contrast(120%);
-}
-
-#details-table {
-  overflow-x: auto;
-  width: 100%;
-}
-
-table {
-  width: 100%;
-  font-size: 14px;
-  border-collapse: collapse;
-}
-table tbody tr:first-child td {
-  border-top: 1px solid #E6E6E6; /* Top border */
-  padding-top: 10px;
-}
-table tbody tr:last-child td {
-  border-bottom: 1px solid #E6E6E6; /* Bottom border */
-}
-td {
-  padding-bottom: 10px;
-}
-
-.TableContent {
-  text-align: right;
-  color: #6D6E78;
-}
-
-.TableLabel {
-  font-weight: 600;
-  color: #30313D;
-}
-
-#view-details {
-  color: #0055DE;
-}
-
-#retry-button {
-  text-align: center;
-  background: #0055DE;
-  color: #ffffff;
-  border-radius: 4px;
-  border: 0;
-  padding: 12px 16px;
-  transition: all 0.2s ease;
-  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
-  width: 100%;
-}
-
-@-webkit-keyframes loading {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-@keyframes loading {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-@keyframes fadeInAnimation {
-  to {
-      opacity: 1;
-  }
-}
-
-@media only screen and (max-width: 600px) {
-  form, #payment-status{
-    width: 80vw;
-    min-width: initial;
-  }
-}
-.hidden {
-  display: none;
-}
-
-form {
-  width:100vw;
-  align-self: center;
-  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
-    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
-  border-radius: 7px;
-  padding: 40px;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-/* 其他样式保持不变... */
-</style>
\ No newline at end of file
diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue
index 2e4e4a2..618afc4 100644
--- a/app/pages/payment/index.vue
+++ b/app/pages/payment/index.vue
@@ -41,14 +41,16 @@ const confirmPay=async ()=>{
  })
 
  if (res.status===0){
-
-  // if (res.status===0){
-  //   window.location.href=res.data.checkoutSessionUrl
-  // }
-
   checkoutSessionUrl.value=res.data.checkoutSessionUrl
   payUid.value=res.data.payUid
-  router.push('/checkoutPage')
+  router.push({
+    path:'/checkoutPage',
+    query:{
+      payUid:res.data.payUid,
+      returnUrl:'/payment/result',
+      stripeKey:res.data.checkoutSessionUrl
+    }
+  })
 }
 }
 const handleInput = (e) => {
diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js
index 5b1ca8b..bd6739d 100644
--- a/app/stores/auth/index.js
+++ b/app/stores/auth/index.js
@@ -15,8 +15,6 @@ export const authStore = createGlobalState(() => {
         buyUid:'',
         auctionArtworkUuid:''
     })
-    const router=useRouter()
-    const config = useRuntimeConfig()
 const payUid=useLocalStorage('payUid','')
     return{
         payUid,

From 33713932a13405ba54b661ac8ccbc3cc20cb17fc Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 11:23:06 +0800
Subject: [PATCH 19/31] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=20Stripe?=
 =?UTF-8?q?=20=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

- 移除了整个 Stripe 支付页面的代码，包括模板、脚本和样式
- 删除了与支付相关的逻辑和 API 调用
- 移除了对 Stripe 库的引用和配置
---
 .../payment/checkoutPage/index.vue            | 374 ------------------
 1 file changed, 374 deletions(-)
 delete mode 100644 app/pages/collectCode/payment/checkoutPage/index.vue

diff --git a/app/pages/collectCode/payment/checkoutPage/index.vue b/app/pages/collectCode/payment/checkoutPage/index.vue
deleted file mode 100644
index fe50217..0000000
--- a/app/pages/collectCode/payment/checkoutPage/index.vue
+++ /dev/null
@@ -1,374 +0,0 @@
-<script setup>
-import { onMounted, ref } from 'vue'
-import {codeAuthStore} from "@/stores-collect-code/auth/index.js";
-import {useRuntimeConfig} from "#app";
-import {orderQuery} from "~/api/goods/index.js";
-const {codePKey,codePayUid} = codeAuthStore()
-const config = useRuntimeConfig()
-
-definePageMeta({
-  layout: 'default',
-  title: 'Stripe支付'
-})
-
-const stripe = Stripe(config.public.NUXT_PUBLIC_PKEY)
-
-const baseURL = config.public.NUXT_PUBLIC_API_BASE
-const items = [{ id: "xl-tshirt", amount: 1000 }]
-const elements = ref(null)
-const paymentMessage = ref('')
-const isLoading = ref(false)
-const showSpinner = ref(false)
-
-async function initialize() {
-  const clientSecret = codePKey.value
-
-  
-  const appearance = {
-    theme: 'stripe',
-  }
-  elements.value = stripe.elements({ appearance, clientSecret })
-
-  const paymentElementOptions = {
-    layout: "accordion",
-  }
-
-  const paymentElement = elements.value.create("payment", paymentElementOptions)
-  paymentElement.mount("#payment-element")
-}
-
-async function handleSubmit(e) {
-  e.preventDefault()
-  setLoading(true)
-
-  let pollTimer = null
-  let timeoutTimer = null
-
-  const startPolling = () => {
-    pollTimer = setInterval(async () => {
-      const res = await orderQuery({
-        orderNo: codePayUid.value
-      })
-      if (res.status === 0) {
-        if (res.data.status !== 3) {
-          clearInterval(pollTimer)
-          clearTimeout(timeoutTimer)
-          window.location.href = `${baseURL}/collectCode/payment/result?orderNo=${codePayUid.value}`
-        }
-      }
-    }, 1000)
-
-    timeoutTimer = setTimeout(() => {
-      clearInterval(pollTimer)
-      showMessage('支付超时，请重试')
-      setLoading(false)
-    }, 180000) // 3分钟超时
-  }
-
-  startPolling()
-
-  const { error } = await stripe.confirmPayment({
-    elements: elements.value,
-    confirmParams: {
-      return_url: `${baseURL}/collectCode/payment/result?orderNo=${codePayUid.value}`,
-    },
-  })
-
-  if (error) {
-    clearInterval(pollTimer)
-    clearTimeout(timeoutTimer)
-    if (error.type === "card_error" || error.type === "validation_error") {
-      showMessage(error.message)
-    } else {
-      showMessage("An unexpected error occurred.")
-    }
-    setLoading(false)
-  }
-}
-
-function showMessage(messageText) {
-  paymentMessage.value = messageText
-  setTimeout(() => {
-    paymentMessage.value = ''
-  }, 4000)
-}
-
-function setLoading(loading) {
-  isLoading.value = loading
-  showSpinner.value = loading
-}
-
-onMounted(() => {
-  initialize()
-})
-</script>
-
-<template>
-  <form id="payment-form" @submit="handleSubmit">
-    <div id="payment-element">
-    </div>
-    <button id="submit">
-      <div class="spinner" :class="{ hidden: !showSpinner }" id="spinner"></div>
-      <span id="button-text" :class="{ hidden: showSpinner }">Pay now</span>
-    </button>
-    <div id="payment-message" :class="{ hidden: !paymentMessage }">{{ paymentMessage }}</div>
-  </form>
-</template>
-
-<style scoped>
-* {
-  box-sizing: border-box;
-}
-
-body {
-  font-family: -apple-system, BlinkMacSystemFont, sans-serif;
-  font-size: 16px;
-  -webkit-font-smoothing: antialiased;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-content: center;
-  height: 100vh;
-  width: 100vw;
-}
-
-form {
-  align-self: center;
-  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
-    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
-  border-radius: 7px;
-  padding: 40px;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-.hidden {
-  display: none;
-}
-
-#payment-message {
-  color: rgb(105, 115, 134);
-  font-size: 16px;
-  line-height: 20px;
-  padding-top: 12px;
-  text-align: center;
-}
-
-#payment-element {
-  margin-bottom: 24px;
-}
-
-/* Buttons and links */
-button {
-  background: #0055DE;
-  font-family: Arial, sans-serif;
-  color: #ffffff;
-  border-radius: 4px;
-  border: 0;
-  padding: 12px 16px;
-  font-size: 16px;
-  font-weight: 600;
-  cursor: pointer;
-  display: block;
-  transition: all 0.2s ease;
-  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
-  width: 100%;
-}
-button:hover {
-  filter: contrast(115%);
-}
-button:disabled {
-  opacity: 0.5;
-  cursor: default;
-}
-
-/* spinner/processing state, errors */
-.spinner,
-.spinner:before,
-.spinner:after {
-  border-radius: 50%;
-}
-.spinner {
-  color: #ffffff;
-  font-size: 22px;
-  text-indent: -99999px;
-  margin: 0px auto;
-  position: relative;
-  width: 20px;
-  height: 20px;
-  box-shadow: inset 0 0 0 2px;
-  -webkit-transform: translateZ(0);
-  -ms-transform: translateZ(0);
-  transform: translateZ(0);
-}
-.spinner:before,
-.spinner:after {
-  position: absolute;
-  content: "";
-}
-.spinner:before {
-  width: 10.4px;
-  height: 20.4px;
-  background: #0055DE;
-  border-radius: 20.4px 0 0 20.4px;
-  top: -0.2px;
-  left: -0.2px;
-  -webkit-transform-origin: 10.4px 10.2px;
-  transform-origin: 10.4px 10.2px;
-  -webkit-animation: loading 2s infinite ease 1.5s;
-  animation: loading 2s infinite ease 1.5s;
-}
-.spinner:after {
-  width: 10.4px;
-  height: 10.2px;
-  background: #0055DE;
-  border-radius: 0 10.2px 10.2px 0;
-  top: -0.1px;
-  left: 10.2px;
-  -webkit-transform-origin: 0px 10.2px;
-  transform-origin: 0px 10.2px;
-  -webkit-animation: loading 2s infinite ease;
-  animation: loading 2s infinite ease;
-}
-
-/* Payment status page */
-#payment-status {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  row-gap: 30px;
-  width: 30vw;
-  min-width: 500px;
-  min-height: 380px;
-  align-self: center;
-  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
-    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
-  border-radius: 7px;
-  padding: 40px;
-  opacity: 0;
-  animation: fadeInAnimation 1s ease forwards;
-}
-
-#status-icon {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  height: 40px;
-  width: 40px;
-  border-radius: 50%;
-}
-
-h2 {
-  margin: 0;
-  color: #30313D;
-  text-align: center;
-}
-
-a {
-  text-decoration: none;
-  font-size: 16px;
-  font-weight: 600;
-  font-family: Arial, sans-serif;
-  display: block;
-}
-a:hover {
-  filter: contrast(120%);
-}
-
-#details-table {
-  overflow-x: auto;
-  width: 100%;
-}
-
-table {
-  width: 100%;
-  font-size: 14px;
-  border-collapse: collapse;
-}
-table tbody tr:first-child td {
-  border-top: 1px solid #E6E6E6; /* Top border */
-  padding-top: 10px;
-}
-table tbody tr:last-child td {
-  border-bottom: 1px solid #E6E6E6; /* Bottom border */
-}
-td {
-  padding-bottom: 10px;
-}
-
-.TableContent {
-  text-align: right;
-  color: #6D6E78;
-}
-
-.TableLabel {
-  font-weight: 600;
-  color: #30313D;
-}
-
-#view-details {
-  color: #0055DE;
-}
-
-#retry-button {
-  text-align: center;
-  background: #0055DE;
-  color: #ffffff;
-  border-radius: 4px;
-  border: 0;
-  padding: 12px 16px;
-  transition: all 0.2s ease;
-  box-shadow: 0px 4px 5.5px 0px rgba(0, 0, 0, 0.07);
-  width: 100%;
-}
-
-@-webkit-keyframes loading {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-@keyframes loading {
-  0% {
-    -webkit-transform: rotate(0deg);
-    transform: rotate(0deg);
-  }
-  100% {
-    -webkit-transform: rotate(360deg);
-    transform: rotate(360deg);
-  }
-}
-@keyframes fadeInAnimation {
-  to {
-      opacity: 1;
-  }
-}
-
-@media only screen and (max-width: 600px) {
-  form, #payment-status{
-    width: 80vw;
-    min-width: initial;
-  }
-}
-.hidden {
-  display: none;
-}
-
-form {
-  width:100vw;
-  align-self: center;
-  box-shadow: 0px 0px 0px 0.5px rgba(50, 50, 93, 0.1),
-    0px 2px 5px 0px rgba(50, 50, 93, 0.1), 0px 1px 1.5px 0px rgba(0, 0, 0, 0.07);
-  border-radius: 7px;
-  padding: 40px;
-  margin-top: auto;
-  margin-bottom: auto;
-}
-
-/* 其他样式保持不变... */
-</style>
\ No newline at end of file

From 5d814a3922c5a306245b78326db6f5695b8c7058 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 11:33:53 +0800
Subject: [PATCH 20/31] =?UTF-8?q?refactor(payment):=20=E7=A7=BB=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E7=9A=84=E5=8F=98=E9=87=8F=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 删除了不必要的 checkoutSessionUrl 和 payUid 变量赋值
-优化了代码结构，提高了代码的可读性和维护性
---
 app/pages/collectCode/payment/index.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/pages/collectCode/payment/index.vue b/app/pages/collectCode/payment/index.vue
index 28f5b91..7330b1a 100644
--- a/app/pages/collectCode/payment/index.vue
+++ b/app/pages/collectCode/payment/index.vue
@@ -43,8 +43,6 @@ const confirmPay = async () => {
   if (res.status === 0) {
     codePKey.value=res.data.checkoutSessionUrl
     codePayUid.value=res.data.payUid
-    checkoutSessionUrl.value=res.data.checkoutSessionUrl
-    payUid.value=res.data.payUid
     router.push({
       path:'/checkoutPage',
       query:{

From e0af9f99a078dde479838e977efda16032834a6c Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:23:45 +0800
Subject: [PATCH 21/31] =?UTF-8?q?refactor(websocket):=20=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=20WebSocket=20=E5=AE=A2=E6=88=B7=E7=AB=AF=20token=20=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=92=8C=E9=94=99=E8=AF=AF=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 WebSocketClient 构造函数中存储 token
- 自动在连接参数中添加 token
- 添加 WebSocket 消息解析错误的控制台日志
---
 app/utils/websocket.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/utils/websocket.ts b/app/utils/websocket.ts
index e8d907e..f6be471 100644
--- a/app/utils/websocket.ts
+++ b/app/utils/websocket.ts
@@ -1,9 +1,11 @@
 export class WebSocketClient {
     private socket: WebSocket | null = null
     private baseUrl: string
+    private token: string
 
     constructor(baseUrl: string, token: string) {
         this.baseUrl = baseUrl
+        this.token = token
     }
 
     connect(path: string, params: Record<string, any> = {}) {
@@ -12,6 +14,7 @@ export class WebSocketClient {
 
         // 构建参数对象，自动添加 token
         const queryParams = {
+            token: this.token,
             ...params
         }
 
@@ -30,12 +33,14 @@ export class WebSocketClient {
             },
             onMessage: (callback: (data: any) => void) => {
                 this.socket!.onmessage = (event) => {
+
                     try {
                         const data = JSON.parse(event.data)
 
                         callback(data)
                     } catch (error) {
-                        }
+                        console.error('解析消息失败:', error)
+                    }
                 }
             },
             onClose: (callback: () => void) => {

From 9688e9b3a6bb25a250db07fc901974f8443d3819 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 13:57:52 +0800
Subject: [PATCH 22/31] =?UTF-8?q?feat(format):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=92=8C=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 ItemList 组件中添加 formatNumber 函数，用于将数字格式化为 "250XX" 格式
- 调整 login 页面背景图片布局，使其居底显示
- 优化 login 页面验证码输入框，提高用户体验
- 移除 nuxt.config.js 中的 https 配置项
---
 app/pages/home/components/ItemList/index.vue | 22 +++++++++++++++++++-
 app/pages/login/index.vue                    | 20 +++++++++++++++---
 nuxt.config.js                               |  2 +-
 3 files changed, 39 insertions(+), 5 deletions(-)

diff --git a/app/pages/home/components/ItemList/index.vue b/app/pages/home/components/ItemList/index.vue
index aeb1145..81f6b29 100644
--- a/app/pages/home/components/ItemList/index.vue
+++ b/app/pages/home/components/ItemList/index.vue
@@ -40,6 +40,26 @@ const openShow = async (item) => {
   localState.value.showDetail = true
   currentItem.value = item
 }
+/**
+ * 将数字格式化为"250XX"格式，其中XX是两位数
+ * @param {number} num - 要格式化的数字
+ * @return {string} - 格式化后的字符串
+ */
+ function formatNumber(num) {
+  // 确保输入是有效数字
+  if (typeof num !== 'number' && isNaN(Number(num))) {
+    throw new Error('输入必须是有效数字');
+  }
+  
+  // 转换为数字类型(以防输入是字符串数字)
+  const number = Number(num);
+  
+  // 数字部分格式化为两位数，不足补0
+  const formattedNum = number.toString().padStart(2, '0');
+  
+  // 添加前缀"250"并返回结果
+  return `250${formattedNum}`;
+}
 </script>
 
 <template>
@@ -73,7 +93,7 @@ const openShow = async (item) => {
                   <div
                       class="absolute rounded-2px overflow-hidden line-height-12px left-[8px] top-[8px] h-[17px] w-[55px] flex items-center justify-center bg-[#2b53ac] text-[12px] text-[#fff]"
                   >
-                    Lot{{ item.index }}
+                    Lot{{ formatNumber(item.index) }}
                   </div>
                 </div>
                 <div class="pt-[8px]">
diff --git a/app/pages/login/index.vue b/app/pages/login/index.vue
index 0fba9fd..d32249a 100644
--- a/app/pages/login/index.vue
+++ b/app/pages/login/index.vue
@@ -160,7 +160,7 @@ onUnmounted(() => {
 </script>
 
 <template>
-  <div class="h-screen-nav w-[100vw] bg-[url('@/static/images/asdfsdd.png')] bg-cover px-[31px] pt-[86px]">
+  <div class="w-[100vw] bg-[url('@/static/images/asdfsdd.png')] bg-bottom bg-cover grow-1 px-[31px] pt-[86px]">
     <div class="w-full flex justify-center mb-[100px]">
       <img class="h-[105px] w-[189px]" src="@/static/images/ghfggff.png" alt="">
     </div>
@@ -197,7 +197,22 @@ onUnmounted(() => {
             <div class="text-[16px] text-[#BDBDBD] mr-[10px]">{{ $t('login.hasSendTo') }}</div>
             <div class="text-[16px] text-[#000]">+{{ selectedZone }} {{ phoneNum }}</div>
           </div>
-          <van-password-input :value="code" :gutter="10" :mask="false" focused @focus="showKeyboard = true" />
+      <div class="relative">
+        <van-password-input 
+  :value="code" 
+  :gutter="10" 
+  :mask="false" 
+  :focused="false"
+
+/>
+<input 
+  v-model="code" 
+  type="tel" 
+  maxlength="6" 
+  class="opacity-0 absolute top-0 left-0 h-full w-full" 
+  @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
+/>
+      </div>
           <div class="flex justify-between">
             <div :class="`${countdown>0?'text-#BDBDBD':'text-#2B53AC'}  text-14px`">
               {{ $t('login.reSend') }}<span v-if="countdown>0">({{countdown}})</span>
@@ -213,7 +228,6 @@ onUnmounted(() => {
         </div>
       </van-swipe-item>
     </van-swipe>
-    <van-number-keyboard v-model="code" :show="showKeyboard" @blur="showKeyboard = false" />
     <div v-if="!isKeyboardVisible" class="text-center text-14px absolute left-1/2 transform translate-x--1/2 bottom-20px">
       {{ $t('login.agreement') }}<span class="text-#3454AF " @click="$router.push('/privacyPolicy')">{{ $t('login.privacyPolicy') }}</span>
     </div>
diff --git a/nuxt.config.js b/nuxt.config.js
index ad8ace6..15b784d 100644
--- a/nuxt.config.js
+++ b/nuxt.config.js
@@ -151,7 +151,7 @@ export default defineNuxtConfig({
   // 指定 Nuxt 应用程序的兼容性日期，确保应用程序在未来的 Nuxt 版本中保持稳定性
   compatibilityDate: '2025-02-28',
   devServer: {
-    https: httpsOptions,
+    // https: httpsOptions,
     host: '0.0.0.0',
     port: 3000,
   },

From 8207170a0115fcb172c262a27cb5f8f6c659ea8a Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:10:24 +0800
Subject: [PATCH 23/31] =?UTF-8?q?feat(login):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=A1=B5=E9=9D=A2=E9=AA=8C=E8=AF=81=E7=A0=81?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E4=BD=93=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除虚拟键盘，改用原生输入框
- 添加输入框焦点管理，提升用户体验
- 优化验证码输入框样式和功能
- 改进登录流程中的页面切换逻辑
---
 app/pages/collectCode/login/index.vue | 38 ++++++++++++++++-----------
 app/pages/login/index.vue             | 22 ++++++++--------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/app/pages/collectCode/login/index.vue b/app/pages/collectCode/login/index.vue
index f99f91c..02f30af 100644
--- a/app/pages/collectCode/login/index.vue
+++ b/app/pages/collectCode/login/index.vue
@@ -36,7 +36,6 @@ const countdown = ref(0);
 const phoneNum = ref('')
 const code = ref('')
 const pane = ref(0)
-const showKeyboard = ref(false);
 const getFingerprint = async () => {
   const fp = await FingerprintJS.load()
   const result = await fp.get()
@@ -50,6 +49,7 @@ const checkFingerprint = async () => {
     await router.push('/collectCode/mine')
   }
 }
+const isFocused = ref(false)
 checkFingerprint()
 const vanSwipeRef = ref(null)
 const getCode = async () => {
@@ -63,23 +63,13 @@ const getCode = async () => {
     if (res.status === 0) {
       pane.value = 1
       vanSwipeRef.value?.swipeTo(pane.value)
-      showKeyboard.value = true
+      nextTick(()=>{
+    codeInput.value.focus()
+  })
     }
   }
-  /*  loadingRef.value.loading1 = false
-    if (res.status === 0) {
 
 
-    }
-    pane.value = 1
-    vanSwipeRef.value?.swipeTo(pane.value)
-    showKeyboard.value = true
-    startCountdown();*/
-  /*  pane.value = 1
-    vanSwipeRef.value?.swipeTo(pane.value)
-    showKeyboard.value=true
-    startCountdown();*/
-
 }
 const changeToPwd = async () => {
   loginType.value = loginType.value === 0 ? 1 : 0
@@ -184,7 +174,24 @@ const togglePasswordVisibility = () => {
             <div class="text-[16px] text-[#BDBDBD] mr-[10px]">{{ $t('collectCode.login.hasSendTo') }}</div>
             <div class="text-[16px] text-[#000]">+86 {{ phoneNum }}</div>
           </div>
-          <van-password-input :value="code" :gutter="10" :mask="false" focused @focus="showKeyboard = true"/>
+          <div class="relative">
+        <van-password-input 
+  :value="code" 
+  :gutter="10" 
+  :mask="false" 
+  :focused="isFocused"
+/>
+<input 
+  v-model="code" 
+  type="tel" 
+  maxlength="6" 
+   ref="codeInput"
+  class="opacity-0 absolute top-0 left-0 h-full w-full" 
+  @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
+  @focus="isFocused = true"
+  @blur="isFocused = false"
+/>
+      </div>
           <div class="flex justify-between">
             <div :class="`${countdown>0?'text-#BDBDBD':'text-#2B53AC'}  text-14px`">
               {{ $t('collectCode.login.reSend') }}<span v-if="countdown>0">({{ countdown }})</span>
@@ -205,7 +212,6 @@ const togglePasswordVisibility = () => {
         </div>
       </van-swipe-item>
     </van-swipe>
-    <van-number-keyboard v-model="code" :show="showKeyboard" @blur="showKeyboard = false"/>
   </div>
 </template>
 
diff --git a/app/pages/login/index.vue b/app/pages/login/index.vue
index d32249a..60765eb 100644
--- a/app/pages/login/index.vue
+++ b/app/pages/login/index.vue
@@ -19,6 +19,7 @@ const loadingRef=ref({
 })
 const isExist=ref(false)//帐号是否存在  true存在
 const isReal=ref(false) //isReal 是否实名过
+const codeInput=ref(null)
 function goToPage() {
   router.push('/countryRegion');
 }
@@ -40,7 +41,6 @@ const countdown = ref(0);
 const phoneNum = ref('')
 const code = ref('')
 const pane = ref(0)
-const showKeyboard = ref(false);
 // 根据语言获取默认国家
 const getDefaultCountry = () => {
   let defaultCode = 'CN' // 默认中国大陆
@@ -98,13 +98,11 @@ const getCode =async () => {
   }
   pane.value = 1
   vanSwipeRef.value?.swipeTo(pane.value)
-  showKeyboard.value=true
+ 
   startCountdown();
-/*  pane.value = 1
-  vanSwipeRef.value?.swipeTo(pane.value)
-  showKeyboard.value=true
-  startCountdown();*/
-
+  nextTick(()=>{
+    codeInput.value.focus()
+  })
 }
 const goBack = () => {
   code.value = ''
@@ -142,7 +140,7 @@ const goLogin =async () => {
 }
 const isKeyboardVisible = ref(false)
 const windowHeight = ref(window.innerHeight)
-
+const isFocused = ref(false)
 onMounted(() => {
   // 记录初始窗口高度
   windowHeight.value = window.innerHeight
@@ -197,20 +195,22 @@ onUnmounted(() => {
             <div class="text-[16px] text-[#BDBDBD] mr-[10px]">{{ $t('login.hasSendTo') }}</div>
             <div class="text-[16px] text-[#000]">+{{ selectedZone }} {{ phoneNum }}</div>
           </div>
-      <div class="relative">
+          <div class="relative">
         <van-password-input 
   :value="code" 
   :gutter="10" 
   :mask="false" 
-  :focused="false"
-
+  :focused="isFocused"
 />
 <input 
   v-model="code" 
   type="tel" 
   maxlength="6" 
+   ref="codeInput"
   class="opacity-0 absolute top-0 left-0 h-full w-full" 
   @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
+  @focus="isFocused = true"
+  @blur="isFocused = false"
 />
       </div>
           <div class="flex justify-between">

From 53571882a0eff7f8c2588d1f0cfb9ab5f38dcad7 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:35:00 +0800
Subject: [PATCH 24/31] =?UTF-8?q?refactor(auth):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=A8=A1=E5=9D=97=E5=B9=B6=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E7=A0=81=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 token 在 codeAuthStore 中的名称，从 token 改为 codeToken
- 优化验证码发送逻辑，增加错误处理和加载状态管理
- 调整页面布局和样式，提高用户体验
- 修复了一些小的 UI 问题，例如输入框聚焦状态和倒计时显示
---
 app/api-collect-code/http.js          |   4 +-
 app/pages/collectCode/login/index.vue | 225 ++++++++++++++------------
 app/stores-collect-code/auth/index.js |   4 +-
 3 files changed, 125 insertions(+), 108 deletions(-)

diff --git a/app/api-collect-code/http.js b/app/api-collect-code/http.js
index e59b001..dfcdaa2 100644
--- a/app/api-collect-code/http.js
+++ b/app/api-collect-code/http.js
@@ -9,7 +9,7 @@ let http
 // HTTP 状态码映射 - 使用i18n国际化
 export function setupHttp() {
   if (http) return http
- const {token}=  codeAuthStore()
+ const {codeToken}=  codeAuthStore()
   const config = useRuntimeConfig()
   const baseURL = config.public.NUXT_PUBLIC_API_COLLECT_CODE
   const router = useRouter()
@@ -43,7 +43,7 @@ export function setupHttp() {
       // 添加 token
       options.headers = {
         ...options.headers,
-        Authorization: token.value,
+        Authorization: codeToken.value,
         'accept-language': i18n.locale.value
       }
 
diff --git a/app/pages/collectCode/login/index.vue b/app/pages/collectCode/login/index.vue
index 02f30af..783c365 100644
--- a/app/pages/collectCode/login/index.vue
+++ b/app/pages/collectCode/login/index.vue
@@ -8,7 +8,7 @@ import {message} from '@/components/x-message/useMessage.js'
 import FingerprintJS from '@fingerprintjs/fingerprintjs'
 import {checkPhone, mobileLogin, userSend} from "@/api-collect-code/auth/index.js";
 
-const {userInfo, token, fingerprint} = codeAuthStore()
+const {userInfo, codeToken, fingerprint} = codeAuthStore()
 const router = useRouter();
 const route = useRoute();
 const {locale} = useI18n()
@@ -49,27 +49,31 @@ const checkFingerprint = async () => {
     await router.push('/collectCode/mine')
   }
 }
+const codeInput = ref(null)
 const isFocused = ref(false)
 checkFingerprint()
 const vanSwipeRef = ref(null)
 const getCode = async () => {
   loadingRef.value.loading1 = true
-  const res = await checkPhone({
-    tel: phoneNum.value,
-  })
-  loadingRef.value.loading1 = false
-  if (res.status === 0) {
-    const res = await userSend({telNum: phoneNum.value, zone: '+86'})
+  try {
+    const res = await checkPhone({
+      tel: phoneNum.value,
+    })
     if (res.status === 0) {
-      pane.value = 1
-      vanSwipeRef.value?.swipeTo(pane.value)
-      nextTick(()=>{
-    codeInput.value.focus()
-  })
+      const sendRes = await userSend({telNum: phoneNum.value, zone: '+86'})
+      startCountdown()
+        pane.value = 1
+        await nextTick()
+        vanSwipeRef.value?.swipeTo(pane.value)
+        nextTick(() => {
+          codeInput.value?.focus()
+        })
     }
+  } catch (error) {
+    console.error('获取验证码失败:', error)
+  } finally {
+    loadingRef.value.loading1 = false
   }
-
-
 }
 const changeToPwd = async () => {
   loginType.value = loginType.value === 0 ? 1 : 0
@@ -88,7 +92,7 @@ const goLogin = async () => {
   })
   if (res.status === 0) {
     userInfo.value = res.data.accountInfo
-    token.value = res.data.token
+    codeToken.value = res.data.token
     fingerprint.value = await getFingerprint()
 
     await router.push('/collectCode/mine');
@@ -101,113 +105,126 @@ const showPassword = ref(false)
 const togglePasswordVisibility = () => {
   showPassword.value = !showPassword.value
 }
+onMounted(()=>{
+  // vanSwipeRef.value?.swipeTo(1)
+})
 </script>
 
 <template>
-  <div class="h-[100vh] w-[100vw] bg-[url('@/static/images/asdfsdd.png')] bg-cover px-[31px] pt-[86px]">
+  <div class="grow-1 w-[100vw] bg-[url('@/static/images/asdfsdd.png')] bg-bottom bg-cover px-[31px] pt-[86px]">
     <div class="w-full flex justify-center mb-[100px] flex-col items-center">
       <img class="h-[105px] w-[189px]" src="@/static/images/ghfggff.png" alt="">
       <img class="h-[29px] w-[108px]" src="@/static/images/qrcodetext.png" alt="">
     </div>
     <van-swipe ref="vanSwipeRef" :show-indicators="false" :touchable="false" :lazy-render="true" :loop="false">
       <van-swipe-item>
-        <div v-show="pane === 0">
-          <div class="">
-            <div class="border-b-[1.7px] mt-[8px]">
-              <van-field v-model="phoneNum" clearable :placeholder="$t('collectCode.login.phoneNumberPlaceholder')">
-                <template #label>
-                  <div class="text-[16px] text-[#1A1A1A] flex align-center justify-start">
-                    {{ $t('collectCode.login.phoneNumber') }}
-                  </div>
-                </template>
-              </van-field>
-            </div>
-            <div class="border-b-[1.7px] mt-[8px]" v-show="loginType === 1">
-              <van-field
-                  v-model="password"
-                  :type="showPassword ? 'text' : 'password'"
-                  clearable
-                  :placeholder="$t('collectCode.login.passwordPlaceholder')"
-              >
-                <template #label>
-                  <div class="text-[16px] text-[#1A1A1A] flex align-center justify-start">
-                    {{ $t('collectCode.login.password') }}
-                  </div>
-                </template>
-                <template #button>
-                  <div class="flex justify-center items-center">
-                    <van-icon
-                        size="20"
-                        :name="showPassword ? 'eye-o' : 'closed-eye'"
-                        @click="togglePasswordVisibility"
-                    />
-                  </div>
-                </template>
-              </van-field>
-            </div>
-            <div class="flex justify-end mt-[10px]">
-              <div class="text-[14px] text-[#2B53AC]" @click="changeToPwd">
-                {{ loginType === 0 ? $t('collectCode.login.passwordLogin') : $t('collectCode.login.codeLogin') }}
+        <div v-if="pane === 0">
+          <div>
+            <div class="">
+              <div class="border-b-[1.7px] mt-[8px]">
+                <van-field v-model="phoneNum" clearable :placeholder="$t('collectCode.login.phoneNumberPlaceholder')">
+                  <template #label>
+                    <div class="text-[16px] text-[#1A1A1A] flex align-center justify-start">
+                      {{ $t('collectCode.login.phoneNumber') }}
+                    </div>
+                  </template>
+                </van-field>
+              </div>
+              <div class="border-b-[1.7px] mt-[8px]" v-if="loginType === 1">
+                <van-field
+                    v-model="password"
+                    :type="showPassword ? 'text' : 'password'"
+                    clearable
+                    :placeholder="$t('collectCode.login.passwordPlaceholder')"
+                >
+                  <template #label>
+                    <div class="text-[16px] text-[#1A1A1A] flex align-center justify-start">
+                      {{ $t('collectCode.login.password') }}
+                    </div>
+                  </template>
+                  <template #button>
+                    <div class="flex justify-center items-center">
+                      <van-icon
+                          size="20"
+                          :name="showPassword ? 'eye-o' : 'closed-eye'"
+                          @click="togglePasswordVisibility"
+                      />
+                    </div>
+                  </template>
+                </van-field>
+              </div>
+              <div class="flex justify-end mt-[10px]">
+                <div class="text-[14px] text-[#2B53AC]" @click="changeToPwd">
+                  {{ loginType === 0 ? $t('collectCode.login.passwordLogin') : $t('collectCode.login.codeLogin') }}
+                </div>
               </div>
             </div>
-            <div/>
-          </div>
-          <div class="mt-[55px]">
-            <div v-if="loginType === 0">
-              <van-button :loading="loadingRef.loading1" v-if="phoneNum" :loading-text="$t('collectCode.login.getCode')"
-                          type="primary" block style="height: 48px" @click="getCode">{{ $t('collectCode.login.getCode') }}
-              </van-button>
-              <van-button v-else type="primary" color="#D3D3D3" block style="height: 48px">{{ $t('collectCode.login.getCode') }}</van-button>
-            </div>
-            <div v-else>
-              <van-button type="primary" v-if="password" block :loading="loadingRef.loading2" :loading-text="$t('collectCode.login.login')"
-                          style="height: 48px;margin-top:10px" @click="goLogin">{{ $t('collectCode.login.login') }}
-              </van-button>
-              <van-button v-else type="primary" color="#D3D3D3" block style="height: 48px">{{ $t('collectCode.login.login') }}</van-button>
+            <div class="mt-[55px]">
+              <div v-if="loginType === 0">
+                <van-button :loading="loadingRef.loading1" v-if="phoneNum" :loading-text="$t('collectCode.login.getCode')"
+                            type="primary" block style="height: 48px" @click="getCode">{{
+                    $t('collectCode.login.getCode')
+                  }}
+                </van-button>
+                <van-button v-else type="primary" color="#D3D3D3" block style="height: 48px">
+                  {{ $t('collectCode.login.getCode') }}
+                </van-button>
+              </div>
+              <div v-else>
+                <van-button type="primary" v-if="password" block :loading="loadingRef.loading2"
+                            :loading-text="$t('collectCode.login.login')"
+                            style="height: 48px;margin-top:10px" @click="goLogin">{{ $t('collectCode.login.login') }}
+                </van-button>
+                <van-button v-else type="primary" color="#D3D3D3" block style="height: 48px">
+                  {{ $t('collectCode.login.login') }}
+                </van-button>
+              </div>
             </div>
           </div>
         </div>
       </van-swipe-item>
       <van-swipe-item>
-        <div v-show="pane === 1">
-          <div class="flex mb-[16px]">
-            <div class="text-[16px] text-[#BDBDBD] mr-[10px]">{{ $t('collectCode.login.hasSendTo') }}</div>
-            <div class="text-[16px] text-[#000]">+86 {{ phoneNum }}</div>
-          </div>
-          <div class="relative">
-        <van-password-input 
-  :value="code" 
-  :gutter="10" 
-  :mask="false" 
-  :focused="isFocused"
-/>
-<input 
-  v-model="code" 
-  type="tel" 
-  maxlength="6" 
-   ref="codeInput"
-  class="opacity-0 absolute top-0 left-0 h-full w-full" 
-  @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
-  @focus="isFocused = true"
-  @blur="isFocused = false"
-/>
-      </div>
-          <div class="flex justify-between">
-            <div :class="`${countdown>0?'text-#BDBDBD':'text-#2B53AC'}  text-14px`">
-              {{ $t('collectCode.login.reSend') }}<span v-if="countdown>0">({{ countdown }})</span>
+        <div v-if="pane == 1">
+          <div>
+            <div class="flex mb-[16px]">
+              <div class="text-[16px] text-[#BDBDBD] mr-[10px]">{{ $t('collectCode.login.hasSendTo') }}</div>
+              <div class="text-[16px] text-[#000]">+86 {{ phoneNum }}</div>
             </div>
-            <div @click="goBack" class="text-#2B53AC text-14px">
-              {{ $t('collectCode.login.back') }}
+            <div class="relative">
+              <van-password-input
+                  :value="code"
+                  :gutter="10"
+                  :mask="false"
+                  :focused="isFocused"
+              />
+              <input
+                  v-model="code"
+                  type="tel"
+                  maxlength="6"
+                  ref="codeInput"
+                  class="opacity-0 absolute top-0 left-0 h-full w-full"
+                  @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
+                  @focus="isFocused = true"
+                  @blur="isFocused = false"
+              />
+            </div>
+            <div class="flex justify-between">
+              <div :class="`${countdown>0?'text-#BDBDBD':'text-#2B53AC'}  text-14px`">
+                {{ $t('collectCode.login.reSend') }}<span v-if="countdown>0">({{ countdown }})</span>
+              </div>
+              <div @click="goBack" class="text-#2B53AC text-14px">
+                {{ $t('collectCode.login.back') }}
+              </div>
+            </div>
+            <div class="mt-[17px]">
+              <van-button v-if="code.length === 6" type="primary" block :loading="loadingRef.loading2"
+                          :loading-text="$t('collectCode.login.login')" style="height: 48px" @click="goLogin">
+                {{ $t('collectCode.login.login') }}
+              </van-button>
+              <van-button v-else type="primary" color="#D3D3D3" block style="height: 48px">
+                {{ $t('collectCode.login.login') }}
+              </van-button>
             </div>
-          </div>
-          <div class="mt-[17px]">
-            <van-button v-if="code.length === 6" type="primary" block :loading="loadingRef.loading2"
-                        :loading-text="$t('collectCode.login.login')" style="height: 48px" @click="goLogin">
-              {{ $t('collectCode.login.login') }}
-            </van-button>
-            <van-button v-else type="primary" color="#D3D3D3" block style="height: 48px">
-              {{ $t('collectCode.login.login') }}
-            </van-button>
           </div>
         </div>
       </van-swipe-item>
diff --git a/app/stores-collect-code/auth/index.js b/app/stores-collect-code/auth/index.js
index 987f9d4..938fde0 100644
--- a/app/stores-collect-code/auth/index.js
+++ b/app/stores-collect-code/auth/index.js
@@ -1,6 +1,6 @@
 import { createGlobalState,useLocalStorage } from '@vueuse/core'
 export const codeAuthStore = createGlobalState(() => {
-    const token=useLocalStorage('token','')
+    const codeToken=useLocalStorage('codeToken','')
     const RefreshToken=useLocalStorage('RefreshToken','')
     const userInfo=useLocalStorage('userInfo',{})
     const fingerprint=useLocalStorage('fingerprint','')
@@ -41,7 +41,7 @@ export const codeAuthStore = createGlobalState(() => {
         formData,
         userInfo,
         RefreshToken,
-        token,
+        codeToken,
         fingerprint
     }
 })
\ No newline at end of file

From 575fcae049a2fb399cfd66b4f494f91d12986880 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:43:17 +0800
Subject: [PATCH 25/31] 12

---
 app/pages/collectCode/login/index.vue | 3 ---
 app/plugins/vconsole.client.js        | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/app/pages/collectCode/login/index.vue b/app/pages/collectCode/login/index.vue
index 783c365..3fe41e4 100644
--- a/app/pages/collectCode/login/index.vue
+++ b/app/pages/collectCode/login/index.vue
@@ -105,9 +105,6 @@ const showPassword = ref(false)
 const togglePasswordVisibility = () => {
   showPassword.value = !showPassword.value
 }
-onMounted(()=>{
-  // vanSwipeRef.value?.swipeTo(1)
-})
 </script>
 
 <template>
diff --git a/app/plugins/vconsole.client.js b/app/plugins/vconsole.client.js
index 6738ed9..8224b4f 100644
--- a/app/plugins/vconsole.client.js
+++ b/app/plugins/vconsole.client.js
@@ -1,5 +1,7 @@
 import VConsole from 'vconsole'
 
 export default defineNuxtPlugin(() => {
-  const vConsole = new VConsole()
+  if (process.env.NODE_ENV !== 'production') {
+    const vConsole = new VConsole()
+  }
 })
\ No newline at end of file

From 2b13718cea8177e83e2dd870e3c05408d5a52f72 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 14:57:15 +0800
Subject: [PATCH 26/31] 12

---
 app/pages/login/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/pages/login/index.vue b/app/pages/login/index.vue
index 60765eb..da13d04 100644
--- a/app/pages/login/index.vue
+++ b/app/pages/login/index.vue
@@ -181,7 +181,6 @@ onUnmounted(() => {
                 </template>
               </van-field>
             </div>
-            <div />
           </div>
           <div class="mt-[55px]">
             <van-button :loading="loadingRef.loading1" v-if="phoneNum" :loading-text="$t('login.getCode')" color="#2B53AC" block style="height: 48px" @click="getCode">{{ $t('login.getCode') }}</van-button>

From a79f1b85da7509ce88a2702e473044511ed74012 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:21:17 +0800
Subject: [PATCH 27/31] 12123

---
 app/api-collect-code/goods/index.js   |  2 +-
 app/api-collect-code/http.js          |  4 ++--
 app/pages/collectCode/login/index.vue |  6 ++----
 app/pages/collectCode/mine/index.vue  |  2 +-
 app/pages/login/index.vue             | 21 +++++++++------------
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/app/api-collect-code/goods/index.js b/app/api-collect-code/goods/index.js
index f95a0e3..ba219d6 100644
--- a/app/api-collect-code/goods/index.js
+++ b/app/api-collect-code/goods/index.js
@@ -1,4 +1,4 @@
-import { request } from '@/api/http.js'
+import { request } from '@/api-collect-code/http.js'
 
 export async function offlineQrcodeList(data) {
     return await request( {
diff --git a/app/api-collect-code/http.js b/app/api-collect-code/http.js
index dfcdaa2..0bb1f33 100644
--- a/app/api-collect-code/http.js
+++ b/app/api-collect-code/http.js
@@ -64,11 +64,11 @@ export function setupHttp() {
       if (data.status === 1) {
         message.error(data.msg || i18n.t('http.error.operationFailed'))
       }
-
+      console.log('拦截响应',data)
       // 处理登录失效
       if (data.status === 401) {
         message.error(i18n.t('http.error.loginExpired'))
-        token.value = '' // 清除 token
+        codeToken.value = '' // 清除 token
         router.replace('/collectCode/login')
       }
 
diff --git a/app/pages/collectCode/login/index.vue b/app/pages/collectCode/login/index.vue
index 3fe41e4..d908856 100644
--- a/app/pages/collectCode/login/index.vue
+++ b/app/pages/collectCode/login/index.vue
@@ -65,9 +65,7 @@ const getCode = async () => {
         pane.value = 1
         await nextTick()
         vanSwipeRef.value?.swipeTo(pane.value)
-        nextTick(() => {
-          codeInput.value?.focus()
-        })
+
     }
   } catch (error) {
     console.error('获取验证码失败:', error)
@@ -199,7 +197,7 @@ const togglePasswordVisibility = () => {
                   type="tel"
                   maxlength="6"
                   ref="codeInput"
-                  class="opacity-0 absolute top-0 left-0 h-full w-full"
+                  class="opacity-0 absolute top-0 left-0 h-full w-full z-999"
                   @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
                   @focus="isFocused = true"
                   @blur="isFocused = false"
diff --git a/app/pages/collectCode/mine/index.vue b/app/pages/collectCode/mine/index.vue
index 194cb13..3921b45 100644
--- a/app/pages/collectCode/mine/index.vue
+++ b/app/pages/collectCode/mine/index.vue
@@ -81,7 +81,7 @@ const abnormal=ref(false)
 const abnormalRow=ref({})
 const inputLotNo=async (data)=>{
 const res=await offlineQrcodeList({
-  lotNo:createForm.value.lotNo
+  lotNo:createForm.value.lotNo-25000
 })
   if (res.status===0){
     if (res.data.Data?.length>0){
diff --git a/app/pages/login/index.vue b/app/pages/login/index.vue
index da13d04..38c14e6 100644
--- a/app/pages/login/index.vue
+++ b/app/pages/login/index.vue
@@ -100,9 +100,6 @@ const getCode =async () => {
   vanSwipeRef.value?.swipeTo(pane.value)
  
   startCountdown();
-  nextTick(()=>{
-    codeInput.value.focus()
-  })
 }
 const goBack = () => {
   code.value = ''
@@ -195,18 +192,18 @@ onUnmounted(() => {
             <div class="text-[16px] text-[#000]">+{{ selectedZone }} {{ phoneNum }}</div>
           </div>
           <div class="relative">
-        <van-password-input 
-  :value="code" 
-  :gutter="10" 
-  :mask="false" 
+        <van-password-input
+  :value="code"
+  :gutter="10"
+  :mask="false"
   :focused="isFocused"
 />
-<input 
-  v-model="code" 
-  type="tel" 
-  maxlength="6" 
+<input
+  v-model="code"
+  type="tel"
+  maxlength="6"
    ref="codeInput"
-  class="opacity-0 absolute top-0 left-0 h-full w-full" 
+  class="opacity-0 absolute top-0 left-0 h-full w-full"
   @input="code = $event.target.value.replace(/\D/g, '').slice(0, 6)"
   @focus="isFocused = true"
   @blur="isFocused = false"

From fb6cb233a193aa8978d5af58fea63064aad2758a Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 17:31:04 +0800
Subject: [PATCH 28/31] 12123

---
 app/api-collect-code/http.js         | 2 +-
 app/pages/collectCode/mine/index.vue | 3 +++
 app/plugins/http.ts                  | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/api-collect-code/http.js b/app/api-collect-code/http.js
index 0bb1f33..08e6936 100644
--- a/app/api-collect-code/http.js
+++ b/app/api-collect-code/http.js
@@ -11,7 +11,7 @@ export function setupHttp() {
   if (http) return http
  const {codeToken}=  codeAuthStore()
   const config = useRuntimeConfig()
-  const baseURL = config.public.NUXT_PUBLIC_API_COLLECT_CODE
+  const baseURL = config.public.NUXT_PUBLIC_API_BASE
   const router = useRouter()
   const i18n = useNuxtApp().$i18n
   
diff --git a/app/pages/collectCode/mine/index.vue b/app/pages/collectCode/mine/index.vue
index 3921b45..4398da2 100644
--- a/app/pages/collectCode/mine/index.vue
+++ b/app/pages/collectCode/mine/index.vue
@@ -80,6 +80,9 @@ const loadMore = async () => {
 const abnormal=ref(false)
 const abnormalRow=ref({})
 const inputLotNo=async (data)=>{
+  if (createForm.value.lotNo<=25000){
+    return
+  }
 const res=await offlineQrcodeList({
   lotNo:createForm.value.lotNo-25000
 })
diff --git a/app/plugins/http.ts b/app/plugins/http.ts
index 47533ba..16e2c67 100644
--- a/app/plugins/http.ts
+++ b/app/plugins/http.ts
@@ -1,5 +1,6 @@
 import { setupHttp } from '@/api/http'
-
+import { setupHttp as  setupHttp1} from '@/api-collect-code/http'
 export default defineNuxtPlugin(() => {
   setupHttp()
+  setupHttp1()
 })

From ac25fe40dc3da09424f186686cddf683dee3f7b4 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Sun, 2 Mar 2025 18:05:05 +0800
Subject: [PATCH 29/31] 12123

---
 app/pages/checkoutPage/index.vue              |  2 +-
 .../mine/components/codeCard/index.vue        | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/app/pages/checkoutPage/index.vue b/app/pages/checkoutPage/index.vue
index 4b871c7..cf161be 100644
--- a/app/pages/checkoutPage/index.vue
+++ b/app/pages/checkoutPage/index.vue
@@ -89,7 +89,7 @@ async function handleSubmit(e) {
   const { error } = await stripe.confirmPayment({
     elements: elements.value,
     confirmParams: {
-      return_url: `${baseURL}/payment/result?orderNo=${route.query.payUid}`,
+      return_url: `${baseURL}${route.query.returnUrl}?orderNo=${route.query.payUid}`,
     },
   })
 
diff --git a/app/pages/collectCode/mine/components/codeCard/index.vue b/app/pages/collectCode/mine/components/codeCard/index.vue
index b8c851b..f3b709f 100644
--- a/app/pages/collectCode/mine/components/codeCard/index.vue
+++ b/app/pages/collectCode/mine/components/codeCard/index.vue
@@ -44,7 +44,26 @@ const openQrCode=async ()=>{
   QRUrl.value=base64
   show.value=true
 }
+/**
+ * 将数字格式化为"250XX"格式，其中XX是两位数
+ * @param {number} num - 要格式化的数字
+ * @return {string} - 格式化后的字符串
+ */
+function formatNumber(num) {
+  // 确保输入是有效数字
+  if (typeof num !== 'number' && isNaN(Number(num))) {
+    throw new Error('输入必须是有效数字');
+  }
 
+  // 转换为数字类型(以防输入是字符串数字)
+  const number = Number(num);
+
+  // 数字部分格式化为两位数，不足补0
+  const formattedNum = number.toString().padStart(2, '0');
+
+  // 添加前缀"250"并返回结果
+  return `250${formattedNum}`;
+}
 </script>
 
 <template>
@@ -58,7 +77,7 @@ const openQrCode=async ()=>{
         <XImage class="w-57px h-56px rounded-4px" :src="data.hdPic"></XImage>
       </div>
       <div class="text-12px text-#1E1E1E">
-        <div>{{ $t('collectCode.qrcode.card.lotNo') }}{{ data.lotNo }}</div>
+        <div>{{ $t('collectCode.qrcode.card.lotNo') }}{{ formatNumber(data.lotNo) }}</div>
         <div>{{ $t('collectCode.qrcode.card.creator') }}{{ data.userName }}</div>
         <div>{{ $t('collectCode.qrcode.card.createTime') }}{{data.createdAt}}</div>
       </div>

From 839dbe8a4210e1091396bbfcbfe62564bf760264 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 3 Mar 2025 09:13:12 +0800
Subject: [PATCH 30/31] 12

---
 app/api-collect-code/auth/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api-collect-code/auth/index.js b/app/api-collect-code/auth/index.js
index b8ab883..044cf6e 100644
--- a/app/api-collect-code/auth/index.js
+++ b/app/api-collect-code/auth/index.js
@@ -9,7 +9,7 @@ export async function checkPhone(data) {
 }
 export async function userSend(data) {
     return await request( {
-        url:'/api/v1/m/user/send',
+        url:'/api/v1/m/user/mobile/send',
         method: 'POST',
         data
     })

From 23a127b0d3bd7c951877fea02825176a29ed8931 Mon Sep 17 00:00:00 2001
From: xingyy <64720302+Concur-max@users.noreply.github.com>
Date: Mon, 3 Mar 2025 09:20:27 +0800
Subject: [PATCH 31/31] 12

---
 app/api-collect-code/auth/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api-collect-code/auth/index.js b/app/api-collect-code/auth/index.js
index 044cf6e..07177d0 100644
--- a/app/api-collect-code/auth/index.js
+++ b/app/api-collect-code/auth/index.js
@@ -1,4 +1,4 @@
-import { request } from '@/api/http.js'
+import { request } from '@/api-collect-code/http.js'
 
 export async function checkPhone(data) {
     return await request({