liting2017 6 anni fa
parent
commit
589976602f

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

@@ -442,7 +442,7 @@ const DemandDetailForm = Form.create()(React.createClass({
 						</FormItem>
 						<FormItem className="half-item" {...formItemLayout} label="交易形式">
 							{getFieldDecorator('transferMode', {
-									initialValue:(theData.transferMode||theData.transferMode=='0'?theData.transferMode.toString():undefined)
+								initialValue:(theData.transferMode||theData.transferMode=='0'?theData.transferMode.toString():undefined)
 							})(
 								<Select style={{ width: 160 }} placeholder="请选择交易形式"
 									>

+ 19 - 5
js/component/account/index/content.jsx

@@ -15,12 +15,20 @@ 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 ServiceOrder from "@/account/order/serviceOrder";
-import ConsumptionOrder from "@/account/order/consumptionOrder"
+// 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";
+import DemandOrderS from "@/account/order/demandOrderS";
+import ProjectOrderX from "@/account/order/projectOrderX";
+import ProjectOrderS from "@/account/order/projectOrderS";
+
+
 
 import {hashHistory,Route,Router} from 'react-router';
 import {Layout} from 'antd';
-import '@/account/content.less'
+import '@/account/content.less';
 
 const { Content } = Layout;
 
@@ -43,8 +51,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="/serviceOrder" component={ServiceOrder} />
-            <Route path="/consumptionOrder" component={ConsumptionOrder} />
+            {/* <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} />
         </Router>
       </Content>
     )

+ 32 - 7
js/component/account/menu.jsx

@@ -44,12 +44,25 @@ module.exports = {
           children: [ { name: '业务项目管理', url: 'businessProject' }, ]
         },
         {
-          name: '订单管理',
+          name: '订单管理-我是服务商',
           url: 'sub6',
           icon: 'copy',
           children: [
-            { name: '我是服务商', url: 'serviceOrder' },
-            { name: '我是消费者', url: 'consumptionOrder' },
+            { name: '技术成果订单', url: 'achievementOrderS' },
+            { name: '技术需求订单', url: 'demandOrderS' },
+            { name: '项目订单', url: 'projectOrderS' },
+            // { name: '会员订单', url: 'memberOrderS' }
+          ]
+        },
+        {
+          name: '订单管理-我是消费者',
+          url: 'sub7',
+          icon: 'shop',
+          children: [
+            { name: '技术成果订单', url: 'achievementOrderX' },
+            { name: '技术需求订单', url: 'demandOrderX' },
+            { name: '项目订单', url: 'projectOrderX' },
+            // { name: '会员订单', url: 'memberOrderX' },
           ]
         }
     ],
@@ -97,13 +110,25 @@ module.exports = {
           children: [ { name: '业务项目管理', url: 'businessProject' }, ]
         },
         {
-          name: '订单管理',
+          name: '订单管理-我是服务商',
           url: 'sub6',
           icon: 'copy',
           children: [
-            { name: '我是服务商', url: 'serviceOrder' },
-            { name: '我是消费者', url: 'consumptionOrder' },
-            
+            { name: '技术成果订单', url: 'achievementOrderS' },
+            { name: '技术需求订单', url: 'demandOrderS' },
+            { name: '项目订单', url: 'projectOrderS' },
+            // { name: '会员订单', url: 'memberOrderS' }
+          ]
+        },
+        {
+          name: '订单管理-我是消费者',
+          url: 'sub7',
+          icon: 'shop',
+          children: [
+            { name: '技术成果订单', url: 'achievementOrderX' },
+            { name: '技术需求订单', url: 'demandOrderX' },
+            { name: '项目订单', url: 'projectOrderX' },
+            // { name: '会员订单', url: 'memberOrderX' },
           ]
         }
     ],

+ 19 - 20
js/component/account/order/consumptionOrder.jsx

@@ -6,6 +6,7 @@
 import React from 'react';
 import $ from 'jquery/src/ajax';
 import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { orderType } from '@/dataDic';
 import { getOrderType } from '@/tools.js';
 import moment  from 'moment';
 //主体
@@ -26,9 +27,10 @@ const Order = Form.create()(
 					pageNo: pageNo || 1,
 					pageSize: this.state.pagination.pageSize,
 					orderNo: this.state.numberSearch,
-					userType:0,
+					userType:1,
+					orderType:2,
 					commodityName: this.state.entryNameSearch,
-					sellerName: this.state.companyNameSearch,
+					buyerName: this.state.companyNameSearch,
 					startCreateDate: this.state.releaseDate[0],
 					endCreateDate: this.state.releaseDate[1]
 				},
@@ -49,8 +51,8 @@ const Order = Form.create()(
 								commodityType:thisdata.commodityType,
 								orderAmount:thisdata.orderAmount,
 								commodityName:thisdata.commodityName,
-								sellerName:thisdata.sellerName!=null?thisdata.sellerName:'佚名',
-								sellerMobile:thisdata.sellerMobile,
+								buyerName:thisdata.buyerName,
+								buyerMobile:thisdata.buyerMobile,
 								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
 							});
 						}
@@ -112,12 +114,9 @@ const Order = Form.create()(
 						key: 'createTime'
 					},
 					{
-						title: '订单金额',
+						title: '订单金额(万元)',
 						dataIndex: 'orderAmount',
-                        key: 'orderAmount',
-                        render:(text)=>{
-                            return text?text:'面议'
-                        }
+						key: 'orderAmount'
 					},
 					{
 						title: '项目名称',
@@ -132,15 +131,15 @@ const Order = Form.create()(
 						}
 					},
 					{
-						title: '服务商',
-						dataIndex: 'sellerName',
-						key: 'sellerName',
+						title: '消费者',
+						dataIndex: 'buyerName',
+						key: 'buyerName',
 						
 					},
 					{
 						title: '联系方式',
-						dataIndex: 'sellerMobile',
-						key: 'sellerMobile'
+						dataIndex: 'buyerMobile',
+						key: 'buyerMobile'
 					},
 					
 				],
@@ -196,7 +195,7 @@ const Order = Form.create()(
 			return (
 				<div className="user-content">
 					<div className="content-title">
-						<span>我的订单</span>
+						<span>订单列表</span>
 					</div>
 					<div className="user-search">
 						<Input
@@ -299,9 +298,9 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="订单金额"
+											label="订单金额(万元)"
 										>
-											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : ''}</span>
 										</FormItem>
 									</div>
 									<div className="clearfix">
@@ -319,9 +318,9 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="服务商"
+											label="消费者"
 										>
-											<span>{theData.sellerName}</span>
+											<span>{theData.buyerName}</span>
 										</FormItem>
 										<FormItem
 											className="half-item"
@@ -329,7 +328,7 @@ const Order = Form.create()(
 											wrapperCol={{ span: 12 }}
 											label="联系方式"
 										>
-											<span>{theData.sellerMobile}</span>
+											<span>{theData.buyerMobile}</span>
 										</FormItem>
 									</div>
 								</Spin>

+ 449 - 0
js/component/account/order/achievementOrderX.jsx

@@ -0,0 +1,449 @@
+/* 
+	update:2018/07/16
+	author:liting
+*/
+
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select, Rate,Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:0,
+					orderType:2,
+					commodityName: this.state.entryNameSearch,
+					sellerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
+				},
+				success: function(data) {
+					let theArr = [];
+					if (!data.data || !data.data.list) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						}
+					} else {
+						for (let i = 0; i < data.data.list.length; i++) {
+							let thisdata = data.data.list[i];
+							theArr.push({
+								key: i,
+								sellerId: thisdata.sellerId,
+								commodityId:thisdata.commodityId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								sellerName:thisdata.sellerName!=null?thisdata.sellerName:'佚名',
+								sellerMobile:thisdata.sellerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额(万元)',
+						dataIndex: 'orderAmount',
+                        key: 'orderAmount',
+                        render:(text)=>{
+                            return text?text:'面议'
+                        }
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 12 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '服务商',
+						dataIndex: 'sellerName',
+						key: 'sellerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'sellerMobile',
+						key: 'sellerMobile'
+					},
+					{
+						title: '评价',
+						dataIndex: 'pingjia',
+						key: 'pingjia',
+						render:(text,recard)=>{
+							return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
+						}
+					}
+				],
+				dataSource: []
+			};
+		},
+		//评价
+		evaluate(recard){
+			this.setState({
+				remark:'',
+				star:undefined,
+				ids:recard.commodityId,
+				orderNo:recard.orderNo,
+				evaluateVisible:true
+			})
+		},
+		evaluateOk(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		evaluateCancel(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		//评价
+		evaluateSubmit(e){
+			e.preventDefault();
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method:"post",
+				dataType:'json',
+				url:globalConfig.context+'/api/user/comment/apply',
+				data:{
+					commodityId:this.state.ids,
+					content:this.state.remark,
+					star:this.state.star,
+					orderNo:this.state.orderNo
+				},
+				success:function(data){
+					if(data&&data.error.length){
+						message.error(data.error[0].message)
+					}
+					message.success('提交成功,感谢您的评价!')
+					this.loadData(this.state.page);
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						evaluateVisible:false,
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>我的成果订单</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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 });
+								}}
+							/>
+						</div>
+					</div>
+					<div className="patent-table">
+						<Spin spinning={this.state.loading}>
+							<Table
+								columns={this.state.columns}
+								dataSource={this.state.dataSource}
+								rowSelection={rowSelection}
+								pagination={this.state.pagination}
+								onRowClick={this.tableRowClick}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额(万元)"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="服务商"
+										>
+											<span>{theData.sellerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.sellerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+					<Modal
+							title="评价"
+							width="600px"
+							visible={this.state.evaluateVisible}
+							onOk={this.evaluateOk}
+							okText="提交"
+							onCancel={this.evaluateCancel}
+							footer=''
+						>	
+						<Form layout="horizontal" onSubmit={(e)=>{this.evaluateSubmit(e)}}>
+							<Spin spinning={this.state.loading}>
+								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="评价内容">
+									<Input
+										type="textarea"
+										rows={4}
+										placeholder="输入你的建议"
+										value={this.state.remark}
+										onChange={(e) => {
+											this.setState({ remark: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem
+									labelCol={{ span: 4 }} 
+									wrapperCol={{ span: 8 }}
+									label="评星"
+								>
+									<Rate onChange={(e)=>{this.setState({star:e})}} value={this.state.star} />
+								</FormItem>
+								<div className="clearfix">
+									<FormItem wrapperCol={{ span: 12, offset: 4 }}>
+										<Button className="set-submit" type="primary" htmlType="submit" style={{marginRight:15}}>
+											提交
+										</Button>
+										<Button className="set-submit" type="ghost" onClick={this.evaluateCancel}>
+											取消
+										</Button>
+									</FormItem>
+								</div>
+							</Spin>
+						</Form>
+					</Modal>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 344 - 0
js/component/account/order/demandOrderS.jsx

@@ -0,0 +1,344 @@
+/* 
+	update:2018/07/16
+	author:liting
+*/
+
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { orderType } from '@/dataDic';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:1,
+					orderType:3,
+					commodityName: this.state.entryNameSearch,
+					buyerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
+				},
+				success: function(data) {
+					let theArr = [];
+					if (!data.data || !data.data.list) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						}
+					} else {
+						for (let i = 0; i < data.data.list.length; i++) {
+							let thisdata = data.data.list[i];
+							theArr.push({
+								key: i,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								buyerName:thisdata.buyerName,
+								buyerMobile:thisdata.buyerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额(万元)',
+						dataIndex: 'orderAmount',
+						key: 'orderAmount'
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '消费者',
+						dataIndex: 'buyerName',
+						key: 'buyerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'buyerMobile',
+						key: 'buyerMobile'
+					},
+					
+				],
+				dataSource: []
+			};
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>订单列表</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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 });
+								}}
+							/>
+						</div>
+					</div>
+					<div className="patent-table">
+						<Spin spinning={this.state.loading}>
+							<Table
+								columns={this.state.columns}
+								dataSource={this.state.dataSource}
+								rowSelection={rowSelection}
+								pagination={this.state.pagination}
+								onRowClick={this.tableRowClick}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额(万元)"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : ''}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="消费者"
+										>
+											<span>{theData.buyerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.buyerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 453 - 0
js/component/account/order/demandOrderX.jsx

@@ -0,0 +1,453 @@
+/* 
+	update:2018/07/16
+	author:liting
+*/
+
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select,Rate, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:0,
+					orderType:3,
+					commodityName: this.state.entryNameSearch,
+					sellerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
+				},
+				success: function(data) {
+					let theArr = [];
+					if (!data.data || !data.data.list) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						}
+					} else {
+						for (let i = 0; i < data.data.list.length; i++) {
+							let thisdata = data.data.list[i];
+							theArr.push({
+								key: i,
+								sellerId: thisdata.sellerId,
+								commodityId:thisdata.commodityId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								sellerName:thisdata.sellerName!=null?thisdata.sellerName:'佚名',
+								sellerMobile:thisdata.sellerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额(万元)',
+						dataIndex: 'orderAmount',
+                        key: 'orderAmount',
+                        render:(text)=>{
+                            return text?text:'面议'
+                        }
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '服务商',
+						dataIndex: 'sellerName',
+						key: 'sellerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'sellerMobile',
+						key: 'sellerMobile',
+						render:text=>{
+							return text?text:"暂无"
+						}
+					},
+					{
+						title: '评价',
+						dataIndex: 'pingjia',
+						key: 'pingjia',
+						render:(text,recard)=>{
+							return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
+						}
+					}
+					
+				],
+				dataSource: []
+			};
+		},
+		//评价
+		evaluate(recard){
+			this.setState({
+				remark:'',
+				star:undefined,
+				orderNo:recard.orderNo,
+				ids:recard.commodityId,
+				evaluateVisible:true
+			})
+		},
+		evaluateOk(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		evaluateCancel(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//评价
+		evaluateSubmit(e){
+			e.preventDefault();
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method:"post",
+				dataType:'json',
+				url:globalConfig.context+'/api/user/comment/apply',
+				data:{
+					commodityId:this.state.ids,
+					content:this.state.remark,
+					star:this.state.star,
+					orderNo:this.state.orderNo
+				},
+				success:function(data){
+					if(data&&data.error.length){
+						message.error(data.error[0].message)
+					}
+					message.success('提交成功,感谢您的评价!')
+					this.loadData(this.state.page);
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						evaluateVisible:false,
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>我的需求订单</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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 });
+								}}
+							/>
+						</div>
+					</div>
+					<div className="patent-table">
+						<Spin spinning={this.state.loading}>
+							<Table
+								columns={this.state.columns}
+								dataSource={this.state.dataSource}
+								rowSelection={rowSelection}
+								pagination={this.state.pagination}
+								onRowClick={this.tableRowClick}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额(万元)"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="服务商"
+										>
+											<span>{theData.sellerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.sellerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+					<Modal
+							title="评价"
+							width="600px"
+							visible={this.state.evaluateVisible}
+							onOk={this.evaluateOk}
+							okText="提交"
+							onCancel={this.evaluateCancel}
+							footer=''
+						>	
+						<Form layout="horizontal" onSubmit={this.evaluateSubmit} >
+							<Spin spinning={this.state.loading}>
+								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="评价内容">
+									<Input
+										type="textarea"
+										rows={4}
+										placeholder="输入你的建议"
+										value={this.state.remark}
+										onChange={(e) => {
+											this.setState({ remark: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem
+									labelCol={{ span: 4 }} 
+									wrapperCol={{ span: 8 }}
+									label="评星"
+								>
+									<Rate onChange={(e)=>{this.setState({star:e})}} value={this.state.star} />
+								</FormItem>
+								<div className="clearfix">
+									<FormItem wrapperCol={{ span: 12, offset: 4 }}>
+										<Button className="set-submit" type="primary" htmlType="submit" style={{marginRight:15}}>
+											提交
+										</Button>
+										<Button className="set-submit" type="ghost" onClick={this.evaluateCancel}>
+											取消
+										</Button>
+									</FormItem>
+								</div>
+							</Spin>
+						</Form>
+					</Modal>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 3 - 3
js/component/account/order/serviceOrder.jsx

@@ -113,7 +113,7 @@ const Order = Form.create()(
 						key: 'createTime'
 					},
 					{
-						title: '订单金额',
+						title: '订单金额(万元)',
 						dataIndex: 'orderAmount',
 						key: 'orderAmount'
 					},
@@ -194,7 +194,7 @@ const Order = Form.create()(
 			return (
 				<div className="user-content">
 					<div className="content-title">
-						<span>我的订单</span>
+						<span>订单列表</span>
 					</div>
 					<div className="user-search">
 						<Input
@@ -297,7 +297,7 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="订单金额"
+											label="订单金额(万元)"
 										>
 											<span>{theData.orderAmount ? theData.orderAmount + '万元' : ''}</span>
 										</FormItem>

+ 476 - 0
js/component/account/order/memberOrderX.jsx

@@ -0,0 +1,476 @@
+/* 
+	update:2018/07/16
+	author:liting
+*/
+
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select,Rate, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:0,
+					commodityId:thisdata.commodityId,
+					orderType:5,
+					commodityName: this.state.entryNameSearch,
+					sellerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
+				},
+				success: function(data) {
+					let theArr = [];
+					if (!data.data || !data.data.list) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						}
+					} else {
+						for (let i = 0; i < data.data.list.length; i++) {
+							let thisdata = data.data.list[i];
+							theArr.push({
+								key: i,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								sellerName:thisdata.sellerName!=null?thisdata.sellerName:'佚名',
+								sellerMobile:thisdata.sellerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		//评价
+		evaluateSubmit(e){
+			e.preventDefault();
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method:"post",
+				dataType:'json',
+				url:globalConfig.context+'/api/user/jtOrder/applyaa',
+				data:{
+					commodityId:this.state.ids,
+					remark:this.state.remark,
+					star:this.state.star
+				},
+				success:function(data){
+					if(data&&data.error.length){
+						message.error(data.error[0].message)
+					}
+					messgae.success('提交成功,感谢您的评价!')
+					this.setState({
+						loading:false
+					});
+					this.loadData(this.state.page);
+				}
+			})
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额(万元)',
+						dataIndex: 'orderAmount',
+                        key: 'orderAmount',
+                        render:(text)=>{
+                            return text?text:'面议'
+                        }
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '服务商',
+						dataIndex: 'sellerName',
+						key: 'sellerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'sellerMobile',
+						key: 'sellerMobile'
+					},
+					{
+						title: '评价',
+						dataIndex: 'pingjia',
+						key: 'pingjia',
+						render:(text,recard)=>{
+							return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
+						}
+					}
+				],
+				dataSource: []
+			};
+		},
+		//评价
+		evaluate(recard){
+			this.setState({
+				remark:'',
+				star:undefined,
+				orderNo:recard.orderNo,
+				ids:recard.commodityId,
+				evaluateVisible:true
+			})
+		},
+		evaluateOk(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		evaluateCancel(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		//评价
+		evaluateSubmit(e){
+			e.preventDefault();
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method:"post",
+				dataType:'json',
+				url:globalConfig.context+'/api/user/comment/apply',
+				data:{
+					commodityId:this.state.ids,
+					content:this.state.remark,
+					star:this.state.star,
+					orderNo:this.state.orderNo
+				},
+				success:function(data){
+					if(data&&data.error.length){
+						message.error(data.error[0].message)
+					}
+					message.success('提交成功,感谢您的评价!')
+					this.loadData(this.state.page);
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						evaluateVisible:false,
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>我的会员订单</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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 });
+								}}
+							/>
+						</div>
+					</div>
+					<div className="patent-table">
+						<Spin spinning={this.state.loading}>
+							<Table
+								columns={this.state.columns}
+								dataSource={this.state.dataSource}
+								rowSelection={rowSelection}
+								pagination={this.state.pagination}
+								onRowClick={this.tableRowClick}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额(万元)"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="服务商"
+										>
+											<span>{theData.sellerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.sellerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+					<Modal
+							title="评价"
+							width="600px"
+							visible={this.state.evaluateVisible}
+							onOk={this.evaluateOk}
+							okText="提交"
+							onCancel={this.evaluateCancel}
+							footer=''
+						>	
+						<Form layout="horizontal" onSubmit={this.evaluateSubmit} >
+							<Spin spinning={this.state.loading}>
+								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="评价内容">
+									<Input
+										type="textarea"
+										rows={4}
+										placeholder="输入你的建议"
+										value={this.state.remark}
+										onChange={(e) => {
+											this.setState({ remark: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem
+									labelCol={{ span: 4 }} 
+									wrapperCol={{ span: 8 }}
+									label="评星"
+								>
+									<Rate onChange={(e)=>{this.setState({star:e})}} value={this.state.star} />
+								</FormItem>
+								<div className="clearfix">
+									<FormItem wrapperCol={{ span: 12, offset: 4 }}>
+										<Button className="set-submit" type="primary" htmlType="submit" style={{marginRight:15}}>
+											提交
+										</Button>
+										<Button className="set-submit" type="ghost" onClick={this.evaluateCancel}>
+											取消
+										</Button>
+									</FormItem>
+								</div>
+							</Spin>
+						</Form>
+					</Modal>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 344 - 0
js/component/account/order/projectOrderS.jsx

@@ -0,0 +1,344 @@
+/* 
+	update:2018/07/16
+	author:liting
+*/
+
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { orderType } from '@/dataDic';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:1,
+					orderType:10,
+					commodityName: this.state.entryNameSearch,
+					buyerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
+				},
+				success: function(data) {
+					let theArr = [];
+					if (!data.data || !data.data.list) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						}
+					} else {
+						for (let i = 0; i < data.data.list.length; i++) {
+							let thisdata = data.data.list[i];
+							theArr.push({
+								key: i,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								buyerName:thisdata.buyerName,
+								buyerMobile:thisdata.buyerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额(万元)',
+						dataIndex: 'orderAmount',
+						key: 'orderAmount'
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '消费者',
+						dataIndex: 'buyerName',
+						key: 'buyerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'buyerMobile',
+						key: 'buyerMobile'
+					},
+					
+				],
+				dataSource: []
+			};
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>订单列表</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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 });
+								}}
+							/>
+						</div>
+					</div>
+					<div className="patent-table">
+						<Spin spinning={this.state.loading}>
+							<Table
+								columns={this.state.columns}
+								dataSource={this.state.dataSource}
+								rowSelection={rowSelection}
+								pagination={this.state.pagination}
+								onRowClick={this.tableRowClick}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额(万元)"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : ''}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="消费者"
+										>
+											<span>{theData.buyerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.buyerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 449 - 0
js/component/account/order/projectOrderX.jsx

@@ -0,0 +1,449 @@
+/* 
+	update:2018/07/16
+	author:liting
+*/
+
+import React from 'react';
+import $ from 'jquery/src/ajax';
+import { Form, Button, Input, Select,Rate, Spin, Table, message, Modal, Tooltip, Switch, DatePicker } from 'antd';
+import { getOrderType } from '@/tools.js';
+import moment  from 'moment';
+//主体
+const Order = Form.create()(
+	React.createClass({
+		loadData(pageNo) {
+			this.state.data = [];
+			this.setState({
+				loading: true,
+				page: pageNo
+			});
+			$.ajax({
+				method: 'get',
+				dataType: 'json',
+				crossDomain: false,
+				url: globalConfig.context + '/api/user/jtOrder/list',
+				data: {
+					pageNo: pageNo || 1,
+					pageSize: this.state.pagination.pageSize,
+					orderNo: this.state.numberSearch,
+					userType:0,
+					orderType:10,
+					commodityName: this.state.entryNameSearch,
+					sellerName: this.state.companyNameSearch,
+					startCreateDate: this.state.releaseDate[0],
+					endCreateDate: this.state.releaseDate[1]
+				},
+				success: function(data) {
+					let theArr = [];
+					if (!data.data || !data.data.list) {
+						if (data.error && data.error.length) {
+							message.warning(data.error[0].message);
+						}
+					} else {
+						for (let i = 0; i < data.data.list.length; i++) {
+							let thisdata = data.data.list[i];
+							theArr.push({
+								key: i,
+								sellerId: thisdata.sellerId,
+								buyerId:thisdata.buyerId,
+								orderNo:thisdata.orderNo,
+								commodityId:thisdata.commodityId,
+								commodityType:thisdata.commodityType,
+								orderAmount:thisdata.orderAmount,
+								commodityName:thisdata.commodityName,
+								sellerName:thisdata.sellerName!=null?thisdata.sellerName:'佚名',
+								sellerMobile:thisdata.sellerMobile,
+								createTime: thisdata.createTime ? new Date(thisdata.createTime).toLocaleString() : ''
+							});
+						}
+						this.state.pagination.current = data.data.pageNo;
+						this.state.pagination.total = data.data.totalCount;
+					}
+					this.setState({
+						dataSource: theArr,
+						pagination: this.state.pagination
+					});
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		getInitialState() {
+			return {
+				searchMore: true,
+				selectedRowKeys: [],
+				selectedRows: [],
+				loading: false,
+				releaseDate: [],
+				pagination: {
+					defaultCurrent: 1,
+					defaultPageSize: 10,
+					showQuickJumper: true,
+					pageSize: 10,
+					onChange: function(page) {
+						this.loadData(page);
+						this.setState({
+							selectedRowKeys: []
+						});
+					}.bind(this),
+					showTotal: function(total) {
+						return '共' + total + '条数据';
+					}
+				},
+				columns: [
+					{
+						title: '订单编号',
+						dataIndex: 'orderNo',
+						key: 'orderNo'
+					},
+					{
+						title: '订单类型',
+						dataIndex: 'commodityType',
+						key: 'commodityType',
+						render: (text) => {
+							return getOrderType(text);
+						}
+					},
+					{
+						title: '订单日期',
+						dataIndex: 'createTime',
+						key: 'createTime'
+					},
+					{
+						title: '订单金额(万元)',
+						dataIndex: 'orderAmount',
+                        key: 'orderAmount',
+                        render:(text)=>{
+                            return text?text:'面议'
+                        }
+					},
+					{
+						title: '项目名称',
+						dataIndex: 'commodityName',
+						key: 'commodityName',
+						render: (text) => {
+							return (
+								<Tooltip title={text}>
+									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
+								</Tooltip>
+							);
+						}
+					},
+					{
+						title: '服务商',
+						dataIndex: 'sellerName',
+						key: 'sellerName',
+						
+					},
+					{
+						title: '联系方式',
+						dataIndex: 'sellerMobile',
+						key: 'sellerMobile'
+					},
+					{
+						title: '评价',
+						dataIndex: 'pingjia',
+						key: 'pingjia',
+						render:(text,recard)=>{
+							return <Button type="primary" onClick={(e)=>{e.stopPropagation(),this.evaluate(recard)}}>评价</Button>
+						}
+					}
+				],
+				dataSource: []
+			};
+		},
+		componentWillMount() {
+			this.loadData();
+		},
+		//项目列表整行点击
+		tableRowClick(record, index) {
+			this.state.RowData = record;
+			this.setState({
+				editvisible: true
+			});
+		},
+		edithandleCancel(e) {
+			this.setState({
+				editvisible: false
+			});
+		},
+		search() {
+			this.loadData();
+		},
+		//评价
+		evaluate(recard){
+			this.setState({
+				remark:'',
+				star:undefined,
+				orderNo:recard.orderNo,
+				ids:recard.commodityId,
+				evaluateVisible:true
+			})
+		},
+		evaluateOk(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		evaluateCancel(){
+			this.setState({
+				evaluateVisible:false
+			})
+		},
+		//评价
+		evaluateSubmit(e){
+			e.preventDefault();
+			this.setState({
+				loading:true
+			})
+			$.ajax({
+				method:"post",
+				dataType:'json',
+				url:globalConfig.context+'/api/user/comment/apply',
+				data:{
+					commodityId:this.state.ids,
+					content:this.state.remark,
+					star:this.state.star,
+					orderNo:this.state.orderNo
+				},
+				success:function(data){
+					if(data&&data.error.length){
+						message.error(data.error[0].message)
+					}
+					message.success('提交成功,感谢您的评价!')
+					this.loadData(this.state.page);
+				}.bind(this)
+			}).always(
+				function() {
+					this.setState({
+						evaluateVisible:false,
+						loading: false
+					});
+				}.bind(this)
+			);
+		},
+		//搜索部分的清零
+		reset() {
+			this.state.numberSearch = '';
+			this.state.typeSearch = undefined;
+			this.state.companyNameSearch = '';
+			this.state.entryNameSearch = '';
+			this.state.releaseDate = [];
+			this.state.searchMore=true;
+			this.loadData();
+		},
+		searchSwitch() {
+			this.setState({
+				searchMore: !this.state.searchMore
+			});
+		},
+		render() {
+			const FormItem = Form.Item;
+			const rowSelection = {
+				selectedRowKeys: this.state.selectedRowKeys,
+				onChange: (selectedRowKeys, selectedRows) => {
+					this.setState({
+						selectedRows: selectedRows.slice(-1),
+						selectedRowKeys: selectedRowKeys.slice(-1)
+					});
+				}
+			};
+			const { RangePicker } = DatePicker;
+			const theData = this.state.RowData || {};
+			return (
+				<div className="user-content">
+					<div className="content-title">
+						<span>我的项目订单</span>
+					</div>
+					<div className="user-search">
+						<Input
+							placeholder="订单编号"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.numberSearch}
+							onChange={(e) => {
+								this.setState({ numberSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="公司名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.companyNameSearch}
+							onChange={(e) => {
+								this.setState({ companyNameSearch: e.target.value });
+							}}
+						/>
+						<Input
+							placeholder="项目名称"
+							style={{ width: '150px', marginRight: '10px', marginBottom: '10px' }}
+							value={this.state.entryNameSearch}
+							onChange={(e) => {
+								this.setState({ entryNameSearch: e.target.value });
+							}}
+						/>
+						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
+							搜索
+						</Button>
+						<Button onClick={this.reset} style={{ marginRight: '10px' }}>
+							重置
+						</Button>
+						<span>
+							更多搜索<Switch  checked={!this.state.searchMore} onChange={this.searchSwitch} />
+						</span>
+						<div className="search-more" style={this.state.searchMore ? { display: 'none' } : {}}>
+							<span style={{ marginRight: 10 }}>发布时间 :</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 });
+								}}
+							/>
+						</div>
+					</div>
+					<div className="patent-table">
+						<Spin spinning={this.state.loading}>
+							<Table
+								columns={this.state.columns}
+								dataSource={this.state.dataSource}
+								rowSelection={rowSelection}
+								pagination={this.state.pagination}
+								onRowClick={this.tableRowClick}
+							/>
+						</Spin>
+					</div>
+					<div className="patent-desc">
+						<Modal
+							className="customeDetails"
+							title="订单详情"
+							width="1000px"
+							visible={this.state.editvisible}
+							onOk={this.edithandleCancel}
+							onCancel={this.edithandleCancel}
+							footer=""
+						>
+							<Form layout="horizontal" onSubmit={this.edithandleSubmit} id="demand-form">
+								<Spin spinning={this.state.loading}>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单编号"
+										>
+											<span>{theData.orderNo}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单类型"
+										>
+											<span>{getOrderType(theData.commodityType)}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单日期"
+										>
+											<span>{theData.createTime}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="订单金额(万元)"
+										>
+											<span>{theData.orderAmount ? theData.orderAmount + '万元' : '面议'}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="项目名称"
+										>
+											<span>{theData.commodityName}</span>
+										</FormItem>
+									</div>
+									<div className="clearfix">
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="服务商"
+										>
+											<span>{theData.sellerName}</span>
+										</FormItem>
+										<FormItem
+											className="half-item"
+											labelCol={{ span: 8 }}
+											wrapperCol={{ span: 12 }}
+											label="联系方式"
+										>
+											<span>{theData.sellerMobile}</span>
+										</FormItem>
+									</div>
+								</Spin>
+							</Form>
+						</Modal>
+					</div>
+					<Modal
+							title="评价"
+							width="600px"
+							visible={this.state.evaluateVisible}
+							onOk={this.evaluateOk}
+							okText="提交"
+							onCancel={this.evaluateCancel}
+							footer=''
+						>	
+						<Form layout="horizontal" onSubmit={this.evaluateSubmit} >
+							<Spin spinning={this.state.loading}>
+								<p style={{marginLeft:40,fontSize:20,marginBottom:15}}>其他买家需要您的建议哦!</p>
+								<FormItem labelCol={{ span: 4 }} wrapperCol={{ span: 12 }} label="评价内容">
+									<Input
+										type="textarea"
+										rows={4}
+										placeholder="输入你的建议"
+										value={this.state.remark}
+										onChange={(e) => {
+											this.setState({ remark: e.target.value });
+										}}
+									/>
+								</FormItem>
+								<FormItem
+									labelCol={{ span: 4 }} 
+									wrapperCol={{ span: 8 }}
+									label="评星"
+								>
+									<Rate onChange={(e)=>{this.setState({star:e})}} value={this.state.star} />
+								</FormItem>
+								<div className="clearfix">
+									<FormItem wrapperCol={{ span: 12, offset: 4 }}>
+										<Button className="set-submit" type="primary" htmlType="submit" style={{marginRight:15}}>
+											提交
+										</Button>
+										<Button className="set-submit" type="ghost" onClick={this.evaluateCancel}>
+											取消
+										</Button>
+									</FormItem>
+								</div>
+							</Spin>
+						</Form>
+					</Modal>
+				</div>
+			);
+		}
+	})
+);
+
+export default Order;

+ 4 - 4
js/component/dataDic.js

@@ -1883,16 +1883,16 @@ module.exports = {
     orderType:[
     	 {
 	        value: "0",
-	        key: "知识产权申请"
+	        key: "科技服务订单"
 	    }, {
 	        value: "1",
-	        key: "知识产权赚钱"
+	        key: "知识产权订单"
 	    }, {
 	        value: "2",
-	        key: "知识产权交易"
+	        key: "成果订单"
 	    }, {
 	        value: "3",
-	        key: "知识产权维权"
+	        key: "需求订单"
 	    }
     ],
     //订单阶段