Merge remote-tracking branch 'yx/master-20250403-lyc' into test20250220

This commit is contained in:
joshen
2025-04-03 16:18:13 +08:00

View File

@@ -409,7 +409,7 @@ export default {
this.currentUserRankingTotalData.endValue = this.current.endValue;
}
}
this.current.total=res.result.currentUserRankingData.total;//当前用户的经验值是固定的
this.current.total=res.result.currentUserRankingData.total ? res.result.currentUserRankingData.years : res.result.currentUserRankingData.total;//当前用户的经验值是固定的
const ids= [];
res.result.rankingData.forEach(item=>{
ids.push(item.aid)
@@ -469,9 +469,11 @@ export default {
}
this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
this.learningDuration.data = res.result.currentUserRankingData;
this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
if(data.field == 'total'){
this.learningDurationTotalData.rankNo = res.result.currentUserRankingData.rankingNo;
this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.total;
} else if(data.field == 'years'){
this.learningDurationTotalData.rankValue = res.result.currentUserRankingData.years;
}
}