liting2017 6 anos atrás
pai
commit
b38db4578a
39 arquivos alterados com 233 adições e 135 exclusões
  1. 5 0
      css/base.less
  2. 1 1
      css/login.less
  3. 1 0
      js/admin/bottom.less
  4. 0 1
      js/admin/menu.jsx
  5. 6 5
      js/component/account/achievement/achievementForm.jsx
  6. 1 1
      js/component/account/achievement/techAchievement.jsx
  7. 1 0
      js/component/account/business/businessProject.jsx
  8. 3 2
      js/component/account/demand/demandForm.jsx
  9. 1 2
      js/component/account/demand/techDemand.jsx
  10. 4 4
      js/component/account/index/collection.jsx
  11. 4 6
      js/component/account/index/content.jsx
  12. 4 4
      js/component/account/index/normal.jsx
  13. 10 13
      js/component/account/menu.jsx
  14. 1 1
      js/component/account/order/achievementOrderS.jsx
  15. 1 1
      js/component/account/order/achievementOrderX.jsx
  16. 1 1
      js/component/account/order/demandOrderS.jsx
  17. 1 1
      js/component/account/order/demandOrderX.jsx
  18. 1 1
      js/component/account/order/expertX.jsx
  19. 1 1
      js/component/account/order/memberOrderS.jsx
  20. 1 1
      js/component/account/order/memberOrderX.jsx
  21. 1 1
      js/component/account/order/projectOrderS.jsx
  22. 1 1
      js/component/account/order/projectOrderX.jsx
  23. 4 2
      js/component/account/setAccount/account.jsx
  24. 13 13
      js/component/account/setAccount/expert.jsx
  25. 52 21
      js/component/account/setAccount/personal.jsx
  26. 35 16
      js/component/account/setAccount/unit.jsx
  27. 2 1
      js/component/account/setAccount/unit.less
  28. 2 2
      js/component/account/topTab.less
  29. 0 5
      js/component/administration/achievement/achievementDetaiel.jsx
  30. 2 2
      js/component/administration/achievement/achievementExamine.jsx
  31. 30 2
      js/component/administration/business/businessProject.jsx
  32. 0 5
      js/component/administration/demand/demandDetaiel.jsx
  33. 2 2
      js/component/administration/demand/demandExamine.jsx
  34. 6 3
      js/component/administration/news/newDetails.jsx
  35. 19 8
      js/component/administration/order/order.jsx
  36. 6 3
      js/component/administration/policy/policyDetails.jsx
  37. 6 0
      js/component/dataDic.js
  38. 3 1
      js/component/richTextEditors.jsx
  39. 1 1
      webpack.config.js

+ 5 - 0
css/base.less

@@ -11,6 +11,11 @@
  #LRfloater0{
   left: -200px!important;
 }
+body>a{
+  position: absolute;
+  top: -50px;
+  left: 0px;
+}
 html {
   line-height: 1.15; /* 1 */
   -ms-text-size-adjust: 100%; /* 2 */

+ 1 - 1
css/login.less

@@ -29,4 +29,4 @@
 }
 #LRfloater0{
     left: -200px!important;
-}
+}

+ 1 - 0
js/admin/bottom.less

@@ -12,4 +12,5 @@
     #LRdiv0{
         left:-200px!important;
     }
+   
  

+ 0 - 1
js/admin/menu.jsx

@@ -50,7 +50,6 @@ module.exports = {
         icon: 'copy',
         children: [
           { name: '咨询单管理', url: 'order' },
-         
         ]
       },
       {

+ 6 - 5
js/component/account/achievement/achievementForm.jsx

@@ -338,7 +338,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 							{getFieldDecorator('name', {
 								rules: [ { required: true, message: '此项为必填项!' } ],
 								initialValue: theData.name
-							})(<Input placeholder="给您的成果配个标题吧." />)}
+							})(<Input placeholder="给您的成果配个标题吧." maxLength={200}/>)}
 						</FormItem>
 					</div>
 					<div className="clearfix">
@@ -346,22 +346,22 @@ const DemandDetailForm = Form.create()(React.createClass({
 							{getFieldDecorator('introduction', {
 								rules: [ { required: true, message: '此项为必填项!' } ],
 								initialValue: theData.introduction
-							})(<Input type="textarea" rows={4} placeholder="请详细介绍您的技术成果情况,包括但不限于:能解决什么问题、重大技术性突破、取得的奖励情况." />)}
+							})(<Input type="textarea" rows={4}  placeholder="请详细介绍您的技术成果情况,包括但不限于:能解决什么问题、重大技术性突破、取得的奖励情况." />)}
 						</FormItem>
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="知识产权情况">
 							{getFieldDecorator('patentCase', {
 								initialValue: theData.patentCase
-							})(<Input type="textarea" rows={4} placeholder="请输入您的知识产权情况." />)}
+							})(<Input type="textarea" rows={4} placeholder="请输入您的知识产权情况." maxLength={300}/>)}
 						</FormItem>
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="技术参数">
 							{getFieldDecorator('parameter', {
 								initialValue: theData.parameter
-							})(<Input type="textarea" rows={4} placeholder="请输入您的技术成果参数." />)}
+							})(<Input type="textarea" rows={4} placeholder="请输入您的技术成果参数." maxLength={1024}/>)}
 						</FormItem>
 						<FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="团队情况">
 							{getFieldDecorator('teamDes', {
 								initialValue: theData.teamDes
-							})(<Input type="textarea" rows={4} placeholder="请输入您的团队情况." />)}
+							})(<Input type="textarea" rows={4} placeholder="请输入您的团队情况." maxLength={300}/>)}
 						</FormItem>
 					</div>
 					<div className="clearfix">
