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?'公开':'私密'}}
diff --git a/src/utils/tools.js b/src/utils/tools.js
index 368735ad..a8165b89 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -324,6 +324,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) {
diff --git a/src/views/ucurrency/Index.vue b/src/views/ucurrency/Index.vue
index 40d3101e..9dcc50a7 100644
--- a/src/views/ucurrency/Index.vue
+++ b/src/views/ucurrency/Index.vue
@@ -57,7 +57,7 @@
{{current.total}}/{{current.endValue}}
-
+
@@ -261,19 +261,16 @@
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= [];
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
+
diff --git a/src/views/user/ranking.vue b/src/views/user/ranking.vue
index f8ab24f7..0919dc25 100644
--- a/src/views/user/ranking.vue
+++ b/src/views/user/ranking.vue
@@ -327,17 +327,20 @@ 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) {
+ 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);
}
}