From 15545fab0f64aa7ea78398d1cc6767d6a1942eef Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 20 Jul 2019 22:09:15 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=87=8D=E6=96=B0?=
 =?UTF-8?q?=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/css/Courses.css          | 4 ++--
 .../src/modules/user/account/AccountCertification.js      | 8 +++++---
 .../src/modules/user/modal/RealNameCertificationModal.js  | 6 +-----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index 5766c571c..8b768aa88 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/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;
 }
 
diff --git a/public/react/src/modules/user/account/AccountCertification.js b/public/react/src/modules/user/account/AccountCertification.js
index bd5c0ce10..c72778ced 100644
--- a/public/react/src/modules/user/account/AccountCertification.js
+++ b/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,11 @@ 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>:<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
+          wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
+      ></RealNameCertificationModal>}
           <div className="basicForm">
             <style>{`
                 .basicForm .title {
diff --git a/public/react/src/modules/user/modal/RealNameCertificationModal.js b/public/react/src/modules/user/modal/RealNameCertificationModal.js
index 0a6504c61..617d24a22 100644
--- a/public/react/src/modules/user/modal/RealNameCertificationModal.js
+++ b/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'}}/>

From 863425642c2298156b4b87ebf90454377a6e86c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 22:10:26 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/shixunHomework/CommitSummary.js   | 2 +-
 .../src/modules/courses/shixunHomework/ShixunWorkReport.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/CommitSummary.js b/public/react/src/modules/courses/shixunHomework/CommitSummary.js
index 0be2e3b34..af8bda0dc 100644
--- a/public/react/src/modules/courses/shixunHomework/CommitSummary.js
+++ b/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*/}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
index d11ff7fe4..2f32283bc 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunWorkReport.js
+++ b/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>

From a782beaf9ab31503497e006c09c62ce3b9e8816f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 22:26:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/account/AccountCertification.js      | 192 +++++++++---------
 1 file changed, 97 insertions(+), 95 deletions(-)

diff --git a/public/react/src/modules/user/account/AccountCertification.js b/public/react/src/modules/user/account/AccountCertification.js
index c72778ced..c809fadd5 100644
--- a/public/react/src/modules/user/account/AccountCertification.js
+++ b/public/react/src/modules/user/account/AccountCertification.js
@@ -1,95 +1,97 @@
-import React, { Component } from 'react';
-// import { Button } from 'antd'
-import { WordsBtn, getImageUrl } from 'educoder';
-import RealNameCertificationModal from '../modal/RealNameCertificationModal'
-import '../../courses/css/Courses.css'
-import {CNotificationHOC} from '../../courses/common/CNotificationHOC'
-
-
-class AccountCertification extends Component {
-  constructor(props){
-    super(props);
-    this.state={
-      certification:1
-    }
-  }
-
-  showRealNameCertificationModal = (index) => {
-    this.setState({
-      certification:index,
-    })
-    this.realNameCertificationModal.setVisible(true)
-  }
-    render() {
-      let {certification}=this.state
-      let {basicInfo} = this.props;
-      return (
-        <div>
-          {this.state.certification===1?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
-              wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
-          ></RealNameCertificationModal>:<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
-          wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
-      ></RealNameCertificationModal>}
-          <div className="basicForm">
-            <style>{`
-                .basicForm .title {
-                  font-size: 16px;
-                  padding-left: 30px;
-                  margin-bottom: 10px;
-                }
-              .flexTable {
-                display: flex;
-                flex-direction: column;
-              }
-              .flexRow {
-                display: flex;
-              }
-                .flexRow .name {
-                  margin-left: 46px;
-                }
-                .flexRow .description {
-                  margin-left: 30px;
-                  flex: 1;
-                  color: #CDCDCD;
-                }
-                .flexRow .status {
-                  width: 100px;
-                  color: #28AC7F;
-                }
-            `}</style>
-            <div className="title">认证信息</div>
-            <div className="flexTable">
-              <div className="flexRow lineh-20 mb20">
-                <div className="name">实名认证</div>
-                <div className="description">有些课程需要实名认证才能加入哟，还能获得500金币的奖励~ </div>
-                <div className="status">
-                  {
-                    basicInfo && basicInfo.authentication =="uncertified" ?
-                    <WordsBtn style="blue" className="borderBottom" onClick={()=>this.showRealNameCertificationModal(1)} >立即认证</WordsBtn>:
-                    basicInfo && basicInfo.authentication =="applying" ? <span style={{color: '#FF6800'}}>待审核</span>:
-                    <span><i className="iconfont icon-wancheng color-green font-16 mr3"></i>已认证</span>
-                  }
-                </div>
-              </div>
-
-              <div className="flexRow lineh-20">
-                <div className="name">职业认证</div>
-                <div className="description">教师认证完毕之后，可创建课堂、发布实训、免金币查看所有实训答案..  </div>
-                <div className="status">
-                  {
-                    basicInfo && basicInfo.professional_certification =="uncertified" ?
-                    <WordsBtn style="blue" className="borderBottom" onClick={()=>this.showRealNameCertificationModal(2)} >立即认证</WordsBtn>:
-                    basicInfo && basicInfo.professional_certification =="applying" ? <span style={{color: '#FF6800'}}>待审核</span>:
-                    <span><i className="iconfont icon-wancheng color-green font-16 mr3"></i>已认证</span>
-                  }
-                </div>
-              </div>  
-            </div>
-          </div>
-          <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
-        </div>
-      );
-    }
-}
-
-export default AccountCertification;
+import React, { Component } from 'react';
+// import { Button } from 'antd'
+import { WordsBtn, getImageUrl } from 'educoder';
+import RealNameCertificationModal from '../modal/RealNameCertificationModal'
+import '../../courses/css/Courses.css'
+import {CNotificationHOC} from '../../courses/common/CNotificationHOC'
+
+
+class AccountCertification extends Component {
+  constructor(props){
+    super(props);
+    this.state={
+      certification:1
+    }
+  }
+
+  showRealNameCertificationModal = (index) => {
+    this.setState({
+      certification:index,
+    })
+    this.realNameCertificationModal.setVisible(true)
+  }
+    render() {
+      let {certification}=this.state
+      let {basicInfo} = this.props;
+      return (
+        <div>
+          {this.state.certification===1?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
+              wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
+          ></RealNameCertificationModal>:""}
+
+					{this.state.certification===2?<RealNameCertificationModal ref="realNameCertificationModal" {...this.props}
+          wrappedComponentRef={(form) => this.realNameCertificationModal = form} certification={certification}
+      ></RealNameCertificationModal>:""}
+          <div className="basicForm">
+            <style>{`
+                .basicForm .title {
+                  font-size: 16px;
+                  padding-left: 30px;
+                  margin-bottom: 10px;
+                }
+              .flexTable {
+                display: flex;
+                flex-direction: column;
+              }
+              .flexRow {
+                display: flex;
+              }
+                .flexRow .name {
+                  margin-left: 46px;
+                }
+                .flexRow .description {
+                  margin-left: 30px;
+                  flex: 1;
+                  color: #CDCDCD;
+                }
+                .flexRow .status {
+                  width: 100px;
+                  color: #28AC7F;
+                }
+            `}</style>
+            <div className="title">认证信息</div>
+            <div className="flexTable">
+              <div className="flexRow lineh-20 mb20">
+                <div className="name">实名认证</div>
+                <div className="description">有些课程需要实名认证才能加入哟，还能获得500金币的奖励~ </div>
+                <div className="status">
+                  {
+                    basicInfo && basicInfo.authentication =="uncertified" ?
+                    <WordsBtn style="blue" className="borderBottom" onClick={()=>this.showRealNameCertificationModal(1)} >立即认证</WordsBtn>:
+                    basicInfo && basicInfo.authentication =="applying" ? <span style={{color: '#FF6800'}}>待审核</span>:
+                    <span><i className="iconfont icon-wancheng color-green font-16 mr3"></i>已认证</span>
+                  }
+                </div>
+              </div>
+
+              <div className="flexRow lineh-20">
+                <div className="name">职业认证</div>
+                <div className="description">教师认证完毕之后，可创建课堂、发布实训、免金币查看所有实训答案..  </div>
+                <div className="status">
+                  {
+                    basicInfo && basicInfo.professional_certification =="uncertified" ?
+                    <WordsBtn style="blue" className="borderBottom" onClick={()=>this.showRealNameCertificationModal(2)} >立即认证</WordsBtn>:
+                    basicInfo && basicInfo.professional_certification =="applying" ? <span style={{color: '#FF6800'}}>待审核</span>:
+                    <span><i className="iconfont icon-wancheng color-green font-16 mr3"></i>已认证</span>
+                  }
+                </div>
+              </div>  
+            </div>
+          </div>
+          <div style={{color: '#989898', marginLeft: '20px'}}>* 我们确保你所提供的信息均处于严格保密状态，不会泄露</div>
+        </div>
+      );
+    }
+}
+
+export default AccountCertification;

From 98c45b524a9087a938ca2aea0d1657fc3ab124a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 20 Jul 2019 22:27:06 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/shixunHomework/Listofworksstudentone.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 4ddc71bd0..82aa2eb7a 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/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>