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

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

@@ -17,7 +17,8 @@ class ShowAppraiseList extends Component{
 	render(){
 		let {data, work_comment,work_comment_hidden}=this.props;
 		let work_commenttype=work_comment===undefined||work_comment===null||work_comment==="";
-		let work_comment_hiddentype=work_comment===undefined||work_comment===null||work_comment==="";
+		let work_comment_hiddentype=work_comment_hidden===undefined||work_comment_hidden===null||work_comment_hidden==="";
+
 		return(
 			<div>
 				<style>
@@ -66,25 +67,28 @@ class ShowAppraiseList extends Component{
 
 							{this.props&&this.props.isAdmin()===true?
 								<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
-									<div>
+
+									{work_commenttype===true?"":<div>
 										<span className={"z000"}>学生可见<span className={"z666"}>（学生可查看老师的评阅内容）</span></span>
-									</div>
-									<div className={"borderbom"} style={{minHeight:'40px'}}>
-										{work_comment===true?"":<div className={"personalsummary"}>
+									</div>}
+
+									{work_commenttype===true?"":<div className={work_comment_hiddentype===true?"":"borderbom"} style={{minHeight:'40px'}}>
+										<div className={"personalsummary"}>
 											<div className={"markdown-body"}
 													 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment).replace(/▁/g, "▁▁▁")}}></div>
-										</div>}
-									</div>
+										</div>
+									</div>}
 
-								<div>
+									{work_comment_hiddentype===true?"":<div>
 									<span className={"z000"}>学生不可见<span className={"z666"}>（仅对课堂老师可见）</span></span>
-								</div>
-									<div  style={{minHeight:'40px'}}>
-										{work_comment_hidden===true?"":<div className={"personalsummary"}>
+							  	</div>}
+
+									{work_comment_hiddentype===true?"":<div  style={{minHeight:'40px'}}>
+									<div className={"personalsummary"}>
 										<div className={"markdown-body"}
 												 dangerouslySetInnerHTML={{__html: markdownToHTML(work_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
-									</div>}
-								</div>
+									</div>
+								</div>}
 
 
 							</div>:<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
@@ -109,7 +113,7 @@ class ShowAppraiseList extends Component{
 
 					return(
 						<div key={key}>
-							{challenge_comment===false&&challenge_comment_hidden==false?<div className="stud-class-set mt17" >
+							{challenge_comment===false||challenge_comment_hidden==false?<div className="stud-class-set mt17" >
 							<div className="clearfix edu-back-white poll_list">
 
 								<div className="font-16 color-dark-21 shixunreporttitleboxtop pd20 color333">
@@ -125,25 +129,27 @@ class ShowAppraiseList extends Component{
 
 								{this.props&&this.props.isAdmin()===true?
 									<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30bt">
-										<div>
+
+										{challenge_comment===true?"":<div>
 											<span className={"z000"}>学生可见<span className={"z666"}>（学生可查看老师的评阅内容）</span></span>
-										</div>
-										<div className={"borderbom"} style={{minHeight:'40px'}}>
-											{challenge_comment===true?"":<div className={"personalsummary"}>
+										</div>}
+
+										{challenge_comment===true?"":<div className={challenge_comment_hidden===true?"":"borderbom"} style={{minHeight:'40px'}}>
+											<div className={"personalsummary"}>
 												<div className={"markdown-body"}
 														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment).replace(/▁/g, "▁▁▁")}}></div>
-											</div>}
-										</div>
+											</div>
+										</div>}
 
-										<div>
+										{challenge_comment_hidden===true?"":<div>
 											<span className={"z000"}>学生不可见<span className={"z666"}>（仅对课堂老师可见）</span></span>
-										</div>
-										<div style={{minHeight:'40px'}}>
-											{challenge_comment_hidden===true?"":<div className={"personalsummary"}>
+										</div>}
+										{challenge_comment_hidden===true?"":<div style={{minHeight:'40px'}}>
+											<div className={"personalsummary"}>
 												<div className={"markdown-body"}
 														 dangerouslySetInnerHTML={{__html: markdownToHTML(item.challenge_comment_hidden).replace(/▁/g, "▁▁▁")}}></div>
-											</div>}
-										</div>
+											</div>
+										</div>}
 
 									</div>:	<div className="font-16 color-dark-21 shixunreporttitleboxbom pd30">
 										<div style={{minHeight:'40px'}}>