Merge remote-tracking branch 'origin/develop' into develop

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

@@ -93,11 +93,11 @@ class CompetitionContentspdfpeopledata extends Component {
 	}
 
 
-	getdata = () => {
+	getdata = (id) => {
 		this.setState({
 			certification: 3
 		})
-		let url = `/users/accounts/${this.props.current_user.login}.json`;
+		let url = `/users/accounts/${id}.json`;
 		axios.get(url).then((result) => {
 			if (result.data) {
 				if (result.data && result.data.base_info_completed == false) {

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

@@ -37,10 +37,10 @@ class Mailboxvalidation extends Component {
 	onEmailSubmit = () => {
 		this.props.form.validateFieldsAndScroll((err, values) => {
 			if (!err) {
-				let {login} = this.props.current_user;
+				let {id} = this.props.userdata;
 				let reg = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/;
 				if (reg.test(values.email)) {
-					let url = `/users/accounts/${login}/email_bind.json`
+					let url = `/users/accounts/${id}/email_bind.json`
 					axios.post((url), {
 						email: values.email,
 						code: values.emailValidateCode

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

@@ -37,10 +37,10 @@ class Phonenumberverification extends Component {
 	onPhoneSubmit = () => {
 		this.props.form.validateFieldsAndScroll((err, values) => {
 			if (!err) {
-				let {login} = this.props.current_user;
+				let {id} = this.props.userdata;
 				let reg = /^1\d{10}$/;
 				if (reg.test(values.phone)) {
-					let url = `/users/accounts/${login}/phone_bind.json`
+					let url = `/users/accounts/${id}/phone_bind.json`
 					axios.post((url), {
 						phone: values.phone,
 						code: values.phoneValidateCode

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

@@ -266,7 +266,14 @@ class RealNameCertificationModal extends Component{
           let { certification } = this.props;
           if(certification == 1){
             // 实名认证
-            let url = `/users/accounts/${current_user && current_user.login}/authentication_apply.json`
+            let url="";
+            if( basicInfo===undefined){
+              url = `/users/accounts/${current_user && current_user.login}/authentication_apply.json`;
+
+            }else {
+              url = `/users/accounts/${basicInfo && basicInfo.id}/authentication_apply.json`;
+            }
+
             axios.post((url),{
               name:this.state.realName || basicInfo.name,
               gender:parseInt(values.sex),
@@ -293,7 +300,12 @@ class RealNameCertificationModal extends Component{
           }else{
             // 职业认证
             // console.log(values.job == "student" ? values.student_No : values.job == "teacher" ? values.job1 : values.job2);
-            let url = `/users/accounts/${current_user && current_user.login}/professional_auth_apply.json`
+            let url="";
+            if( basicInfo===undefined){
+              url = `/users/accounts/${current_user && current_user.login}/professional_auth_apply.json`;
+            }else {
+              url = `/users/accounts/${basicInfo && basicInfo.id}/authentication_apply.json`;
+            }
             axios.post((url),{
               school_id:this.state.school_id,
               department_id:this.state.department_id,
@@ -331,7 +343,7 @@ class RealNameCertificationModal extends Component{
     const { course_lists, checkBoxValues } = this.state
     this.onSendOk()
   }
-  
+
   handleChange2 = (info) => {
     if (info.file.status === 'uploading') {
       this.setState({ loading: true });
@@ -693,7 +705,7 @@ class RealNameCertificationModal extends Component{
             </div>
             :
               <AccountBasicEditItem
-                identity={identity} 
+                identity={identity}
                 getFieldDecorator={getFieldDecorator}
                 professionalFlag={professionalFlag}
                 basicInfo={basicInfo}