Commit f399f3ac by xuzhenghua

Merge branch 'ai-test' of https://gitlab.julyedu.com/baiguangyao/mr-julyedu into dev

parents b01879cb e0236b44
...@@ -37,14 +37,14 @@ class scoreReport extends Component { ...@@ -37,14 +37,14 @@ class scoreReport extends Component {
} }
shouldComponentUpdate(nextProps, nextState, nextContext) { // shouldComponentUpdate(nextProps, nextState, nextContext) {
if (this.props.user.data.avatar !== nextProps.user.data.avatar) { // if (this.props.user.data.avatar !== nextProps.user.data.avatar) {
this.getCanvas() // this.getCanvas()
return false // return false
} // }
return true // return true
} // }
//
getCanvas() { getCanvas() {
document.documentElement.scrollTop = 0 document.documentElement.scrollTop = 0
...@@ -96,7 +96,7 @@ class scoreReport extends Component { ...@@ -96,7 +96,7 @@ class scoreReport extends Component {
myRankList: data, myRankList: data,
}) })
let avatar = this.props.user && this.props.user.data.avatar let avatar = data.avatar_file
this.getBase64(avatar) this.getBase64(avatar)
setTimeout(() => { setTimeout(() => {
this.getCanvas() this.getCanvas()
...@@ -212,7 +212,7 @@ class scoreReport extends Component { ...@@ -212,7 +212,7 @@ class scoreReport extends Component {
<div className="comment text-overflow-4"> <div className="comment text-overflow-4">
<img className={'avatar_file'} src={avatar_file} alt=""/> <img className={'avatar_file'} src={avatar_file} alt=""/>
{myRankList && myRankList.title && myRankList.title.comment} <span dangerouslySetInnerHTML={{__html: myRankList.title}}></span>
</div> </div>
<div className="code"> <div className="code">
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
width: 100%; width: 100%;
background-color: #09f; background-color: #09f;
} }
.score-report { .score-report {
width: 100%; width: 100%;
padding: 30px 12px 45px 12px; padding: 30px 12px 45px 12px;
...@@ -115,6 +116,10 @@ ...@@ -115,6 +116,10 @@
font-size: 14px; font-size: 14px;
line-height: 21px; line-height: 21px;
margin: 15px 33px 0; margin: 15px 33px 0;
em {
text-decoration: line-through;
}
} }
.code { .code {
......
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