From 18916caa28cbea38a3f44e3e6b51fa27f1e53ab3 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Sat, 11 Jul 2026 16:52:50 +0800 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E8=81=9A=E5=90=88=E6=89=AB?= =?UTF-8?q?=E7=A0=81=E5=85=A5=E5=8F=A3=E6=9B=B4=E5=90=8D=E4=B8=BA=E7=A0=81?= =?UTF-8?q?=E7=89=8C=E5=92=8C=E8=81=9A=E5=90=88=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 更新工作台卡片、配置页标题与相关提示文案，描述补充码牌支付规则说明。 --- apps/daxpay-admin/src/constants/perm-codes.ts | 2 +- .../src/locales/langs/en-US/payment/merchant/aggregate.json | 6 +++--- .../src/locales/langs/en-US/payment/merchant/app.json | 4 ++-- .../src/locales/langs/zh-CN/payment/merchant/aggregate.json | 6 +++--- .../src/locales/langs/zh-CN/payment/merchant/app.json | 4 ++-- .../src/views/payment/merchant/app/MchAppWorkbench.vue | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/apps/daxpay-admin/src/constants/perm-codes.ts b/apps/daxpay-admin/src/constants/perm-codes.ts index 97d003ff8..970321f03 100644 --- a/apps/daxpay-admin/src/constants/perm-codes.ts +++ b/apps/daxpay-admin/src/constants/perm-codes.ts @@ -69,7 +69,7 @@ export const PermCodes = { VIEW: 'merchant:app:route:view', MANAGE: 'merchant:app:route:manage', }, - /** 聚合扫码配置 menuCode=merchant:gateway-aggregate */ + /** 码牌和聚合支付配置 menuCode=merchant:gateway-aggregate */ GatewayAggregate: { VIEW: 'merchant:gateway-aggregate:view', MANAGE: 'merchant:gateway-aggregate:update', 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 1a4fadb48..76c83d742 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,6 +1,6 @@ { "aggregate": { - "title": "Aggregate QR Pay", + "title": "QR Code & Aggregate Pay", "editModeLabel": "Config Level", "autoLaunch": "Auto Launch", "autoLaunchHint": "Automatically initiate payment after scanning, no manual click needed", @@ -15,8 +15,8 @@ "capability": "Capability", "capabilityPlaceholder": "Select capability", "autoDerived": "Auto-derived", - "saveConfirm": "Are you sure to save the aggregate QR pay config?", - "missingAppContext": "Please access aggregate QR config from app management", + "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", "notSelected": "Not selected", "levelActive": "Active", "scenes": { 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 52372e9f5..efaaf33c1 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 @@ -25,7 +25,7 @@ "validationAppName": "Please enter app name", "validationStatus": "Please select status", "payRoute": "Channel Routing", - "aggregateScan": "Aggregate QR", + "aggregateScan": "QR Code & Aggregate Pay", "notifyConfig": "Notification Config", "cashierConfig": "Cashier Config", "cashierConfigDesc": "Configure cashier items and payment method entries", @@ -39,7 +39,7 @@ "groupManage": "App Management", "groupDanger": "Danger Zone", "payRouteDesc": "Configure channel matching and routing for payment methods", - "aggregateScanDesc": "Configure aggregate QR codes and scan redirect rules", + "aggregateScanDesc": "Configure aggregate QR codes and QR code payment rules; also affects payment QR code settings", "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/zh-CN/payment/merchant/aggregate.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/merchant/aggregate.json index cf0160998..286da1cc6 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,6 +1,6 @@ { "aggregate": { - "title": "聚合扫码", + "title": "码牌和聚合支付", "editModeLabel": "配置模式", "autoLaunch": "自动拉起支付", "autoLaunchHint": "扫码后自动发起支付,无需用户手动点击", @@ -15,8 +15,8 @@ "capability": "支付能力", "capabilityPlaceholder": "请选择支付能力", "autoDerived": "系统自动推导", - "saveConfirm": "确定要保存聚合扫码配置吗?", - "missingAppContext": "请从应用管理进入聚合扫码配置", + "saveConfirm": "确定要保存码牌和聚合支付配置吗?", + "missingAppContext": "请从应用管理进入码牌和聚合支付配置", "notSelected": "未选择", "levelActive": "生效中", "scenes": { 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 ec9c5c225..069b25413 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,7 +25,7 @@ "validationAppName": "请输入应用名称", "validationStatus": "请选择状态", "payRoute": "通道路由", - "aggregateScan": "聚合扫码", + "aggregateScan": "码牌和聚合支付", "notifyConfig": "通知配置", "cashierConfig": "收银台配置", "cashierConfigDesc": "配置收银台展示项与支付方式入口", @@ -39,7 +39,7 @@ "groupManage": "应用管理", "groupDanger": "危险操作", "payRouteDesc": "配置支付方式的通道匹配与路由策略", - "aggregateScanDesc": "配置聚合收款码与扫码跳转规则", + "aggregateScanDesc": "配置聚合收款码与码牌支付规则，同时影响支付码牌相关配置", "notifyConfigDesc": "配置业务事件回调地址与订阅事件", "editDesc": "修改应用名称、启用状态等基本信息", "setDefaultDesc": "未指定应用时，交易默认落到该应用", diff --git a/apps/daxpay-admin/src/views/payment/merchant/app/MchAppWorkbench.vue b/apps/daxpay-admin/src/views/payment/merchant/app/MchAppWorkbench.vue index 76b9a0247..397ec97a3 100644 --- a/apps/daxpay-admin/src/views/payment/merchant/app/MchAppWorkbench.vue +++ b/apps/daxpay-admin/src/views/payment/merchant/app/MchAppWorkbench.vue @@ -85,10 +85,10 @@ if (hasPermission(PermCodes.Merchant.GatewayAggregate.VIEW)) { paymentCards.push({ key: 'aggregateScan', - // 国际化：聚合扫码 + // 国际化：码牌和聚合支付 title: $t('payment.merchant.app.app.aggregateScan'), icon: 'ant-design:qrcode-outlined', - // 国际化：配置聚合收款码与扫码跳转规则 + // 国际化：配置聚合收款码与码牌支付规则，同时影响支付码牌相关配置 description: $t('payment.merchant.app.app.aggregateScanDesc'), route: '/payment/merchant/aggregate', });