合并

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.
@@ -154,7 +154,7 @@ module.exports = {
             loader: require.resolve('babel-loader'),
             options: {
 
-              // This is a feature of `babel-loader` for webpack (not Babel itself).
+							// This is a feature of `babel-loader` for webpack (not Babel itself).
               // It enables caching results in ./node_modules/.cache/babel-loader/
               // directory for faster rebuilds.
               cacheDirectory: true,

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

@@ -434,7 +434,7 @@ class RealNameCertificationModal extends Component{
     }
     const uploadProps2 = {
       name: 'image',
-      data:{type:certification == 1 ? "real_name" : "professional"},      
+      data: {type: certification == 1 ? "real_name" : "professional"},
       multiple: true,
       showUploadList: false,
       // https://newweb.educoder.net
@@ -452,13 +452,14 @@ 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} 
-          addChildOrgSuccess={this.addChildOrgSuccess}
+                                    {...propsWithoutForm}
+                                    wrappedComponentRef={(form) => this.applyForAddChildOrgForm = form}
+                                    addChildOrgSuccess={this.addChildOrgSuccess}
           ></ApplyForAddChildOrgModal>
         <ModalWrapper
           ref="modalWrapper"
           title={
-            certification && certification==1? 
+            certification && certification == 1 ?
             <span><i className="iconfont icon-shenfenrenzheng font-18 color-blue mr5" style={{fontWeight:"normal"}}></i>实名认证</span>:
             <span><i className="iconfont icon-zhiyerenzheng font-18 color-blue mr5" style={{fontWeight:"normal"}}></i>职业认证</span>
           }
@@ -474,7 +475,7 @@ class RealNameCertificationModal extends Component{
               <p>
                 1.你需要准备有效的身份证正面（人像面）的证件照照片，请确保证件照片清晰可见，严禁PS；
               </p><p>
-                2.我们将在你提交认证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你； 
+              2.我们将在你提交认证信息后的24小时（不包含节假日）内完成审核，审核结果将会以系统消息的形式发送给你；
               </p><p>
                 3.实名认证审核完成后，无法删除，请谨慎填写；
               </p><p>
@@ -595,13 +596,13 @@ class RealNameCertificationModal extends Component{
           `}</style>
 
           <Form onSubmit={this.handleSubmit}>
-            { certification && certification == 1 ? 
+            {certification && certification == 1 ?
             <div>
               <Form.Item
                 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,
@@ -663,9 +664,9 @@ class RealNameCertificationModal extends Component{
             :
               <AccountBasicEditItem
                 identity={identity}
-                getFieldDecorator = {getFieldDecorator} 
-                professionalFlag = {professionalFlag} 
-                basicInfo = {basicInfo} 
+                getFieldDecorator={getFieldDecorator}
+                professionalFlag={professionalFlag}
+                basicInfo={basicInfo}
                 {...this.props}
                 {...this.state}
                 {...common}