Merge branch 'develop' into dev_cxt

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

public/react/src/AppConfig.js

@@ -35,7 +35,7 @@ if (isDev) {
 // 老师
 //ebugType="teacher";
 // 学生
-//debugType="student";
+// debugType="student";
 
 window._debugType = debugType;
 export function initAxiosInterceptors(props) {

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

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={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&&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"}>