liting2017 6 years ago
parent
commit
40a566b24a

+ 12 - 22
js/component/account/setAccount/expert.jsx

@@ -137,7 +137,7 @@ const Expert = React.createClass({
 					type:thisData.type,          //0-个人认证  1-企业认证 
 					expert:thisData.expert,   //认证类型   0-未认证专家顾问  1-专家认证 2-顾问认证
  					authMessage:thisData.authMessage||'消息不真实',
-					auditStatus:thisData.auditStatus, //认证状态  0-未认证  1-认证审核中   2-已认证 3-认证失败
+					auditStatus:thisData.auditStatus||'0', //认证状态  0-未认证  1-认证审核中   2-已认证 3-认证失败
 					headPortraitUrl: thisData.headPortraitUrl //专家照片
 						? splitUrl(thisData.headPortraitUrl, ',', globalConfig.avatarHost + '/upload')
 						: [],
@@ -290,11 +290,10 @@ const Expert = React.createClass({
                 if (!data.error.length) {
 					//认证状态判定说明
 					if(this.state.authentication){
-						message.success(this.state.auditStatus=='0'||this.state.auditStatus=='3'?'认证审核提交成功,请耐心等待。':'保存')
+						message.success((this.state.auditStatus=='0'||this.state.auditStatus=='3')&&(this.state.headPortraitUrl).length?'认证审核提交成功,请耐心等待。':'保存成功')
 					}else{
 						message.success('个人认证成功。')
 					}
-					
                     this.loadInformation();
                 } else {
                     message.warning(data.error[0].message);
@@ -306,8 +305,8 @@ const Expert = React.createClass({
         e.preventDefault();
         this.props.form.validateFields((err, values) => {
             if(!err){
-                if(this.state.authenticationState==undefined){
-					if(!this.state.authentication){
+                if(this.state.authenticationState==undefined||this.state.authentication=='0'){
+					if(!this.state.authentication&&(this.state.auditStatus=='0'||this.state.auditStatus=='3'||!this.state.auditStatus)){
 						this.setState({
 							visible: true,
 							values :values
@@ -316,33 +315,24 @@ const Expert = React.createClass({
 						this.newSubmit(values)
 					}
                 }else{
-					if(this.state.authenticationState=='1'){
+					if(this.state.authenticationState=='0'||this.state.authenticationState=='1'){
 						if(!(this.state.headPortraitUrl.length)){
-							message.warning('请上传顾问照片!')
-							return;
-						}
-						if(!(this.state.oppositeIdUrl.length)||!(this.state.positiveIdUrl.length)){
-							message.warning('请上传您的身份证正反照片!')
-							return;
-						}
-					}
-					if(this.state.authenticationState=='0'){
-						if(!(this.state.headPortraitUrl.length)){
-							message.warning('请上传专家照片!');
+							message.warning(this.state.authenticationState?'请上传顾问照片!':'请上传专家照片');
 							return;
 						}
 						if(!(this.state.oppositeIdUrl.length)||!(this.state.positiveIdUrl.length)){
 							message.warning('请上传您的身份证正反照片!');
 							return;
 						}
+						this.setState({
+							visible: true,
+							values :values
+						});
+					}else{
+						this.newSubmit(values)
 					}
-                    this.setState({
-                        visible: true,
-                        values :values
-                    });
                 }
 			}
-			
         })
 	},
 	handleOk() {

+ 0 - 1
js/component/administration/business/businessCategory.jsx

@@ -254,7 +254,6 @@ const BusinessCategory=Form.create()(React.createClass({
         }.bind(this));
     },
     addClick() {
-        alert(1)
         this.state.RowData = {};
         this.setState({
             visible: true,