liting2017 6 years ago
parent
commit
279caa3003
1 changed files with 0 additions and 13 deletions
  1. 0 13
      js/component/account/setAccount/expert.jsx

+ 0 - 13
js/component/account/setAccount/expert.jsx

@@ -766,7 +766,6 @@ const Expert = React.createClass({
 										>
 											<img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 										</Modal>
-<<<<<<< HEAD
 									</FormItem>
 								</div>
 								<FormItem
@@ -778,11 +777,6 @@ 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) => {
@@ -802,7 +796,6 @@ const Expert = React.createClass({
 										>
 											<img alt="" style={{ width: '100%' }} src={this.state.previewImage || ''} />
 										</Modal>
-<<<<<<< HEAD
 									</div>
 								</FormItem>
 								<FormItem
@@ -811,12 +804,6 @@ 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"