diff --git a/packages/global/common/system/types/index.d.ts b/packages/global/common/system/types/index.d.ts index 421c95d85..0ec10272f 100644 --- a/packages/global/common/system/types/index.d.ts +++ b/packages/global/common/system/types/index.d.ts @@ -128,6 +128,7 @@ export type FastGPTFeConfigsType = { alipay?: boolean; bank?: boolean; }; + payFormUrl?: string; fileUrlWhitelist?: string[]; customDomain?: { enable?: boolean; diff --git a/packages/web/i18n/en/common.json b/packages/web/i18n/en/common.json index 9cb5fed1f..68badf0f3 100644 --- a/packages/web/i18n/en/common.json +++ b/packages/web/i18n/en/common.json @@ -996,6 +996,7 @@ "pay.package_tip.buy": "The package you purchased is lower than the current package. This package will take effect after the current package expires.\nYou can view the package usage in Account - Personal Information - Package Details.", "pay.package_tip.renewal": "You are renewing the package. You can view the package usage in Account - Personal Information - Package Details.", "pay.package_tip.upgrade": "The package you purchased is higher than the current package. This package will take effect immediately, and the current package will take effect later. You can view the package usage in Account - Personal Information - Package Details.", + "pay.payment_form_tip": "For more payment methods, please click the form ", "pay.wechat": "Please scan the QR code on WeChat to pay: {{price}} yuan\n\nPlease do not close the page before payment is completed", "pay.wx_payment": "WeChat Payment", "pay.yuan": "{{amount}} Yuan", diff --git a/packages/web/i18n/zh-CN/common.json b/packages/web/i18n/zh-CN/common.json index 73dbcaa56..1a4889714 100644 --- a/packages/web/i18n/zh-CN/common.json +++ b/packages/web/i18n/zh-CN/common.json @@ -1003,6 +1003,7 @@ "pay.package_tip.buy": "您购买的套餐等级低于当前套餐,该套餐将在当前套餐过期后生效。\n您可在账号—个人信息—套餐详情里,查看套餐使用情况。", "pay.package_tip.renewal": "您正在续费套餐。您可在账号—个人信息—套餐详情里,查看套餐使用情况。", "pay.package_tip.upgrade": "您购买的套餐等级高于当前套餐,该套餐将即刻生效,当前套餐将延后生效。您可在账号—个人信息—套餐详情里,查看套餐使用情况。", + "pay.payment_form_tip": "更多支付方式,请点击表单", "pay.wechat": "请微信扫码支付: {{price}}元\n支付完成前,请勿关闭页面", "pay.wx_payment": "微信支付", "pay.yuan": "{{amount}}元", diff --git a/packages/web/i18n/zh-Hant/common.json b/packages/web/i18n/zh-Hant/common.json index c5dfb7def..9fab1a2fa 100644 --- a/packages/web/i18n/zh-Hant/common.json +++ b/packages/web/i18n/zh-Hant/common.json @@ -993,6 +993,7 @@ "pay.package_tip.buy": "您購買的方案等級低於目前方案,該方案將在目前方案過期後生效。\n您可在帳戶 - 個人資訊 - 方案詳細資訊中檢視方案使用情況。", "pay.package_tip.renewal": "您正在續約方案。您可在帳戶 - 個人資訊 - 方案詳細資訊中檢視方案使用情況。", "pay.package_tip.upgrade": "您購買的方案等級高於目前方案,該方案將立即生效,目前方案將延後生效。您可在帳戶 - 個人資訊 - 方案詳細資訊中檢視方案使用情況。", + "pay.payment_form_tip": "更多支付方式,請點擊表單", "pay.wechat": "請微信掃碼付款:{{price}}元\n\n付款完成前,請勿關閉頁面", "pay.wx_payment": "微信支付", "pay.yuan": "{{amount}} 元", diff --git a/projects/app/src/components/support/wallet/QRCodePayModal.tsx b/projects/app/src/components/support/wallet/QRCodePayModal.tsx index e11047f07..685c6a197 100644 --- a/projects/app/src/components/support/wallet/QRCodePayModal.tsx +++ b/projects/app/src/components/support/wallet/QRCodePayModal.tsx @@ -1,7 +1,7 @@ import MyModal from '@fastgpt/web/components/common/MyModal'; import React, { useCallback, useEffect, useRef, useState } from 'react'; -import { useTranslation } from 'next-i18next'; -import { Box, ModalBody, Flex, Button } from '@chakra-ui/react'; +import { useTranslation, Trans } from 'next-i18next'; +import { Box, ModalBody, Flex, Button, Text, Link } from '@chakra-ui/react'; import { checkBalancePayResult, putUpdatePayment } from '@/web/support/wallet/bill/api'; import LightTip from '@fastgpt/web/components/common/LightTip'; import QRCode from 'qrcode'; @@ -241,6 +241,17 @@ const QRCodePayModal = ({ )} + + {feConfigs.payFormUrl && ( + + + }} + /> + + )} ); diff --git a/projects/app/src/pageComponents/dataset/detail/CollectionCard/TemplateImportModal.tsx b/projects/app/src/pageComponents/dataset/detail/CollectionCard/TemplateImportModal.tsx index b2fe3a9ba..7d18a2050 100644 --- a/projects/app/src/pageComponents/dataset/detail/CollectionCard/TemplateImportModal.tsx +++ b/projects/app/src/pageComponents/dataset/detail/CollectionCard/TemplateImportModal.tsx @@ -105,7 +105,7 @@ const TemplateImportModal = ({ FileTypeNode={ { whiteSpace={'pre-wrap'} > , termsLink: ( diff --git a/projects/app/src/pages/dashboard/evaluation/create.tsx b/projects/app/src/pages/dashboard/evaluation/create.tsx index d89229f17..f4b04b507 100644 --- a/projects/app/src/pages/dashboard/evaluation/create.tsx +++ b/projects/app/src/pages/dashboard/evaluation/create.tsx @@ -260,7 +260,7 @@ const EvaluationCreating = () => { FileTypeNode={