fix(i18n): 补齐前端 iam/user 字段并修复 MerchantUserInfo 键路径

- MerchantUserInfo.vue: payment.merchant.field.{mchNo,mchName} 改为 payment.merchant.base.field.{mchNo,mchName}(base.json 文件路径决定 keyPath 前缀, 之前缺一段 base 段导致 raw key 暴露) - iam/user.json × 10 语种补 4 个 key: field.registerTime / field.loginCount / field.lastLoginIp / validation.accountPattern (商户用户详情页和新增表单使用) - iam/menu.json zh-CN/en-US 移除顶层重复的 title (与 L52 的 title 字段重名, JSON 解析时后者覆盖前者, 保留字段语义正确的版本)
2026-08-11 23:25:33 +08:00 · 2026-07-19 21:55:34 +08:00
parent 8294c322ec
commit c5d2babc75
13 changed files with 62 additions and 24 deletions
--- a/apps/daxpay-admin/src/locales/langs/en-US/iam/menu.json
+++ b/apps/daxpay-admin/src/locales/langs/en-US/iam/menu.json
@@ -1,5 +1,4 @@
 {
-  "title": "Menu Management",
  "client": "Client",
  "menuCode": "Menu Code",
  "selectMenuType": "Please select menu type",
--- a/apps/daxpay-admin/src/locales/langs/en-US/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/en-US/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "Selected Role",
    "lastLoginTime": "Last Login Time",
    "detail": "User Detail",
-    "administrator": "Administrator"
+    "administrator": "Administrator",
+    "registerTime": "Registration Time",
+    "loginCount": "Login Count",
+    "lastLoginIp": "Last Login IP"
  },
  "status": {
    "normal": "Normal",
@@ -59,7 +62,8 @@
    "accountFormat": "Account can only contain letters, numbers, underscores and hyphens",
    "passwordNoChinese": "Password cannot contain Chinese characters",
    "cannotEditNonAdmin": "Cannot edit non-admin client users",
-    "cannotAssignRoleNonAdmin": "Cannot assign roles to non-admin client users"
+    "cannotAssignRoleNonAdmin": "Cannot assign roles to non-admin client users",
+    "accountPattern": "Account can only contain letters, numbers and underscores"
  },
  "passwordPolicy": {
    "requireUppercase": "Password must contain uppercase letter",
--- a/apps/daxpay-admin/src/locales/langs/id-ID/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/id-ID/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "Peran yang Dipilih",
    "lastLoginTime": "Waktu Masuk Terakhir",
    "detail": "Detil Pengguna",
-    "administrator": "Administrator"
+    "administrator": "Administrator",
+    "registerTime": "Waktu Pendaftaran",
+    "loginCount": "Jumlah Login",
+    "lastLoginIp": "IP Login Terakhir"
  },
  "status": {
    "normal": "Normal",
@@ -59,7 +62,8 @@
    "accountFormat": "Akun hanya boleh berisi huruf, angka, garis bawah, dan tanda hubung",
    "passwordNoChinese": "Kata sandi tidak boleh berisi karakter Cina",
    "cannotEditNonAdmin": "Tidak dapat mengedit pengguna klien non-admin",
-    "cannotAssignRoleNonAdmin": "Tidak dapat menetapkan peran kepada pengguna klien non-admin"
+    "cannotAssignRoleNonAdmin": "Tidak dapat menetapkan peran kepada pengguna klien non-admin",
+    "accountPattern": "Akun hanya boleh berisi huruf, angka, dan garis bawah"
  },
  "passwordPolicy": {
    "requireUppercase": "Kata sandi harus mengandung huruf besar",
--- a/apps/daxpay-admin/src/locales/langs/ja-JP/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/ja-JP/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "選択された役割",
    "lastLoginTime": "最終ログイン時間",
    "detail": "ユーザーの詳細",
-    "administrator": "管理者"
+    "administrator": "管理者",
+    "registerTime": "登録時間",
+    "loginCount": "ログイン回数",
+    "lastLoginIp": "最終ログイン IP"
  },
  "status": {
    "normal": "普通",
@@ -59,7 +62,8 @@
    "accountFormat": "アカウントには文字、数字、アンダースコア、ハイフンのみを含めることができます",
    "passwordNoChinese": "パスワードに漢字を含めることはできません",
    "cannotEditNonAdmin": "管理者以外のクライアント ユーザーは編集できません",
-    "cannotAssignRoleNonAdmin": "管理者以外のクライアント ユーザーにロールを割り当てることはできません"
+    "cannotAssignRoleNonAdmin": "管理者以外のクライアント ユーザーにロールを割り当てることはできません",
+    "accountPattern": "アカウントは英字、数字、アンダースコアのみ使用できます"
  },
  "passwordPolicy": {
    "requireUppercase": "パスワードには大文字が含まれている必要があります",
--- a/apps/daxpay-admin/src/locales/langs/ko-KR/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/ko-KR/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "선택된 역할",
    "lastLoginTime": "마지막 로그인 시간",
    "detail": "사용자 세부정보",
-    "administrator": "관리자"
+    "administrator": "관리자",
+    "registerTime": "가입 시간",
+    "loginCount": "로그인 횟수",
+    "lastLoginIp": "최근 로그인 IP"
  },
  "status": {
    "normal": "정상",
@@ -59,7 +62,8 @@
    "accountFormat": "계정에는 문자, 숫자, 밑줄, 하이픈만 포함할 수 있습니다.",
    "passwordNoChinese": "비밀번호에는 한자가 포함될 수 없습니다.",
    "cannotEditNonAdmin": "관리자가 아닌 클라이언트 사용자는 편집할 수 없습니다.",
-    "cannotAssignRoleNonAdmin": "관리자가 아닌 클라이언트 사용자에게 역할을 할당할 수 없습니다."
+    "cannotAssignRoleNonAdmin": "관리자가 아닌 클라이언트 사용자에게 역할을 할당할 수 없습니다.",
+    "accountPattern": "계정은 문자, 숫자, 밑줄만 포함할 수 있습니다"
  },
  "passwordPolicy": {
    "requireUppercase": "비밀번호에는 대문자가 포함되어야 합니다.",
--- a/apps/daxpay-admin/src/locales/langs/ms-MY/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/ms-MY/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "Peranan Terpilih",
    "lastLoginTime": "Masa Log Masuk Terakhir",
    "detail": "Butiran Pengguna",
-    "administrator": "Pentadbir"
+    "administrator": "Pentadbir",
+    "registerTime": "Masa Pendaftaran",
+    "loginCount": "Kiraan Log Masuk",
+    "lastLoginIp": "IP Log Masuk Terakhir"
  },
  "status": {
    "normal": "Biasalah",
@@ -59,7 +62,8 @@
    "accountFormat": "Akaun hanya boleh mengandungi huruf, nombor, garis bawah dan sempang",
    "passwordNoChinese": "Kata laluan tidak boleh mengandungi aksara Cina",
    "cannotEditNonAdmin": "Tidak boleh mengedit pengguna pelanggan bukan pentadbir",
-    "cannotAssignRoleNonAdmin": "Tidak boleh memberikan peranan kepada pengguna pelanggan bukan pentadbir"
+    "cannotAssignRoleNonAdmin": "Tidak boleh memberikan peranan kepada pengguna pelanggan bukan pentadbir",
+    "accountPattern": "Akaun hanya boleh mengandungi huruf, nombor dan garis bawah"
  },
  "passwordPolicy": {
    "requireUppercase": "Kata laluan mesti mengandungi huruf besar",
--- a/apps/daxpay-admin/src/locales/langs/th-TH/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/th-TH/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "บทบาทที่เลือก",
    "lastLoginTime": "เวลาเข้าสู่ระบบล่าสุด",
    "detail": "รายละเอียดผู้ใช้",
-    "administrator": "ผู้ดูแลระบบ"
+    "administrator": "ผู้ดูแลระบบ",
+    "registerTime": "เวลาลงทะเบียน",
+    "loginCount": "จำนวนการเข้าสู่ระบบ",
+    "lastLoginIp": "IP เข้าสู่ระบบล่าสุด"
  },
  "status": {
    "normal": "ปกติ",
@@ -59,7 +62,8 @@
    "accountFormat": "บัญชีมีได้เฉพาะตัวอักษร ตัวเลข ขีดล่าง และขีดกลางเท่านั้น",
    "passwordNoChinese": "รหัสผ่านต้องไม่มีตัวอักษรจีน",
    "cannotEditNonAdmin": "แก้ไขผู้ใช้ไคลเอ็นต์ที่ไม่ใช่ผู้ดูแลระบบไม่ได้",
-    "cannotAssignRoleNonAdmin": "ไม่สามารถมอบหมายบทบาทให้กับผู้ใช้ไคลเอ็นต์ที่ไม่ใช่ผู้ดูแลระบบได้"
+    "cannotAssignRoleNonAdmin": "ไม่สามารถมอบหมายบทบาทให้กับผู้ใช้ไคลเอ็นต์ที่ไม่ใช่ผู้ดูแลระบบได้",
+    "accountPattern": "บัญชีสามารถมีเฉพาะตัวอักษร ตัวเลข และขีดล่างเท่านั้น"
  },
  "passwordPolicy": {
    "requireUppercase": "รหัสผ่านจะต้องมีตัวพิมพ์ใหญ่",
--- a/apps/daxpay-admin/src/locales/langs/vi-VN/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/vi-VN/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "Vai trò đã chọn",
    "lastLoginTime": "Lần đăng nhập cuối cùng",
    "detail": "Chi tiết người dùng",
-    "administrator": "Quản trị viên"
+    "administrator": "Quản trị viên",
+    "registerTime": "Thời gian đăng ký",
+    "loginCount": "Số lần đăng nhập",
+    "lastLoginIp": "IP đăng nhập cuối"
  },
  "status": {
    "normal": "Bình thường",
@@ -59,7 +62,8 @@
    "accountFormat": "Tài khoản chỉ có thể chứa chữ cái, số, dấu gạch dưới và dấu gạch nối",
    "passwordNoChinese": "Mật khẩu không được chứa ký tự tiếng Trung",
    "cannotEditNonAdmin": "Không thể chỉnh sửa người dùng khách hàng không phải quản trị viên",
-    "cannotAssignRoleNonAdmin": "Không thể chỉ định vai trò cho người dùng khách hàng không phải quản trị viên"
+    "cannotAssignRoleNonAdmin": "Không thể chỉ định vai trò cho người dùng khách hàng không phải quản trị viên",
+    "accountPattern": "Tài khoản chỉ được chứa chữ cái, số và dấu gạch dưới"
  },
  "passwordPolicy": {
    "requireUppercase": "Mật khẩu phải chứa chữ in hoa",
--- a/apps/daxpay-admin/src/locales/langs/zh-CN/iam/menu.json
+++ b/apps/daxpay-admin/src/locales/langs/zh-CN/iam/menu.json
@@ -1,5 +1,4 @@
 {
-  "title": "菜单管理",
  "client": "终端",
  "menuCode": "菜单编码",
  "selectMenuType": "请选择菜单类型",
--- a/apps/daxpay-admin/src/locales/langs/zh-CN/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/zh-CN/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "已选角色",
    "lastLoginTime": "最后登录时间",
    "detail": "用户详情",
-    "administrator": "管理员"
+    "administrator": "管理员",
+    "registerTime": "注册时间",
+    "loginCount": "登录次数",
+    "lastLoginIp": "最后登录 IP"
  },
  "status": {
    "normal": "正常",
@@ -59,7 +62,8 @@
    "accountFormat": "账号只能包含字母、数字、下划线和中划线",
    "passwordNoChinese": "密码不能包含中文字符",
    "cannotEditNonAdmin": "不允许编辑非运营端用户",
-    "cannotAssignRoleNonAdmin": "不允许为非运营端用户分配角色"
+    "cannotAssignRoleNonAdmin": "不允许为非运营端用户分配角色",
+    "accountPattern": "账号只能包含字母、数字、下划线"
  },
  "passwordPolicy": {
    "requireUppercase": "密码必须包含大写字母",
--- a/apps/daxpay-admin/src/locales/langs/zh-HK/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/zh-HK/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "已選角色",
    "lastLoginTime": "最後登錄時間",
    "detail": "用户詳情",
-    "administrator": "管理員"
+    "administrator": "管理員",
+    "registerTime": "註冊時間",
+    "loginCount": "登入次數",
+    "lastLoginIp": "最後登入 IP"
  },
  "status": {
    "normal": "正常",
@@ -59,7 +62,8 @@
    "accountFormat": "賬號只能包含字母、數字、下劃線和中劃線",
    "passwordNoChinese": "密碼不能包含中文字符",
    "cannotEditNonAdmin": "不允許編輯非運營端用户",
-    "cannotAssignRoleNonAdmin": "不允許為非運營端用户分配角色"
+    "cannotAssignRoleNonAdmin": "不允許為非運營端用户分配角色",
+    "accountPattern": "帳號只能包含字母、數字、底線"
  },
  "passwordPolicy": {
    "requireUppercase": "密碼必須包含大寫字母",
--- a/apps/daxpay-admin/src/locales/langs/zh-TW/iam/user.json
+++ b/apps/daxpay-admin/src/locales/langs/zh-TW/iam/user.json
@@ -12,7 +12,10 @@
    "selectedRole": "已選角色",
    "lastLoginTime": "最後登入時間",
    "detail": "使用者詳情",
-    "administrator": "管理員"
+    "administrator": "管理員",
+    "registerTime": "註冊時間",
+    "loginCount": "登入次數",
+    "lastLoginIp": "最後登入 IP"
  },
  "status": {
    "normal": "正常",
@@ -59,7 +62,8 @@
    "accountFormat": "賬號只能包含字母、數字、下劃線和中劃線",
    "passwordNoChinese": "密碼不能包含中文字元",
    "cannotEditNonAdmin": "不允許編輯非運營端使用者",
-    "cannotAssignRoleNonAdmin": "不允許為非運營端使用者分配角色"
+    "cannotAssignRoleNonAdmin": "不允許為非運營端使用者分配角色",
+    "accountPattern": "帳號只能包含字母、數字、底線"
  },
  "passwordPolicy": {
    "requireUppercase": "密碼必須包含大寫字母",
--- a/apps/daxpay-admin/src/views/payment/merchant/user/info/MerchantUserInfo.vue
+++ b/apps/daxpay-admin/src/views/payment/merchant/user/info/MerchantUserInfo.vue
@@ -106,11 +106,11 @@
          </a-tag>
        </a-descriptions-item>
        <!-- 商户号 -->
-        <a-descriptions-item :label="$t('payment.merchant.field.mchNo')">
+        <a-descriptions-item :label="$t('payment.merchant.base.field.mchNo')">
          {{ userInfo.mchNo }}
        </a-descriptions-item>
        <!-- 商户名称 -->
-        <a-descriptions-item :label="$t('payment.merchant.field.mchName')">
+        <a-descriptions-item :label="$t('payment.merchant.base.field.mchName')">
          {{ userInfo.mchName }}
        </a-descriptions-item>
        <!-- 注册时间 -->