Commit f87b2f57 by zhanghaozhe

Merge branch 'ai-test' into dev

# Conflicts:
#	build/asset-manifest.json
#	build/index.html
#	build/mrstatic/js/runtime~main.9c123e50.js
#	build/mrstatic/js/runtime~main.9c123e50.js.map
#	build/precache-manifest.f4b3c3260d0c797a081804013ade46be.js
#	build/service-worker.js
parents 6e86552e f9af6d0a
......@@ -229,12 +229,12 @@ class Scores extends Component {
</tr>
: <tr>
{
userScore.score === '-' ? '-' :
userScore.score === '-' ? <td>'-'</td> :
<td>{userScore.score} <Link to={`/ai-test/analysis/${userScore.r_id}`}>解析</Link></td>
}
<td>{userScore.cost_time}</td>
{
userScore.rank === '-' ? '-' : <td>{userScore.rank}</td>
userScore.rank === '-' ? <td>'-'</td> : <td>{userScore.rank}名</td>
}
</tr>
}
......@@ -297,12 +297,12 @@ class Scores extends Component {
<span className={'score'}>{item.score}</span>/<span>{item.cost_time}</span>
</td>
<td>
<div> 奖品奖品奖品奖品奖品
奖品奖品奖品奖品奖品</div>
{
// item.prize_url ? <a href={`${item.prize_url}#goback`}>{item.prize}</a> : item.prize
<div>
{
item.prize_url ? <a href={`${item.prize_url}#goback`}>{item.prize}</a> : item.prize
}
</div>
}
</td>
</tr>
})
......
......@@ -261,7 +261,7 @@
}
}
td:nth-of-type(3){
td:nth-of-type(3) {
width: 20%;
}
......@@ -355,12 +355,11 @@
.rule {
position: absolute;
top: 19.7%;
top: 50%;
left: 50%;
transform: translateX(-50%);
transform: translate(-50%, -50%);
width: 300px;
//min-height: 311px;
padding: 18px 25px;
padding: 18px 25px 10px;
background-color: #fff;
border-radius: 5px;
color: #525C65;
......@@ -372,6 +371,9 @@
}
div:nth-child(2) {
max-height: 280px;
overflow: auto;
//height: 100%;
font-size: 14px;
margin-bottom: 16px;
white-space: pre-wrap;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment