Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into develop

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

@@ -86,13 +86,12 @@ class SiderBar extends Component {
     }
 
     render() {
+
+    	// console.log(this.props)
         return (
 
-						<div className="-task-sidebar"
+						<div className="-task-sidebar" >
-							style={{
+							{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div>
-								display:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?"":"none"
-							}}
-						>
 								<div className="gotop"  tooltips="返回顶部">
 									<a>
 										<i className="iconfont icon-shangjiantou color-white"></i>
@@ -133,6 +132,8 @@ class SiderBar extends Component {
 										<i className="iconfont icon-qqzaixianzixun color-white font-22"></i>
 									</a>
 								</div>
+							</div>:""}
+
 
             </div>
 				);