浏览代码

顾问图片截图上传

liting2017 6 年之前
父节点
当前提交
caa2aec0f2

+ 21 - 20
js/component/account/setAccount/expert.jsx

@@ -28,7 +28,7 @@ import { socialAttribute, industry, adviserType, lawType } from '@/dataDic.js';
 import { splitUrl, getAuthState, getAdviserType, getSocialAttribute } from '@/tools.js';
 const FormItem = Form.Item;
 const monthFormat = 'YYYY/MM';
-
+import Crop from '@/crop/cropBlock';
 //图片组件
 
 const PicturesWall = React.createClass({
@@ -94,7 +94,7 @@ const Expert = React.createClass({
 			loading: false,
 			orgCodeUrl: [],
 			companyLogoUrl: [],
-			headPortraitUrl: [],
+			headPortraitUrl:[],
 			lawState: false,
 			adviserUrl: [],
 			positiveIdUrl: [],
@@ -146,6 +146,7 @@ const Expert = React.createClass({
 					headPortraitUrl: thisData.headPortraitUrl //专家照片
 						? splitUrl(thisData.headPortraitUrl, ',', globalConfig.avatarHost + '/upload')
 						: [],
+					companyLogoUrl:thisData.headPortraitUrl?thisData.headPortraitUrl.split(','):[],
 					adviserUrl: thisData.adviserUrl //顾问照片
 						? splitUrl(thisData.adviserUrl, ',', globalConfig.avatarHost + '/upload')
 						: [],
@@ -196,16 +197,6 @@ const Expert = React.createClass({
 	//基本信息提交
 	newSubmit(values = {}) {
 		this.state.data = [];
-		let theorgCodeUrl = [];
-		if (this.state.headPortraitUrl.length) {
-			let picArr = [];
-			this.state.headPortraitUrl.map(function(item) {
-				if (item.response && item.response.data && item.response.data.length) {
-					picArr.push(item.response.data);
-				}
-			});
-			theorgCodeUrl = picArr.join(',');
-		}
 		let thecompanyLogoUrl = [];
 		if (this.state.positiveIdUrl.length) {
 			let picArr = [];
@@ -277,7 +268,7 @@ const Expert = React.createClass({
 			dataList.qualification = values.qualification;
 			dataList.majorCategory = values.majorCategory;
 			dataList.graduateSchool = values.graduateSchool;
-			dataList.headPortraitUrl = theorgCodeUrl.length != 0 ? theorgCodeUrl : '';
+			dataList.headPortraitUrl = this.state.companyLogoUrl.length>0?(this.state.companyLogoUrl).join(','):[];
 			dataList.positiveIdUrl = thecompanyLogoUrl.length != 0 ? thecompanyLogoUrl : '';
 			dataList.oppositeIdUrl = thecompanyLogoUrls.length != 0 ? thecompanyLogoUrls : '';
 		} else if (this.state.authenticationState == '1') {
@@ -288,7 +279,7 @@ const Expert = React.createClass({
 			dataList.goodAtIndustry = values.adviserType == '4' ? values.goodAtIndustry : '';
 			dataList.consultantCertificateUrl = values.adviserType == '4' && lawUrls.length != 0 ? lawUrls : ''; //法律职业资格证
 			dataList.consultantType = values.adviserType; //顾问类型
-			dataList.headPortraitUrl = theorgCodeUrl.length != 0 ? theorgCodeUrl : ''; //顾问照片
+			dataList.headPortraitUrl =  this.state.companyLogoUrl.length>0?(this.state.companyLogoUrl).join(','):[];
 			dataList.positiveIdUrl = thecompanyLogoUrl.length != 0 ? thecompanyLogoUrl : '';
 			dataList.oppositeIdUrl = thecompanyLogoUrls.length != 0 ? thecompanyLogoUrls : '';
 		}
@@ -306,7 +297,7 @@ const Expert = React.createClass({
 					//认证状态判定说明
 					message.success(
 						(this.state.auditStatus == '0' || this.state.auditStatus == '3') &&
-						this.state.headPortraitUrl.length
+						this.state.companyLogoUrl.length
 							? '认证审核提交成功,请耐心等待。'
 							: '保存成功'
 					);
@@ -322,7 +313,7 @@ const Expert = React.createClass({
 		this.props.form.validateFields((err, values) => {
 			if (!err) {
 				if (this.state.authenticationState == '0' || this.state.authenticationState == '1') {
-					if ((this.state.headPortraitUrl.length)<1) {
+					if ((this.state.companyLogoUrl.length)<1) {
 						message.warning(this.state.authenticationState == '1' ? '请上传顾问照片!' : '请上传专家照片');
 						return;
 					}
@@ -368,7 +359,7 @@ const Expert = React.createClass({
 		}
 	},
 	getHeadPortraitUrl(e) {
-		this.setState({ headPortraitUrl: e });
+		this.setState({ companyLogoUrl: e });
 	},
 	getPositiveIdUrl(e) {
 		this.setState({ positiveIdUrl: e });
@@ -387,6 +378,12 @@ const Expert = React.createClass({
 			this.loadInformation();
 		}
 	},
+	//logo图片获取
+	getAllImg(imgArr){
+		this.setState({
+			companyLogoUrl:imgArr
+		})
+	},
 	componentWillReceiveProps(nextProps) {},
 	render() {
 		const { getFieldDecorator } = this.props.form;
@@ -677,9 +674,13 @@ const Expert = React.createClass({
 													</span>
 												}
 											>
-												<PicturesWall
-													fileList={this.getHeadPortraitUrl}
-													pictureUrl={this.state.headPortraitUrl}
+												<Crop 
+													getAllImg={this.getAllImg}
+													number = {1} 
+													aspectRatio = {1/1}
+													url ={globalConfig.context + '/api/user/uploadPicture64'}
+													uploadData = {{sign:'user_picture'}} 
+													urlArr = {this.state.companyLogoUrl} 
 												/>
 												<p>建议:图片要清晰。</p>
 											</FormItem>

+ 0 - 26
js/component/account/setAccount/unit.jsx

@@ -170,13 +170,6 @@ const Unit = React.createClass({
 					}
 					thisData = {};
 				}
-				// thisData.companyLogoUrl='/user/33e04d30-d001-45c5-8e1e-33a1964d2498/1104216629777565_user_picture.jpg'
-				// let ProvinceCityArr = [];
-				// let ProvinceS = thisData.locationProvince; //getprovince
-				// let citys = thisData.locationCity;
-				// let Areas = thisData.locationArea;
-				// ProvinceCityArr.push(ProvinceS, citys, Areas);
-
 				this.setState({
 					InformationId: thisData.id,
 					InformationUid: thisData.uid,
@@ -186,9 +179,6 @@ const Unit = React.createClass({
 					orgCodeUrl: thisData.orgCodeUrl
 						? splitUrl(thisData.orgCodeUrl, ',', globalConfig.avatarHost + '/upload')
 						: [],
-					// companyLogoUrl: thisData.companyLogoUrl
-					// 	? splitUrl(thisData.companyLogoUrl, ',', globalConfig.avatarHost + '/upload')
-					// 	: [],
 					companyLogoUrl:thisData.companyLogoUrl?thisData.companyLogoUrl.split(','):[],
 					qualiUrl: thisData.honorPicture
 					? splitUrl(thisData.honorPicture, ',', globalConfig.avatarHost + '/upload')
@@ -253,16 +243,6 @@ const Unit = React.createClass({
 			});
 			theorgCodeUrl = picArr.join(',');
 		}
-		//let thecompanyLogoUrl = [];
-		// if (this.state.companyLogoUrl.length) {
-		// 	let picArr = [];
-		// 	this.state.companyLogoUrl.map(function(item) {
-		// 		if (item.response && item.response.data && item.response.data.length) {
-		// 			picArr.push(item.response.data);
-		// 		}
-		// 	});
-		// 	thecompanyLogoUrl = picArr.join(',');
-		//}		
 		let thequaliUrl = [];
 		if (this.state.qualiUrl.length) {
 			let picArr = [];
@@ -667,12 +647,6 @@ const Unit = React.createClass({
 									wrapperCol={{ span: 18 }}
 								label={<span><span className="color-red"> * </span>企业logo</span>}
 								>
-									{/* <PicturesWall
-										pictureSign="logo"
-										fileList={this.getCompanyLogoUrl}
-										pictureUrl={this.state.companyLogoUrl}
-									/>
-									<p>图片建议:图片要清晰。</p> */}
 									<Crop 
 										getAllImg={this.getAllImg}
 										number = {1} 

+ 11 - 1
js/component/administration/business/businessProject.jsx

@@ -327,12 +327,16 @@ const BusinessProject = Form.create()(
 						}
 					});
 					document.querySelector('.txt').innerHTML='';
-					let eleDiv = document.createElement('div');
+					let eleDiv = document.createElement('div'),tagsArr=[];
 					eleDiv.innerHTML=thisData.introduce;
 					document.querySelector('.txt').append(eleDiv);
+					thisData.tags?thisData.tags.map(item=>{
+						tagsArr.push(item.name)
+					}):''
 					this.setState({
 						id: thisData.id,
 						data: thisData,
+						tags:tagsArr.join(' , '),
 						name: name,
 						createTime: thisData.createTime ? new Date(thisData.createTime).toLocaleString() : '',
 						auditStatus: thisData.auditStatus,
@@ -584,8 +588,14 @@ const BusinessProject = Form.create()(
 											>
 												<span>{this.state.createTime}</span>
 											</FormItem>
+											<FormItem className="half-item"
+												labelCol={{ span: 8 }}
+												wrapperCol={{ span: 12 }} label="标签">
+												<span>{this.state.tags}</span>
+											</FormItem>
 										</div>
 										<div className="clearfix">
+											
 											<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="关键字">
 												<span>{theData.keyword}</span>
 											</FormItem>