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

dev_auth
杨树林 5 years ago
commit 0744edfbf8

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

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

@ -90,7 +90,7 @@ class CompetitionContents extends Component{
let list={ let list={
usersum:key+1, usersum:key+1,
userimg:item.user_image, 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, school:item.school_name,
spendtime:item.spend_time, spendtime:item.spend_time,
score:item.score, score:item.score,
@ -147,7 +147,7 @@ class CompetitionContents extends Component{
<div className={"mt10"}> <div className={"mt10"}>
<a href={`/users/${item.user_login}`} className="color-dark"> <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}`)} /> <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> </a>
</div> </div>
</li> </li>
@ -183,7 +183,7 @@ class CompetitionContents extends Component{
<div className={"mt10"}> <div className={"mt10"}>
<a href={`/users/${item.user_login}`} className="color-dark"> <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}`)} /> <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> </a>
</div> </div>
</li> </li>
@ -219,7 +219,7 @@ class CompetitionContents extends Component{
<div className={"mt10"}> <div className={"mt10"}>
<a href={`/users/${item.user_login}`} className="color-dark"> <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}`)} /> <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> </a>
</div> </div>
</li> </li>

Loading…
Cancel
Save