@@ -504,6 +504,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 										<Col span={6}><Checkbox value="app_index">APP首页</Checkbox></Col>
 										<Col span={6}><Checkbox value="app_achievement_main">APP成果首页</Checkbox></Col>
 										<Col span={6}><Checkbox value="app_achievement_list" disabled>APP成果搜索页</Checkbox></Col>
+										<Col span={6}><Checkbox value="web_achievement_trading_index">知识产权交易首页</Checkbox></Col>
 									</Row>
 								</Checkbox.Group>
 							)}

+ 1 - 1
js/component/account/achievement/techAchievement.jsx

@@ -290,7 +290,7 @@ const DemandList = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span>我的科技成果</span>
+                    <span>科技成果列表</span>
                     <div className="patent-addNew">
                         <Button type="primary" onClick={this.addClick}>发布成果<Icon type="plus" /></Button>
                     </div>

+ 1 - 0
js/component/account/business/businessProject.jsx

@@ -605,6 +605,7 @@ const BusinessProject = Form.create()(
  			return (
 				<div className="user-content">
 					<div className="content-title">
+						<span>项目业务列表</span>
 						<div className="user-search">
 							<Button
 								type="primary"

+ 3 - 2
js/component/account/demand/demandForm.jsx

@@ -353,13 +353,13 @@ const DemandDetailForm = Form.create()(React.createClass({
 							{getFieldDecorator('problemDes', {
 								rules: [ { required: true, message: '此项为必填项!' } ],
 								initialValue: theData.problemDes
-							})(<Input type="textarea" rows={4} placeholder="亲,发个需求吧!让技术专家主动找到您." />)}
+							})(<Input type="textarea" rows={4} placeholder="亲,发个需求吧!让技术专家主动找到您." 	maxLength={512}/>)}
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="标题">
 							{getFieldDecorator('name', {
 								rules: [ { required: true, message: '此项为必填项!' } ],
 								initialValue: theData.name
-							})(<Input placeholder="给您的需求配个标题吧." />)}
+							})(<Input placeholder="给您的需求配个标题吧." maxLength={128} />)}
 						</FormItem>
 					</div>
 					<div className="clearfix">
@@ -482,6 +482,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 										<Col span={6}><Checkbox value="app_index">APP首页</Checkbox></Col>
 										<Col span={6}><Checkbox value="app_demand_main">APP需求首页</Checkbox></Col>
 										<Col span={6}><Checkbox value="app_demand_list" disabled>APP需求搜索页</Checkbox></Col>
+										<Col span={6}><Checkbox value="web_demand_trading_index">知识产权交易首页</Checkbox></Col>
 									</Row>
 								</Checkbox.Group>
 							)}

+ 1 - 2
js/component/account/demand/techDemand.jsx

@@ -7,7 +7,6 @@ import './techDemand.less';
 import TechDemandDesc from './demandDesc.jsx';
 import { demandTypeList } from '@/dataDic.js';
 import { getDemandType,getReleaseStateList } from '@/tools.js';
