diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 7f48c3b..02c8876 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -35,9 +35,13 @@ export default { orderStatusPlaceholder: "Select status", payCurrency: "Pay Currency", payCurrencyPlaceholder: "Select currency", + payPlatform1: "Payment Platform", + payPlatformPlaceholder1: "Select payment platform", productName: "Product", productNamePlaceholder: "Enter product", type: "Type", + status: "Status", + statusPlaceholder: "Select status", typePlaceholder: "Select type", customerBelong: "Customer Region", activityBelong: "Activity Region", @@ -66,6 +70,7 @@ export default { consumeTime: "Consume Time", consumetime: "Consume Time", payTime: "Payment Time", + payTime2: "Payment Time", rechargeTime: "Recharge Time", refundTime: "Refund Time", updateTime: "Update Time", @@ -92,6 +97,7 @@ export default { pass: "Approve", close: "Close", reject: "Reject", + rejectInfo: "Reject Info", cancel: "Cancel", confirm: "Confirm", submit: "Submit", @@ -110,13 +116,13 @@ export default { pendingFee: "Fee Pending", viewRejectReason: "Reject Reason", viewProgress: "View Progress", - viewProgress: "View Progress", // Buttons-Date today: "Today", yesterday: "Yesterday", last7Days: "Last 7 Days", // Buttons-Cash-Audit pendingAudit: "Pending", + audited: "Audited", passed: "Passed", completed: "Completed", withdrawn: "Recalled", @@ -171,14 +177,11 @@ export default { changeRoleConfirmContent1: "Confirm role change?
Changing role for [", changeRoleConfirmContent2: "] from [", changeRoleConfirmContent3: "] to [", - changeRoleConfirmContent4: - "]
Permissions will update to the new role configuration. Please confirm.", + changeRoleConfirmContent4: "]
Permissions will update to the new role configuration. Please confirm.", changeRoleSuccessContent1: "User ", changeRoleSuccessContent2: "'s role changed to [", - roleRegionNote: - "Region setting is for display only; used by branch managers to view roles.", + roleRegionNote: "Region setting is for display only; used by branch managers to view roles.", }, - // Message Group elmessage: { // Common @@ -337,6 +340,7 @@ export default { limitImageSize2MB: "Max 2MB!", // Audit noPermission: "No permission", + checkJwcodeFormat: "Invalid Homily ID format", rejectReasonPlaceholder: "Enter reject reason", rejectSuccess: "Rejected", rejectFailed: "Reject failed", @@ -370,6 +374,7 @@ export default { pleaseInputCorrectRateFormat: "Check rate format", pleaseInputCorrectSymbol: "Check symbol", onlyOneDecimalPoint: "One decimal point only", + noNegativeNumber: "No negative numbers", integerPartLimit: "Integer max 6 digits", decimalPartLimit: "Decimal max 7 digits", // Gold Bean @@ -387,11 +392,14 @@ export default { refundReasonPlaceholder: "Enter refund reason", activityLoadFailed: "Activity load failed", activityDataLoadFailed: "Activity data error", + getDataFailed: "Get data failed", // Permission noPermissionText: "No permission, contact admin", permissionPrompt: "Permission Prompt", noRoleAssigned: "No role assigned", unknownRole: "Unknown role", + refundSubmitSuccess: "Refund application submitted successfully", + exportError: "Export failed", }, // Common List Fields @@ -419,6 +427,7 @@ export default { payPlatform: "Platform", type: "Type", orderNo: "Order No.", + orderCode: "Order Code", number: "number", money: "Amount", goodsName: "Product Name", @@ -466,6 +475,7 @@ export default { receiveTime: "Received Time", rejectTime: "Reject Time", rejectReason: "Reject Reason", + rejectRemark: "Reject Remark", refundReason: "Refund Reason", operation: "Operation", // Gold Bean @@ -488,6 +498,7 @@ export default { articleVideoTitle: "Title", author: "Author", payTime: "Pay Time", + payTime2: "Pay Time", currentGoldBean: "Current Beans", historyConsumption: "Hist. Consume", customerName: "Customer", @@ -509,9 +520,13 @@ export default { inProgress: "In Progress", ended: "Ended", }, + operation: "Operation", configTime: "Config Time", + status: "Status", enable: "Enable", disable: "Disable", + received: "Received", + rejected: "Rejected", }, // Common Export Fields common_export: { @@ -568,6 +583,8 @@ export default { customerNamePlaceholder: "Enter customer name", rejectReason: "Reject Reason", rejectReasonPlaceholder: "Enter reason", + rejectRemark: "Reject Remark", + rejectRemarkPlaceholder: "Enter remark", market: "Region", marketPlaceholder: "Enter region", activity: "Activity", @@ -626,6 +643,7 @@ export default { paymentVoucherPlaceholder: "JPG/PNG ≤1MB", transferVoucherPlaceholder: "JPG/PNG ≤2MB", uploadPhoto: "Upload Image", + remark: "Remark", remarkPlaceholder: "Enter remark", // Confirm operationConfirm: "Confirm", @@ -676,6 +694,7 @@ export default { // Audit Group audit: { + // 按照项目文件名分配 // General refundTypeOptions: { 商品退款: "Product Refund", @@ -740,6 +759,8 @@ export default { // Bean Audit totalNum: "Total Items", totalBean: "Total Beans", + permanentBean: "PermanentBeans", + freeBean: "Free Beans", // Dialog Titles rejectRecord: "Reject Record!", passRecord: "Approve Record!", @@ -747,11 +768,15 @@ export default { // Recharge Group recharge: { + // 金币充值明细 coinRechargeDetail: "Coin Recharge Details", + // 订单状态 normal: "Normal", refunded: "Refunded", unknown: "Unknown", + // 金币新增充值 addCoinRecharge: "New Recharge", + // // Pay Methods payMethods: { bankTransfer: "Bank Transfer", @@ -779,10 +804,13 @@ export default { // Consume Group consume: { + // coinConsumeDetail: "Coin Consume Details", + // normal: "Normal", refunded: "Refunded", unknown: "Unknown", + // consumePlatforms: { goldSystem: "Gold System", HomilyChart: "HomilyChart", @@ -791,7 +819,9 @@ export default { other: "Other", initGold: "Init Gold", }, + // addCoinConsume: "New Consume", + // addBeanConsume: "New Consume", liveStream: "Live", dieHardFan: "Die-hard Fan", @@ -926,7 +956,7 @@ export default { query: "Query", gold: "Gold", recharge: "Recharge", - consume: "Consume", + consumes: "Consume", rank: "Rank", allTypes: "All Types", region: "Region", @@ -1138,5 +1168,14 @@ export default { }, pending: "Pending", refundSuccess: "Refund Success", + refundConfirmTitle: "Refund Confirmation", + refundConfirmContent: "Are you sure you want to refund order {orderNo}?", + }, + + // Message + message: { + today: "Today", + yesterday: "Yesterday", + earlier: "Earlier", }, }; diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 56092c3..3010cc6 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -35,9 +35,13 @@ export default { orderStatusPlaceholder: "请选择订单状态", payCurrency: "付款币种", payCurrencyPlaceholder: "请选择付款币种", + payPlatform1: "支付平台", + payPlatformPlaceholder1: "请选择支付平台", productName: "产品名称", productNamePlaceholder: "请输入产品名称", type: "类型", + status: "状态", + statusPlaceholder: "请选择状态", typePlaceholder: "请选择类型", customerBelong: "客户归属地", activityBelong: "活动归属地", @@ -66,6 +70,7 @@ export default { consumeTime: "消耗时间", consumetime: "消费时间", payTime: "付费时间", + payTime2: "付款时间", rechargeTime: "充值时间", refundTime: "退款时间", updateTime: "更新时间", @@ -387,11 +392,14 @@ export default { refundReasonPlaceholder: "请输入退款原因", activityLoadFailed: "活动列表加载失败,请稍后重试", activityDataLoadFailed: "活动数据加载异常,请稍后重试", + getDataFailed: "获取数据失败", // 权限 noPermissionText: "您暂无该页面操作权限,请联系管理员", permissionPrompt: "权限提示", noRoleAssigned: "暂未分配角色", unknownRole: "未知角色", + refundSubmitSuccess: "退款申请已提交", + exportError: "导出失败", }, // 通用列表字段组 @@ -419,6 +427,7 @@ export default { payPlatform: "平台信息", type: "更新类型", orderNo: "订单号", + orderCode: "系统交易号", number: "数量", money: "金额", goodsName: "商品名称", @@ -467,6 +476,7 @@ export default { rejectTime: "驳回时间", rejectReason: "驳回理由", rejectRemark: "驳回备注", + refundReason: "退款理由", operation: "操作", // 金豆相关 permanentBean: "付费金豆", @@ -488,6 +498,7 @@ export default { articleVideoTitle: "文章/视频标题", author: "作者", payTime: "付费时间", + payTime2: "付款时间", currentGoldBean: "现有金豆", historyConsumption: "历史消费", customerName: "客户姓名", @@ -514,6 +525,8 @@ export default { status: "状态", enable: "启用", disable: "禁用", + received: "已到账", + rejected: "已驳回", }, // 通用导出字段组 common_export: { @@ -1172,6 +1185,8 @@ export default { // 退款执行 pending: "待处理", refundSuccess: "退款成功", + refundConfirmTitle: "退款确认", + refundConfirmContent: "确定要对订单 {orderNo} 进行退款吗?", }, // 消息 @@ -1181,4 +1196,3 @@ export default { earlier: "更早", }, }; - diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue index e8ba32a..3ba6dc4 100644 --- a/src/views/moneyManage/financialAccount/cashFlow.vue +++ b/src/views/moneyManage/financialAccount/cashFlow.vue @@ -25,8 +25,8 @@ const paytypeList = [ const payPlatformOptions = ref([...paytypeList]) const statusOptions = [ - { label: '已到账', value: 4 }, - { label: '已退款', value: 6 } + { label: t('common_list.received'), value: 4 }, + { label: t('common_list.rejected'), value: 6 } ] // 地区树 @@ -101,13 +101,13 @@ const fetchData = async () => { total.value = res.data.total || 0 loading.value = false } else { - ElMessage.error(res.msg || '获取数据失败') + ElMessage.error(res.msg || t('elmessage.getDataFailed')) loading.value = false } } catch (error) { console.error(error) loading.value = false - ElMessage.error('获取数据失败') + ElMessage.error(t('elmessage.getDataFailed')) } } @@ -138,14 +138,14 @@ const handleCurrentChange = (val) => { // 退款操作 const handleRefund = (row) => { - ElMessageBox.confirm(`确定要对订单 ${row.systemTradeNo} 进行退款吗?`, '退款确认', { - confirmButtonText: '确定', - cancelButtonText: '取消', + ElMessageBox.confirm(t('cash.refundConfirmContent', { orderNo: row.systemTradeNo }), t('cash.refundConfirmTitle'), { + confirmButtonText: t('common.confirm'), + cancelButtonText: t('common.cancel'), type: 'warning' }).then(() => { - ElMessage.success('退款申请已提交') + ElMessage.success(t('elmessage.refundSubmitSuccess')) // 刷新列表 fetchData() }).catch(() => {}) @@ -184,7 +184,7 @@ const handleExport = async () => { } catch (error) { console.error(error) - ElMessage.error('导出失败') + ElMessage.error(t('elmessage.exportError')) } } @@ -261,11 +261,11 @@ onMounted(() => {
- 精网号: - + {{ t('common.jwcode') }}: +
- 所属地区: + {{ t('common.market') }}: { :props="{ multiple: true, emitPath: false }" collapse-tags collapse-tags-tooltip - placeholder="请选择地区" + :placeholder="t('common.marketPlaceholder')" clearable style="width: 220px;" />
- 支付平台: - + {{ t('common.payPlatform1') }}: +
- 状态: - + {{ t('common.status') }}: +
@@ -295,17 +295,17 @@ onMounted(() => {
- 订单号: - + {{ t('common.orderNo') }}: +
- 付款时间: + {{ t('common.payTime2') }}: @@ -323,39 +323,39 @@ onMounted(() => { - - - - - + + + + + - + - + - + - + - - - + + + - + - +