From 52a091806a45f5257ff4485bed8d09a78375dbe3 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Mon, 15 Jun 2026 13:33:32 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=9A=E9=81=93=E5=95=86=E6=88=B7?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=20title=20=E5=8C=BA=E5=88=86?= =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=9B=B4=E8=BF=9E/=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=95=86=E3=80=81=E6=94=AF=E4=BB=98=E5=AE=9D=E7=9B=B4=E8=BF=9E?= =?UTF-8?q?/=E6=9C=8D=E5=8A=A1=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/locales/langs/en-US/payment/channel/wechat.json | 6 +++--- .../langs/en-US/payment/merchant/channelMerchant.json | 6 ++++-- .../src/locales/langs/zh-CN/payment/channel/wechat.json | 6 +++--- .../src/locales/langs/zh-CN/payment/channel/wechatIsv.json | 2 +- .../langs/zh-CN/payment/merchant/channelMerchant.json | 2 ++ .../detail/ChannelMerchantDetailDispatch.vue | 4 ++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechat.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechat.json index 266edd116..5861e4dd8 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechat.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechat.json @@ -5,8 +5,8 @@ "appSecret": "App Secret", "publicKey": "Public Key", "publicKeyId": "Public Key ID", - "privateKey": "apiclient_key", - "privateCert": "apiclient_cert", + "privateKey": "API Certificate Private Key", + "privateCert": "API Certificate", "certSerialNo": "Certificate Serial No", "wxAppSecret": "WeChat App Secret", "wxAuthUrl": "WeChat Auth URL", @@ -17,7 +17,7 @@ "appSecretRequired": "Please enter app secret", "publicKeyRequired": "Please enter public key", "publicKeyIdRequired": "Please enter public key ID", - "privateCertRequired": "Please enter apiclient_cert", + "privateCertRequired": "Please enter API certificate", "certSerialNoRequired": "Please enter certificate serial number", "wxAppSecretRequired": "Please enter WeChat app secret" } diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json index f518e0428..a0faa7b4f 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/channelMerchant.json @@ -8,8 +8,10 @@ "product": "Payment Product", "icon": "Icon", "manage": "Manage", - "manageTitleAlipay": "Alipay Channel Merchant", - "manageTitleWechat": "WeChat Channel Merchant", + "manageTitleAlipay": "Alipay ISV Channel Merchant", + "manageTitleAlipayDirect": "Alipay Direct Channel Merchant", + "manageTitleWechat": "WeChat ISV Channel Merchant", + "manageTitleWechatDirect": "WeChat Direct Channel Merchant", "manageTitleDefault": "Channel Merchant Management", "groupBasic": "Basic Management", "groupApp": "App Management", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechat.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechat.json index 69b6ce027..3481399b1 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechat.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechat.json @@ -5,8 +5,8 @@ "appSecret": "APPID接口密码", "publicKey": "支付公钥", "publicKeyId": "支付公钥ID", - "privateKey": "apiclient_key证书", - "privateCert": "apiclient_cert证书", + "privateKey": "API证书私钥", + "privateCert": "API证书", "certSerialNo": "证书序列号", "wxAppSecret": "微信密钥", "wxAuthUrl": "微信授权认证地址", @@ -17,7 +17,7 @@ "appSecretRequired": "请输入APPID接口密码", "publicKeyRequired": "请输入支付公钥", "publicKeyIdRequired": "请输入支付公钥ID", - "privateCertRequired": "请输入apiclient_cert证书", + "privateCertRequired": "请输入API证书", "certSerialNoRequired": "请输入证书序列号", "wxAppSecretRequired": "请输入微信密钥" } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatIsv.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatIsv.json index 23f85d455..6f2b2ae6a 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatIsv.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatIsv.json @@ -26,7 +26,7 @@ "publicKey": "支付公钥", "publicKeyTooltip": "微信平台中的支付公钥(pub_key.pem)", "uploadPublicKey": "上传支付公钥", - "publicKeyId": "公钥编号", + "publicKeyId": "支付公钥ID", "publicKeyIdPlaceholder": "请输入公钥编号", "validation": { "enable": "请选择是否启用", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json index 66d0e3a84..5fa627216 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/channelMerchant.json @@ -9,7 +9,9 @@ "icon": "图标", "manage": "管理", "manageTitleAlipay": "支付宝通道商户管理", + "manageTitleAlipayDirect": "支付宝直连通道商户管理", "manageTitleWechat": "微信通道商户管理", + "manageTitleWechatDirect": "微信直连通道商户管理", "manageTitleDefault": "通道商户管理", "groupBasic": "基础管理", "groupApp": "应用管理", diff --git a/apps/daxpay-admin/src/views/payment/merchant/channel-merchant/detail/ChannelMerchantDetailDispatch.vue b/apps/daxpay-admin/src/views/payment/merchant/channel-merchant/detail/ChannelMerchantDetailDispatch.vue index a27a19e40..279e96f24 100644 --- a/apps/daxpay-admin/src/views/payment/merchant/channel-merchant/detail/ChannelMerchantDetailDispatch.vue +++ b/apps/daxpay-admin/src/views/payment/merchant/channel-merchant/detail/ChannelMerchantDetailDispatch.vue @@ -59,7 +59,7 @@ function isSupported(p: string) { /** 按产品解析页头标题 */ function resolvePageTitle(productCode: string) { if (productCode === ProductEnum.ALIPAY) { - return $t('payment.channel.alipayMchManage.title'); + return $t('payment.merchant.channelMerchant.manageTitleAlipayDirect'); } if (productCode === ProductEnum.ALIPAY_ISV) { return $t('payment.merchant.channelMerchant.manageTitleAlipay'); @@ -68,7 +68,7 @@ function resolvePageTitle(productCode: string) { return $t('payment.merchant.channelMerchant.manageTitleWechat'); } if (productCode === ProductEnum.WECHAT_PAY) { - return $t('payment.merchant.channelMerchant.manageTitleWechat'); + return $t('payment.merchant.channelMerchant.manageTitleWechatDirect'); } return $t('payment.merchant.channelMerchant.manageTitleDefault'); }