From 24d9673b14708ea3db69a30d10035bc875c13c04 Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:18:54 +0800 Subject: [PATCH 01/29] 1231 --- app/pages/payment/index.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/pages/payment/index.vue b/app/pages/payment/index.vue index 6f34474..cbb8c5a 100644 --- a/app/pages/payment/index.vue +++ b/app/pages/payment/index.vue @@ -37,13 +37,13 @@ const confirmPay=async ()=>{ testReturnEndPoint:'/payment/result' }) if (res.status===0){ -/* router.push({ + router.push({ path:'/externallinks', query:{ url:res.data.checkoutSessionUrl } - })*/ - window.location.href=res.data.checkoutSessionUrl + }) +/* window.location.href=res.data.checkoutSessionUrl*/ } } From ffd4f5092099561af8853e3f47b9fca7c8979fbe Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Wed, 26 Feb 2025 15:38:07 +0800 Subject: [PATCH 02/29] =?UTF-8?q?refactor(i18n):=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E6=94=B6=E9=9B=86=E7=A0=81=E7=AD=BE=E7=BD=B2=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=96=87=E6=A1=88=E5=B9=B6=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=94=AF=E4=BB=98=E9=A1=B5=E9=9D=A2=E8=B7=B3=E8=BD=AC=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改收集码签署结果页面的标题和提示文案 -修复支付页面的成功跳转逻辑- 新增国际化文案 --- app/pages/collectCode/signature/result/index.vue | 6 +++--- app/pages/payment/index.vue | 6 +++--- i18n/locales/zh-CN.json | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/pages/collectCode/signature/result/index.vue b/app/pages/collectCode/signature/result/index.vue index 01aa118..3731d47 100644 --- a/app/pages/collectCode/signature/result/index.vue +++ b/app/pages/collectCode/signature/result/index.vue @@ -6,7 +6,7 @@ const { t } = useI18n(); const {formData,number}=codeAuthStore() const auctionUserNo=ref('') definePageMeta({ - i18n: 'collectCode.signature.result.title' + i18n: 'collectCode.signature.title' }) const res=await sessionUserNoCreate({ phone:formData.value.phone @@ -19,8 +19,8 @@ if (res.status===0){ \ No newline at end of file diff --git a/app/stores/auth/index.js b/app/stores/auth/index.js index e6a7cee..a812e23 100644 --- a/app/stores/auth/index.js +++ b/app/stores/auth/index.js @@ -12,8 +12,9 @@ export const authStore = createGlobalState(() => { buyUid:'', auctionArtworkUuid:'' }) - +const payUid=useLocalStorage('payUid','') return{ + payUid, selectedZone, payment, checkoutSessionUrl, diff --git a/env/.env.test b/env/.env.test index e2232e5..6d382ab 100644 --- a/env/.env.test +++ b/env/.env.test @@ -2,4 +2,5 @@ NUXT_PUBLIC_API_BASE=https://auction-test.szjixun.cn NUXT_PUBLIC_API_COLLECT_CODE=http://auction-test.szjixun.cn NUXT_API_SECRET=test-secret -NUXT_PUBLIC_SOCKET_URL=wss://auction-test.szjixun.cn \ No newline at end of file +NUXT_PUBLIC_SOCKET_URL=wss://auction-test.szjixun.cn +NUXT_PUBLIC_PKEY=pk_test_51QfbSAAB1Vm8VfJq3AWsR4k2mZjnlF7XFrmlbc6XVXrtwXquAUfwzZmOFDbxMIAwqJBgqao8KLt2wmPc4vNOCTeo00WB78KtfV \ No newline at end of file diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json index 4905db7..c19cc95 100644 --- a/i18n/locales/en-US.json +++ b/i18n/locales/en-US.json @@ -268,7 +268,9 @@ "placeholder": { "amount": "Maximum {currency}{price}" }, - "amount": "Payment Amount" + "amount": "Payment Amount", + "amountRequired": "Please enter the amount", + "exceedAmount": "Can't be greater than the total amount" }, "signature": { "protocol": { diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json index 5a604a4..239bad2 100644 --- a/i18n/locales/ja-JP.json +++ b/i18n/locales/ja-JP.json @@ -268,7 +268,9 @@ "placeholder": { "amount": "最大 {currency}{price}" }, - "amount": "支払い金額" + "amount": "支払い金額", + "amountRequired": "金額を入力してください", + "exceedAmount": "総額よりも大きくすることはできません" }, "signature": { "protocol": { diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json index 062c7f5..fa1788c 100644 --- a/i18n/locales/zh-CN.json +++ b/i18n/locales/zh-CN.json @@ -269,7 +269,9 @@ "placeholder": { "amount": "最多" }, - "amount": "支付金额" + "amount": "支付金额", + "amountRequired": "请输入金额", + "exceedAmount": "不能大于全部金额" }, "signature": { "protocol": { diff --git a/i18n/locales/zh-TW.json b/i18n/locales/zh-TW.json index 1d60898..fda58d0 100644 --- a/i18n/locales/zh-TW.json +++ b/i18n/locales/zh-TW.json @@ -319,7 +319,9 @@ "placeholder": { "amount": "最多{currency}{price}" }, - "amount": "支付金額" + "amount": "支付金額", + "amountRequired": "請輸入金額", + "exceedAmount": "不能大於全部金額" }, "signature": { "protocol": { diff --git a/nuxt.config.js b/nuxt.config.js index d8e8076..2e45790 100644 --- a/nuxt.config.js +++ b/nuxt.config.js @@ -72,6 +72,13 @@ export default defineNuxtConfig({ link: [ { rel: 'icon', href: '/favicon.ico', sizes: 'any' }, ], + // stripe支付CDN引用 + script: [ + { + src: 'https://js.stripe.com/v3/', + defer: true // 可选，建议添加 defer + } + ], meta: [ { name: 'viewport', content: 'width=device-width, initial-scale=1, viewport-fit=cover,user-scalable=no' }, { name: 'apple-mobile-web-app-capable', content: 'yes' }, From 28679f3627ad4eda78082daa02213267372218a3 Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Fri, 28 Feb 2025 15:14:36 +0800 Subject: [PATCH 27/29] =?UTF-8?q?refactor(i18n):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=96=87=E6=A1=88=E8=A1=A8=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改身份证相关文案，使其更加通用和国际化 - 统一使用"ID number"、"证件号"等表述，替代"ID Card Number"、"身份证号" - 调整部分文案以提高可读性和一致性 --- i18n/locales/en-US.json | 4 ++-- i18n/locales/ja-JP.json | 4 ++-- i18n/locales/zh-CN.json | 4 ++-- i18n/locales/zh-TW.json | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json index c19cc95..51769ff 100644 --- a/i18n/locales/en-US.json +++ b/i18n/locales/en-US.json @@ -133,8 +133,8 @@ "otherTab": "Non-Mainland Residents", "cnTabDesc": "Please fill in ID card information", "otherTabDesc": "Please upload personal information", - "idCard": "ID Card Number", - "idCardPlaceholder": "Please enter ID card number", + "idCard": "ID number", + "idCardPlaceholder": "Please enter your ID number", "name": "Name", "namePlaceholder": "Please enter your name", "gender": "Gender", diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json index 239bad2..d0241e6 100644 --- a/i18n/locales/ja-JP.json +++ b/i18n/locales/ja-JP.json @@ -133,8 +133,8 @@ "otherTab": "中国本土以外の居住者", "cnTabDesc": "身分証明書の情報を入力してください", "otherTabDesc": "個人情報をアップロードしてください", - "idCard": "身分証明書番号", - "idCardPlaceholder": "身分証明書番号を入力してください", + "idCard": "ID番号", + "idCardPlaceholder": "ID番号を入力してください", "name": "名前", "namePlaceholder": "名前を入力してください", "gender": "性別", diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json index fa1788c..32cd535 100644 --- a/i18n/locales/zh-CN.json +++ b/i18n/locales/zh-CN.json @@ -133,8 +133,8 @@ "otherTab": "非大陆居民", "cnTabDesc": "请填写身份证相关信息", "otherTabDesc": "请上传个人相关信息", - "idCard": "身份证号", - "idCardPlaceholder": "请输入身份证号", + "idCard": "证件号", + "idCardPlaceholder": "请输入证件号", "name": "姓名", "namePlaceholder": "请输入姓名", "gender": "性别", diff --git a/i18n/locales/zh-TW.json b/i18n/locales/zh-TW.json index fda58d0..1b009e3 100644 --- a/i18n/locales/zh-TW.json +++ b/i18n/locales/zh-TW.json @@ -184,8 +184,8 @@ "otherTab": "非大陸居民", "cnTabDesc": "請填寫身份證相關信息", "otherTabDesc": "請上傳個人相關信息", - "idCard": "身份證號", - "idCardPlaceholder": "請輸入身份證號", + "idCard": "證件號", + "idCardPlaceholder": "請輸入證件號", "name": "姓名", "namePlaceholder": "請輸入姓名", "gender": "性別", From ee720107fad01ae2aada4802657b2acae2080d10 Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Fri, 28 Feb 2025 15:29:00 +0800 Subject: [PATCH 28/29] =?UTF-8?q?refactor(i18n):=20=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=96=87=E6=A1=88=E5=B9=B6=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个语言文件中添加新的翻译字段 idTypeString 和 incompleteForm - 修改个人身份信息页面中的证件类型文本 - 更新错误提示信息 --- app/pages/collectCode/signature/personal-Info/index.vue | 2 +- i18n/locales/en-US.json | 6 ++++-- i18n/locales/ja-JP.json | 6 ++++-- i18n/locales/zh-CN.json | 6 ++++-- i18n/locales/zh-TW.json | 6 ++++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/app/pages/collectCode/signature/personal-Info/index.vue b/app/pages/collectCode/signature/personal-Info/index.vue index 9426f12..3983ce7 100644 --- a/app/pages/collectCode/signature/personal-Info/index.vue +++ b/app/pages/collectCode/signature/personal-Info/index.vue @@ -20,7 +20,7 @@ const columns = ref([ {text: t('realAuth.female'), value: 2}, ]) const columns1 = ref([ - {text: t('realAuth.idCard'), value: 1}, + {text: t('realAuth.idTypeString'), value: 1}, {text: t('realAuth.passport'), value: 2}, {text: t('realAuth.other'), value: 3}, ]) diff --git a/i18n/locales/en-US.json b/i18n/locales/en-US.json index 51769ff..3a2ffbd 100644 --- a/i18n/locales/en-US.json +++ b/i18n/locales/en-US.json @@ -162,7 +162,8 @@ "passport": "passport", "other": "other", "idNumber": "ID number", - "idNumberPlaceholder": "Please enter your ID number" + "idNumberPlaceholder": "Please enter your ID number", + "idTypeString": "ID card" }, "detail": { "text1": "Artist", @@ -296,7 +297,8 @@ "transfer": "Auction Transfer Confirmation" }, "error": { - "getRecord": "Failed to get auction record" + "getRecord": "Failed to get auction record", + "incompleteForm": "Please fill in the complete information" }, "action": { "agree": "Agree and Sign", diff --git a/i18n/locales/ja-JP.json b/i18n/locales/ja-JP.json index d0241e6..d6f053a 100644 --- a/i18n/locales/ja-JP.json +++ b/i18n/locales/ja-JP.json @@ -162,7 +162,8 @@ "passport": "パスポート", "other": "他の", "idNumber": "ID番号", - "idNumberPlaceholder": "ID番号を入力してください" + "idNumberPlaceholder": "ID番号を入力してください", + "idTypeString": "IDカード" }, "detail": { "text1": "アーティスト", @@ -296,7 +297,8 @@ "transfer": "オークション譲渡確認" }, "error": { - "getRecord": "オークション記録の取得に失敗しました" + "getRecord": "オークション記録の取得に失敗しました", + "incompleteForm": "完全な情報を入力してください" }, "action": { "agree": "同意して署名", diff --git a/i18n/locales/zh-CN.json b/i18n/locales/zh-CN.json index 32cd535..60e8d0f 100644 --- a/i18n/locales/zh-CN.json +++ b/i18n/locales/zh-CN.json @@ -162,7 +162,8 @@ "passport": "护照", "other": "其他", "idNumber": "证件号", - "idNumberPlaceholder": "请输入证件号" + "idNumberPlaceholder": "请输入证件号", + "idTypeString": "身份证" }, "detail": { "text1": "作者", @@ -297,7 +298,8 @@ "transfer": "《拍卖移交确认书》" }, "error": { - "getRecord": "获取拍卖笔录失败" + "getRecord": "获取拍卖笔录失败", + "incompleteForm": "请填写完整信息" }, "action": { "agree": "同意并签字", diff --git a/i18n/locales/zh-TW.json b/i18n/locales/zh-TW.json index 1b009e3..aa08434 100644 --- a/i18n/locales/zh-TW.json +++ b/i18n/locales/zh-TW.json @@ -213,7 +213,8 @@ "passport": "護照", "other": "其他", "idNumber": "證件號", - "idNumberPlaceholder": "請輸入證件號" + "idNumberPlaceholder": "請輸入證件號", + "idTypeString": "身份證" }, "detail": { "text1": "作者", @@ -347,7 +348,8 @@ "transfer": "《拍賣移交確認書》" }, "error": { - "getRecord": "獲取拍賣筆錄失敗" + "getRecord": "獲取拍賣筆錄失敗", + "incompleteForm": "請填寫完整信息" }, "action": { "agree": "同意並簽字", From f973f047427e9ee371e9b0d541d414fee46b903c Mon Sep 17 00:00:00 2001 From: xingyy <64720302+Concur-max@users.noreply.github.com> Date: Fri, 28 Feb 2025 15:33:10 +0800 Subject: [PATCH 29/29] =?UTF-8?q?ci(env):=20=E6=B7=BB=E5=8A=A0=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E5=85=AC=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- env/.env.prod | 1 + 1 file changed, 1 insertion(+) diff --git a/env/.env.prod b/env/.env.prod index f9f8eaf..b4f2cf6 100644 --- a/env/.env.prod +++ b/env/.env.prod @@ -2,3 +2,4 @@ NUXT_PUBLIC_API_BASE=https://auction.szjixun.cn NUXT_PUBLIC_SOCKET_URL=wss://auction.szjixun.cn NUXT_API_SECRET=prod-secret +NUXT_PUBLIC_PKEY=pk_live_51QfbSAAB1Vm8VfJqEVY2uFHPn9N4sDbOaCzht8IVKoylYBrYvdUsmsnCzGxIoN9skBCvI5PsxLJcf4PlytXIr1aX00mFJBXSB8 \ No newline at end of file