diff --git a/apps/daxpay-admin/src/locales/langs/en-US/dashboard/workspace.json b/apps/daxpay-admin/src/locales/langs/en-US/dashboard/workspace.json index 09cb5f9f2..edac285c3 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/dashboard/workspace.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/dashboard/workspace.json @@ -57,7 +57,7 @@ "menu": "Menus", "operateLog": "Operate Logs", "notice": "Notices", - "productConfig": "Payment Products", + "productConfig": "Channel Product Config", "platformConfig": "Platform Config", "onlineUser": "Online Users", "analytics": "Analytics", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/page.json b/apps/daxpay-admin/src/locales/langs/en-US/page.json index 8774561d2..64ad9c3cc 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/page.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/page.json @@ -14,7 +14,7 @@ }, "payment": { "title": "Payment Management", - "platform": "Platform Management", + "platform": "Payment Management", "merchantList": "Merchant List", "merchantManage": "Merchant Management", "merchantChannelMerchant": "Merchant Channel Merchant", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json index 0b6769b72..6f073687a 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/constant/product.json @@ -25,7 +25,7 @@ "unknown": "Product Configuration" }, "productConfig": { - "title": "Payment Product Management", + "title": "Channel Product Config", "emptyDesc": "No payment product data available", "prodLabel": "Prod", "sandboxLabel": "Sandbox", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/develop.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/develop.json index 13904fe14..18086f25d 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/develop.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/develop.json @@ -64,10 +64,10 @@ }, "mode": { "label": "Pay Mode", - "route": "Route Mode", - "direct": "Direct Mode", - "routeDesc": "Dynamically matched by merchant/method + app via routing engine", - "directDesc": "Directly decided by channel merchant + capability" + "route": "Follow Channel Routing", + "direct": "Explicit Channel Merchant", + "routeDesc": "Resolve channel merchant and capability via the app's channel routing", + "directDesc": "Decided by channel merchant + capability; skip channel routing" }, "preview": { "title": "Request JSON", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/aggregate.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/aggregate.json index 76c83d742..d101a39c2 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/aggregate.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/aggregate.json @@ -1,13 +1,13 @@ { "aggregate": { - "title": "QR Code & Aggregate Pay", + "title": "Aggregate Pay Config", "editModeLabel": "Config Level", "autoLaunch": "Auto Launch", "autoLaunchHint": "Automatically initiate payment after scanning, no manual click needed", - "autoModeHint": "System auto-derives payment method by scan environment, resolved via basic routing. No manual config needed.", - "methodModeHint": "Manually select payment method per scene, resolved via scene routing.", - "directModeHint": "Directly specify channel merchant and capability per scene, bypassing routing.", - "scene": "Scene", + "autoModeHint": "System derives pay method from open environment and follows app channel routing. No manual config needed.", + "methodModeHint": "Manually select pay method per open environment, then resolve via app channel routing.", + "directModeHint": "Explicitly set channel merchant and capability per open environment; skip channel routing.", + "scene": "Open Environment", "method": "Payment Method", "methodPlaceholder": "Select payment method", "channelMerchant": "Channel Merchant", @@ -15,8 +15,8 @@ "capability": "Capability", "capabilityPlaceholder": "Select capability", "autoDerived": "Auto-derived", - "saveConfirm": "Are you sure to save the QR code and aggregate pay config?", - "missingAppContext": "Please access QR code and aggregate pay config from app management", + "saveConfirm": "Save aggregate pay config?", + "missingAppContext": "Please open aggregate pay config from app management", "notSelected": "Not selected", "levelActive": "Active", "scenes": { @@ -25,8 +25,8 @@ "union_pay": "UnionPay", "douyin": "Douyin" }, - "modeAuto": "Auto", + "modeAuto": "Follow Channel Routing", "modeMethod": "By Method", - "modeDirect": "Direct" + "modeDirect": "Explicit Channel Merchant" } } diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/app.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/app.json index efaaf33c1..57bc6ede5 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/app.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/app.json @@ -24,9 +24,9 @@ "noDefaultAppTip": "You haven't set a default app yet. Please select an app as default", "validationAppName": "Please enter app name", "validationStatus": "Please select status", - "payRoute": "Channel Routing", - "aggregateScan": "QR Code & Aggregate Pay", - "notifyConfig": "Notification Config", + "payRoute": "Channel Binding", + "aggregateScan": "Aggregate Pay Config", + "notifyConfig": "Async Notify Config", "cashierConfig": "Cashier Config", "cashierConfigDesc": "Configure cashier items and payment method entries", "actionDrawerTitle": "App Configuration", @@ -38,8 +38,8 @@ "groupConfig": "Payment Config", "groupManage": "App Management", "groupDanger": "Danger Zone", - "payRouteDesc": "Configure channel matching and routing for payment methods", - "aggregateScanDesc": "Configure aggregate QR codes and QR code payment rules; also affects payment QR code settings", + "payRouteDesc": "Choose which channel merchant each wallet (WeChat/Alipay/…) uses for this app", + "aggregateScanDesc": "Configure aggregate QR and how scan resolves pay method and channel", "notifyConfigDesc": "Configure event callback URLs and subscriptions", "editDesc": "Edit app name, status and basic info", "setDefaultDesc": "Used when no app is specified for a transaction", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json index 823403dd1..953de026d 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/cashier.json @@ -5,7 +5,7 @@ "typeH5": "H5", "typeWeb": "WEB", "addItem": "Add Payment Item", - "empty": "No payment items for this scene", + "empty": "No payment items for this open environment", "confirmDelete": "Delete this payment item?", "name": "Name", "namePlaceholder": "Display name on cashier page", @@ -16,9 +16,9 @@ "recommendNo": "No", "sortNo": "Sort", "sortNoPlaceholder": "Smaller numbers first", - "resolveMode": "Resolve Mode", + "resolveMode": "Pay Resolve Mode", "modeMethod": "By Method", - "modeDirect": "Direct", + "modeDirect": "Explicit Channel Merchant", "method": "Payment Method", "methodPlaceholder": "Select payment method", "channelMerchant": "Channel Merchant", 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 47976b148..764cd4c50 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 @@ -2,8 +2,8 @@ "title": "Channel Merchant", "channel": "Channel", "channelMerchantNo": "Channel Merchant No.", - "channelMerchantName": "Merchant Name", - "channelMerchantShortName": "Short Name", + "channelMerchantName": "Channel Merchant Name", + "channelMerchantShortName": "Channel Merchant Short Name", "channelMerchantType": "Merchant Type", "product": "Payment Product", "icon": "Icon", @@ -18,10 +18,10 @@ "groupApp": "App Management", "cardBasicInfo": "Basic Info", "cardBasicInfoDesc": "View channel merchant basic configuration", - "cardEditMerchantName": "Edit Merchant Name", + "cardEditMerchantName": "Edit Channel Merchant Name", "cardEditMerchantNameDesc": "Edit the display name of the channel merchant", - "editMerchantNameTitle": "Edit Merchant Name", - "editMerchantNameSuccess": "Merchant name updated successfully", + "editMerchantNameTitle": "Edit Channel Merchant Name", + "editMerchantNameSuccess": "Channel merchant name updated successfully", "cardAuthOperation": "App Auth Token", "cardAuthOperationDesc": "Manually set or obtain the app auth token via agent authorization for platform-operated Alipay merchants", "cardApp": "App Management", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/credential.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/credential.json index f66836eaa..c74ddc68a 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/credential.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/credential.json @@ -1,6 +1,6 @@ { "credential": { - "title": "Credential Config", + "title": "API Credentials", "backToWorkbench": "Back to Management", "publicKey": "Merchant Public Key", "publicKeyPlaceholder": "Please enter the merchant RSA public key (PEM format)", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/notifyConfig.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/notifyConfig.json index ce0b1aeba..df11e5861 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/notifyConfig.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/notifyConfig.json @@ -1,7 +1,7 @@ { "notifyConfig": { - "title": "Notification Config", - "infoBanner": "Notification config receives business event callbacks pushed by the platform. Please fill in an https callback URL accessible from the public network", + "title": "Async Notify Config", + "infoBanner": "Async notify config receives business event callbacks pushed by the platform. Please fill in an https callback URL accessible from the public network", "notifyUrl": "Callback URL", "notifyUrlTooltip": "Event notifications will be pushed to this URL via HTTP POST, must start with https://", "notifyUrlPlaceholder": "https://your-callback-receiver-url", @@ -17,7 +17,7 @@ "statusDisable": "Disable", "remark": "Remark", "remarkPlaceholder": "Please enter remark", - "confirmSave": "Are you sure to save the notification config?", + "confirmSave": "Save async notify config?", "saveSuccess": "Saved successfully" } } diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/route.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/route.json index 6e3b6db0d..e5ecab78d 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/route.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/route.json @@ -1,22 +1,22 @@ { "route": { - "title": "Channel Routing", - "editModeLabel": "Configure Mode", - "setActiveMode": "Enable This Mode", - "setActiveModeConfirm": "This app's payment channel routing will be set to \"{mode}\". New orders will resolve routes using this mode. Continue?", - "alreadyActiveMode": "Already the active mode", + "title": "Channel Binding", + "editModeLabel": "Config dimension", + "setActiveMode": "Set as active", + "setActiveModeConfirm": "Set this app's channel routing to \"{mode}\". New orders will resolve the channel merchant using this config. Continue?", + "alreadyActiveMode": "Already the active config", "activeModeTag": "Active", - "modeBasic": "Basic", - "modeScene": "Scene", + "modeBasic": "By Brand Default", + "modeScene": "By Method", "payCapability": "Payment capability", "payCapabilityPlaceholder": "Select a capability", - "sceneSaveConfirm": "Save scene mode routing configuration? This will overwrite the current channel merchant and capability mapping per pay method.", + "sceneSaveConfirm": "Save By Method routing? This will overwrite the channel merchant and capability mapping per pay method.", "basicProductNotSelected": "Not selected", "channelMerchant": "Channel merchant", "channelMerchantPlaceholder": "Select a channel merchant", "channelMerchantNotFound": "No channel merchants available", "sceneChannelMchCapabilityPairHint": "Select both channel merchant and capability, or leave both empty; partial selection is not allowed", - "basicSaveConfirm": "Save basic mode routing configuration? This will overwrite the default channel merchant per payment channel.", + "basicSaveConfirm": "Save By Brand Default routing? This will overwrite the default channel merchant per pay provider.", "sceneRouteNotSelected": "Not selected", "configTab": "Routing", "method": "Pay Method", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/workbench.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/workbench.json index ed4fbbf69..a42a86d40 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/workbench.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/merchant/workbench.json @@ -16,8 +16,8 @@ "cardChannelMerchantDesc": "Merchant No. configuration and management across payment channels", "cardApp": "App Management", "cardAppDesc": "Merchant app creation and management", - "cardCredentialConfig": "Credential Config", - "cardCredentialConfigDesc": "Merchant public key, communication key, platform public key and other credential configuration", + "cardCredentialConfig": "API Credentials", + "cardCredentialConfigDesc": "Merchant public key, communication key, platform public key and other API credential configuration", "cardWxDomainVerify": "WeChat Domain Verify", "cardWxDomainVerifyDesc": "Upload and manage WeChat Official Account / Mini Program business domain verification files", "cardUser": "Merchant User", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/dashboard/workspace.json b/apps/daxpay-admin/src/locales/langs/zh-CN/dashboard/workspace.json index edb01ceac..ebbd20f25 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/dashboard/workspace.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/dashboard/workspace.json @@ -57,7 +57,7 @@ "menu": "菜单管理", "operateLog": "操作日志", "notice": "通知公告", - "productConfig": "支付产品管理", + "productConfig": "通道产品配置", "platformConfig": "平台配置", "onlineUser": "在线用户", "analytics": "分析页", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/page.json b/apps/daxpay-admin/src/locales/langs/zh-CN/page.json index 5f123db9d..5b41f5d05 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/page.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/page.json @@ -14,7 +14,7 @@ }, "payment": { "title": "支付管理", - "platform": "平台管理", + "platform": "支付管理", "merchantList": "商户列表", "merchantManage": "商户管理", "merchantChannelMerchant": "商户通道商户", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json index 001ecf70e..638fc769a 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/constant/product.json @@ -25,7 +25,7 @@ "unknown": "产品配置" }, "productConfig": { - "title": "支付产品管理", + "title": "通道产品配置", "emptyDesc": "暂无支付产品数据", "prodLabel": "生产", "sandboxLabel": "沙箱", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/develop.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/develop.json index c0699c58d..ae537697b 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/develop.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/develop.json @@ -64,10 +64,10 @@ }, "mode": { "label": "支付模式", - "route": "路由模式", - "direct": "直传模式", - "routeDesc": "由商户/支付方式+应用经路由引擎动态匹配", - "directDesc": "由通道商户+支付能力直接决定支付实现" + "route": "跟随通道路由", + "direct": "指定通道商户", + "routeDesc": "按应用通道路由解析通道商户与支付能力", + "directDesc": "由通道商户+支付能力直接决定支付实现,跳过通道路由" }, "preview": { "title": "请求参数 JSON", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/aggregate.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/aggregate.json index 286da1cc6..b7e18035b 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/aggregate.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/aggregate.json @@ -1,13 +1,13 @@ { "aggregate": { - "title": "码牌和聚合支付", + "title": "聚合收款配置", "editModeLabel": "配置模式", "autoLaunch": "自动拉起支付", "autoLaunchHint": "扫码后自动发起支付,无需用户手动点击", - "autoModeHint": "系统按扫码环境自动推导支付方式,走路由基础模式解析,无需手动配置", - "methodModeHint": "每个场景手动选择支付方式,走路由场景模式解析", - "directModeHint": "每个场景直接指定通道商户号和支付能力,跳过路由直定通道", - "scene": "场景", + "autoModeHint": "系统按打开环境自动推导支付方式,跟随应用通道路由解析,无需手动配置", + "methodModeHint": "每个打开环境手动选择支付方式,再按应用通道路由解析", + "directModeHint": "每个打开环境直接指定通道商户和支付能力,跳过通道路由", + "scene": "打开环境", "method": "支付方式", "methodPlaceholder": "请选择支付方式", "channelMerchant": "通道商户号", @@ -15,8 +15,8 @@ "capability": "支付能力", "capabilityPlaceholder": "请选择支付能力", "autoDerived": "系统自动推导", - "saveConfirm": "确定要保存码牌和聚合支付配置吗?", - "missingAppContext": "请从应用管理进入码牌和聚合支付配置", + "saveConfirm": "确定要保存聚合收款配置吗?", + "missingAppContext": "请从应用管理进入聚合收款配置", "notSelected": "未选择", "levelActive": "生效中", "scenes": { @@ -25,8 +25,8 @@ "union_pay": "云闪付环境", "douyin": "抖音环境" }, - "modeAuto": "自动模式", - "modeMethod": "方式模式", - "modeDirect": "精确模式" + "modeAuto": "跟随通道路由", + "modeMethod": "指定支付方式", + "modeDirect": "指定通道商户" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/app.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/app.json index 069b25413..e1791eebb 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/app.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/app.json @@ -25,8 +25,8 @@ "validationAppName": "请输入应用名称", "validationStatus": "请选择状态", "payRoute": "通道路由", - "aggregateScan": "码牌和聚合支付", - "notifyConfig": "通知配置", + "aggregateScan": "聚合收款配置", + "notifyConfig": "异步通知配置", "cashierConfig": "收银台配置", "cashierConfigDesc": "配置收银台展示项与支付方式入口", "actionDrawerTitle": "应用配置", @@ -38,8 +38,8 @@ "groupConfig": "支付配置", "groupManage": "应用管理", "groupDanger": "危险操作", - "payRouteDesc": "配置支付方式的通道匹配与路由策略", - "aggregateScanDesc": "配置聚合收款码与码牌支付规则,同时影响支付码牌相关配置", + "payRouteDesc": "指定本应用微信/支付宝等收款走哪个通道商户", + "aggregateScanDesc": "配置一码多付与码牌扫码后如何选择支付方式与通道", "notifyConfigDesc": "配置业务事件回调地址与订阅事件", "editDesc": "修改应用名称、启用状态等基本信息", "setDefaultDesc": "未指定应用时,交易默认落到该应用", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json index 7a5582b4b..230e3bafd 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/cashier.json @@ -5,7 +5,7 @@ "typeH5": "H5", "typeWeb": "WEB", "addItem": "新增支付项", - "empty": "当前场景暂无支付项", + "empty": "当前打开环境暂无支付项", "confirmDelete": "确定删除该支付项吗?", "name": "名称", "namePlaceholder": "请输入前台展示名称", @@ -16,9 +16,9 @@ "recommendNo": "否", "sortNo": "排序", "sortNoPlaceholder": "数字越小越靠前", - "resolveMode": "解析模式", - "modeMethod": "方式模式", - "modeDirect": "精确模式", + "resolveMode": "支付解析方式", + "modeMethod": "指定支付方式", + "modeDirect": "指定通道商户", "method": "支付方式", "methodPlaceholder": "请选择支付方式", "channelMerchant": "通道商户", 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 41e52e4c9..ef46894c5 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 @@ -2,8 +2,8 @@ "title": "通道商户", "channel": "所属通道", "channelMerchantNo": "通道商户号", - "channelMerchantName": "商户名称", - "channelMerchantShortName": "商户简称", + "channelMerchantName": "通道商户名称", + "channelMerchantShortName": "通道商户简称", "channelMerchantType": "商户类型", "product": "支付产品", "icon": "图标", @@ -18,10 +18,10 @@ "groupApp": "应用管理", "cardBasicInfo": "基本信息", "cardBasicInfoDesc": "查看通道商户基础配置信息", - "cardEditMerchantName": "修改商户名称", + "cardEditMerchantName": "修改通道商户名称", "cardEditMerchantNameDesc": "修改通道商户的显示名称", - "editMerchantNameTitle": "修改商户名称", - "editMerchantNameSuccess": "商户名称修改成功", + "editMerchantNameTitle": "修改通道商户名称", + "editMerchantNameSuccess": "通道商户名称修改成功", "cardAuthOperation": "应用授权令牌", "cardAuthOperationDesc": "手动设置或代运营授权获取应用授权令牌,用于平台代运营支付宝商户", "cardApp": "应用管理", @@ -50,7 +50,7 @@ "confirmDisableOk": "确认禁用", "confirmDeleteOk": "确认删除", "editTitle": "编辑通道商户", - "pleaseInputName": "请输入商户名称", + "pleaseInputName": "请输入通道商户名称", "enableSuccess": "启用成功", "disableSuccess": "禁用成功", "deleteSuccess": "删除成功", @@ -68,7 +68,7 @@ "selectedProduct": "所属支付产品", "channelType": "通道类型", "channelMchNoRequired": "请输入通道商户号", - "channelMerchantNameRequired": "请输入商户名称", + "channelMerchantNameRequired": "请输入通道商户名称", "channelMchNoPlaceholder": "请输入通道侧的商户号", "createSuccess": "创建成功", "createSuccessDesc": "通道商户已成功创建,可以关闭此页面", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/notifyConfig.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/notifyConfig.json index e0865fd68..aa7206ef6 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/notifyConfig.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/notifyConfig.json @@ -1,7 +1,7 @@ { "notifyConfig": { - "title": "通知配置", - "infoBanner": "通知配置用于接收平台主动推送的业务事件回调,请填写可被公网访问的 https 回调地址", + "title": "异步通知配置", + "infoBanner": "异步通知配置用于接收平台主动推送的业务事件回调,请填写可被公网访问的 https 回调地址", "notifyUrl": "回调地址", "notifyUrlTooltip": "事件通知将以 HTTP POST 方式推送到该地址,需以 https:// 开头", "notifyUrlPlaceholder": "https://您的回调接收地址", @@ -17,7 +17,7 @@ "statusDisable": "禁用", "remark": "备注", "remarkPlaceholder": "请输入备注", - "confirmSave": "确定要保存通知配置吗?", + "confirmSave": "确定要保存异步通知配置吗?", "saveSuccess": "保存成功" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/route.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/route.json index ddf3a0245..6dbe78e54 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/route.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/route.json @@ -1,22 +1,22 @@ { "route": { "title": "通道路由", - "editModeLabel": "配置模式", - "setActiveMode": "启用该模式", - "setActiveModeConfirm": "将把本应用的支付通道路由设为「{mode}」,之后下单按该模式解析。是否继续?", - "alreadyActiveMode": "已是当前生效模式", + "editModeLabel": "配置维度", + "setActiveMode": "设为当前生效", + "setActiveModeConfirm": "将把本应用的通道路由设为「{mode}」,之后下单按该配置解析收款通道商户。是否继续?", + "alreadyActiveMode": "已是当前生效配置", "activeModeTag": "生效中", - "modeBasic": "基础模式", - "modeScene": "场景模式", + "modeBasic": "按渠道默认", + "modeScene": "按支付方式", "payCapability": "支付能力", "payCapabilityPlaceholder": "请选择支付能力", - "sceneSaveConfirm": "确定要保存场景模式路由配置吗?保存后将覆盖当前按支付方式映射的通道商户与能力。", + "sceneSaveConfirm": "确定要保存「按支付方式」通道路由配置吗?保存后将覆盖当前按支付方式映射的通道商户与能力。", "basicProductNotSelected": "未选择", "channelMerchant": "通道商户", "channelMerchantPlaceholder": "请选择通道商户", "channelMerchantNotFound": "暂无可选通道商户", "sceneChannelMchCapabilityPairHint": "通道商户与支付能力须同时选择或同时留空,不可只填其中一项", - "basicSaveConfirm": "确定要保存基础模式路由配置吗?保存后将覆盖各支付渠道对应的默认通道商户。", + "basicSaveConfirm": "确定要保存「按渠道默认」通道路由配置吗?保存后将覆盖各支付渠道对应的默认通道商户。", "sceneRouteNotSelected": "未选择", "configTab": "路由配置", "method": "支付方式", diff --git a/apps/daxpay-admin/src/views/payment/merchant/aggregate/shared/constants.ts b/apps/daxpay-admin/src/views/payment/merchant/aggregate/shared/constants.ts index 2be9b7090..b4468024b 100644 --- a/apps/daxpay-admin/src/views/payment/merchant/aggregate/shared/constants.ts +++ b/apps/daxpay-admin/src/views/payment/merchant/aggregate/shared/constants.ts @@ -26,9 +26,9 @@ export const AGGREGATE_SCENES: AggregateSceneConfig[] = [ { scene: 'douyin', provider: 'douyin', defaultMethod: 'douyin_jsapi' }, ]; -// 模式显示名 +// 模式显示名(与 i18n payment.merchant.route / aggregate 词表对齐;页面优先用 $t) export const LEVEL_DISPLAY: Record = { - auto: '自动模式', - method: '方式模式', - direct: '精确模式', + auto: '跟随通道路由', + method: '指定支付方式', + direct: '指定通道商户', };