liting2017 6 years ago
parent
commit
8892c519bb

+ 17 - 4
js/component/account/setAccount/expert.jsx

@@ -323,10 +323,10 @@ const Expert = React.createClass({
 						message.warning(this.state.authenticationState == '1' ? '请上传顾问照片!' : '请上传专家照片');
 						return;
 					}
-					if(!(this.state.lawUrl.length)){
-						message.warning('请上传您的律师职业资格证!');
-						return;
-					}
+//					if(!(this.state.lawUrl.length)){
+//						message.warning('请上传您的律师职业资格证!');
+//						return;
+//					}
 					if(!(this.state.oppositeIdUrl.length)||!(this.state.positiveIdUrl.length)){
 						message.warning('请上传您的身份证正反照片!');
 						return;
@@ -766,6 +766,7 @@ const Expert = React.createClass({
 										>
 											<img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 										</Modal>
+<<<<<<< HEAD
 									</FormItem>
 								</div>
 								<FormItem
@@ -777,6 +778,11 @@ const Expert = React.createClass({
 									<div className="clearfix">
 										<Upload
 											className="demandDetailShow-upload"
+=======
+								</FormItem>
+								{/*<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 10 }} label="律师职业资格证">
+										<Upload className="demandDetailShow-upload"
+>>>>>>> 27804543ec9e998d961332721678873174a185dd
 											listType="picture-card"
 											fileList={this.state.positiveIdUrl}
 											onPreview={(file) => {
@@ -796,6 +802,7 @@ const Expert = React.createClass({
 										>
 											<img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 										</Modal>
+<<<<<<< HEAD
 									</div>
 								</FormItem>
 								<FormItem
@@ -804,6 +811,12 @@ const Expert = React.createClass({
 									wrapperCol={{ span: 10 }}
 									label="身份证反面"
 								>
+=======
+								</FormItem>*/}
+							</div>
+							<div>
+								<FormItem className="picWidth" labelCol={{ span: 9 }} wrapperCol={{ span: 10 }} label="身份证正面">
+>>>>>>> 27804543ec9e998d961332721678873174a185dd
 									<div className="clearfix">
 										<Upload
 											className="demandDetailShow-upload"

+ 8 - 1
js/component/account/setAccount/unit.jsx

@@ -1,7 +1,6 @@
 /* 
 	@author:李霆
 	@update:2018/05/29
-	@descript:复制粘贴,拿起来就是干!!
 */
 
 import React from 'react';
@@ -264,6 +263,14 @@ const Unit = React.createClass({
 		// 	});
 		// 	thecompanyLogoUrl = picArr.join(',');
 		// }
+		if (this.state.businessScope&&this.state.businessScope.length>400) {
+			message.warning('业务范围字数为1~400!');
+			return false;
+		}
+		if (this.state.introduction&&this.state.introduction.length>400) {
+			message.warning('企业简介字数为1~512!');
+			return false;
+		}
 		let thequaliUrl = [];
 		if (this.state.qualiUrl.length) {
 			let picArr = [];

+ 4 - 0
js/component/administration/business/userLibrary.jsx

@@ -24,7 +24,11 @@ class UserLibrary extends Component {
 			},
 			columns: [
 				{
+<<<<<<< HEAD
 					title: '用户名',
+=======
+					title: '客户名称',
+>>>>>>> 27804543ec9e998d961332721678873174a185dd
 					dataIndex: 'nickname',
 					key: 'nickname'
 				},