调整

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

@@ -44,6 +44,11 @@ class Bankcardnumberverification extends Component {
 				subbranch: this.props.bank_account.second_bank,
 				subbranchs: this.props.bank_account.card_no,
 			})
+			this.setState({
+				openingbank: this.props.bank_account.bank,
+				subbranch:   this.props.bank_account.second_bank,
+				subbranchs: this.props.bank_account.card_no,
+			})
 		}
 
 	}
@@ -56,6 +61,50 @@ class Bankcardnumberverification extends Component {
 		 })
 	 }
 	componentDidUpdate = (prevProps) => {
+		if (prevProps.bank_account != this.props.bank_account) {
+			// console.log("componentDidUpdate");
+			// console.log(this.props);
+			// console.log(prevProps);
+			////console.log("Registration");
+			////console.log("componentDidUpdate");
+			////console.log(this.props.user.admin);
+			try {
+				if(this.props.bank_account){
+					this.props.form.setFieldsValue({
+						openingbank: this.props.bank_account.bank,
+						subbranch: this.props.bank_account.second_bank,
+						subbranchs: this.props.bank_account.card_no,
+					})
+				}
+				this.setState({
+					openingbank: this.props.bank_account.bank,
+					subbranch:   this.props.bank_account.second_bank,
+					subbranchs: this.props.bank_account.card_no,
+				})
+			}catch (e) {
+
+			}
+
+			try {
+				if(prevProps.bank_account){
+					this.props.form.setFieldsValue({
+						openingbank:prevProps.bank_account.bank,
+						subbranch: prevProps.bank_account.second_bank,
+						subbranchs: prevProps.bank_account.card_no,
+					})
+
+					this.setState({
+						openingbank: prevProps.bank_account.bank,
+						subbranch:   prevProps.bank_account.second_bank,
+						subbranchs: prevProps.bank_account.card_no,
+					})
+				}
+			}catch (e) {
+
+			}
+
+
+		}
 
 	}
 	yhBankstrue = () => {
@@ -71,19 +120,24 @@ class Bankcardnumberverification extends Component {
 					.then((result) => {
 						try {
 							if (result.data.status == 0) {
-								console.log(values.openingbank);
-								console.log(values.subbranch);
-								console.log(values.subbranchs);
-								this.props.form.setFieldsValue({
-									openingbank: values.openingbank,
-									subbranch:   values.subbranch,
-									subbranchs: values.subbranchs,
-								});
-								this.setState({
-									openingbank: values.openingbank,
-									subbranch:   values.subbranch,
-									subbranchs: values.subbranchs,
-								})
+							  try {
+									// console.log(values.openingbank);
+									// console.log(values.subbranch);
+									// console.log(values.subbranchs);
+									this.props.form.setFieldsValue({
+										openingbank: values.openingbank,
+										subbranch:   values.subbranch,
+										subbranchs: values.subbranchs,
+									});
+									this.setState({
+										openingbank: values.openingbank,
+										subbranch:   values.subbranch,
+										subbranchs: values.subbranchs,
+									})
+								}catch (e) {
+
+								}
+
 								try {
 									this.props.showNotification(`提交成功,等待审核!`);
 
@@ -116,24 +170,6 @@ class Bankcardnumberverification extends Component {
 	render() {
 		const {getFieldDecorator} = this.props.form;
 		const {updating, seconds, secondsFlag, basicInfo, phonebool, emailbool, certification, formationdata, bank_account_editable, leader, bank_account} = this.state
-		var bank="";
-		if(this.props.bank_account){
-			if(this.props.bank_account.bank){
-				bank=this.props.bank_account.bank;
-			}
-		}
-		var second_bank ="";
-		if(this.props.bank_account){
-			if(this.props.bank_account.second_bank){
-				second_bank=this.props.bank_account.second_bank;
-			}
-		}
-		var card_no="";
-		if(this.props.bank_account){
-			if(this.props.bank_account.card_no){
-				card_no=this.props.bank_account.card_no;
-			}
-		}
 		return (
 			<div>
 				<div className="flexdirections mt36">