From 8e076eedf2623b34025f0c9d520114832f4bc327 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 18 Dec 2019 11:47:11 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/AppConfig.js                            | 2 +-
 public/react/src/modules/paths/PathDetail/DetailCards.js | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 40a38b3e8..ac39562a7 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -35,7 +35,7 @@ if (isDev) {
 // 老师
 //ebugType="teacher";
 // 学生
-//debugType="student";
+// debugType="student";
 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {
diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index fdcbb0297..54cad02eb 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -341,6 +341,7 @@ class DetailCards extends Component{
     }=this.state;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
    // console.log("zzz"+this.props.MenuItemsindextype)
+   //  console.log(this.props.detailInfoList&&this.props.detailInfoList.allow_visit)
     return(
       <div>
 
@@ -547,13 +548,13 @@ class DetailCards extends Component{
                                           :<i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
                                       }
                                       </span>
-                                    <span className={this.props.current_user&&this.props.current_user.admin===false&&line.shixun_status==="暂未公开"?"paragraph_name color204":"paragraph_name color-grey3"}>
+                                    <span className={this.props.detailInfoList&&this.props.detailInfoList.allow_visit===false&&line.shixun_status==="暂未公开"?"paragraph_name color204":"paragraph_name color-grey3"}>
                                         <span className="subject_stage_shixun_index">{key+1}</span>-{index+1}&nbsp;&nbsp;{line.shixun_name}
                                       </span>
 
                                   </li>
                                   {
-																		this.props.current_user&&this.props.current_user.admin===false&&line.shixun_status==="暂未公开"?
+                                    this.props.detailInfoList&&this.props.detailInfoList.allow_visit===false&&line.shixun_status==="暂未公开"?
                                       <li className="fr status_li"><span className="fr color204">暂未公开</span></li>
                                       :
                                       <li className={showparagraph===false?"none":"fr status_li"}>

From 9723c28621bfefc23160e4ab3a9c4e490bfd8452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 18 Dec 2019 12:02:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/elearning/YslDetailCards.js   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js
index 6ca63a42a..436e0a984 100644
--- a/public/react/src/modules/courses/elearning/YslDetailCards.js
+++ b/public/react/src/modules/courses/elearning/YslDetailCards.js
@@ -492,13 +492,13 @@ class YslDetailCards extends Component{
 																					:<i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
 																			}
                                       </span>
-																				<span className={this.props.current_user&&this.props.current_user.admin===false&&this.props.current_user&&this.props.current_user.business===false&&line.shixun_status==="暂未公开"?"paragraph_name color204":"paragraph_name color-grey3"}>
+																				<span className={line.allow_visit===false&&line.shixun_status==="暂未公开"?"paragraph_name color204":"paragraph_name color-grey3"}>
                                         <span className="subject_stage_shixun_index">{key+1}</span>-{index+1}&nbsp;&nbsp;{line.shixun_name}
                                       </span>
 
 																			</li>
 																			{
-																				this.props.current_user&&this.props.current_user.admin===false&&this.props.current_user&&this.props.current_user.business===false&&line.shixun_status==="暂未公开"?
+																				line.allow_visit===false&&line.shixun_status==="暂未公开"?
 																					<li className="fr status_li"><span className="fr color204">暂未公开</span></li>
 																					:
 																					<li className={showparagraph===false?"none":"fr status_li"}>
@@ -512,7 +512,7 @@ class YslDetailCards extends Component{
 																					</li>
 																			}
 
-																			{this.props.current_user&&this.props.current_user.admin===false&&this.props.current_user&&this.props.current_user.business===false&&line.shixun_status==="暂未公开"?"":	<li className={showparagraph===false?"fr status_li":"fr status_li"}>
+																			{line.allow_visit===false&&line.shixun_status==="暂未公开"?"":	<li className={showparagraph===false?"fr status_li":"fr status_li"}>
 																				{
 																					showparagraphkey === key && showparagraphindex === index ? "" :
 																						<span className="fr color204">实验任务 <span

From 4dc2470111177c73a2350e528bde35e5825ca878 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 18 Dec 2019 12:38:42 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=88=E4=BD=9C?=
 =?UTF-8?q?=E8=80=85=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/paths/PathDetail/DetailCards.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index 54cad02eb..006cb3179 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -548,13 +548,13 @@ class DetailCards extends Component{
                                           :<i className="iconfont icon-bofang progressRing-part font-18 mt10"></i>
                                       }
                                       </span>
-                                    <span className={this.props.detailInfoList&&this.props.detailInfoList.allow_visit===false&&line.shixun_status==="暂未公开"?"paragraph_name color204":"paragraph_name color-grey3"}>
+                                    <span className={line.allow_visit===false&&line.shixun_status==="暂未公开"?"paragraph_name color204":"paragraph_name color-grey3"}>
                                         <span className="subject_stage_shixun_index">{key+1}</span>-{index+1}&nbsp;&nbsp;{line.shixun_name}
                                       </span>
 
                                   </li>
                                   {
-                                    this.props.detailInfoList&&this.props.detailInfoList.allow_visit===false&&line.shixun_status==="暂未公开"?
+                                    line.allow_visit===false&&line.shixun_status==="暂未公开"?
                                       <li className="fr status_li"><span className="fr color204">暂未公开</span></li>
                                       :
                                       <li className={showparagraph===false?"none":"fr status_li"}>

From b9eb293006ee3837024d2fb52d5308bcbe1ad36a Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Wed, 18 Dec 2019 14:10:30 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/export_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/export_helper.rb b/app/helpers/export_helper.rb
index 47d3bd7b9..ca76ee953 100644
--- a/app/helpers/export_helper.rb
+++ b/app/helpers/export_helper.rb
@@ -483,7 +483,7 @@ module ExportHelper
           w_14 = nil
         end
         w_15 = w.work_score.nil? ? "--" : w.work_score.round(1)
-        w_16 = w.update_time ? format_time(w.update_time) : "--"  "更新时间"
+        w_16 = w.update_time ? format_time(w.update_time) : "--"
         myshixun_complete = myshixun && myshixun.status == 1
         w_17 = myshixun_complete && w.cost_time ? (game_spend_time w.cost_time) : "未完成"
         teacher_comment = w.shixun_work_comments.select{|comment| comment.challenge_id == 0}.first