-
 const DemandList = React.createClass({
     loadData(pageNo) {
         this.state.data = [];
@@ -308,7 +307,7 @@ const DemandList = React.createClass({
         return (
             <div className="user-content" >
                 <div className="content-title">
-                    <span>我的科技需求</span>
+                    <span>科技需求列表</span>
                     <div className="patent-addNew">
                         <Button type="primary" onClick={this.addClick}>发布需求<Icon type="plus" /></Button>
                     </div>

+ 4 - 4
js/component/account/index/collection.jsx

@@ -21,7 +21,7 @@ class Collection extends Component {
         axios.get(url,{
             params:{
                 pageNo:page||1,
-                pageSize:8
+                pageSize:(this.props.nub)?4:8
             }
         })
         .then(data=>{
@@ -64,7 +64,7 @@ class Collection extends Component {
         axios.get(url,{
             params:{
                 pageNo:page||1,
-                pageSize:8
+                pageSize:(this.props.nub)?4:8
             }
         })
         .then(data=>{
@@ -107,7 +107,7 @@ class Collection extends Component {
         axios.get(url,{
             params:{
                 pageNo:page||1,
-                pageSize:8
+                pageSize:(this.props.nub)?4:8
             }
         })
         .then(data=>{
@@ -225,7 +225,7 @@ class Collection extends Component {
                     </Row>:
                     <Row style={{color:'#333'}}>暂无数据</Row>}
                 </Spin>
-                {this.state.total?<Pagination className="page" pageSize={8} current={this.state.current} total={this.state.total} onChange={this.onShowSizeChange.bind(this)}/>:''}
+                {this.state.total?<Pagination className="page" pageSize={this.props.nub?4:8} current={this.state.current} total={this.state.total} onChange={this.onShowSizeChange.bind(this)}/>:''}
             </div>
            
         </div>

+ 4 - 6
js/component/account/index/content.jsx

@@ -16,8 +16,8 @@ import DemandList from '@/account/demand/techDemand';
 import Achievement from '@/account/achievement/techAchievement';
 import BusinessProject from '@/account/business/businessProject';
 import Follow from "@/account/index/follow";
-// import MemberOrderX from "@/account/order/memberOrderX";
-// import MemberOrderS from "@/account/order/memberOrderS";
+import MemberOrderX from "@/account/order/memberOrderX";
+import MemberOrderS from "@/account/order/memberOrderS";
 import AchievementOrderX from "@/account/order/achievementOrderX";
 import AchievementOrderS from "@/account/order/achievementOrderS";
 import DemandOrderX from "@/account/order/demandOrderX";
@@ -29,7 +29,6 @@ import ExpertS from "@/account/order/expertS";
 import AdviserX from "@/account/order/adviserX";
 import AdviserS from "@/account/order/adviserS";
 
-
 import {hashHistory,Route,Router} from 'react-router';
 import {Layout} from 'antd';
 import '@/account/content.less';
@@ -56,15 +55,14 @@ export default class ContentRouter extends React.Component {
             <Route path="/achievement" component={Achievement} />
             <Route path="/expert" component={Expert} />
             <Route path="/businessProject" component={BusinessProject} />
-            {/* <Route path="/memberOrderX" component={MemberOrderX} />
-            <Route path="/memberOrderS" component={MemberOrderS} /> */}
+            <Route path="/memberOrderX" component={MemberOrderX} />
+            <Route path="/memberOrderS" component={MemberOrderS} />
             <Route path="/achievementOrderX" component={AchievementOrderX} />
             <Route path="/achievementOrderS" component={AchievementOrderS} />
             <Route path="/demandOrderX" component={DemandOrderX} />
             <Route path="/demandOrderS" component={DemandOrderS} />
             <Route path="/projectOrderX" component={ProjectOrderX} />
             <Route path="/projectOrderS" component={ProjectOrderS} />
-
             <Route path="/expertX" component={ExpertX} />
             <Route path="/expertS" component={ExpertS} />
             <Route path="/adviserX" component={AdviserX} />

+ 4 - 4
js/component/account/index/normal.jsx

@@ -125,12 +125,12 @@ const Content = React.createClass({
                             </p>
                         </div>
                     </div>
-                    <div className="index-record">
+                    {/* <div className="index-record">
                         <p className="acc-title">我的轨迹</p>
-                    </div>
+                    </div>*/}
                     <div className="index-activity">
-                        <Collection />
-                    </div>
+                        <Collection nub={1}/>
+                    </div> 
                 </div>
                 <Modal maskClosable={false}
                     title="实名认证提示"

+ 10 - 13
js/component/account/menu.jsx

@@ -8,9 +8,6 @@ module.exports = {
           { name: '常用功能', url: 'normal' },
           { name: '我的收藏', url: 'collection' },
           { name: '我的关注', url: 'follow' },
-          // { name: '科技订单', url: 'techList' },
-          // { name: '服务订单', url: 'serviceList' },
-          // { name: '咨询订单', url: 'consultList' },
         ]
       },
          {
@@ -21,7 +18,7 @@ module.exports = {
             { name: '账号管理', url: 'account' },
             { name: '企业资料', url: 'unit' },
             { name: '个人资料', url: 'personal' },
-            { name: '知识产权顾问资料  ', url: 'patent' },
+            // { name: '知识产权顾问资料  ', url: 'patent' },
             { name: '专家资料  ', url: 'expert' },
             { name: '常用联系人', url: 'contacts' },
           ]
@@ -52,8 +49,8 @@ module.exports = {
             { name: '技术成果订单', url: 'achievementOrderS' },
             { name: '技术需求订单', url: 'demandOrderS' },
             { name: '赚钱订单', url: 'projectOrderS' },
-            { name: '专家订单', url: 'expertS' },
-            { name: '顾问订单', url: 'adviserS' }
+            // { name: '专家订单', url: 'expertS' },
+            // { name: '顾问订单', url: 'adviserS' }
           ]
         },
         {
@@ -64,9 +61,9 @@ module.exports = {
             { name: '技术成果订单', url: 'achievementOrderX' },
             { name: '技术需求订单', url: 'demandOrderX' },
             { name: '赚钱订单', url: 'projectOrderX' },
-            { name: '专家订单', url: 'expertX' },
-            { name: '顾问订单', url: 'adviserX' },
-            { name: '会员订单', url: 'memberOrderX' },
+            // { name: '专家订单', url: 'expertX' },
+            // { name: '顾问订单', url: 'adviserX' },
+            // { name: '会员订单', url: 'memberOrderX' },
           ]
         }
     ],
@@ -120,8 +117,8 @@ module.exports = {
             { name: '技术成果订单', url: 'achievementOrderS' },
             { name: '技术需求订单', url: 'demandOrderS' },
             { name: '赚钱订单', url: 'projectOrderS' },
-            { name: '专家订单', url: 'expertS' },
-            { name: '顾问订单', url: 'adviserS' },
+            // { name: '专家订单', url: 'expertS' },
+            // { name: '顾问订单', url: 'adviserS' },
           ]
         },
         {
@@ -132,8 +129,8 @@ module.exports = {
             { name: '技术成果订单', url: 'achievementOrderX' },
             { name: '技术需求订单', url: 'demandOrderX' },
             { name: '赚钱订单', url: 'projectOrderX' },
-            { name: '专家订单', url: 'expertX' },
-            { name: '顾问订单', url: 'adviserX' },
+            // { name: '专家订单', url: 'expertX' },
+            // { name: '顾问订单', url: 'adviserX' },
             // { name: '会员订单', url: 'memberOrderX' },
           ]
         }

+ 1 - 1
js/component/account/order/achievementOrderS.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length >12 ? text.substr(0,12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/achievementOrderX.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 12 ? text.substr(0, 6) + '...' : text}
+									{text && text.length > 12 ? text.substr(0,12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/demandOrderS.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length > 12 ? text.substr(0,12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/demandOrderX.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length >12 ? text.substr(0, 12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/expertX.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length >12 ? text.substr(0, 12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/memberOrderS.jsx

@@ -127,7 +127,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length > 12 ? text.substr(0, 12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/memberOrderX.jsx

@@ -155,7 +155,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length > 12? text.substr(0,12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/projectOrderS.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length > 12 ? text.substr(0, 12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 1 - 1
js/component/account/order/projectOrderX.jsx

@@ -128,7 +128,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length >12 ? text.substr(0,12) + '...' : text}
 								</Tooltip>
 							);
 						}

+ 4 - 2
js/component/account/setAccount/account.jsx

@@ -212,6 +212,7 @@ class Account extends React.Component {
 		const accountData = this.state.account || [];
 		return (
 			<div className="account-wrap">
+				<span style={{'fontSize':20,marginLeft:30,marginBottom:20,display:'inline-block'}}>账号管理</span>
 				<div className="clearfix">
 					<Spin spinning={this.state.loading}>
 						<Row>
@@ -264,7 +265,7 @@ class Account extends React.Component {
 						<Row>
 							<Col span={8}>
 								<FormItem className="half-mid" {...formItemLayout} label="注册手机号">
-									{this.state.editPhoto ? (
+									{/* {this.state.editPhoto ? (
 										<Input
 											value={this.state.mobile}
 											onBlur={(e) => {
@@ -289,7 +290,8 @@ class Account extends React.Component {
 											}}
 											icon="edit"
 										/>
-									)}
+									)} */}
+									<span>{this.state.mobile}</span>
 								</FormItem>
 							</Col>
 							<Col span={8}>

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

@@ -317,7 +317,7 @@ const Expert = React.createClass({
 								{getFieldDecorator('identifyName', {
 									rules: [ { required: true, message: '此项为必填项!' } ],
 									initialValue: theData.identifyName
-								})(<Input placeholder="输入姓名" />)}
+								})(<Input placeholder="输入姓名" maxLength={128}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="行业">
 								{getFieldDecorator('industry', {
@@ -365,7 +365,7 @@ const Expert = React.createClass({
 							<FormItem className="half-item" {...formItemLayout} label="身份证号码">
 								{getFieldDecorator('idNumber', {
 									initialValue: theData.idNumber
-								})(<Input placeholder="身份证号码" />)}
+								})(<Input placeholder="身份证号码" maxLength={20}/>)}
 							</FormItem>
 						</div>
 						<div className="clearfix">
@@ -378,53 +378,53 @@ const Expert = React.createClass({
 							<FormItem className="half-item" {...formItemLayout} label="通信地址">
 								{getFieldDecorator('postalAddress', {
 									initialValue: theData.postalAddress
-								})(<Input placeholder="输入通信地址" />)}
+								})(<Input placeholder="输入通信地址" maxLength={255}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="手机号码">
 								{getFieldDecorator('mobile', {
 									rules: [ { required: true, message: '此项为必填项!' } ],
 									initialValue: theData.mobile
-								})(<Input placeholder="输入手机号码" />)}
+								})(<Input placeholder="输入手机号码" maxLength={16}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="固定电话">
 								{getFieldDecorator('fixedTel', {
 									initialValue: theData.fixedTel
-								})(<Input placeholder="输入固定电话" />)}
+								})(<Input placeholder="输入固定电话" maxLength={13}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="QQ">
 								{getFieldDecorator('qq', {
 									initialValue: theData.qq
-								})(<Input placeholder="输入qq" />)}
+								})(<Input placeholder="输入qq" maxLength={16}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="电子邮箱">
 								{getFieldDecorator('email', {
 									initialValue: theData.email
-								})(<Input placeholder="输入电子邮箱" />)}
+								})(<Input placeholder="输入电子邮箱" maxLength={128}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="毕业院校">
 								{getFieldDecorator('graduateSchool', {
 									initialValue: theData.graduateSchool
-								})(<Input placeholder="输入毕业院校全称" />)}
+								})(<Input placeholder="输入毕业院校全称" maxLength={32}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="专业类别">
 								{getFieldDecorator('majorCategory', {
 									initialValue: theData.majorCategory
-								})(<Input placeholder="输入专业" />)}
+								})(<Input placeholder="输入专业" maxLength={16}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="职业资格">
 								{getFieldDecorator('qualification', {
 									initialValue: theData.qualification
-								})(<Input placeholder="输入职业资格" />)}
+								})(<Input placeholder="输入职业资格" maxLength={32} />)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="就职单位">
 								{getFieldDecorator('workUnit', {
 									initialValue: theData.workUnit
-								})(<Input placeholder="输入就职单位全称" />)}
+								})(<Input placeholder="输入就职单位全称" maxLength={64}/>)}
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="职称">
 								{getFieldDecorator('professionalTitle', {
 									initialValue: theData.professionalTitle
-								})(<Input placeholder="输入职称" />)}
+								})(<Input placeholder="输入职称" maxLength={32}/>)}
 							</FormItem>
 						</div>
 						<div className="clearfix">
@@ -435,7 +435,7 @@ const Expert = React.createClass({
 							>
 								{getFieldDecorator('introduction', {
 									initialValue: theData.introduction
-								})(<Input type="textarea" rows={4} />)}
+								})(<Input type="textarea" rows={4} maxLength={512}/>)}
 							</FormItem>
 						</div>
 						<div className="clearfix pictures">

+ 52 - 21
js/component/account/setAccount/personal.jsx

@@ -34,6 +34,9 @@ import {
 import {
 	splitUrl,
 } from '@/tools.js';
+message.config({
+	top: 200,
+  });
 const FormItem = Form.Item;
 const monthFormat = 'YYYY/MM';
 //图片组件
@@ -182,27 +185,7 @@ const Personal = React.createClass({
 	},
 	//基本信息提交
 	newSubmit(e) {
-        if(!this.state.identifyName){
-            message.warning("请填写姓名!")
-            return;
-        }
-		if (!this.state.industry) {
-			message.warning('请选择行业!');
-			return false;
-		}
-		if (!this.state.societyTag) {
-			message.warning('请选择社会性质!');
-			return false;
-		}
-		if (!this.state.ProvinceCity||!this.state.ProvinceCity.length) {
-			message.warning('请选择地区!');
-			return false;
-        }
         
-        if(!this.state.mobile){
-            message.warning("请填写手机号码!")
-            return;
-        }
 		this.state.data = [];
 		this.setState({
 			selectedRowKeys: []
@@ -297,8 +280,48 @@ const Personal = React.createClass({
 	},
 	subFun(){
 		if(this.state.type=='0'||this.state.type=='1'){
+			if(!this.state.identifyName){
+				message.warning("请填写姓名!")
+				return;
+			}
+			if (!this.state.industry) {
+				message.warning('请选择行业!');
+				return false;
+			}
+			if (!this.state.societyTag) {
+				message.warning('请选择社会性质!');
+				return false;
+			}
+			if (!this.state.ProvinceCity||!this.state.ProvinceCity.length) {
+				message.warning('请选择地区!');
+				return false;
+			}
+			if(!this.state.mobile){
+				message.warning("请填写手机号码!")
+				return;
+			}
 			this.newSubmit()
 		}else{
+			if(!this.state.identifyName){
+				message.warning("请填写姓名!")
+				return;
+			}
+			if (!this.state.industry) {
+				message.warning('请选择行业!');
+				return false;
+			}
+			if (!this.state.societyTag) {
+				message.warning('请选择社会性质!');
+				return false;
+			}
+			if (!this.state.ProvinceCity||!this.state.ProvinceCity.length) {
+				message.warning('请选择地区!');
+				return false;
+			}
+			if(!this.state.mobile){
+				message.warning("请填写手机号码!")
+				return;
+			}
 			this.setState({
 				visible:true
 			})
@@ -350,6 +373,7 @@ const Personal = React.createClass({
 						<div className="clearfix">
 							<FormItem className="half-item" {...formItemLayout} label={<span><span className="color-red"> * </span>姓名</span>}>
 								<Input
+									maxLength={128}
 									placeholder="输入姓名"
 									value={this.state.identifyName}
 									onChange={(e) => {
@@ -417,6 +441,7 @@ const Personal = React.createClass({
 							</FormItem>
 							<FormItem className="half-item" {...formItemLayout} label="身份证号码">
 								<Input
+									maxLength={20}
 									placeholder="身份证号码"
 									value={this.state.idNumber}
 									onChange={(e) => {
@@ -438,6 +463,7 @@ const Personal = React.createClass({
                             </FormItem>
                             <FormItem className="half-item" {...formItemLayout} label="通信地址">
                                 <Input
+									maxLength={255}
                                     placeholder="客户通信地址"
                                     value={this.state.postalAddress}
                                     onChange={(e, pre) => {
@@ -447,6 +473,7 @@ const Personal = React.createClass({
                             </FormItem>
                             <FormItem className="half-item" {...formItemLayout} label={<span><span className="color-red"> * </span>手机号码</span>}>
                                 <Input
+									maxLength={16}
                                     placeholder="手机号码"
                                     value={this.state.mobile}
                                     onChange={(e) => {
@@ -456,6 +483,7 @@ const Personal = React.createClass({
                             </FormItem>
                             <FormItem className="half-item" {...formItemLayout} label="固定电话">
                                 <Input
+									maxLength={13}
                                     placeholder="客户固定电话"
                                     value={this.state.fixedTel}
                                     onChange={(e) => {
@@ -465,6 +493,7 @@ const Personal = React.createClass({
                             </FormItem>
                             <FormItem className="half-item" {...formItemLayout} label="QQ">
                                 <Input
+									maxLength={16}
                                     placeholder="QQ"
                                     value={this.state.qq}
                                     onChange={(e) => {
@@ -474,6 +503,7 @@ const Personal = React.createClass({
                             </FormItem>
                             <FormItem className="half-item" {...formItemLayout} label="电子邮箱">
                                 <Input
+									maxLength={128}
                                     placeholder="客户电子邮箱"
                                     value={this.state.email}
                                     onChange={(e) => {
@@ -483,8 +513,9 @@ const Personal = React.createClass({
                             </FormItem>
                         </div>
                         <div className="clearfix">
-                            <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="专家简介">
+                            <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="个人简介">
                                 <Input
+									maxLength={512}
                                     type="textarea"
                                     rows={4}
                                     value={this.state.introduction}

+ 35 - 16
js/component/account/setAccount/unit.jsx

@@ -235,23 +235,7 @@ const Unit = React.createClass({
 	},
 	//基本信息提交
 	newSubmit(e) {
-		if(!this.state.identifyName){
-			message.warning('请填写单位名称!');
-			return;
-		}
-		if (!this.state.industry) {
-			message.warning('请选择行业!');
-			return false;
-		}
-		if (!this.state.societyTag) {
-			message.warning('请选择社会性质!');
-			return false;
-		}
 		
-		if (isNaN(this.state.registeredCapital)) {
-			message.warning('注册资本只能输入数字!');
-			return false;
-		}
 		this.setState({
 			selectedRowKeys: []
 		});
@@ -346,8 +330,40 @@ const Unit = React.createClass({
 	},
 	subFun(){
 		if(this.state.type=='0'||this.state.type=='1'){
+			if(!this.state.identifyName){
+				message.warning("请填写单位名称")
+				return;
+			}
+			if (!this.state.industry) {
+				message.warning('请选择行业!');
+				return false;
+			}
+			if (!this.state.societyTag) {
+				message.warning('请选择社会性质!');
+				return false;
+			}
+			if (isNaN(this.state.registeredCapital)) {
+				message.warning('注册资本只能输入数字!');
+				return false;
+			}
 			this.newSubmit()
 		}else{
+			if(!this.state.identifyName){
+				message.warning("请填写单位名称")
+				return;
+			}
+			if (!this.state.industry) {
+				message.warning('请选择行业!');
+				return false;
+			}
+			if (!this.state.societyTag) {
+				message.warning('请选择社会性质!');
+				return false;
+			}
+			if (isNaN(this.state.registeredCapital)) {
+				message.warning('注册资本只能输入数字!');
+				return false;
+			}
 			this.setState({
 				visible:true
 			})
@@ -388,6 +404,7 @@ const Unit = React.createClass({
 								label={<span><span className="color-red"> * </span>企业名称</span>}
 							>
 								<Input
+									maxLength={128}
 									value={this.state.identifyName}
 									onChange={(e) => {
 										this.setState({ identifyName: e.target.value });
@@ -455,6 +472,7 @@ const Unit = React.createClass({
 								label="通信地址"
 							>
 								<Input
+									maxLength={255}
 									placeholder="客户通信地址"
 									value={this.state.postalAddress}
 									onChange={(e) => {
@@ -469,6 +487,7 @@ const Unit = React.createClass({
 								label="固定电话"
 							>
 								<Input
+									maxLength={13}
 									placeholder="客户固定电话"
 									value={this.state.fixedTel}
 									onChange={(e) => {

+ 2 - 1
js/component/account/setAccount/unit.less

@@ -1,6 +1,7 @@
 .unit-wrap{
     padding:10px;
-    background-color: #ffffff;
+    background:#fff;
+     background-size:100% 100%; 
     .half-item{
         width: 50%;
         display: inline-block;

+ 2 - 2
js/component/account/topTab.less

@@ -2,10 +2,10 @@
         width: 100%;
         border-bottom: 1px solid #eee;
         background: #fff;
-        position: absolute;
+        position: fixed;
         top: 0;
         left: 0;
-        z-index: 1;
+        z-index: 999999999;
         .acc-top-user {
             margin-bottom: 2px;
             overflow: hidden;

+ 0 - 5
js/component/administration/achievement/achievementDetaiel.jsx

@@ -236,11 +236,6 @@ const DemandDetail = Form.create()(React.createClass({
                                 <span>{getAchievementPosition(theData.publishPages)}</span>
 						</FormItem>
                     </div>
-                   {!this.props.examineState&&<div className="clearfix">
-                            <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="审核信息">
-                                <span>{theData.auditInfo}</span>
-                            </FormItem>
-					</div>}
 					<div className="clearfix">
 						{this.props.examineState&&<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 							<Button className="set-submit" type="primary"  onClick={(e)=>{this.updateFun(1)}} >

+ 2 - 2
js/component/administration/achievement/achievementExamine.jsx

@@ -246,11 +246,11 @@ const DemandList = React.createClass({
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <Input style={{width:140,marginRight:10}} value={this.state.employerNameSearch} onChange={(e)=>{this.setState({employerNameSearch:e.target.value})}} placeholder="客户名称"/>
-                        <span>发布时间 :</span>
+                        {/* <span>发布时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> */}
                     </div>
                 </div>
                 <div className="patent-table">

+ 30 - 2
js/component/administration/business/businessProject.jsx

@@ -190,12 +190,40 @@ const BusinessProject = Form.create()(
 					{
 						title: '品类名称',
 						dataIndex: 'cname',
-						key: 'cname'
+						key: 'cname',
+						render:(text,recard)=>{
+							let ids =recard.categoryId,categoryList =this.state.categoryList,txt='' ;
+							 categoryList.map(item=>{
+								if(item.children){
+									(item.children).map(atem=>{
+										if(atem.value==ids){
+											txt= atem.label
+										}
+									})
+								}
+							})
+							return txt;
+							
+						}
 					},
 					{
 						title: '上级品类',
 						dataIndex: 'superName',
-						key: 'superName'
+						key: 'superName',
+						render:(text,recard)=>{
+							let ids =recard.categoryId,categoryList =this.state.categoryList,txt='' ;
+							 categoryList.map(item=>{
+								if(item.children){
+									(item.children).map(atem=>{
+										if(atem.value==ids){
+											txt= item.label
+										}
+									})
+								}
+							})
+							return txt;
+							
+						}
 					},
 					{
 						title: '业务地区',

+ 0 - 5
js/component/administration/demand/demandDetaiel.jsx

@@ -263,11 +263,6 @@ const DemandDetail = Form.create()(React.createClass({
                                  <span>{getReleasePositionList(this.state.publishPagesArr)}</span>
 						</FormItem>
                     </div>
-                    <div className="clearfix">
-                            <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="审核信息">
-                                <span>{theData.auditInfo}</span>
-                            </FormItem>
-					</div>
 					<div className="clearfix">
 						{this.props.examineState&&<FormItem wrapperCol={{ span: 12, offset: 3 }}>
 							<Button className="set-submit" type="primary"  onClick={(e)=>{this.updateFun(1)}} >

+ 2 - 2
js/component/administration/demand/demandExamine.jsx

@@ -274,11 +274,11 @@ const DemandList = React.createClass({
                     <span>更多搜索<Switch defaultChecked={false} onChange={this.searchSwitch} /></span>
                     <div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
                         <Input style={{width:140,marginRight:10}} value={this.state.employerNameSearch} onChange={(e)=>{this.setState({employerNameSearch:e.target.value})}} placeholder="客户名称"/>
-                        <span>发布时间 :</span>
+                        {/* <span>发布时间 :</span>
                         <RangePicker
                             value={[this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
                             this.state.releaseDate[1] ? moment(this.state.releaseDate[1]) : null]}
-                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} />
+                            onChange={(data, dataString) => { this.setState({ releaseDate: dataString }); }} /> */}
                     </div>
                 </div>
                 <div className="patent-table">

+ 6 - 3
js/component/administration/news/newDetails.jsx

@@ -178,13 +178,16 @@ const NewDetail = Form.create()(React.createClass({
 						<FormItem className="half-item" {...formItemLayout} label="新闻来源">
 							<span>{theData.source}</span>
 						</FormItem>
-						<FormItem className="half-item" {...formItemLayout} label="来源链接">
-							<span>{theData.sourceUrl}</span>
-						</FormItem>
+						
                         <FormItem className="half-item" {...formItemLayout} label="省市区">
 							<span>{this.state.ProvinceCity}</span>
 						</FormItem>
 					</div>
+                    <div>
+                    <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="来源链接">
+							<span>{theData.sourceUrl}</span>
+						</FormItem>
+                    </div>
                     <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="新闻图片">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"

+ 19 - 8
js/component/administration/order/order.jsx

@@ -118,7 +118,10 @@ const Order = Form.create()(
 					{
 						title: '订单金额(万元)',
 						dataIndex: 'orderAmount',
-						key: 'orderAmount'
+						key: 'orderAmount',
+						render:text=>{
+							return text?text:'面议'
+						}
 					},
 					{
 						title: '项目名称',
@@ -127,7 +130,7 @@ const Order = Form.create()(
 						render: (text) => {
 							return (
 								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+									{text && text.length > 12 ? text.substr(0, 12) + '...' : text}
 								</Tooltip>
 							);
 						}
@@ -136,8 +139,12 @@ const Order = Form.create()(
 						title: '消费者联系人',
 						dataIndex: 'buyerName',
 						key: 'buyerName',
-						render:(text)=>{
-							return text?text:'佚名'
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length >12 ? text.substr(0,12) + '...' : text?text:'佚名'}
+								</Tooltip>
+							);
 						}
 					},
 					{
@@ -152,8 +159,12 @@ const Order = Form.create()(
 						title: '服务商联系人',
 						dataIndex: 'sellerName',
 						key: 'sellerName',
-						render:(text)=>{
-							return text?text:'佚名'
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length >12 ? text.substr(0,12) + '...' : text?text:'佚名'}
+								</Tooltip>
+							);
 						}
 					},
 					{
@@ -273,7 +284,7 @@ const Order = Form.create()(
 							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
 						</span>
 						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
-							<span style={{ marginRight: 10 }}>发布时间 :</span>
+							<span style={{ marginRight: 10 }}>订单日期 :</span>
 							<RangePicker
 								value={[
 									this.state.releaseDate[0] ? moment(this.state.releaseDate[0]) : null,
@@ -341,7 +352,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="订单金额"
 										>
-											<span>{theData.orderAmount||theData.orderAmount=='0' ? theData.orderAmount + '万元' : ''}</span>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">

+ 6 - 3
js/component/administration/policy/policyDetails.jsx

@@ -165,13 +165,16 @@ const NewDetail = Form.create()(React.createClass({
 						<FormItem className="half-item" {...formItemLayout} label="政策来源">
 							<span>{theData.source}</span>
 						</FormItem>
-						<FormItem className="half-item" {...formItemLayout} label="来源链接">
-							<span>{theData.sourceUrl}</span>
-						</FormItem>
+						
                         <FormItem className="half-item" {...formItemLayout} label="省市区">
 							<span>{this.state.ProvinceCity}</span>
 						</FormItem>
 					</div>
+                    <div>
+                        <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }}  label="来源链接">
+							<span>{theData.sourceUrl}</span>
+						</FormItem>
+                    </div>
                     <FormItem labelCol={{ span: 3 }} wrapperCol={{ span: 18 }} label="政策图片">
                         <div className="clearfix">
                                 <Upload className="demandDetailShow-upload"

+ 6 - 0
js/component/dataDic.js

@@ -2191,6 +2191,9 @@ module.exports = {
 	    }, {
 	        value: "app_demand_list",
 	        key: "APP需求搜索页"
+	    }, {
+	        value: "web_demand_trading_index",
+	        key: "知识产权交易首页"
 	    }
     ],
     //成果发布位置
@@ -2213,6 +2216,9 @@ module.exports = {
 	    }, {
 	        value: "app_achievement_list",
 	        key: "APP成果搜索页"
+	    }, {
+	        value: "web_achievement_trading_index",
+	        key: "知识产权交易首页"
 	    }
     ],
      //新闻发布位置

+ 3 - 1
js/component/richTextEditors.jsx

@@ -59,7 +59,9 @@ const Editors = React.createClass({
     },
     componentWillReceiveProps(nextProps) {
             this.state.theBool = true;
-            this.state.value = nextProps.textContent;
+            if(nextProps.textContent){
+                this.state.value = nextProps.textContent;
+            }
     },
     render() {
         const modules = {

+ 1 - 1
webpack.config.js

@@ -152,7 +152,7 @@ module.exports = (function () {
         plugins: plugins,
         devServer: {
             disableHostCheck: true,
-            allowedHosts: ['aft.hnzhiming.com', 'afts.hnzhiming.com'],
+            allowedHosts: ['127.0.0.1','192.168.1.123'],
             headers: {
                 "Access-Control-Allow-Origin": "*"
             }