liting2017 6 years ago
parent
commit
c6f82fbbca

+ 6 - 6
js/component/account/achievement/achievementDetails.jsx

@@ -19,7 +19,7 @@ const DemandDetail = Form.create()(React.createClass({
             loading: false,
             auditStatus: 0,
             textFileList: [],
-            pictureUrlMax:[],
+            pictureUrlMin:[],
             videoFileList: [],
             pictureUrl: [],
         };
@@ -54,7 +54,7 @@ const DemandDetail = Form.create()(React.createClass({
                     data: thisData,
                     auditStatus:thisData.auditStatus,
                     pictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-                    pictureUrlMax: thisData.pictureUrlMax ? splitUrl(thisData.pictureUrlMax, ',', globalConfig.avatarHost + '/upload') : []
+                    pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
         }).always(function () {
@@ -139,7 +139,7 @@ const DemandDetail = Form.create()(React.createClass({
             } else {
 				this.state.data = {};
                 this.state.pictureUrl = [];
-                this.state.pictureUrlMax = [];
+                this.state.pictureUrlMin = [];
             };
             this.props.form.resetFields();
         };
@@ -200,7 +200,7 @@ const DemandDetail = Form.create()(React.createClass({
                             <span>{getTransaction(theData.transferMode)}</span>
 						</FormItem>
 					</div>
-					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
+					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
@@ -219,11 +219,11 @@ const DemandDetail = Form.create()(React.createClass({
                                 </Modal>
                             </div> 
 					</FormItem>
-                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
+                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
-                                    fileList={this.state.pictureUrlMax}                               
+                                    fileList={this.state.pictureUrlMin}                               
                                     onPreview={(file) => {
                                         this.setState({
                                             previewImage: file.url || file.thumbUrl,

+ 11 - 11
js/component/account/achievement/achievementForm.jsx

@@ -158,7 +158,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             textFileList: [],
             videoFileList: [],
 			pictureUrl: [],
-			pictureUrlMax:[],
+			pictureUrlMin:[],
 			tags:[]
         };
     },
@@ -189,7 +189,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 					publishPages:thisData.publishPages.length?thisData.publishPages:['app_achievement_list','web_achievement_list'],
 					auditStatus:thisData.auditStatus,
 					pictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-					pictureUrlMax: thisData.pictureUrlMax ? splitUrl(thisData.pictureUrlMax, ',', globalConfig.avatarHost + '/upload') : []
+					pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : []
 					
 				});
             }.bind(this),
@@ -219,15 +219,15 @@ const DemandDetailForm = Form.create()(React.createClass({
                 });
                 thePictureUrl = picArr.join(",");
 			};
-			let thePictureUrlMax = [];
+			let thepictureUrlMin = [];
             if (this.state.pictureUrl.length) {
                 let picArr = [];
-                this.state.pictureUrlMax.map(function (item) {
+                this.state.pictureUrlMin.map(function (item) {
                     if ( item.response && item.response.data && item.response.data.length ){
                         picArr.push(item.response.data);
                     }
                 });
-                thePictureUrlMax = picArr.join(",");
+                thepictureUrlMin = picArr.join(",");
 			};
 			if(!this.state.tags.length){
 				message.warning('请填写关键词.')
@@ -250,7 +250,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         dataCategory: values.dataCategory,
                         category: values.category,
 						technicalPictureUrl: thePictureUrl,
-						pictureUrlMax: thePictureUrlMax,
+						pictureUrlMin: thepictureUrlMin,
 						introduction:values.introduction,
 						keyword: this.state.tags ? this.state.tags.join(",") : [],
 						keywords: this.state.tags,
@@ -327,7 +327,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             } else {
 				this.state.data = {};
 				this.state.pictureUrl = [];
-				this.state.pictureUrlMax=[];
+				this.state.pictureUrlMin=[];
 				this.state.tags = [];
 				this.setState({
 					publishPages:['app_achievement_list','web_achievement_list']
@@ -471,7 +471,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 						</FormItem>
 					</div>
 					<div className="clearfix">
-						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
+						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
 							<PicturesWall
 								fileList={this.getPictureUrl}
 								pictureUrl={this.state.pictureUrl}
@@ -480,10 +480,10 @@ const DemandDetailForm = Form.create()(React.createClass({
 						</FormItem>
 					</div>
 					<div className="clearfix">
-						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
+						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
 							<PicturesWall
-								fileList={(e)=>{this.setState({pictureUrlMax:e})}}
-								pictureUrl={this.state.pictureUrlMax}
+								fileList={(e)=>{this.setState({pictureUrlMin:e})}}
+								pictureUrl={this.state.pictureUrlMin}
 								visible={this.props.visible}
 							/>
 						</FormItem>

+ 5 - 5
js/component/account/demand/demandDetaiel.jsx

@@ -20,7 +20,7 @@ const DemandDetail = Form.create()(React.createClass({
             loading: false,
             auditStatus: 0,
             textFileList: [],
-            pictureUrlMax:[],
+            pictureUrlMin:[],
             videoFileList: [],
             pictureUrl: [],
         };
@@ -58,7 +58,7 @@ const DemandDetail = Form.create()(React.createClass({
 					isUrgent:thisData.isUrgent,
 					status:thisData.status,
                     isHot:thisData.isHot,
-                    pictureUrlMax: thisData.pictureUrlMax ? splitUrl(thisData.pictureUrlMax, ',', globalConfig.avatarHost + '/upload') : [],
+                    pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : [],
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
@@ -221,7 +221,7 @@ const DemandDetail = Form.create()(React.createClass({
                             </span>
 						</FormItem>
 					</div>
-					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
+					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
@@ -240,11 +240,11 @@ const DemandDetail = Form.create()(React.createClass({
                                 </Modal>
                             </div> 
 					</FormItem>
-                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
+                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
-                                    fileList={this.state.pictureUrlMax}                               
+                                    fileList={this.state.pictureUrlMin}                               
                                     onPreview={(file) => {
                                         this.setState({
                                             previewImage: file.url || file.thumbUrl,

+ 11 - 11
js/component/account/demand/demandForm.jsx

@@ -161,7 +161,7 @@ const DemandDetailForm = Form.create()(React.createClass({
             auditStatus: 0,
             textFileList: [],
 			videoFileList: [],
-			pictureUrlMax:[],
+			pictureUrlMin:[],
 			pictureUrl: [],
 			tags:[]
         };
@@ -201,7 +201,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 					status:thisData.status,
 					isHot:thisData.isHot,
 					pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-					pictureUrlMax: thisData.pictureUrlMax ? splitUrl(thisData.pictureUrlMax, ',', globalConfig.avatarHost + '/upload') : []
+					pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
         }).always(function () {
@@ -230,15 +230,15 @@ const DemandDetailForm = Form.create()(React.createClass({
                 });
                 thePictureUrl = picArr.join(",");
 			};
-			let thePictureUrlMax = [];
-            if (this.state.pictureUrlMax.length) {
+			let thepictureUrlMin = [];
+            if (this.state.pictureUrlMin.length) {
                 let picArr = [];
-                this.state.pictureUrlMax.map(function (item) {
+                this.state.pictureUrlMin.map(function (item) {
                     if ( item.response && item.response.data && item.response.data.length ){
                         picArr.push(item.response.data);
                     }
                 });
-                thePictureUrlMax = picArr.join(",");
+                thepictureUrlMin = picArr.join(",");
 			};
 			if(!this.state.tags.length){
 				message.warning('请填写关键词.')
@@ -261,7 +261,7 @@ const DemandDetailForm = Form.create()(React.createClass({
                         demandType: values.demandType,
                         problemDes: values.problemDes,
 						pictureUrl: thePictureUrl,
-						pictureUrlMax: thePictureUrlMax,
+						pictureUrlMin: thepictureUrlMin,
 						crowdCost:values.crowdCost,
 						keyword: this.state.tags ? this.state.tags.join(",") : [],
 						keywords: this.state.tags,
@@ -471,17 +471,17 @@ const DemandDetailForm = Form.create()(React.createClass({
 							</Radio.Group>
 						</FormItem>
 					</div>
-					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
+					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
 						<PicturesWall
 							fileList={this.getPictureUrl}
 							pictureUrl={this.state.pictureUrl}
 							visible={this.props.visible}
 						/>
 					</FormItem>
-					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
+					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
 						<PicturesWall
-							fileList={(e)=>{this.setState({pictureUrlMax:e})}}
-							pictureUrl={this.state.pictureUrlMax}
+							fileList={(e)=>{this.setState({pictureUrlMin:e})}}
+							pictureUrl={this.state.pictureUrlMin}
 							visible={this.props.visible}
 						/>
 					</FormItem>

+ 6 - 6
js/component/administration/achievement/achievementDetaiel.jsx

@@ -23,7 +23,7 @@ const DemandDetail = Form.create()(React.createClass({
             textFileList: [],
             videoFileList: [],
             pictureUrl: [],
-            pictureUrlMax:[]
+            pictureUrlMin:[]
         };
     },
     loadData(id) {
@@ -59,7 +59,7 @@ const DemandDetail = Form.create()(React.createClass({
 					status:thisData.status,
 					isHot:thisData.isHot,
                     pictureUrl: thisData.technicalPictureUrl ? splitUrl(thisData.technicalPictureUrl, ',', globalConfig.avatarHost + '/upload') : [],
-                    pictureUrlMax: thisData.pictureUrlMax ? splitUrl(thisData.pictureUrlMax, ',', globalConfig.avatarHost + '/upload') : []
+                    pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
         }).always(function () {
@@ -140,7 +140,7 @@ const DemandDetail = Form.create()(React.createClass({
             } else {
 				this.state.data = {};
                 this.state.pictureUrl = [];
-                this.state.pictureUrlMax=[];
+                this.state.pictureUrlMin=[];
             };
             this.props.form.resetFields();
         };
@@ -201,7 +201,7 @@ const DemandDetail = Form.create()(React.createClass({
                             <span>{getTransaction(theData.transferMode)}</span>
 						</FormItem>
 					</div>
-					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
+					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
@@ -220,11 +220,11 @@ const DemandDetail = Form.create()(React.createClass({
                                 </Modal>
                             </div> 
 					</FormItem>
-                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
+                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="成果(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
-                                    fileList={this.state.pictureUrlMax}                               
+                                    fileList={this.state.pictureUrlMin}                               
                                     onPreview={(file) => {
                                         this.setState({
                                             previewImage: file.url || file.thumbUrl,

+ 1 - 1
js/component/administration/business/userLibrary.jsx

@@ -38,7 +38,7 @@ class UserLibrary extends Component {
 					dataIndex: 'type',
 					key: 'type',
 					render: (text) => {
-						return text == '1' ? '企业用户' : '个人用户';
+						return text == '1' ? '企业用户':text=='0'? '个人用户':'未认证';
 					}
 				},
 				{

+ 6 - 6
js/component/administration/demand/demandDetaiel.jsx

@@ -23,7 +23,7 @@ const DemandDetail = Form.create()(React.createClass({
             textFileList: [],
             videoFileList: [],
             pictureUrl: [],
-            pictureUrlMax: [],
+            pictureUrlMin: [],
         };
     },
     loadData(id) {
@@ -64,7 +64,7 @@ const DemandDetail = Form.create()(React.createClass({
 					isUrgent:thisData.isUrgent,
 					status:thisData.status,
                     isHot:thisData.isHot,
-                    pictureUrlMax: thisData.pictureUrlMax ? splitUrl(thisData.pictureUrlMax, ',', globalConfig.avatarHost + '/upload') : [],
+                    pictureUrlMin: thisData.pictureUrlMin ? splitUrl(thisData.pictureUrlMin, ',', globalConfig.avatarHost + '/upload') : [],
                     pictureUrl: thisData.pictureUrl ? splitUrl(thisData.pictureUrl, ',', globalConfig.avatarHost + '/upload') : []
                 });
             }.bind(this),
@@ -151,7 +151,7 @@ const DemandDetail = Form.create()(React.createClass({
 				this.state.hotDemand=undefined;
 				this.state.solve=undefined;
                 this.state.pictureUrl = [];
-                this.state.pictureUrlMax=[]
+                this.state.pictureUrlMin=[]
             };
             this.props.form.resetFields();
         };
@@ -236,7 +236,7 @@ const DemandDetail = Form.create()(React.createClass({
 							{this.state.ProvinceCity}
 						</FormItem>  
 					</div> */}
-					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
+					<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
@@ -255,11 +255,11 @@ const DemandDetail = Form.create()(React.createClass({
                                 </Modal>
                             </div> 
 					</FormItem>
-                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
+                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="需求(图)">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"
                                     listType="picture-card"
-                                    fileList={this.state.pictureUrlMax}                               
+                                    fileList={this.state.pictureUrlMin}                               
                                     onPreview={(file) => {
                                         this.setState({
                                             previewImage: file.url || file.thumbUrl,