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

public/react/src/App.js

@@ -367,10 +367,10 @@ const JupyterTPI = Loadable({
 	loading: Loading
 });
 // 微信代码编辑器
-// const WXCode = Loadable({
-// 	loader: () => import('./modules/wxcode'),
-// 	loading: Loading
-// });
+const WXCode = Loadable({
+	loader: () => import('./modules/wxcode'),
+	loading: Loading
+});
 // //个人竞赛报名
 // const PersonalCompetit = Loadable({
 // 	loader: () => import('./modules/competition/personal/PersonalCompetit.js'),
@@ -828,11 +828,11 @@ class App extends Component {
 											 render={
 												 (props) => (<Headplugselection  {...this.props} {...props} {...this.state} />)
 											 }/>
-								{/*<Route path="/wxcode/:identifier?" component={WXCode} */}
-								{/*	render={*/}
-								{/*		(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)*/}
-								{/*	}*/}
-								{/*/>*/}
+								<Route path="/wxcode/:identifier?" component={WXCode}
+									render={
+										(props)=>(<WXCode {...this.props} {...props} {...this.state}></WXCode>)
+									}
+								/>
 								<Route exact path="/"
 											// component={ShixunsHome}
 											render={

public/react/src/AppConfig.js

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

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -387,16 +387,7 @@ class ShixunhomeWorkItem extends Component{
 							{this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1?
                 discussMessage.time_status<5?
 								<WordsBtn  style="blue" className="colorblue font-16 mr20 fr mt2 ">
-									{startbtn===false?
-										(discussMessage.task_operation[0] == '进入学习' || discussMessage.task_operation[0] == '进入学习' ?
-											<a className="btn colorblue" href={getTaskUrlById(discussMessage.task_operation[1])}>
-												{/*{discussMessage.task_operation[0]}*/}
-                        进入学习
-											</a>
-											:
-											<a className="btn colorblue" onClick={()=>this.taskoperationId(discussMessage.task_operation[1])}>
-                        进入学习
-											</a>):<a className="btn colorblue" >进入中</a>}
+                  <Link className="btn colorblue font-16 fontweight400" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>进入学习</Link>
 								</WordsBtn>:"":"":"":""
 							}
 

public/react/src/modules/paths/statics/index.js

@@ -4,7 +4,7 @@
  * @Github:
  * @Date: 2020-01-10 09:33:45
  * @LastEditors  : tangjiang
- * @LastEditTime : 2020-02-14 15:15:06
+ * @LastEditTime : 2020-02-14 17:51:48
  */
 import './index.scss';
 import React, { useEffect } from 'react';
@@ -173,35 +173,39 @@ const App = (props) => {
       title: '通关实训数',
       dataIndex: 'passed_myshixun_count',
       align: 'center',
-      with: 180,
+      with: 170,
+      render: (val) => val + '', 
       sorter: (a, b) => a.passed_myshixun_count - b.passed_myshixun_count
     },
     {
       title: '完成关卡',
       dataIndex: 'passed_games_count',
       align: 'center',
-      with: 180,
+      with: 170,
+      render: (val) => val + '', 
       sorter: (a, b) => a.passed_games_count - b.passed_games_count
     },
     {
       title: '代码行',
       dataIndex: 'code_line_count',
       align: 'center',
-      with: 180,
+      with: 170,
+      render: (val) => val + '', 
       sorter: (a, b) => a.code_line_count - b.code_line_count
     },
     {
       title: '评测次数',
       dataIndex: 'evaluate_count',
       align: 'center',
-      with: 180,
+      with: 170,
+      render: (val) => val + '', 
       sorter: (a, b) => a.evaluate_count - b.evaluate_count
     },
     {
       title: '所用时间',
       dataIndex: 'cost_time',
       align: 'center',
-      with: 180,
+      // with: 180,
       render: (text) => (text && moment(text).format('HH:mm:ss')) || '-',
       sorter: (a, b) => a.cost_time - b.cost_time
     }