Merge branches 'courseware' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

 Conflicts:

	public/react/src/AppConfig.js

public/react/src/context/TPIContextProvider.js

@@ -137,6 +137,9 @@ class TPIContextProvider extends Component {
 		this.costTimeInterval && window.clearInterval(this.costTimeInterval)
 	}
 	componentDidMount() {
+		window.$(window).unload( ()=>{
+			console.log(12321)
+		});
 
 		// TODO 登录状态的判断？
 		// request
@@ -159,11 +162,23 @@ class TPIContextProvider extends Component {
 		}, 1000)
 
 			// 页面离开时存下用户的任务耗时
-
-		window.$(window).unload( ()=>{
+		window.$(window).bind('beforeunload', function (e) {
+			console.log(111111)
 			this._updateCostTime();
-		});
+		}) 	
+
+		// // 页面离开时存下用户的任务耗时
+		// window.$(window).unload( ()=>{
+		// 	this._updateCostTime();
+
+		// });
+
 	}
+
+	
+	
+
+
 	// force 评测通过后，异步执行该方法，强制同步costTime到服务端
 	_updateCostTime(async = false, force) {
 		const { game, loading } = this.state;

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

@@ -59,7 +59,7 @@ class LeftNav extends Component {
 
 				    <div className="leftnav" style={{position: 'fixed', bottom:0}}>
 				        <a href="/shixuns/uznmbg54?exit=true" className="leftnav-box-inner" id="exit_task_tab">
-				        	<i className="fa fa-arrow-left font-20"></i><br/><span className="font-12">退出实训</span>
+				        	<i className="fa fa-arrow-left font-20"></i><br/><span className="font-12">退出实训1</span>
 				        </a>
 				    </div>