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

public/react/src/AppConfig.js

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

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

@@ -364,7 +364,8 @@ class Testpapersettinghomepage extends Component{
                                         <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
                                             <Menu.Item key="0" className={"exercisesafonts"}>答题列表</Menu.Item>
 																					{Commonheadofthetestpaper&&Commonheadofthetestpaper.show_statistic===true?
-																						<Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>:""}
+                                            Commonheadofthetestpaper && Commonheadofthetestpaper.exercise_status===3?
+																						<Menu.Item key="1" className={"exercisesafonts"}>统计结果</Menu.Item>:"":""}
                                             <Menu.Item key="3" className={"exercisesafonts"}>设置</Menu.Item>
                                         </Menu>
                                     }

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

@@ -35,14 +35,14 @@ if (!window['indexHOCLoaded']) {
   // $('head').append($('<link rel="stylesheet" type="text/css" />')
   //     .attr('href', `${_url_origin}/stylesheets/educoder/antd.min.css?1525440977`));
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2021`));
+      .attr('href', `${_url_origin}/stylesheets/css/edu-common.css?2`));
 
   $('head').append($('<link rel="stylesheet" type="text/css" />')
-      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2021`));
+      .attr('href', `${_url_origin}/stylesheets/educoder/edu-main.css?2`));
 
   // index.html有加载
 	$('head').append($('<link rel="stylesheet" type="text/css" />')
-		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2021`));
+		.attr('href', `${_url_origin}/stylesheets/educoder/edu-all.css?2`));
 
 
   // $('head').append($('<link rel="stylesheet" type="text/css" />')