diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 246c24a..ce863c1 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -88,6 +88,7 @@ export default { searchButton: "Search", exportExcel: "Export Excel", viewExportList: "Export List", + exportCompanyWalletDetail: "Export Company Wallet Detail", reset: "Reset", audit: "Audit", refund: "Refund", @@ -143,6 +144,8 @@ export default { taskGold: "Task Coins", SGD: "SGD", goldCoin: "Coins", + recharge: "Recharge", + consume: "Consume", 条: "items", 个: "", goldBean: "Beans", @@ -401,6 +404,9 @@ export default { activityLoadFailed: "Activity load failed", activityDataLoadFailed: "Activity data error", getDataFailed: "Get data failed", + exportWalletDetailError: "Export wallet detail error", + selectCompanyWallet: "Please select company wallet", + getDetailFailed: "Get detail failed", // Permission noPermissionText: "No permission, contact admin", permissionPrompt: "Permission Prompt", @@ -428,6 +434,9 @@ export default { name: "Name", jwcode: "Homily ID", market: "Region", + hongKong: "Hong Kong", + companyWallet: "Company Wallet", + companyWalletPlaceholder: "Select Company Wallet", position: "Position", roleName: "Role", departmentPermission: "Dept Perm", @@ -913,10 +922,31 @@ export default { clientCountDetail: "Coin Details", // 客户钱包 --------------------------------- clientCountWallet: "Wallet", + wallet: "Wallet", + user: "User", recharge: "Recharge", consume: "Consume", refund: "Refund", other: "Other", + currentBalance: "Current Balance", + transactionType: "Type", + transactionDesc: "Desc", + transactionOrderNo: "Order No.", + transactionStatus: "Status", + exceptionData: "Exception Data", + time: "Time", + market: { + hkGold: "Hong Kong", + sgHcGold: "Singapore HC", + sgCmGold: "Singapore CM", + myGold: "Malaysia", + sgGold: "Singapore", + caGold: "Canada", + thHsGold: "Thailand HS", + thHaGold: "Thailand HA", + vnGold: "Vietnam", + bjGold: "Beijing", + }, type: { recharge: "Recharge", consume: "Consume", diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 564cb1f..6b6bed4 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -88,6 +88,7 @@ export default { searchButton: "查询", exportExcel: "导出Excel", viewExportList: "查看导出列表", + exportCompanyWalletDetail: "导出公司钱包明细", reset: "重置", audit: "审核", refund: "退款", @@ -143,6 +144,8 @@ export default { taskGold: "任务金币", SGD: "新币", goldCoin: "金币", + recharge: "充值", + consume: "消耗", 条: "条", 个: "个", goldBean: "金豆", @@ -401,6 +404,8 @@ export default { activityLoadFailed: "活动列表加载失败，请稍后重试", activityDataLoadFailed: "活动数据加载异常，请稍后重试", getDataFailed: "获取数据失败", + exportWalletDetailError: "导出钱包明细出错", + selectCompanyWallet: "请选择公司钱包", // 权限 noPermissionText: "您暂无该页面操作权限，请联系管理员", permissionPrompt: "权限提示", @@ -428,6 +433,9 @@ export default { name: "姓名", jwcode: "精网号", market: "所属地区", + hongKong: "香港", + companyWallet: "公司钱包", + companyWalletPlaceholder: "请选择公司钱包", position: "职位", roleName: "角色名称", departmentPermission: "部门权限", @@ -920,10 +928,31 @@ export default { clientCountDetail: "金币明细", // 客户钱包 --------------------------------- clientCountWallet: "钱包", + wallet: "钱包", + user: "用户", recharge: "充值", consume: "消耗", refund: "退款", other: "其他", + currentBalance: "当前余额", + transactionType: "交易类型", + transactionDesc: "交易说明", + transactionOrderNo: "交易单号", + transactionStatus: "交易状态", + exceptionData: "异常数据", + time: "时间", + market: { + hkGold: "香港", + sgHcGold: "新加坡HC", + sgCmGold: "新加坡CM", + myGold: "马来西亚", + sgGold: "新加坡", + caGold: "加拿大", + thHsGold: "泰国HS", + thHaGold: "泰国HA", + vnGold: "越南", + bjGold: "北京", + }, type: { recharge: "充值", consume: "消耗", diff --git a/src/views/usergold/gold/clientCountBalance.vue b/src/views/usergold/gold/clientCountBalance.vue index abf9088..374ad21 100644 --- a/src/views/usergold/gold/clientCountBalance.vue +++ b/src/views/usergold/gold/clientCountBalance.vue @@ -582,7 +582,7 @@ const handleMouseLeave = () => { >
- 永久金币 + {{ $t('common.permanentGold') }} {{ popoverData.currentPermanentGold || 0 }}
diff --git a/src/views/usergold/gold/clientCountWallet.vue b/src/views/usergold/gold/clientCountWallet.vue index 76f7a0d..1041ba3 100644 --- a/src/views/usergold/gold/clientCountWallet.vue +++ b/src/views/usergold/gold/clientCountWallet.vue @@ -158,7 +158,7 @@ const get = async function (val) { }); total.value = result.data.size; } else { - ElMessage.error(result.msg || '获取数据失败'); + ElMessage.error(result.msg || t('elmessage.getDataFailed')); } } catch (error) { console.log('请求失败', error) @@ -194,27 +194,27 @@ const cellClick = function (row, column) { console.log('cellClick', column) const walletId = propToWalletId[column.property]; const propToMarketName = { - hkGold: '香港', - sgHcGold: '新加坡HC', - myGold: '马来西亚', - sgGold: '新加坡', - caGold: '加拿大', - thHsGold: '泰国HS', - thHaGold: '泰国HA', - vnGold: '越南', - bjGold: '北京' - } - const marketName = propToMarketName[column.property] - - if (marketName && walletId) { - currentWalletInfo.value = { - userName: row.name, - jwcode: row.jwcode, - marketName: row.market, // 用户所属地区 - walletName: marketName + '钱包', // 钱包名称 - currentBalance: row[column.property] || 0, - walletId: walletId - } + hkGold: t('clientCount.market.hkGold'), + sgHcGold: t('clientCount.market.sgHcGold'), + myGold: t('clientCount.market.myGold'), + sgGold: t('clientCount.market.sgGold'), + caGold: t('clientCount.market.caGold'), + thHsGold: t('clientCount.market.thHsGold'), + thHaGold: t('clientCount.market.thHaGold'), + vnGold: t('clientCount.market.vnGold'), + bjGold: t('clientCount.market.bjGold') + } + const marketName = propToMarketName[column.property] + + if (marketName && walletId) { + currentWalletInfo.value = { + userName: row.name, + jwcode: row.jwcode, + marketName: row.market, // 用户所属地区 + walletName: marketName + t('clientCount.wallet'), // 钱包名称 + currentBalance: row[column.property] || 0, + walletId: walletId + } walletDetailQuery.value.pageNum = 1 getWalletDetail() walletDetailVisible.value = true @@ -253,7 +253,7 @@ const getWalletDetail = async () => { if (result.code === 200) { walletDetailList.value = result.data.list.map(item => ({ time: item.createTime, - type: item.type === 0 ? '充值' : '消耗', + type: item.type === 0 ? t('common.recharge') : t('common.consume'), amount: item.type === 1 ? -Math.abs(item.amount) : Math.abs(item.amount), desc: item.description, orderNo: item.orderCode, @@ -261,7 +261,7 @@ const getWalletDetail = async () => { })) walletDetailTotal.value = result.data.total } else { - ElMessage.error(result.msg || '获取明细失败') + ElMessage.error(result.msg || t('elmessage.getDetailFailed')) } } catch (error) { console.error(error) @@ -328,7 +328,7 @@ const exportExcel = async function () { ElMessage.success(t('elmessage.exportSuccess')) // 不需要立即打开导出列表 } else { - ElMessage.error(res.msg || '导出失败') + ElMessage.error(res.msg || t('elmessage.exportFailed')) } } @@ -351,11 +351,11 @@ const exportWalletDetail = async () => { if (res.code === 200) { ElMessage.success(t('elmessage.exportSuccess')) } else { - ElMessage.error(res.msg || '导出失败') + ElMessage.error(res.msg || t('elmessage.exportFailed')) } } catch (error) { console.error('导出钱包明细出错:', error) - ElMessage.error('导出钱包明细出错') + ElMessage.error(t('elmessage.exportWalletDetailError')) } } @@ -364,7 +364,7 @@ const selectWallet = async function () { } const exportExcelOnlyOne = async function () { if (!selectWalletForm.value.companyWalletId) { - ElMessage.error('请选择公司钱包') + ElMessage.error(t('elmessage.selectCompanyWallet')) return } @@ -388,11 +388,11 @@ const exportExcelOnlyOne = async function () { ElMessage.success(t('elmessage.exportSuccess')) openExportList() // 导出成功后打开导出列表 } else { - ElMessage.error(res.msg || '导出失败') + ElMessage.error(res.msg || t('elmessage.exportFailed')) } } catch (error) { console.error('导出失败:', error) - ElMessage.error('导出失败') + ElMessage.error(t('elmessage.exportFailed')) } finally { selectWalletVisible.value = false } @@ -404,7 +404,7 @@ const selectWalletVisible = ref(false) const selectWalletFormRef = ref(null) const selectWalletRules = { companyWalletId: [ - { required: true, message: '请选择公司钱包', trigger: 'change' } + { required: true, message: t('common_list.companyWalletPlaceholder'), trigger: 'change' } ] } // 关闭选择公司钱包弹窗 @@ -419,39 +419,39 @@ const selectWalletForm = ref({}) const companyWalletList = ref([ { id: 1, - name: '香港钱包' + name: t('clientCount.market.hkGold') + t('clientCount.wallet') }, { id: 2, - name: '新加坡HC' + name: t('clientCount.market.sgHcGold') }, { id: 3, - name: '马来西亚' + name: t('clientCount.market.myGold') }, { id: 4, - name: '新加坡CM' + name: t('clientCount.market.sgCmGold') }, { id: 5, - name: '加拿大' + name: t('clientCount.market.caGold') }, { id: 6, - name: '泰国HS' + name: t('clientCount.market.thHsGold') }, { id: 7, - name: '泰国HA' + name: t('clientCount.market.thHaGold') }, { id: 8, - name: '越南' + name: t('clientCount.market.vnGold') }, { id: 9, - name: '北京' + name: t('clientCount.market.bjGold') } ]) // 打开导出列表弹窗 @@ -600,7 +600,7 @@ const format3 = (num) => { {{ $t('common.search') }} {{ $t('common.reset') }} {{ $t('common.exportExcel') }} - 导出公司钱包明细 + {{ $t('common.exportCompanyWalletDetail') }} {{ $t('common.viewExportList') }}
@@ -618,49 +618,49 @@ const format3 = (num) => { - + - + - + - + - + - + - + - + - + - + @@ -707,15 +707,15 @@ const format3 = (num) => { - - + + @@ -724,32 +724,32 @@ const format3 = (num) => { - + - - + + - - - + + + @@ -852,4 +852,4 @@ const format3 = (num) => { margin-right: 20px; } } - \ No newline at end of file +