From 3b39c43ef50e525e3c0d2b5e04727928694b627b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 19 Jul 2019 15:21:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B5=9B=E4=BA=8B=E6=9D=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_returnTop_btn.html.erb  | 14 ++++++++++++--
 public/react/src/modules/tpm/SiderBar.js | 14 +++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/app/views/users/_returnTop_btn.html.erb b/app/views/users/_returnTop_btn.html.erb
index 9bdc31d6..6ecc9e39 100644
--- a/app/views/users/_returnTop_btn.html.erb
+++ b/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>
\ No newline at end of file
+</div>
+
+<script>
+  function trophyreturnfun(){
+      $("#trophyreturn").hide()
+  }
+
+</script>
\ No newline at end of file
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index fd74c759..cb473f6d 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/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>
             );