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

public/react/src/AppConfig.js

@@ -42,7 +42,7 @@ if (isDev) {
 // 老师
 //debugType="teacher";
 // 学生
-debugType="student";
+//debugType="student";
 
 
  function railsgettimes(proxy) {

public/react/src/context/TPIContextProvider.js

@@ -32,7 +32,7 @@ import _ from 'lodash'
 
 import TPIContext from './TPIContext'
 import { EDU_ADMIN, EDU_SHIXUN_MANAGER, EDU_SHIXUN_MEMBER, EDU_CERTIFICATION_TEACHER
-    , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL, EDU_BUSINESS, CNotificationHOC } from 'educoder'
+    , EDU_GAME_MANAGER, EDU_TEACHER, EDU_NORMAL, EDU_BUSINESS, CNotificationHOC ,getRandomNumber} from 'educoder'
 import { MuiThemeProvider, createMuiTheme, withStyles } from 'material-ui/styles';
 import MUIDialogStyleUtil from '../modules/page/component/MUIDialogStyleUtil'
 
@@ -176,7 +176,7 @@ class TPIContextProvider extends Component {
 			testPath = 'http://test-newweb.educoder.net'
 		}
 		// var url = `${testPath}/api/v1/games/${ game.identifier }/cost_time`
-		var url = `${testPath}/api/tasks/${ game.identifier }/cost_time`
+		var url = `${testPath}/api/tasks/${ game.identifier }/cost_time${getRandomNumber()}`
 	    window.$.ajax({
 	        type: 'get',
 	        url: url,

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -549,6 +549,10 @@ class Coursesleftnav extends Component{
 							window.location.href=`/courses/${coursesId}/boards/${result.data.category_id}`;
 						}
 
+            if(positiontype!="course_groups"){
+              this.updasaveNavmoda()
+            }
+
 						if(positiontype==="course_groups"){
 							window.location.href=`/courses/${coursesId}/course_groups/${result.data.group_id}`;
 						}

public/react/src/modules/page/layers/TaskResultLayer.js

@@ -14,6 +14,7 @@ import passpartImg from '../../../images/tpi/passpart.png'
 import empiricgreenImg from '../../../images/tpi/empiricgreen.png'
 
 import { trigger } from 'educoder';
+import SecondTab from "../../paths/SchoolStatistics/SecondTab";
 
 
 class TaskResultLayer extends Component {
@@ -177,7 +178,15 @@ class TaskResultLayer extends Component {
                     </p>
                   </div>
                   <div className="winPanel">
-                      
+                      <style>
+                        {
+                          `
+                          .page--body{
+                              z-index: 0 !important;
+                          }
+                          `
+                        }
+                      </style>
                       <div className="cl"></div>
                       { !game.star ?
                         <React.Fragment>