diff --git a/app/helpers/competitions_helper.rb b/app/helpers/competitions_helper.rb index ebafe4e02..6b75e6aac 100644 --- a/app/helpers/competitions_helper.rb +++ b/app/helpers/competitions_helper.rb @@ -38,7 +38,7 @@ module CompetitionsHelper def chart_stages competition stages = [] statistic_stages = competition.competition_stages.where("score_rate > 0") - if competition.end_time && competition.end_time < Time.now && statistic_stages.size > 1 + if competition.max_stage_end_time && competition.max_stage_end_time < Time.now && statistic_stages.size > 1 stages << {id: nil, name: "总排行榜", rate: 1.0, start_time: competition.start_time, end_time: competition.end_time} end @@ -48,7 +48,7 @@ module CompetitionsHelper end end - stages = stages.sort { |a, b| b[:end_time] <=> a[:end_time] } if stages.size > 0 + # stages = stages.sort { |a, b| b[:end_time] <=> a[:end_time] } if stages.size > 0 return stages end end \ No newline at end of file diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css index aff7cdcd8..f55c9a336 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css @@ -78,6 +78,7 @@ font-size:25px; font-weight:400; color:rgba(5,16,26,1); + line-height: 30px; } .CompetitionCommonbannerfont .competitionbannerdiv:nth-child(2){ @@ -394,4 +395,8 @@ .CompetitionCommonbannerfont{ width: 350px !important; margin-left:10px; +} + +.color000{ + color: #000; } \ No newline at end of file diff --git a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js index 1f9508932..850c82e1e 100644 --- a/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js +++ b/public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js @@ -258,12 +258,12 @@ class CompetitionCommon extends Component{