合并

public/react/config/webpack.config.dev.js

@@ -32,7 +32,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-	//devtool: "source-map",  // 开启调试
+	devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.

public/react/src/modules/competitions/Competitioncommon/CompetitionCommonChild/CompetitionContentspdfChild/CompetitionContentspdfpeopledata.js

@@ -315,12 +315,12 @@ class CompetitionContentspdfpeopledata extends Component {
 		console.log(emailbool);
 		return (
 			<div className="flexdidirectionss mt17">
-				{this.state.certification === 1 ? <RealNameCertificationModal  {...this.props}
+				{this.state.certification === 1 ? <RealNameCertificationModal  {...this.props} {...this.state}
 																																			 wrappedComponentRef={(form) => this.realNameCertificationModal1 = form}
 																																			 certification={certification}
 				></RealNameCertificationModal> : ""}
 
-				{this.state.certification === 2 ? <RealNameCertificationModal  {...this.props}
+				{this.state.certification === 2 ? <RealNameCertificationModal  {...this.props} {...this.state}
 																																			 wrappedComponentRef={(form) => this.realNameCertificationModal2 = form}
 																																			 certification={certification}
 				></RealNameCertificationModal> : ""}

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

@@ -452,7 +452,8 @@ class RealNameCertificationModal extends Component{
           {...propsWithoutForm} addOrgSuccess={this.addOrgSuccess}
           ></ApplyForAddOrgModal>
           <ApplyForAddChildOrgModal ref="applyForAddChildOrgModal" schoolName={school} schoolId={school_id} departmentName={departmentsName}
-          {...propsWithoutForm} wrappedComponentRef={(form) => this.applyForAddChildOrgForm = form} 
+                                    {...propsWithoutForm}
+                                    wrappedComponentRef={(form) => this.applyForAddChildOrgForm = form}
                                     addChildOrgSuccess={this.addChildOrgSuccess}
           ></ApplyForAddChildOrgModal>
         <ModalWrapper
@@ -601,7 +602,7 @@ class RealNameCertificationModal extends Component{
                 label="姓名"
                 className="formItemInline"
               >
-                { basicInfo.authentication == 'uncertified' ? <React.Fragment>{getFieldDecorator('name', {
+                {basicInfo && basicInfo.authentication == 'uncertified' ? <React.Fragment>{getFieldDecorator('name', {
                     rules: [{
                       // initialValue: this.state.cityDefaultValue,
                       required: true,