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

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

@@ -2344,15 +2344,17 @@ class Listofworksstudentone extends Component {
 							<ul className="clearfix" style={{padding: '20px 15px 10px 20px'}}>
 								<li className="clearfix ">
 									<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-
+									<span>
-											{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+									{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
-																{teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
+										(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTimet}>
-																	computeTimetype===true&&this.props.isNotMember()===false?	<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 											计算成绩
-																	</div>:<div className={"computeTimes font-13"}>
+										</div>:""):
+										teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+											(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 												计算成绩
-																	</div>}
+											</div>:"")
-															</span>}
+									}
+						  	</span>
 
 									<div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 										<Search
@@ -2631,16 +2633,22 @@ class Listofworksstudentone extends Component {
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 															{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-
+													{computeTimetype===true?
-																{teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status=== 0? "":
+														(this.props.isNotMember()===false?
-																	computeTimetype===true&&this.props.isNotMember()===false?	<div className={"computeTime font-13"} onClick={this.setComputeTime}>
+															<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 																计算成绩
-																	</div>:<div className={"computeTimes font-13"}>
+															</div>
+															:"")
+														:
+														(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+															this.props.isNotMember()===false?
+																<div className={"computeTimes font-13"}>
 																	计算成绩
-																	</div>}
+																</div>
+																:"")
+													}
 												</span>}
 
-
 														</div>
 
 													</div>
@@ -2792,16 +2800,17 @@ class Listofworksstudentone extends Component {
 														<div className="fr">
 
 															<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":
+															{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
-															 <span>
+													{computeTimetype===true?
-																 {teacherdata&&teacherdata.time_status!==undefined&&teacherdata.time_status===0?"":
+														(this.props.isNotMember()===false?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
-																	 this.props.isNotMember()===false&&computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 															计算成绩
-																 </div>:<div className={"computeTimes font-13"}>
+														</div>:""):
+														teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
+															(this.props.isNotMember()===false?<div className={"computeTimes font-13"}>
 																计算成绩
-																 </div>}
+															</div>:"")
-															 </span>
 													}
+												 </span>}
 
 														</div>
 														{/*因为计算按钮占了和这个位置，和设计沟通学生视角取消这个按钮*/}

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

@@ -210,9 +210,9 @@ class TraineetraininginformationModal extends Component {
                     footer={null}
                     onCancel={this.Cancel}
                 >
-                    <div style={{width:"100%" }}className="login_register_content"  >
+                    <div style={{width:"100%" }} >
                     <div style={{"width": "100%","text-align": "left","clear": "both"}}>
-                        <div className="mt5 fl" >
+                        <div className="mt8 fl" >
                             <span style={{"text-align": "left"}}>{this.props.viewtrainingdata === undefined ? "" :  this.LimitNumber(this.props.viewtrainingdata.shixun_name)}</span>
                           <span className="ml10  "  style={{"text-align": "left","color":'#29BD8B'}} >经验值：<span style={{"color":'#29BD8B'}}> {this.props.experience=== undefined?"0" :this.props.experience}/</span><span style={{"color":'#29BD8B'}}>{this.props.viewtrainingdata === undefined ? "" : this.props.viewtrainingdata.shixun_score}</span></span>
                         </div>
@@ -224,7 +224,7 @@ class TraineetraininginformationModal extends Component {
                     </div>
 
                     </div>
-                    <div className=" bor-bottom-greyE mt45 "></div>
+                    {/*<div className=" bor-bottom-greyE mt45 "></div>*/}
 
                     <div style={{"clear": "both"}}>
                     <div className="fl edu-back-white ml10 ">

public/react/src/modules/user/FindPasswordComponent.js

@@ -213,10 +213,7 @@ class LoginRegisterComponent extends Component {
 			})
 			return
 		}
-		if (this.state.password !== this.state.passwords==="") {
+
-			this.openNotification(`两次输入的密码不一致`);
-			return
-		}
 		else if (this.state.password !==undefined&&this.state.password.length>0&&this.state.password.length<8){
 			this.setState({
 				Phonenumberisnotcosmmm:"密码不能少于8位",
@@ -239,6 +236,13 @@ class LoginRegisterComponent extends Component {
 			})
 			return
 		}
+		if (this.state.password !== this.state.passwords) {
+			this.setState({
+				Phonenumberisnotcosmmm:"两次输入的密码不一致",
+				Phonenumberisnotcosymmmm:"两次输入的密码不一致",
+			})
+			return
+		}
 		if (this.state.codes === undefined|| this.state.codes.length ===0 || this.state.codes === "") {
 			this.setState({
 				Phonenumberisnotcosyzm:"验证码不能为空"