Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js

@@ -88,6 +88,7 @@ class CompetitionsIndex extends Component{
 												background-position: center;
 												background-repeat: no-repeat;
 										}
+
 									`
 								}
 							</style>

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.css

@@ -333,16 +333,19 @@
     text-align: center;
     color: #fff;
     font-size: 22px;
+
+}
+
+.relative{position: relative;}
+
+.relative:hover .CompetitionsListzhezhao{
+    display: block;
     display: flex;
     align-items: center;
     justify-content: space-around;
     flex-direction: column;
 }
 
-.relative{position: relative;}
-
-.relative:hover .CompetitionsListzhezhao{   display: block;}
-
 .image_urlbox{
     width: 705px;
     /*height: 400px;*/

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js

@@ -90,7 +90,7 @@ class CompetitionContents extends Component{
 				let list={
 					usersum:key+1,
 				  userimg:item.user_image,
-					username:personal===undefined||personal===null?item.record_user_name:personal===false?item.record_user_name:item.team_name,
+					username:personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name,
 					school:item.school_name,
 					spendtime:item.spend_time,
 					score:item.score,
@@ -147,7 +147,7 @@ class CompetitionContents extends Component{
 													<div className={"mt10"}>
 														<a href={`/users/${item.user_login}`} className="color-dark">
 															<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
-															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===false?item.record_user_name:item.team_name}</p>
+															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
 														</a>
 													</div>
 												</li>
@@ -183,7 +183,7 @@ class CompetitionContents extends Component{
 													<div className={"mt10"}>
 														<a href={`/users/${item.user_login}`} className="color-dark">
 															<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
-															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===false?item.record_user_name:item.team_name}</p>
+															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
 														</a>
 													</div>
 												</li>
@@ -219,7 +219,7 @@ class CompetitionContents extends Component{
 													<div className={"mt10"}>
 														<a href={`/users/${item.user_login}`} className="color-dark">
 															<img className={"rankingimg"} src={getImageUrl(`images/${item.user_image===null?`avatars/User/0?1442652658`:item.user_image}`)} />
-															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===false?item.record_user_name:item.team_name}</p>
+															<p className="task-hide rankName mt5 jinshaifont">{personal===undefined||personal===null?item.record_user_name:personal===true?item.record_user_name:item.team_name}</p>
 														</a>
 													</div>
 												</li>