From 423ecf432446726bc8becf4e53f32f8590747e3b Mon Sep 17 00:00:00 2001 From: woody Date: Sat, 24 May 2025 10:04:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(global):=20=E5=85=A8=E5=B1=80=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E7=BA=A7=E5=B7=AE=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- i8n.js | 12 +++--- src/api/bonus.js | 2 +- src/api/level.js | 10 ++--- src/api/product.js | 4 +- src/assets/languages/zhCn.js | 4 +- src/router/index.js | 2 +- src/views/configManage/bonus/ztpz.vue | 4 +- src/views/configManage/level/fgjc.vue | 14 +++---- src/views/configManage/level/index.vue | 2 +- src/views/configManage/level/jxpz.vue | 2 +- src/views/dashboard/onlineSign.json | 40 +++++++++---------- .../goodsManage/goodsList/goodsEdit/jcsz.vue | 2 +- src/views/goodsManage/goodsRelease/jcsz.vue | 2 +- .../settlementCenter/bonusDetail/index.vue | 8 ++-- .../performanceRatio/performanceChart.vue | 4 +- .../settlementCenter/topPerformance/index.vue | 2 +- .../settlementCenter/totalBonus/index.vue | 4 +- 17 files changed, 57 insertions(+), 61 deletions(-) diff --git a/i8n.js b/i8n.js index 7843339..b33651b 100644 --- a/i8n.js +++ b/i8n.js @@ -221,7 +221,7 @@ module.exports = { ENU_ACT_T_15: '节日赠送', ENU_ACT_T_16: '新人礼包', ENU_ACT_T_17: '抽奖', - ENU_ACT_T_18: '极差测试', + ENU_ACT_T_18: '级差测试', ENU_ACT_T_19: '植树', ENU_ACT_T_20: '海豆赠送', ENU_ACT_T_21: '权益赠送', @@ -235,7 +235,7 @@ module.exports = { ENU_AFT_SALE_3: '申请失败', ENU_AGENT_G_1: '国代', ENU_AGENT_G_2: '省代', - ENU_AGENT_G_3: '极差测试', + ENU_AGENT_G_3: '级差测试', ENU_AGENT_G_4: '县代', ENU_ALGEBRA_A_1: '一代', ENU_ALGEBRA_A_10: '十代', @@ -1271,7 +1271,7 @@ module.exports = { MN_F_T_1098: '晋升总数', MN_F_T_1099: '达标人数', MN_F_T_11: '办理业务', - MN_F_T_110: '复购极差', + MN_F_T_110: '复购级差', MN_F_T_1100: '预发金额', MN_F_T_1101: '预发合计', MN_F_T_1102: '实发合计', @@ -1423,9 +1423,9 @@ module.exports = { MN_F_T_1234: '左区奖衔', MN_F_T_1235: '右区奖衔', MN_F_T_1236: '考核', - MN_F_T_1237: '极差名称', + MN_F_T_1237: '级差名称', MN_F_T_1238: '金额比例', - MN_F_T_1239: '极差属性', + MN_F_T_1239: '级差属性', MN_F_T_124: '短信配置', MN_F_T_1240: '配送等级', MN_F_T_1241: '结算金额/业绩', @@ -2592,7 +2592,7 @@ module.exports = { N_I_136: '重复消费', N_I_137: '平台服务费', N_I_138: '实发小计', - N_I_140: '复购极差收益', + N_I_140: '复购级差收益', N_I_141: '复购拓展收益', N_I_142: '海粉直推收益', N_I_143: '海粉直推收益', diff --git a/src/api/bonus.js b/src/api/bonus.js index 9c8c708..230c998 100644 --- a/src/api/bonus.js +++ b/src/api/bonus.js @@ -185,7 +185,7 @@ export function getdirectLoopList() { }) } -//极差枚举类型列表1等级2奖衔 +//级差枚举类型列表1等级2奖衔 export function getrangeTypeList() { return request({ url: '/system/pub/enums/range-type', diff --git a/src/api/level.js b/src/api/level.js index 8bb300c..2170ec9 100644 --- a/src/api/level.js +++ b/src/api/level.js @@ -169,7 +169,7 @@ export function getRelationList(params) { }) } -// 级别配置-复购极差-获取复购极差列表 +// 级别配置-复购级差-获取复购级差列表 export function getRangeList(params) { return request({ url: '/system/manage/range/list', @@ -178,7 +178,7 @@ export function getRangeList(params) { }) } -// 生成极差、添加 +// 生成级差、添加 export function scRangeGenerate(data) { return request({ url: '/system/manage/range/generate', @@ -187,7 +187,7 @@ export function scRangeGenerate(data) { }) } -// 获取单条极差 +// 获取单条级差 export function getOneManage(pkId) { return request({ url: '/system/manage/range/getOne/' + pkId, @@ -195,7 +195,7 @@ export function getOneManage(pkId) { }) } -// 删除极差列表 +// 删除级差列表 export function deleteRange(pkId) { return request({ url: '/system/manage/range/' + pkId, @@ -248,7 +248,7 @@ export function getAwardsValueList(params) { }) } -// 极差属性 +// 级差属性 export function getJcsxList(params) { return request({ url: '/system/pub/enums/awardsAllList', diff --git a/src/api/product.js b/src/api/product.js index 1f10491..06407a0 100644 --- a/src/api/product.js +++ b/src/api/product.js @@ -398,14 +398,14 @@ export function getPostageList(params) { params }) } -// 极差等级 +// 级差等级 export function rangeList() { return request({ url: '/system/manage/grade/gradeRanglist', method: 'get' }) } -// 极差等级2 +// 级差等级2 export function toRangeList() { return request({ url: '/system/manage/range/find-all', diff --git a/src/assets/languages/zhCn.js b/src/assets/languages/zhCn.js index b7891b4..281f0b2 100644 --- a/src/assets/languages/zhCn.js +++ b/src/assets/languages/zhCn.js @@ -471,7 +471,7 @@ const zhCn = { dividendIncome: "分红收益", dividendIncome2: "分红收益(¥)", dividendIncome3: "分红收益(%)", - RepurchaseRangeIncome: "复购极差收益", + RepurchaseRangeIncome: "复购级差收益", IncomeFromConsumptionExpansion: "消费拓展收益", IncomeFromConsumptionExpansion2: "消费拓展收益(¥)", IncomeFromConsumptionExpansion3: "消费拓展收益(%)", @@ -561,7 +561,7 @@ const zhCn = { RepurchaseIncome2: "复购收益(¥)", RepurchaseIncome3: "复购收益(%)", NewRepurchase: "新增复购", - RepurchaseRange: "复购极差", + RepurchaseRange: "复购级差", ConsumptionExpansion: "消费拓展", NewRepurchaseAllocationRatio: "新增复购拨比", RepurchasePVAllocationRatio: "复购PV拨比", diff --git a/src/router/index.js b/src/router/index.js index 4ed61c7..d99601c 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1324,7 +1324,7 @@ export const constantRoutes = [ path: 'fgjc', name: 'PoorRepurchase', component: () => import('@/views/configManage/level/fgjc'), - meta: { title: '复购极差' }, + meta: { title: '复购级差' }, hidden: true } diff --git a/src/views/configManage/bonus/ztpz.vue b/src/views/configManage/bonus/ztpz.vue index c018402..db77ecd 100644 --- a/src/views/configManage/bonus/ztpz.vue +++ b/src/views/configManage/bonus/ztpz.vue @@ -545,7 +545,7 @@ export default { ], // 升级方式 rules: {}, gradeRangList: [], // 等级范围选择 - rangeTypeList: [], // 等级极差枚举类型选择 + rangeTypeList: [], // 等级级差枚举类型选择 awardsList: [], // 奖衔选择 cellTypeList: [], // 计算类型枚举值 ycxbcList: [], // 一次性补差升级 @@ -574,7 +574,7 @@ export default { this.awardsList = res.rows }) - // 获取极差枚举类型列表 + // 获取级差枚举类型列表 getrangeTypeList().then((res) => { this.rangeTypeList = res.data }) diff --git a/src/views/configManage/level/fgjc.vue b/src/views/configManage/level/fgjc.vue index e656afc..4ed1ad4 100644 --- a/src/views/configManage/level/fgjc.vue +++ b/src/views/configManage/level/fgjc.vue @@ -27,13 +27,13 @@ @selection-change="handleSelectionChange" > - + - + - + { diff --git a/src/views/configManage/level/index.vue b/src/views/configManage/level/index.vue index 64efc07..d0b83eb 100644 --- a/src/views/configManage/level/index.vue +++ b/src/views/configManage/level/index.vue @@ -271,7 +271,7 @@ export default { path: 'jxpz' }, { - name: '复购极差', + name: '复购级差', path: 'fgjc' } diff --git a/src/views/configManage/level/jxpz.vue b/src/views/configManage/level/jxpz.vue index 184645b..c5a9eb9 100644 --- a/src/views/configManage/level/jxpz.vue +++ b/src/views/configManage/level/jxpz.vue @@ -329,7 +329,7 @@ export default { path: 'jxpz' }, { - name: '复购极差', + name: '复购级差', path: 'fgjc' } diff --git a/src/views/dashboard/onlineSign.json b/src/views/dashboard/onlineSign.json index c9703e1..b6b6a16 100644 --- a/src/views/dashboard/onlineSign.json +++ b/src/views/dashboard/onlineSign.json @@ -599,7 +599,6 @@ "label": "政策币扣除比例", "value": "deductMoney" } - ] }, { @@ -626,7 +625,7 @@ "value": "dividendAwardKeyVal" }, { - "label": "极差奖衔", + "label": "级差奖衔", "value": "extremeAwardsKeyVal" }, { @@ -671,7 +670,7 @@ "value": "dividendAwardKeyVal" }, { - "label": "极差奖衔", + "label": "级差奖衔", "value": "extremeAwardsKeyVal" }, { @@ -716,7 +715,7 @@ "value": "dividendAwardKeyVal" }, { - "label": "极差奖衔", + "label": "级差奖衔", "value": "extremeAwardsKeyVal" }, { @@ -905,7 +904,6 @@ "label": "续约年限", "value": "years" } - ] }, { @@ -1350,7 +1348,6 @@ "label": "退单编号", "value": "orderCode" } - ] }, { @@ -1483,7 +1480,8 @@ { "label": "产品业绩(PV)", "value": "achievement" - },{ + }, + { "label": "产品业绩(BV)", "value": "assAchievement" }, @@ -1491,8 +1489,6 @@ "label": "操作", "value": "action" } - - ] }, { @@ -2052,7 +2048,6 @@ "label": "充值已购买次数", "value": "num" } - ] }, { @@ -2070,7 +2065,6 @@ "label": "充值未购买次数", "value": "num" } - ] }, { @@ -2219,7 +2213,8 @@ "value": "actExplain" } ] - }, { + }, + { "id": 739, "textList": [ { @@ -2239,7 +2234,8 @@ "value": "actExplain" } ] - }, { + }, + { "id": 740, "textList": [ { @@ -2322,7 +2318,8 @@ "value": "actExplain" } ] - },{ + }, + { "id": 749, "textList": [ { @@ -2342,7 +2339,8 @@ "value": "actExplain" } ] - },{ + }, + { "id": 750, "textList": [ { @@ -2362,7 +2360,8 @@ "value": "actExplain" } ] - },{ + }, + { "id": 751, "textList": [ { @@ -2777,7 +2776,8 @@ { "label": "资质8", "value": "aptitude8" - }, { + }, + { "label": "证书", "value": "certificate" } @@ -2834,7 +2834,6 @@ "label": "纳税人登记号", "value": "taxpayerid" } - ] }, { @@ -2856,7 +2855,6 @@ "label": "BV", "value": "orderAssAchieve" } - ], "textList2": [ { @@ -2875,7 +2873,6 @@ "label": "BV", "value": "orderAssAchieve" } - ] }, { @@ -2941,5 +2938,4 @@ } ] } - -] +] \ No newline at end of file diff --git a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue index 98b50d2..49c09ef 100644 --- a/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue +++ b/src/views/goodsManage/goodsList/goodsEdit/jcsz.vue @@ -1216,7 +1216,7 @@ export default { this.pkId = this.$route.query.id this.methods = this.$route.query.methods this.getOther() - // 获取极差列表 + // 获取级差列表 this.getRangeList() // 血缘关系 this.getXYList() diff --git a/src/views/goodsManage/goodsRelease/jcsz.vue b/src/views/goodsManage/goodsRelease/jcsz.vue index 84902e9..5ee4cc5 100644 --- a/src/views/goodsManage/goodsRelease/jcsz.vue +++ b/src/views/goodsManage/goodsRelease/jcsz.vue @@ -1193,7 +1193,7 @@ export default { this.$refs.box.scrollTop = 0 this.$store.commit('settings/GGMX_SETTING', []) - // 获取极差列表 + // 获取级差列表 this.getRangeList() }, methods: { diff --git a/src/views/settlementCenter/bonusDetail/index.vue b/src/views/settlementCenter/bonusDetail/index.vue index f7046c8..5a44196 100644 --- a/src/views/settlementCenter/bonusDetail/index.vue +++ b/src/views/settlementCenter/bonusDetail/index.vue @@ -254,7 +254,7 @@ align="center" prop="globalPointsOri" width="130" - :label="$t('直推极差') + '(¥)'" + :label="$t('直推级差') + '(¥)'" :formatter="stateFormat" /> @@ -289,7 +289,7 @@ prop="cloudRealSubtotalOri" width="130" :formatter="stateFormat" - :label="$t('极差小计') + '(¥)'" + :label="$t('级差小计') + '(¥)'" /> {{ '海粉专区' }}(¥)
{{ '云代复购' }}(¥)
{{'复购金额'}}(¥)
-
{{'复购极差收益'}}(¥)
+
{{'复购级差收益'}}(¥)
{{'复购拓展收益'}}(¥)
{{ '复购拨出比例' }}(%)
@@ -259,7 +259,7 @@
{{ '海粉专区' }}(¥)
{{ '云代复购' }}(¥)
{{'复购金额'}}(¥)
-
{{'复购极差收益'}}(¥)
+
{{'复购级差收益'}}(¥)
{{'复购拓展收益'}}(¥)
{{ '复购拨出比例' }}(%)
diff --git a/src/views/settlementCenter/topPerformance/index.vue b/src/views/settlementCenter/topPerformance/index.vue index 238a424..881db92 100644 --- a/src/views/settlementCenter/topPerformance/index.vue +++ b/src/views/settlementCenter/topPerformance/index.vue @@ -287,7 +287,7 @@ export default { }, { id: 19, - text: `${'复购极差收益'}(¥)`, + text: `${'复购级差收益'}(¥)`, checked: false, prop: 'repurRangeBonus', total: 'repurRangeBonusSum' diff --git a/src/views/settlementCenter/totalBonus/index.vue b/src/views/settlementCenter/totalBonus/index.vue index d1d9b23..30023f1 100644 --- a/src/views/settlementCenter/totalBonus/index.vue +++ b/src/views/settlementCenter/totalBonus/index.vue @@ -348,7 +348,7 @@ align="center" prop="globalPointsOri" width="130" - :label="'直推极差' + '(¥)'" + :label="'直推级差' + '(¥)'" :formatter="stateFormat" />