Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js

@@ -159,7 +159,7 @@ class GraduationTasksappraise extends Component{
             categoryid={category_id}
             setupdate={this.setupdate}
           />
-          <div className="newMain clearfix">
+          <div className="newMain clearfix graduationAppraise">
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.css

@@ -18,8 +18,8 @@
   color: #999999;
 }
 
-.panel-comment_item .t_info {
-  width: 100%;
+.graduationAppraise .panel-comment_item .t_info {
+  width: 1062px;
 }
 .course-message .panel-comment_item .comment_orig_content {
   width: 980px;

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReply.js

@@ -158,7 +158,7 @@ class GraduationTasksappraiseReply extends Component{
 
     return(
       <React.Fragment>
-				{comment_scores.length===0&&isStudent===true||comment_scores.length===0&&isNotMember===true? "": <div className="edu-back-white padding20-30" style={{marginTop: '16px'}}>
+				{comment_scores.length===0&&isStudent===true||comment_scores.length===0&&isNotMember===true? "": <div className="edu-back-white" style={{marginTop: '16px'}}>
         {isStudent===true?
           <GraduationTasksappraiseReplyChild
               {...this.props}

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js

@@ -30,7 +30,8 @@ class GraduationTasksappraiseReplyChild extends Component{
 		return(
 			<React.Fragment>
 
-					<div className={"stud-class-set pd20 edu-back-white mb10"} style={{height:"100%"}}>
+					<div className={`${comment_scores && comment_scores.length && 'bor-bottom-greyE'} stud-class-set  edu-back-white mb10 padding20-30 `}
+							style={{height:"100%"}}>
 
 						<Modals
 							modalsType={this.props.Modalstype}
@@ -70,32 +71,31 @@ class GraduationTasksappraiseReplyChild extends Component{
 						{this.props.ultimate===true?"":<div className={"color-grey-6 mb10"}>
 							<span className="labal">全部评阅</span>
 							{ !!comment_scores.length && <span className="count">
-								{comment_scores.length===0?"":(comment_scores.length)}
+								{comment_scores.length===0?"":`(${comment_scores.length})`}
 							</span> }
 						</div>}
 
-						<div className="padding20 bor-bottom-greyE memoReplies commentsDelegateParent course-message"
-								 style={{ paddingTop: '0px', paddingBottom: '0px' }}
-						>
-							{/* style={{ display: (comments && !!comments.length) ? 'block' : 'none' }} */}
-							{/* <div className="replies_count">
-
-            </div> */}
-
-							{this.props.ultimate===true?"": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
+						{this.props.ultimate===true ? "": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
 								addSuccess={() => this.props.addSuccess()}																																								
 							></GraduationTasksappraiseMainEditor> }
-							<style>{`
+				</div>
 
+				<div className={"stud-class-set  edu-back-white mb10"} style={{height:"100%"}}>
 
-            `}</style>
-							<div className="panel-comment_item">
-								{ comment_scores.map(item => {
-									return <Graduationtaskitem item={item} onDelete={this.props.onDelete} {...this.props}></Graduationtaskitem>
-								}) }
-							</div>
+					<div className="padding20 memoReplies commentsDelegateParent course-message"
+								style={{ paddingTop: '0px', paddingBottom: '0px' }}
+					>
+
+						
+						<style>{`
+						`}</style>
+						<div className="panel-comment_item">
+							{ comment_scores.map(item => {
+								return <Graduationtaskitem item={item} onDelete={this.props.onDelete} {...this.props}></Graduationtaskitem>
+							}) }
 						</div>
 					</div>
+				</div>
 			</React.Fragment>
 		)
 	}

public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js

@@ -36,7 +36,7 @@ class Graduationtaskitem extends Component{
 									</a>
 									<span className="t_area fl">{item.time}</span>
 									{/* 分数 */}
-									{item.score && <span className="score_area fl">{item.score}分</span>}
+									{item.score >= 0 && <span className="score_area fl">{item.score}分</span>}
 
 									{ !item.is_invalid && item.delete && <Tooltip title={ "删除" } >
 										<i className="iconfont icon-shanchu mr5 fr" style={{marginLeft: '6px'}}