Merge branches 'develop' and 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop

app/views/users/_returnTop_btn.html.erb

@@ -30,9 +30,19 @@
 
 </div>
 
-<div class="-task-sidebars" style="right: 240px !important;">
+<div id="trophyreturn" class="-task-sidebars" style="right: 65px !important;width: 154px;">
+  <a  onclick="trophyreturnfun();" id="closeIcon" style="position: absolute;right: 12px;top: 10px; color: #000;">
+    <i class="iconfont icon-shanchudiao"></i>
+  </a>
   <a href="/competitions">
     <img src="/images/educoder/competition/lvmeng.png" width="150px" height="150px">
   </a>
 
-</div>
+</div>
+
+<script>
+  function trophyreturnfun(){
+      $("#trophyreturn").hide()
+  }
+
+</script>

public/react/src/modules/tpm/SiderBar.js

@@ -14,7 +14,11 @@ class SiderBar extends Component {
         window._initSider();
         
     }
-
+	trophyreturnfun=()=>{
+    	this.setState({
+				trophyreturn:true
+			})
+	}
     render() {
         return (
 					<div>
@@ -51,11 +55,15 @@ class SiderBar extends Component {
 							</div>
 						</div>
 
-						<div className="-task-sidebars" style={{right: "240px"}}>
+						{this.state.trophyreturn===true?"":<div className="-task-sidebars" style={{right: "65x",width: "154px"}}>
+							<a onClick={this.trophyreturnfun} id="closeIcon"
+								 style={{position: "absolute", right: "12px",top:"10px",color: "#000"}}>
+								<i className="iconfont icon-shanchudiao"></i>
+							</a>
 							<a href="/competitions">
 								<img src={getImageUrl("images/educoder/competition/lvmeng.png")}  width="150px" height="150px" />
 							</a>
-						</div>
+						</div>}
 
 					</div>
             );