From 9cf8efebc8fbbe97a7533a8782bf298e5da1e992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 14 Feb 2020 17:25:04 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/App.js                        | 18 +++++++++---------
 public/react/src/AppConfig.js                  |  2 +-
 .../shixunHomework/ShixunhomeWorkItem.js       | 11 +----------
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index 8f56cac3c..d445d1d35 100644
--- a/public/react/src/App.js
+++ b/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={
diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index a3c081285..4667ebbde 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -46,7 +46,7 @@ if (isDev) {
 // 老师
 //debugType="teacher";
 // 学生
-//debugType="student";
+debugType="student";
 
 
 
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 1e99756ed..c8639e6eb 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/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>:"":"":"":""
 							}
 

From 024783dd4b4d8d8e32d8c8fa0c664067bf94a022 Mon Sep 17 00:00:00 2001
From: tangjiang <465264938@qq.com>
Date: Fri, 14 Feb 2020 17:53:16 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=AE=BD=E5=BA=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/paths/statics/index.js | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/paths/statics/index.js b/public/react/src/modules/paths/statics/index.js
index 7996ed9c2..849311c12 100644
--- a/public/react/src/modules/paths/statics/index.js
+++ b/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
     }