From f193857ec72f15b7777ba7bd80a507116f46b965 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 9 Jul 2024 16:59:50 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=BB=8F=E9=AA=8C=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C=E5=A2=9E=E5=8A=A0=E5=BD=93=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tools.js | 1 + src/views/user/ranking.vue | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/utils/tools.js b/src/utils/tools.js index 185fb2cc..eb286cd5 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -423,6 +423,7 @@ export function translate(field) { let name = ''; switch (field) { case 'total':name = '累计'; break; + case 'now':name = '当前'; break; case 'weeks':name = '本周'; break; case 'months':name = '本月'; break; case 'years':name = '本年'; break; diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index e890e5f0..b343a499 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -23,6 +23,7 @@ 累计 + 当前 @@ -32,10 +33,10 @@
- 当前排名 : {{currentUserRankingTotalData.rankNo}} + {{isNow ? '当前' : '累计'}}排名 : {{currentUserRankingTotalData.rankNo}}
- 累计经验值 : {{currentUserRankingTotalData.rankValue}} + {{isNow ? '当前' : '累计'}}经验值 : {{currentUserRankingTotalData.rankValue}}
@@ -340,7 +341,8 @@ export default { total:0 }, list:[], - } + }, + isNow: false, } }, mounted() { @@ -352,6 +354,7 @@ export default { // 经验值排行榜(下拉框事件) experienceCommand(e) { + this.isNow = false this.experience.field = e; this.experience.name = this.translate(e) this.getExperience(); @@ -371,10 +374,15 @@ export default { getExperience() {//经验值 let data = { aid:this.userInfo.aid,// #用户id - statType:20, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数 + statType:21, // #统计类型 10学习时长 11 学习天数 20表经验值 30表u币 40表获取天数 field:this.experience.field,// #统计周期 todays-当天,weeks-周,months-月,years-年 total-总计 num:5,// #显示的条数 } + if(data.field == 'now'){ + data.statType = 20 + data.field = 'total' + this.isNow = true + } apiStat.getRanking(data).then(res=>{ if(res.status==200){ if(res.result.currentUserRankingData) { From 26f2d3f9d3bd4a2b6967a612cee840c36c1ab505 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Wed, 10 Jul 2024 18:45:35 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=BB=8F=E9=AA=8C=E5=80=BC=E5=B1=95?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index b343a499..83941fc8 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -354,6 +354,9 @@ export default { // 经验值排行榜(下拉框事件) experienceCommand(e) { + if(e == 'now'){ + e = 'total' + } this.isNow = false this.experience.field = e; this.experience.name = this.translate(e) From 7ceb60584429c434e7660c4f3ca25d003c8c7bf2 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Thu, 11 Jul 2024 13:18:58 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E5=BD=93=E5=89=8D=E6=8E=92=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index 83941fc8..aac364e8 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -354,9 +354,6 @@ export default { // 经验值排行榜(下拉框事件) experienceCommand(e) { - if(e == 'now'){ - e = 'total' - } this.isNow = false this.experience.field = e; this.experience.name = this.translate(e) @@ -384,6 +381,7 @@ export default { if(data.field == 'now'){ data.statType = 20 data.field = 'total' + this.experience.field = 'total' this.isNow = true } apiStat.getRanking(data).then(res=>{ From 8d4a6800d8814dfc2a72548a654ded4eea56a6c4 Mon Sep 17 00:00:00 2001 From: zhangsir Date: Tue, 6 Aug 2024 17:01:01 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E6=97=B6=E9=95=BF=E5=A4=A9=E6=95=B0?= =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E5=8C=BA=E5=88=86=E5=BD=93=E5=89=8D?= =?UTF-8?q?=E5=92=8C=E7=B4=AF=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 1344 ++++++++++++++++++------------------ 1 file changed, 681 insertions(+), 663 deletions(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index aac364e8..fc98775c 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -1,282 +1,284 @@