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

public/react/src/context/TPIContextProvider.js

@@ -417,7 +417,7 @@ pop_box_new(htmlvalue, 480, 182);
 		 */
 	    let user = resData.user;
   		user.username = resData.user.name;
-  		// user.user_url = resData.user_url;
+  		user.user_url = `/user/${resData.user.login}`;
   		// user.image_url = resData.image_url;
   		user.is_teacher = resData.is_teacher;
   		resData.user = user;

public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js

@@ -627,7 +627,7 @@ render(){
 
         <Form.Item>
           <div className="clearfix mt30 mb30">
-            <Button type="primary" htmlType="submit"  className="defalutSubmitbtn fl mr20">提交</Button>
+            <Button type="primary" htmlType="submit"   className="defalutSubmitbtn fl mr20">提交</Button>
             <a onClick={this.gocannel} className="defalutCancelbtn fl">取消</a>
           </div>
         </Form.Item>

public/react/src/modules/page/MainContent.js

@@ -61,7 +61,7 @@ class MainContent extends Component {
 				`}</style>
 		      	<div className="-layout -stretch -fit labelN" id="game_show_content">
 		      		<div className="split-panel--first -layout -vertical -flex -relative -flex-basic40"
-		      			id="game_left_contents" style={{ width: '35%'}}>
+		      			id="game_left_contents" style={{ width: '40%'}}>
 						{/*  style={{width: '694px'}} */}
 
 		      			{/* 左侧任务说明等功能的区域 */}

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

@@ -330,14 +330,15 @@ class NewHeader extends Component {
     })
   }
   educoderlogin=()=>{
-    //登出账号
+    //退出账号
     var url = `/accounts/logout.json`;
 
     axios.get((url)).then((result) => {
        if(result!==undefined){
-         this.setState({
-           isRender:true
-         })
+         // this.setState({
+         //   isRender:true
+         // })
+         window.location.href = "/";
        }
     }).catch((error) => {
        console.log(error);