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

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

@@ -62,38 +62,30 @@ class Bankcardnumberverification extends Component {
 	 }
 	componentDidUpdate = (prevProps) => {
 		if (prevProps.bank_account != this.props.bank_account) {
-			let url = `/competitions/${this.props.match.params.identifier}/prize.json`;
+			console.log("componentDidUpdate");
-			let query=this.props.location&&this.props.location.search;
+			console.log(this.props);
-			const types = query.split('user_id=')
+			console.log(prevProps);
-			let userid;
+			////console.log("Registration");
-			if(types[1]===undefined){
+			////console.log("componentDidUpdate");
-				userid=this.props.user&&this.props.user.user_id;
+			////console.log(this.props.user.admin);
-			}else{
-				userid=types[1];
-			}
-			axios.get(url,{params:{
-					user_id:userid,
-				}
-			}).then((result) => {
-				if (result.data) {
 			try {
+				if(this.props.bank_account){
 					this.props.form.setFieldsValue({
-							openingbank: result.data.bank_account.bank,
+						openingbank: this.props.bank_account.bank,
-							subbranch: result.data.bank_account.second_bank,
+						subbranch: this.props.bank_account.second_bank,
-							subbranchs: result.data.bank_account.card_no,
+						subbranchs: this.props.bank_account.card_no,
-						});
+					})
+				}
 				this.setState({
-							openingbank: result.data.bank_account.bank,
+					openingbank: this.props.bank_account.bank,
-							subbranch: result.data.bank_account.second_bank,
+					subbranch:   this.props.bank_account.second_bank,
-							subbranchs: result.data.bank_account.card_no,
+					subbranchs: this.props.bank_account.card_no,
 				})
 			}catch (e) {
+
 			}
 		}
-			}).catch((error) => {
+
-				console.log(error);
-			})
-		}
 	}
 	yhBankstrue = () => {
 		this.props.form.validateFieldsAndScroll((err, values) => {