From b091c0177736793caab36a5954c25a9b1d41c0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 28 Nov 2019 19:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=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  | 32 ---------------
 public/react/src/modules/tpm/SiderBar.js | 50 ++++++++++++------------
 2 files changed, 25 insertions(+), 57 deletions(-)

diff --git a/app/views/users/_returnTop_btn.html.erb b/app/views/users/_returnTop_btn.html.erb
index 9a3c7c32..1ce6b917 100644
--- a/app/views/users/_returnTop_btn.html.erb
+++ b/app/views/users/_returnTop_btn.html.erb
@@ -30,35 +30,3 @@
 
 </div>
 
-<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>
-<script>
-    function trophyreturnfun(){
-        $("#trophyreturn").hide()
-        localStorage.setItem('trophy_uid', true);
-    }
-
-    $(function() {
-
-        var trophy_uid = false;
-
-        if (window.localStorage) {
-            trophy_uid = localStorage.getItem('trophy_uid');
-        } else {
-            trophy_uid = false
-        }
-
-        if(trophy_uid==="true"||trophy_uid===true){
-            $("#trophyreturn").hide()
-        }
-
-    })
-
-</script>
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index b7f5b5ec..0b88a37d 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -13,26 +13,26 @@ class SiderBar extends Component {
     }
 
     componentDidMount() {
-        window._initSider();
-				var trophy_uid = false;
-				if (window.localStorage) {
-					trophy_uid = localStorage.getItem('trophy_uid');
-				} else {
-					trophy_uid = false
-				}
-				if(trophy_uid==="true"||trophy_uid===true){
-					this.setState({
-						trophyreturn:true
-					})
-				}
+        // window._initSider();
+				// var trophy_uid = false;
+				// if (window.localStorage) {
+				// 	trophy_uid = localStorage.getItem('trophy_uid');
+				// } else {
+				// 	trophy_uid = false
+				// }
+				// if(trophy_uid==="true"||trophy_uid===true){
+				// 	this.setState({
+				// 		trophyreturn:true
+				// 	})
+				// }
 
     }
 
 		trophyreturnfun=()=>{
-				this.setState({
-					trophyreturn:true
-				})
-				localStorage.setItem('trophy_uid', true);
+				// this.setState({
+				// 	trophyreturn:true
+				// })
+				// localStorage.setItem('trophy_uid', true);
 		}
     render() {
         return (
@@ -70,15 +70,15 @@ class SiderBar extends Component {
 							</div>
 						</div>
 
-						{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>}
+						{/*{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>
             );