liting2017 6 years ago
parent
commit
fb154298c9

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

@@ -15,7 +15,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 Order from '@/account/order/order';
+import ServiceOrder from "@/account/order/serviceOrder";
+import ConsumptionOrder from "@/account/order/consumptionOrder"
 
 import {hashHistory,Route,Router} from 'react-router';
 import {Layout} from 'antd';
@@ -42,7 +43,8 @@ export default class ContentRouter extends React.Component {
             <Route path="/achievement" component={Achievement} />
             <Route path="/expert" component={Expert} />
             <Route path="/businessProject" component={BusinessProject} />
-            <Route path="/order" component={Order} />
+            <Route path="/serviceOrder" component={ServiceOrder} />
+            <Route path="/consumptionOrder" component={ConsumptionOrder} />
         </Router>
       </Content>
     )

+ 5 - 4
js/component/account/menu.jsx

@@ -48,8 +48,8 @@ module.exports = {
           url: 'sub6',
           icon: 'copy',
           children: [
-            { name: '我的订单', url: 'order' },
-           
+            { name: '我是服务商', url: 'serviceOrder' },
+            { name: '我是消费者', url: 'consumptionOrder' },
           ]
         }
     ],
@@ -101,8 +101,9 @@ module.exports = {
           url: 'sub6',
           icon: 'copy',
           children: [
-            { name: '咨询单管理', url: 'order' },
-           
+            { name: '我是服务商', url: 'serviceOrder' },
+            { name: '我是消费者', url: 'consumptionOrder' },
+            
           ]
         }
     ],

+ 13 - 0
js/component/account/order/consumptionOrder.jsx

@@ -0,0 +1,13 @@
+import {Component} from 'react';
+
+class Order extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {  }
+    }
+    render() { 
+        return ( <div>111</div> );
+    }
+}
+ 
+export default Order;

+ 4 - 61
js/component/account/order/order.jsx

@@ -113,18 +113,6 @@ const Order = Form.create()(
 						key: 'price'
 					},
 					{
-						title: '公司名称',
-						dataIndex: 'offset',
-						key: 'offset',
-						render: (text) => {
-							return (
-								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
-								</Tooltip>
-							);
-						}
-					},
-					{
 						title: '项目名称',
 						dataIndex: 'memberPrice',
 						key: 'memberPrice',
@@ -147,7 +135,7 @@ const Order = Form.create()(
 						key: 'activityFlag1'
 					},
 					{
-						title: '买方',
+						title: '消费者',
 						dataIndex: 'activityFlag12',
 						key: 'activityFlag12',
 						render: (text) => {
@@ -157,20 +145,7 @@ const Order = Form.create()(
 								</Tooltip>
 							);
 						}
-					},
-					{
-						title: '卖方',
-						dataIndex: 'activityFlag123',
-						key: 'activityFlag123',
-						render: (text) => {
-							return (
-								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
-								</Tooltip>
-							);
-						}
 					}
-
 				],
 				dataSource: []
 			};
@@ -298,14 +273,6 @@ const Order = Form.create()(
 								this.setState({ entryNameSearch: e.target.value });
 							}}
 						/>
-						<Input
-							style={{ width: 140, marginRight: 10 }}
-							value={this.state.employerNameSearch}
-							onChange={(e) => {
-								this.setState({ employerNameSearch: e.target.value });
-							}}
-							placeholder="客户名称"
-						/>
 						<Button type="primary" onClick={this.search} style={{ marginRight: '10px' }}>
 							搜索
 						</Button>
@@ -402,7 +369,7 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="买方名称"
+											label="联系人"
 										>
 											<span>{theData.memberPrice1}</span>
 										</FormItem>
@@ -410,7 +377,7 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="卖方名称"
+											label="联系方式"
 										>
 											<span>{theData.activityFlag1}</span>
 										</FormItem>
@@ -418,34 +385,10 @@ const Order = Form.create()(
 											className="half-item"
 											labelCol={{ span: 8 }}
 											wrapperCol={{ span: 12 }}
-											label="买方联系人"
+											label="消费者"
 										>
 											<span>{theData.activityPrice}</span>
 										</FormItem>
-										<FormItem
-											className="half-item"
-											labelCol={{ span: 8 }}
-											wrapperCol={{ span: 12 }}
-											label="卖方联系人"
-										>
-											<span>{theData.offset}</span>
-										</FormItem>
-										<FormItem
-											className="half-item"
-											labelCol={{ span: 8 }}
-											wrapperCol={{ span: 12 }}
-											label="买方联系方式"
-										>
-											<span>{theData.memberPrice}</span>
-										</FormItem>
-										<FormItem
-											className="half-item"
-											labelCol={{ span: 8 }}
-											wrapperCol={{ span: 12 }}
-											label="卖方联系方式"
-										>
-											<span>{theData.activityFlag}</span>
-										</FormItem>
 									</div>
 								</Spin>
 							</Form>

+ 14 - 17
js/component/administration/order/order.jsx

@@ -113,18 +113,6 @@ const Order = Form.create()(
 						key: 'price'
 					},
 					{
-						title: '公司名称',
-						dataIndex: 'offset',
-						key: 'offset',
-						render: (text) => {
-							return (
-								<Tooltip title={text}>
-									{text && text.length > 6 ? text.substr(0, 6) + '...' : text}
-								</Tooltip>
-							);
-						}
-					},
-					{
 						title: '项目名称',
 						dataIndex: 'memberPrice',
 						key: 'memberPrice',
@@ -137,7 +125,7 @@ const Order = Form.create()(
 						}
 					},
 					{
-						title: '订单进度',
+						title: '消费者',
 						dataIndex: 'activityPrice',
 						key: 'activityPrice',
 						render: (text) => {
@@ -145,17 +133,17 @@ const Order = Form.create()(
 						}
 					},
 					{
-						title: '联系人',
+						title: '消费者联系人',
 						dataIndex: 'activityFlag',
 						key: 'activityFlag'
 					},
 					{
-						title: '联系方式',
+						title: '消费者联系方式',
 						dataIndex: 'activityFlag1',
 						key: 'activityFlag1'
 					},
 					{
-						title: '买方',
+						title: '服务商',
 						dataIndex: 'activityFlag12',
 						key: 'activityFlag12',
 						render: (text) => {
@@ -165,7 +153,16 @@ const Order = Form.create()(
 								</Tooltip>
 							);
 						}
-					}
+					},{
+						title: '服务商联系人',
+						dataIndex: 'activityFlag3',
+						key: 'activityFlag3'
+					},
+					{
+						title: '服务商联系方式',
+						dataIndex: 'activityFlag41',
+						key: 'activityFlag41'
+					},
 				],
 				dataSource: []
 			};