From 4c9299e7263ab30d2eb358030499240e1a67b893 Mon Sep 17 00:00:00 2001 From: zhangrenyuan <18990852002@163.com> Date: Tue, 2 Dec 2025 19:02:02 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9E=20fix::=20=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=8C=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=80=E4=BA=9B=E8=8B=B1=E6=96=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/locales/lang/en.js | 62 ++++++++++++++-------------- src/components/locales/lang/zh-CN.js | 2 +- src/views/consume/gold/coinConsumeDetail.vue | 12 +++--- src/views/home.vue | 23 ++++++++--- 4 files changed, 55 insertions(+), 44 deletions(-) diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 6af574e..6190592 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -7,8 +7,8 @@ export default { common: { // Filters name: 'Name', - jwcode: 'Jwcode', - jwcodePlaceholder: 'Please enter Jwcode', + jwcode: 'Homily ID', + jwcodePlaceholder: 'Please enter Homily ID', activityName: 'Activity Name', activityNamePlaceholder: 'Please enter activity name', goodsName: 'Product Name', @@ -32,13 +32,13 @@ export default { refundTime: 'Refund Time', updateTime: 'Update Time', submitTime: 'Submit Time', - auditTime: 'Audit Time', + auditTime: 'Review time', startTime: 'Start Time', to: 'To', endTime: 'End Time', // Buttons - search: 'Search', + search: 'Query', exportExcel: 'Export Excel', viewExportList: 'View Export List', reset: 'Reset', @@ -58,9 +58,9 @@ export default { // Units rechargeSGD: 'Recharge (SGD)', consumeSGD: 'Consumption (SGD)', - refundGoldCoin: 'Total Refunded Gold Coins', + refundGoldCoin: 'Total refunded coins', totalGoldCoin: 'Total Gold Coins', - netGoldChange: 'Net Gold Coin Change', + netGoldChange: 'Net Coin Change', netGoldChangeTip: 'The current total shows the net change in gold coins within the selected range (Total Recharged - Total Consumed + Total Refunded)', permanentGold: 'Permanent Gold Coins', @@ -83,10 +83,10 @@ export default { addSuccess: 'Added successfully', searchSuccess: 'Search completed', requestFailed: 'Request failed', - jwcodeError: 'Invalid Jwcode', + jwcodeError: 'Invalid Homily ID', addFailedUnknown: 'Add failed due to an unknown error', addFailed: 'Add failed. Please check your network or contact the administrator', - queryFailed: 'Query failed. Please check your network or Jwcode', + queryFailed: 'Query failed. Please check your network or Homily ID', refundTypeError: 'Refund type format error. Please contact the administrator', getTotalFailed: 'Failed to obtain summary data. Please try again later', payPlatformError: 'Platform data format error. Please contact the administrator', @@ -95,9 +95,9 @@ export default { // Validation checkInputContent: 'Please verify the input content', permanentAndFreeNoZero: 'Permanent and free gold coins cannot both be 0', - checkRate: 'Please select a currency', - checkMoney: 'Please enter the recharge amount', - checkJwcode: 'Please enter Jwcode', + checkRate: 'Please select', + checkMoney: 'Please enter the amount', + checkJwcode: 'Please enter Homily ID', checkGoodsName: 'Please select a product', checkUserInfo: 'Please query user information first', checkActivity: 'Please enter activity name', @@ -113,13 +113,13 @@ export default { checkOrderNo: 'Please enter the order number', // Validation Error - noEmptyJwcode: 'Jwcode cannot be empty', + noEmptyJwcode: 'Homily ID cannot be empty', noEmptySumGold: 'Total consumed gold coins cannot be empty', noUser: 'User does not exist', noOrder: 'No related order found', noTotalGoldZero: 'Total gold coins cannot be 0', noNegativeNumber: 'Negative numbers are not allowed', - limitDigitJwcode: 'Jwcode may only contain digits', + limitDigitJwcode: 'Homily ID may only contain digits', limitNoSpecialChar: 'Cannot contain special characters or negative numbers', limitNegativeNumber: 'Consumed gold coins cannot be negative', limitExceeded: 'Consumed gold coins exceed the available balance', @@ -127,7 +127,7 @@ export default { limitTwoDecimal: 'Decimal part cannot exceed 2 digits', limitZero: 'Amount cannot be less than 0', limitPositiveNumber: 'Enter a positive number greater than 0 (up to 2 decimals)', - limitJwcodeNine: 'Jwcode must be numeric and up to 9 digits', + limitJwcodeNine: 'Homily ID must be numeric and up to 9 digits', limitBalance: 'Entered amount exceeds available balance', // Image Upload @@ -138,12 +138,12 @@ export default { // Audit noPermission: 'No permission', - checkJwcodeFormat: 'Please check the Jwcode format', + checkJwcodeFormat: 'Please check the Homily ID format', rejectReasonPlaceholder: 'Please enter a rejection reason', rejectSuccess: 'Rejected successfully', rejectFailed: 'Rejection failed', operationFailed: 'Operation failed', - approveSuccess: 'Approved successfully', + approveSuccess: 'Review approved successfully', approveFailed: 'Approval failed', activityFormatError: 'Activity data format error. Please contact the administrator', rechargeFormatError: 'Recharge method format error. Please contact the administrator', @@ -167,9 +167,9 @@ export default { common_list: { id: 'No.', name: 'Name', - jwcode: 'Jwcode', + jwcode: 'Homily ID', market: 'Region', - sumGold: 'Total Gold Coins', + sumGold: 'Total Coins', payPlatform: 'Platform', type: 'Update Type', orderNo: 'Order No.', @@ -178,7 +178,7 @@ export default { refundModel: 'Refund Method', refundModelAll: 'Full Refund', refundModelPart: 'Partial Refund', - refundGoldCoin: 'Refunded Gold Coins', + refundGoldCoin: 'Total refunded coins', activity: 'Activity Name', rateName: 'Currency', rechargeAmount: 'Recharge Amount', @@ -190,7 +190,7 @@ export default { taskGold: 'Task Gold Coins', rechargePlatform: 'Recharge Platform', consumePlatform: 'Consumption Platform', - consumeTotalGold: 'Total Consumed Gold Coins', + consumeTotalGold: 'Total coins consumed', payModel: 'Payment Method', remark: 'Remark', orderStatus: 'Order Status', @@ -214,7 +214,7 @@ export default { // Add Form Fields common_add: { - jwcode: 'Jwcode', + jwcode: 'Homily ID', activity: 'Activity Name', activityPlaceholder: 'Please enter activity name', permanentGold: 'Permanent Gold Coins', @@ -232,10 +232,10 @@ export default { refundModel: 'Refund Method', refundModelAll: 'Full Refund', refundModelPart: 'Partial Refund', - refundGoldCoin: 'Refunded Gold Coins', + refundGoldCoin: 'Total refunded coins', payModelPlaceholder: 'Select collection method', - consumeTotalGold: 'Total Consumed Gold Coins', - totalGold: 'Total Gold Coins', + consumeTotalGold: 'Total coins consumed', + totalGold: 'Total Coins', paymentTime: 'Payment Time', paymentVoucher: 'Payment Voucher', paymentVoucherPlaceholder: 'JPG/PNG only, ≤1MB', @@ -246,21 +246,21 @@ export default { userInfo: 'User Information', prompt: 'Duplicate Recharge Warning', similarRechargeRecords: 'Recent similar recharge records were detected for this user', - rechargePermanentGold: 'Permanent Gold Coin Recharge', + rechargePermanentGold: 'Recharge permanent coins', buy: 'Purchase', operator: 'Operator', - continueOperation: 'Proceed with this action?', + continueOperation: 'Do you want to continue the operation?', }, // Add Form User Info common_add_user: { customerInfo: 'Customer Information', name: 'Name', - currentGoldCoinTotal: 'Current Gold Coin Total', + currentGoldCoinTotal: 'Current total coins', permanentGold: 'Permanent Gold Coins', freeGold: 'Free Gold Coins', taskGold: 'Task Gold Coins', - jwcode: 'Jwcode', + jwcode: 'Homily ID', consumptionTimes: 'Consumption Count', onlyStatisticsDataAfter20250101: 'Statistics only include data after 2025-01-01', store: 'Store', @@ -281,7 +281,7 @@ export default { id: 'No.', name: 'Name', - jwcode: 'Jwcode', + jwcode: 'Homily ID', market: 'Region', activityName: 'Activity Name', currencyName: 'Currency', @@ -295,7 +295,7 @@ export default { rejectReasonPlaceholder: 'Enter rejection reason', paymentTime: 'Payment Time', submitTime: 'Submit Time', - auditTime: 'Audit Time', + auditTime: 'Review time', operation: 'Operation', orderCode: 'Order No.', @@ -327,7 +327,7 @@ export default { }, refundAudit: 'Refund Audit', - refundTotalGold: 'Total Refunded Gold Coins', + refundTotalGold: 'Total Total refunded coins', totalNum: 'Total Items', totalBean: 'Total Gold Beans', diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 9f526aa..e7b7d9a 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -235,7 +235,7 @@ export default { rechargePermanentGold: '充值永久金币', buy: '购买', operator: '操作人', - continueOperation: '是否继续操作', + continueOperation: '是否继续操作？', }, // 新增表单客户信息字段组 common_add_user: { diff --git a/src/views/consume/gold/coinConsumeDetail.vue b/src/views/consume/gold/coinConsumeDetail.vue index a81df1c..7ebe52b 100644 --- a/src/views/consume/gold/coinConsumeDetail.vue +++ b/src/views/consume/gold/coinConsumeDetail.vue @@ -107,28 +107,28 @@ const sortOrder = ref('') const consumePlatform = [ { value: '金币系统', - label: t('consume.consumePlatforms.goldSystem') + label: '金币系统' }, { value: 'HomilyChart', - label: t('consume.consumePlatforms.HomilyChart') + label: 'HomilyChart' }, { value: 'HomilyLink', - label: t('consume.consumePlatforms.HomilyLink') + label: 'HomilyLink' }, { value: 'ERP', - label: t('consume.consumePlatforms.ERP') + label: 'ERP' }, { value: '其他', - label: t('consume.consumePlatforms.other') + label: '其他' }, { value: '初始化金币', - label: t('consume.consumePlatforms.initGold') + label: '初始化金币' }, ] diff --git a/src/views/home.vue b/src/views/home.vue index 50cf584..d3db58d 100644 --- a/src/views/home.vue +++ b/src/views/home.vue @@ -322,7 +322,7 @@ onMounted(() => getMessage()) style="width: 4vh; height: 4vh; margin-right: 4px;" > - {{ menu.menuName }} + {{ menu.menuName }} @@ -362,7 +362,7 @@ onMounted(() => getMessage()) :alt="`${menu.menuName}图标`" style="width: 4vh; height: 4vh; margin-right: 4px;" > - {{ menu.menuName }} + {{ menu.menuName }} @@ -589,6 +589,17 @@ onMounted(() => getMessage()) height: 12vh; } +/* 菜单项文字样式 */ +.menu-item-text { + display: inline-block; + max-width: 120px; /* 设置最大宽度 */ + min-width: 80px; /* 设置最小宽度 */ + /* overflow: hidden; */ + /* text-overflow: ellipsis; */ + white-space: nowrap; /* 不换行 */ + flex: 1; /* 自动填充剩余空间 */ + text-align: left; /* 文字左对齐 */ +} /* 中间可滚动菜单容器 */ .menu-scroll-container { @@ -620,7 +631,7 @@ onMounted(() => getMessage()) } .sidebar-layout { - width: 15vw; + width: 16vw; height: 100%; background: #E7F4FD; /* 浅蓝色背景 */ /* backdrop-filter: blur(5px); 毛玻璃效果 --消耗性能 */