From b8ad2e71f12ae3f1c40c156e2c41a3bf644dd21e Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 17:16:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tools.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/utils/tools.js b/src/utils/tools.js index 368735ad..36bc33a9 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -277,6 +277,7 @@ export function experienceValue(total) { data.start = 'LV1'; data.end = 'LV2'; data.endValue = 600; + if(total == 0){total = 1;} data.percentage = parseFloat((total / 600) * 100); } else if(total > 300 || total == 300 || total < 600){ data.start = 'LV2'; @@ -324,6 +325,8 @@ export function experienceValue(total) { data.endValue = 30000; data.percentage = parseFloat((total / 30000) * 100); } + console.log("&&&&&&&&&&&&&&&&&&&&&&&"); + console.log(data); return data; } export function translate(field) { From d0c74dc3a3977d2ee29e466d84c9385deff0d7c8 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 17:17:17 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ucurrency/Index.vue | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index 40d3101e..88bd7847 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -261,19 +261,14 @@ sex: null } this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData]) + if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;} + if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;} + if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;} this.currentUserRankingData = res.result.currentUserRankingData; - if(res.result.currentUserRankingData.total) { - this.current = this.experienceValue(res.result.currentUserRankingData.total); - } - if(res.result.currentUserRankingData.weeks) { - this.current = this.experienceValue(res.result.currentUserRankingData.weeks); - } - if(res.result.currentUserRankingData.months) { - this.current = this.experienceValue(res.result.currentUserRankingData.months); - } - if(res.result.currentUserRankingData.years) { - this.current = this.experienceValue(res.result.currentUserRankingData.years); - } + if(res.result.currentUserRankingData.total>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.total);} + if(res.result.currentUserRankingData.weeks>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.weeks);} + if(res.result.currentUserRankingData.months>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.months);} + if(res.result.currentUserRankingData.years>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.years);} } const ids= []; From 3b6e5749b8888f6543bbde813e8dc17c78317fd5 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 17:47:27 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ucurrency/Index.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index 88bd7847..c2310508 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -57,7 +57,7 @@
{{current.total}}/{{current.endValue}}
-
+
@@ -261,9 +261,7 @@ sex: null } this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData]) - if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;} - if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;} - if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;} + this.currentUserRankingData = res.result.currentUserRankingData; if(res.result.currentUserRankingData.total>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.total);} if(res.result.currentUserRankingData.weeks>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.weeks);} From 186843017602a105226e4c3bd9c79aa514787ef6 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 17:48:01 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index f8ab24f7..343be5f5 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -321,23 +321,24 @@ export default { if(res.result.currentUserRankingData) { res.result.currentUserRankingData.authorInfo={ aid: "", - name: "", + name: " orgInfo: "", avatar: "", sex: null } this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData]) + this.experience.data = res.result.currentUserRankingData; - if(res.result.currentUserRankingData.total) { + if(res.result.currentUserRankingData.total>=0) { this.current = this.experienceValue(res.result.currentUserRankingData.total); } - if(res.result.currentUserRankingData.weeks) { + if(res.result.currentUserRankingData.weeks>=0) { this.current = this.experienceValue(res.result.currentUserRankingData.weeks); } - if(res.result.currentUserRankingData.months) { + if(res.result.currentUserRankingData.months>=0) { this.current = this.experienceValue(res.result.currentUserRankingData.months); } - if(res.result.currentUserRankingData.years) { + if(res.result.currentUserRankingData.years>=0) { this.current = this.experienceValue(res.result.currentUserRankingData.years); } } From f595d24f187fbc658ad0a0eba20ff345dbc153a9 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 17:48:25 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tools.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/utils/tools.js b/src/utils/tools.js index 36bc33a9..a8165b89 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -277,7 +277,6 @@ export function experienceValue(total) { data.start = 'LV1'; data.end = 'LV2'; data.endValue = 600; - if(total == 0){total = 1;} data.percentage = parseFloat((total / 600) * 100); } else if(total > 300 || total == 300 || total < 600){ data.start = 'LV2'; From 3bf03a854c438c2afcaf9c677254a17ae5623709 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 17:53:00 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E6=97=B6=E6=97=A0=E6=B3=95=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=9A=84=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index 343be5f5..4552fc0b 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -321,7 +321,7 @@ export default { if(res.result.currentUserRankingData) { res.result.currentUserRankingData.authorInfo={ aid: "", - name: " + name: "", orgInfo: "", avatar: "", sex: null From d608268acab7e15ef898fbf57b7d04ab3f60c917 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 18:27:28 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E9=BB=98=E8=AE=A4=E4=B8=BA0=E7=9A=84=E6=83=85?= =?UTF-8?q?=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/ucurrency/Index.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue index c2310508..9dcc50a7 100644 --- a/src/views/ucurrency/Index.vue +++ b/src/views/ucurrency/Index.vue @@ -262,6 +262,10 @@ } this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData]) + if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;} + if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;} + if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;} + this.currentUserRankingData = res.result.currentUserRankingData; if(res.result.currentUserRankingData.total>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.total);} if(res.result.currentUserRankingData.weeks>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.weeks);} From 8eacc0f98b77a90aaf7ab1ee81060a6a1d0dd5c0 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 18:35:03 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=8F=E9=AA=8C?= =?UTF-8?q?=E5=80=BC=E4=B8=BA0=E7=9A=84=E6=83=85=E5=86=B5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/ranking.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue index 4552fc0b..0919dc25 100644 --- a/src/views/user/ranking.vue +++ b/src/views/user/ranking.vue @@ -327,7 +327,9 @@ export default { sex: null } this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData]) - + if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;} + if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;} + if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;} this.experience.data = res.result.currentUserRankingData; if(res.result.currentUserRankingData.total>=0) { this.current = this.experienceValue(res.result.currentUserRankingData.total); From 641fff7ede7fa8250c865c1ac4f4f02eb87c76d7 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 18:58:39 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E7=A7=81=E5=AF=86=E4=B8=8D=E8=83=BD=E8=BD=AC=E5=85=AC=E5=BC=80?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/Noteedit.vue | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue index 6a43873a..465bd108 100644 --- a/src/views/user/Noteedit.vue +++ b/src/views/user/Noteedit.vue @@ -24,10 +24,8 @@
- - 公开 - 私密 - + 公开私密 + 私密 保存 取消
@@ -104,7 +102,7 @@ export default { this.editdata = res.result; this.editdata.openTypeBackups = res.result.openType; this.histId = res.result.id; - + this.hist(); }) }, @@ -123,9 +121,9 @@ export default { this.$message({ type: 'info', message: '已取消还原' - }); + }); }); - + // apiNote.restore(item.id).then(res=>{ // this.$message({ // message: '还原成功', @@ -141,7 +139,7 @@ export default { res.result.forEach(item=>{ item.beforeContent = item.beforeContent.split(','); }) - + } this.histdata = res.result }) @@ -156,7 +154,7 @@ export default { } if(num == 1) { this.editdata.isAuto = true; - + } if(this.imgContent.length > 0) { this.editdata.content = this.imgContent.join(); @@ -197,7 +195,7 @@ export default { clearInterval(this.timer) this.timer = null } - + } @@ -257,7 +255,7 @@ export default { display: flex; font-size: 16px; font-weight: 600; - color: #666666; + color: #666666; div{ flex: 1; } @@ -267,7 +265,7 @@ export default { color: #387DF7; font-weight: 400; font-size: 16px; - } + } } } .hist-top{ @@ -398,4 +396,4 @@ export default { } - \ No newline at end of file + From 37aab3f8e66982f498a751cb09546fa03f78b4b9 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Fri, 30 Sep 2022 19:38:03 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=AC=94=E8=AE=B0?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4=E6=8E=92?= =?UTF-8?q?=E5=BA=8F=E5=92=8C=E6=98=BE=E7=A4=BA=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/myNote.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue index b7cb362d..52d0dfd0 100644 --- a/src/components/Course/myNote.vue +++ b/src/components/Course/myNote.vue @@ -25,7 +25,7 @@
- {{note.sysCreateTime}} + {{note.sysUpdateTime}} {{note.openType == 9?'公开':'私密'}}