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

public/react/src/modules/courses/css/Courses.css

@@ -801,10 +801,10 @@ a.white-btn.use_scope-btn:hover{
     position: absolute;
 }
 
-.ant-input{
+.ant-input,.ant-input .ant-input-suffix{
     background-color: #fafafa!important;
 }
-.ant-input:focus{
+.ant-input:focus,.ant-input:focus .ant-input-suffix{
     background-color:#ffffff!important;
 }
 

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

@@ -135,7 +135,7 @@ class CommitSummary extends Component{
 
                         </div>
                         <div>
-                            <p className="ml29 fl color-black mt10 summaryname" onClick={this.asdasdsad}>提交总结</p>
+                            <p className="ml29 fl color-black mt10 summaryname" onClick={this.asdasdsad}>修改总结</p>
                                 <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${this.props.match.params.homeworkid}/openlist?tab=0`} className="color-grey-6 fr font-16 ml30 mt10">返回</a>
                         </div>
                         {/*educontentbox*/}

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

@@ -2536,7 +2536,7 @@ class Listofworksstudentone extends Component {
 										<div className="mh650 edu-back-white">
 											<div className="edu-tab-con-box clearfix edu-txt-center">
 												<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-												<p className="edu-nodata-p mb30">没有数据可以显示.！</p>
+												<p className="edu-nodata-p mb30">没有数据可以显示！</p>
 											</div>
 										</div>
 

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

@@ -125,7 +125,7 @@ class ShixunWorkReport extends Component {
 							</WordsBtn>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<WordsBtn to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+category_id} style="grey" className="btn colorgrey fl hovercolorblue ">
-									<span className={"color-grey-9"}>{data&&data.category.category_name}</span>
+									<span className={"color-grey-9"}>{data===undefined?"":data.category===null?"":data.category.category_name}</span>
 							</WordsBtn>
 							<span className="color-grey-9 fl ml3 mr3">&gt;</span>
 							<WordsBtn to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+homework_common_id+"/list?tab=0"} className="fl color-grey-9">作业详情</WordsBtn>

public/react/src/modules/user/account/AccountCertification.js

@@ -16,7 +16,7 @@ class AccountCertification extends Component {
 
   showRealNameCertificationModal = (index) => {
     this.setState({
-      certification:index
+      certification:index,
     })
     this.realNameCertificationModal.setVisible(true)
   }
@@ -25,9 +25,13 @@ class AccountCertification extends Component {
       let {basicInfo} = this.props;
       return (
         <div>
-          <RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
+          {this.state.certification===1?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
               wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
-          ></RealNameCertificationModal>
+          ></RealNameCertificationModal>:""}
+
+					{this.state.certification===2?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
+          wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
+      ></RealNameCertificationModal>:""}
           <div className="basicForm">
             <style>{`
                 .basicForm .title {

public/react/src/modules/user/modal/RealNameCertificationModal.js

@@ -30,7 +30,6 @@ class RealNameCertificationModal extends Component{
   constructor(props){
     super(props);
     this.state={
-      fileList:[]
     }
   }
 
@@ -38,7 +37,6 @@ class RealNameCertificationModal extends Component{
     
   }
   setVisible = (visible) => {
-    this.setState({ fileList:[] });
     this.refs.modalWrapper.setVisible(visible)
   }
 
@@ -120,8 +118,6 @@ class RealNameCertificationModal extends Component{
         loading: false,
       }));
     }
-    let fileList = [...info.fileList];
-    this.setState({ fileList });
   }
 
   render(){
@@ -294,7 +290,7 @@ class RealNameCertificationModal extends Component{
               <span className="idPic-uploader demoImg">
                 <img src={`${certification == 1 ? authImg : jobImg}`} alt="avatar" style={{ maxHeight: '110px'}}/>
               </span>
-              <Dragger {...uploadProps2} fileList = {this.state.fileList}>
+              <Dragger {...uploadProps2}>
                 {imageUrl2 ? 
                   // <a href={imageUrl2} target="_blank" title="点击重新上传图片"></a>
                     <img src={imageUrl2} alt="avatar" style={{ maxHeight: '110px'}}/>