diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 24c5e10..addca5c 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -27,6 +27,8 @@ export default { payPlatformPlaceholder: 'Select platform', updateType: 'Update Type', updateTypePlaceholder: 'Select update type', + customerBelong: 'Customer Belonging', + activityBelong: 'Activity Belonging', consumeTime: 'Consumption Time', rechargeTime: 'Recharge Time', refundTime: 'Refund Time', @@ -48,6 +50,7 @@ export default { cancel: 'Cancel', confirm: 'Confirm', submit: 'Submit', + addActivity: 'Add Activity', addReceive: 'Add Receive', confirmRecharge: 'Confirm Recharge', @@ -76,6 +79,7 @@ export default { // Dialog Titles will: 'Will ', deleteRecord: 'Delete Record!', + deleteActivityRecord: 'Delete this activity record', }, // Message Group @@ -150,6 +154,7 @@ export default { activityFormatError: 'Activity data format error. Please contact the administrator', rechargeFormatError: 'Recharge method format error. Please contact the administrator', getRechargeError: 'Failed to obtain recharge methods. Please try again later', + deleteSuccess: 'Deleted successfully', // Export exportSuccess: 'Export successful', @@ -182,6 +187,11 @@ export default { refundModelPart: 'Partial Refund', refundGoldCoin: 'Total refunded coins', activity: 'Activity', + businessBelong: 'Performance Belonging', + startTime: 'Start Time', + endTime: 'End Time', + status: 'Status', + creator: 'Creator', rateName: 'Currency', rechargeAmount: 'Recharge Amount', Gold: 'Gold Coin Quantity', @@ -219,6 +229,9 @@ export default { jwcode: 'Homily ID', activity: 'Activity', activityPlaceholder: 'Please enter activity name', + businessBelong: 'Performance Belonging', + startTime: 'Start Time', + endTime: 'End Time', permanentGold: 'Permanent Gold Coins', freeGold: 'Free Gold Coins', taskGold: 'Task Gold Coins', diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index 5265b87..9b19908 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -33,6 +33,8 @@ export default { productNamePlaceholder: "请输入产品名称", type: "类型", typePlaceholder: "请选择类型", + customerBelong: "客户归属地", + activityBelong: "活动归属地", articleVideoID: "文章/视频ID", articleVideoIDPlaceholder: "请输入文章/视频ID", author: "作者", @@ -81,6 +83,7 @@ export default { cancel: "取消", confirm: "确认", submit: "提交", + addActivity: "新增活动", modify: "修改", addReceive: "添加收款", confirmRecharge: "确认充值", @@ -124,6 +127,7 @@ export default { // 对话框标题 will: "将要", deleteRecord: "删除该翻译记录!", + deleteActivityRecord: "删除该活动数据", willRefundOrder: "将要对该订单退款!", willRecallOrder: "将要撤回该订单!", // 市场 @@ -159,6 +163,7 @@ export default { limitRedAmount: "红包抵扣额不足", inNetworkError: "网络异常,请重试", adminInfoLoadFailed: "管理员信息加载异常,请稍后重试", + deleteSuccess: "删除成功", // 校验精网号,充值等输入 checkInputContent: "请检查输入内容", permanentAndFreeNoZero: "永久金币和免费金币不能同时为0", @@ -184,6 +189,11 @@ export default { checkFreeBean: "请输入免费金豆数", checkRemark: "请输入备注", checkFormInfo: "请检查并完善表单信息", + selectBusinessBelong: "请选择业绩归属", + selectMarket: "请选择所属地区", + selectStartTime: "请选择开始时间", + selectEndTime: "请选择结束时间", + currentSelectionEmpty: "当前选择无数据", checkArticleIdFormat: "请检查文章ID格式", checkNameOrJwcode: "请输入姓名或精网号", checkPermanentFormat: "请检查永久金币格式", @@ -310,6 +320,11 @@ export default { refundVoucher: "退款截图", refundSuccess: "退款成功", activity: "活动名称", + businessBelong: "业绩归属地", + startTime: "开始时间", + endTime: "结束时间", + status: "状态", + creator: "添加人", rateName: "货币名称", num: "汇率", rechargeAmount: "充值金额", @@ -396,6 +411,9 @@ export default { marketPlaceholder: "请输入所属地区", activity: "活动名称", activityPlaceholder: "请输入活动名称", + businessBelong: "业绩归属", + startTime: "开始时间", + endTime: "结束时间", permanentGold: "永久金币", freeGold: "免费金币", taskGold: "任务金币", diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue index ed22865..16ed76a 100644 --- a/src/views/activityManage/activity.vue +++ b/src/views/activityManage/activity.vue @@ -2,30 +2,30 @@
- 活动名称: - + {{ t('common.activityName') }}: +
- 业绩归属: + {{ t('common.type') }}: - - - + + +
- 开始时间: - {{ t('common.startTime') }}: +
- 结束时间: - {{ t('common.endTime') }}: +
- 查询 - 重置 + {{ t('common.search') }} + {{ t('common.reset') }}
@@ -33,31 +33,31 @@
- 新增活动 + {{ t('common.addActivity') }}
- + - - - - + + + + - + - + - - + + @@ -84,72 +84,72 @@
- 活动名称: - + {{ t('common_add.activity') }} +
- 业绩归属: + {{ t('common_add.businessBelong') }} - 客户归属地 - 活动归属地 + {{ t('common.customerBelong') }} + {{ t('common.activityBelong') }}
- 所属地区: - {{ t('common_add.market') }} +
- 开始时间: - {{ t('common_add.startTime') }} +
- 结束时间: - {{ t('common_add.endTime') }} +
- 取消 - 确定 + {{ t('common.cancel') }} + {{ t('common.confirm') }}
- 活动名称: - + {{ t('common_add.activity') }} +
- 业绩归属: + {{ t('common_add.businessBelong') }} - 客户归属地 - 活动归属地 + {{ t('common.customerBelong') }} + {{ t('common.activityBelong') }}
- 所属地区: - {{ t('common_add.market') }} +
- 开始时间: - {{ t('common_add.startTime') }} +
- 结束时间: - {{ t('common_add.endTime') }} +
- 取消 - 确定 + {{ t('common.cancel') }} + {{ t('common.confirm') }}
- + @@ -489,18 +500,18 @@ const getTagText = (state) => {
- 精网号: - + {{ t('common.jwcode') }}: +
- 地区: - + {{ t('common.market') }}: +
- 频道: - + {{ t('common.channel') }}: +
@@ -509,9 +520,9 @@ const getTagText = (state) => {
- 消费时间: - {{ t('common.consumetime') }}: +
@@ -520,24 +531,24 @@ const getTagText = (state) => {
- 查询 - 导出Excel - 查看导出列表 - 重置 + {{ t('common.search') }} + {{ t('common.exportExcel') }} + {{ t('common.viewExportList') }} + {{ t('common.reset') }}
- 金豆总数:{{ format3(Math.abs(permanentBean + freeBean)) }}     - 付费金豆数:{{ format3(Math.abs(permanentBean)) }}     - 免费金豆数:{{ format3(Math.abs(freeBean)) }} + {{ t('common.totalGoldBean') }}{{ format3(Math.abs(permanentBean + freeBean)) }}     + {{ t('common.payGoldBean') }}{{ format3(Math.abs(permanentBean)) }}     + {{ t('common.freeGoldBean') }}{{ format3(Math.abs(freeBean)) }}
- - + - + - - - - - - - + + + + + + + - +
@@ -571,33 +582,33 @@ const getTagText = (state) => {
- + - - + + - + - + @@ -663,7 +674,7 @@ const getTagText = (state) => { padding: 0 0.5vw; .text { - width: 5vw; + width: 5.3vw; font-size: 15px; } diff --git a/src/views/channelManage/reward/reward.vue b/src/views/channelManage/reward/reward.vue index 43b0d48..b7cd3f8 100644 --- a/src/views/channelManage/reward/reward.vue +++ b/src/views/channelManage/reward/reward.vue @@ -1,16 +1,20 @@ @@ -523,42 +528,43 @@ const getTagText = (state) => {
- 精网号: - + {{ t('common.jwcode') }}: +
- 地区: - - + {{ t('common.market') }}: + +
- 礼物名称: - - + {{ t('common.giftName') }}: + +
-
- 频道: - - +
+ {{ t('common.channel') }}: + +
-
- 直播间: - +
+ {{ t('common.liveRoom') }}: +
- 消费时间: - + {{ t('common.consumetime') }}: +
@@ -566,83 +572,84 @@ const getTagText = (state) => {
- 查询 - 导出excel - 查看导出列表 - 重置 + {{ t('common.search') }} + {{ t('common.exportExcel') }} + {{ t('common.viewExportList') }} + {{ t('common.reset') }}
- 金豆总数:{{ format3(Math.abs(permanentBean + freeBean)) }}     - 付费金豆数:{{ format3(Math.abs(permanentBean)) }}     - 免费金豆数:{{ format3(Math.abs(freeBean)) }} + {{ t('common.totalGoldBean') }}{{ format3(Math.abs(permanentBean + freeBean)) }}     + {{ t('common.payGoldBean') }}{{ format3(Math.abs(permanentBean)) }}     + {{ t('common.freeGoldBean') }}{{ format3(Math.abs(freeBean)) }}
- - + + - + - - - + + + - - + + - - - - - + + + + +
- +
- + - - + + - + - + @@ -675,7 +682,7 @@ const getTagText = (state) => { :deep(.el-table__header-wrapper), :deep(.el-table__body-wrapper), :deep(.el-table__cell), -/* 表格 */ + /* 表格 */ :deep(.el-table__body td) { background-color: #F3FAFE !important; } @@ -707,7 +714,7 @@ const getTagText = (state) => { padding: 0 0.5vw; .text { - width: 5vw; + width: 5.3vw; font-size: 15px; }