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

public/react/src/modules/courses/exercise/Exercisesetting.js

@@ -608,6 +608,9 @@ class Exercisesetting extends Component{
         };
 
         // console.log(flagPageEdit===true?polls&&polls.exercise_status===1?3:2:1)
+			console.log("asdasdasda");
+			 console.log(this.props);
+			 console.log(this.props.Commonheadofthetestpaper);
         return(
             <div>
                 <Modals
@@ -713,7 +716,7 @@ class Exercisesetting extends Component{
                                             course_group={course_group}
                                             flagPageEdit={flagPageEdit}
                                             rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
-																					Commonheadofthetestpaper
+																					  Commonheadofthetestpaper={this.props.Commonheadofthetestpaper}
                                         ></PollDetailTabForthRules>
                                 }
                             </div>

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

@@ -87,7 +87,12 @@ class SiderBar extends Component {
 
     render() {
         return (
-					this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div className="-task-sidebar">
+
+						<div className="-task-sidebar"
+							style={{
+								display:this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?"":"none"
+							}}
+						>
                 <div className="gotop"  tooltips="返回顶部">
                     <a>
                         <i className="iconfont icon-shangjiantou color-white"></i>
@@ -129,7 +134,7 @@ class SiderBar extends Component {
                     </a>
                 </div>
 
-            </div>:""
+            </div>
 				);
     }
 }