|
@@ -1,8 +1,9 @@
|
|
import React from 'react';
|
|
import React from 'react';
|
|
-import { Icon, Button, Input, Select, Spin, Table, message, DatePicker, Modal } from 'antd';
|
|
|
|
|
|
+import { Icon, Button, Input, Select, Spin, Table, message, DatePicker, Modal, InputNumber, Radio } from 'antd';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import ajax from 'jquery/src/ajax/xhr.js';
|
|
import $ from 'jquery/src/ajax';
|
|
import $ from 'jquery/src/ajax';
|
|
import './userList.less';
|
|
import './userList.less';
|
|
|
|
+import moment from 'moment';
|
|
|
|
|
|
|
|
|
|
const OrderList = React.createClass({
|
|
const OrderList = React.createClass({
|
|
@@ -12,39 +13,52 @@ const OrderList = React.createClass({
|
|
loading: true
|
|
loading: true
|
|
});
|
|
});
|
|
$.ajax({
|
|
$.ajax({
|
|
- method: "post",
|
|
|
|
|
|
+ method: "get",
|
|
dataType: "json",
|
|
dataType: "json",
|
|
crossDomain: false,
|
|
crossDomain: false,
|
|
- url: globalConfig.context + "/api/admin/orgList",
|
|
|
|
|
|
+ url: globalConfig.context + "/api/admin/member/selectMemberOrderBa",
|
|
data: {
|
|
data: {
|
|
pageNo: pageNo || 1,
|
|
pageNo: pageNo || 1,
|
|
- pageSize: this.state.pagination.pageSize
|
|
|
|
|
|
+ pageSize: this.state.pagination.pageSize,
|
|
|
|
+ id: this.state.searchOrderNumber,
|
|
|
|
+ nickname: this.state.searchName,
|
|
|
|
+ mobile: this.state.searchAftNumber,
|
|
|
|
+ orderState: this.state.searchOrderStatus,
|
|
|
|
+ startTime: this.state.searchTime[0],
|
|
|
|
+ endTime: this.state.searchTime[1]
|
|
},
|
|
},
|
|
success: function (data) {
|
|
success: function (data) {
|
|
- if (!data.data || !data.data.list) {
|
|
|
|
|
|
+ if (!data.data || !data.data.List) {
|
|
if (data.error && data.error.length) {
|
|
if (data.error && data.error.length) {
|
|
message.warning(data.error[0].message);
|
|
message.warning(data.error[0].message);
|
|
};
|
|
};
|
|
} else {
|
|
} else {
|
|
- for (let i = 0; i < data.data.list.length; i++) {
|
|
|
|
- let thisdata = data.data.list[i];
|
|
|
|
|
|
+ for (let i = 0; i < data.data.List.length; i++) {
|
|
|
|
+ let thisdata = data.data.List[i];
|
|
this.state.data.push({
|
|
this.state.data.push({
|
|
key: i,
|
|
key: i,
|
|
id: thisdata.id,
|
|
id: thisdata.id,
|
|
|
|
+ formattedOrderTime: thisdata.formattedOrderTime,
|
|
|
|
+ formattedPaymentTime: thisdata.formattedPaymentTime,
|
|
|
|
+ formattedValidTime: thisdata.formattedValidTime,
|
|
|
|
+ gradeName: thisdata.gradeName,
|
|
|
|
+ menberType: thisdata.menberType,
|
|
|
|
+ nickname: thisdata.nickname,
|
|
mobile: thisdata.mobile,
|
|
mobile: thisdata.mobile,
|
|
- email: thisdata.email,
|
|
|
|
- createTime: thisdata.createTime,
|
|
|
|
- aftUsername: thisdata.aftUsername,
|
|
|
|
- managerName: thisdata.managerName,
|
|
|
|
- number: thisdata.number,
|
|
|
|
- orgAuditStatus: thisdata.orgAuditStatus,
|
|
|
|
- createTimeFormattedDate: thisdata.createTimeFormattedDate,
|
|
|
|
- adminName: thisdata.adminName,
|
|
|
|
- unitName: thisdata.unitName
|
|
|
|
|
|
+ orderState: thisdata.orderState,
|
|
|
|
+ orderTime: thisdata.orderTime,
|
|
|
|
+ paymentId: thisdata.paymentId,
|
|
|
|
+ paymentTime: thisdata.paymentTime,
|
|
|
|
+ paymentType: thisdata.paymentType,
|
|
|
|
+ paymentValue: thisdata.paymentValue,
|
|
|
|
+ price: thisdata.price,
|
|
|
|
+ userId: thisdata.userId,
|
|
|
|
+ validMonth: thisdata.validMonth,
|
|
|
|
+ validTime: thisdata.validTime,
|
|
});
|
|
});
|
|
};
|
|
};
|
|
- this.state.pagination.current = data.data.pageNo;
|
|
|
|
- this.state.pagination.total = data.data.totalCount;
|
|
|
|
|
|
+ this.state.pagination.current = data.data.pNo;
|
|
|
|
+ this.state.pagination.total = data.data.countWhere;
|
|
};
|
|
};
|
|
this.setState({
|
|
this.setState({
|
|
dataSource: this.state.data,
|
|
dataSource: this.state.data,
|
|
@@ -61,6 +75,8 @@ const OrderList = React.createClass({
|
|
return {
|
|
return {
|
|
searchMore: true,
|
|
searchMore: true,
|
|
data: [],
|
|
data: [],
|
|
|
|
+ RowData: {},
|
|
|
|
+ visible: false,
|
|
searchTime: [],
|
|
searchTime: [],
|
|
loading: false,
|
|
loading: false,
|
|
pagination: {
|
|
pagination: {
|
|
@@ -78,24 +94,43 @@ const OrderList = React.createClass({
|
|
columns: [
|
|
columns: [
|
|
{
|
|
{
|
|
title: '订单编号',
|
|
title: '订单编号',
|
|
- dataIndex: 'number',
|
|
|
|
- key: 'number',
|
|
|
|
|
|
+ dataIndex: 'id',
|
|
|
|
+ key: 'id',
|
|
}, {
|
|
}, {
|
|
title: '账号',
|
|
title: '账号',
|
|
dataIndex: 'mobile',
|
|
dataIndex: 'mobile',
|
|
key: 'mobile',
|
|
key: 'mobile',
|
|
}, {
|
|
}, {
|
|
title: '认证名称',
|
|
title: '认证名称',
|
|
- dataIndex: 'unitName',
|
|
|
|
- key: 'unitName',
|
|
|
|
|
|
+ dataIndex: 'nickname',
|
|
|
|
+ key: 'nickname',
|
|
|
|
+ }, {
|
|
|
|
+ title: '会员类型',
|
|
|
|
+ dataIndex: 'gradeName',
|
|
|
|
+ key: 'gradeName',
|
|
}, {
|
|
}, {
|
|
title: '订单状态',
|
|
title: '订单状态',
|
|
- dataIndex: 'orderStatus',
|
|
|
|
- key: 'orderStatus',
|
|
|
|
|
|
+ dataIndex: 'orderState',
|
|
|
|
+ key: 'orderState',
|
|
|
|
+ render: (text) => {
|
|
|
|
+ if (text == 1) {
|
|
|
|
+ return '已支付'
|
|
|
|
+ } else {
|
|
|
|
+ return '未支付'
|
|
|
|
+ };
|
|
|
|
+ }
|
|
}, {
|
|
}, {
|
|
title: '生成时间',
|
|
title: '生成时间',
|
|
- dataIndex: 'createTimeFormattedDate',
|
|
|
|
- key: 'createTimeFormattedDate',
|
|
|
|
|
|
+ dataIndex: 'formattedOrderTime',
|
|
|
|
+ key: 'formattedOrderTime',
|
|
|
|
+ }, {
|
|
|
|
+ title: '支付时间',
|
|
|
|
+ dataIndex: 'formattedPaymentTime',
|
|
|
|
+ key: 'formattedPaymentTime',
|
|
|
|
+ }, {
|
|
|
|
+ title: '到期时间',
|
|
|
|
+ dataIndex: 'formattedValidTime',
|
|
|
|
+ key: 'formattedValidTime',
|
|
}
|
|
}
|
|
],
|
|
],
|
|
dataSource: []
|
|
dataSource: []
|
|
@@ -115,13 +150,17 @@ const OrderList = React.createClass({
|
|
this.state.searchTime = [];
|
|
this.state.searchTime = [];
|
|
this.loadData();
|
|
this.loadData();
|
|
},
|
|
},
|
|
|
|
+ tableRowClick (record, index) {
|
|
|
|
+ this.state.RowData = record;
|
|
|
|
+ this.setState({ visible: true });
|
|
|
|
+ },
|
|
render () {
|
|
render () {
|
|
const { RangePicker } = DatePicker;
|
|
const { RangePicker } = DatePicker;
|
|
const Option = Select.Option;
|
|
const Option = Select.Option;
|
|
return (
|
|
return (
|
|
<div className="user-content" >
|
|
<div className="user-content" >
|
|
<div className="content-title">
|
|
<div className="content-title">
|
|
- <span>用户订单列表</span>
|
|
|
|
|
|
+ <span>会员订单列表</span>
|
|
</div>
|
|
</div>
|
|
<div className="user-search">
|
|
<div className="user-search">
|
|
<Input placeholder="订单编号" value={this.state.searchOrderNumber}
|
|
<Input placeholder="订单编号" value={this.state.searchOrderNumber}
|
|
@@ -130,6 +169,11 @@ const OrderList = React.createClass({
|
|
onChange={(e) => { this.setState({ searchAftNumber: e.target.value }); }} />
|
|
onChange={(e) => { this.setState({ searchAftNumber: e.target.value }); }} />
|
|
<Input placeholder="认证名称" value={this.state.searchName}
|
|
<Input placeholder="认证名称" value={this.state.searchName}
|
|
onChange={(e) => { this.setState({ searchName: e.target.value }); }} />
|
|
onChange={(e) => { this.setState({ searchName: e.target.value }); }} />
|
|
|
|
+ <Select placeholder="订单类型" value={this.state.searchOrderType} style={{ width: 120 }}
|
|
|
|
+ onChange={(e) => { this.setState({ searchOrderType: e }) }}>
|
|
|
|
+ <Option value="0">会员服务</Option>
|
|
|
|
+ <Option value="1">科技服务</Option>
|
|
|
|
+ </Select>
|
|
<Select placeholder="订单状态" value={this.state.searchOrderStatus} style={{ width: 120 }}
|
|
<Select placeholder="订单状态" value={this.state.searchOrderStatus} style={{ width: 120 }}
|
|
onChange={(e) => { this.setState({ searchOrderStatus: e }) }}>
|
|
onChange={(e) => { this.setState({ searchOrderStatus: e }) }}>
|
|
<Option value="0">未付款</Option>
|
|
<Option value="0">未付款</Option>
|
|
@@ -154,6 +198,92 @@ const OrderList = React.createClass({
|
|
onRowClick={this.tableRowClick} />
|
|
onRowClick={this.tableRowClick} />
|
|
</Spin>
|
|
</Spin>
|
|
</div>
|
|
</div>
|
|
|
|
+ <Modal title="订单详情" width={600} className="activity-modal"
|
|
|
|
+ visible={this.state.visible}
|
|
|
|
+ maskClosable={false}
|
|
|
|
+ footer={null}
|
|
|
|
+ afterClose={() => { this.state.RowData = {}; this.state.asist = null; this.state.asistArray = []; }}
|
|
|
|
+ onCancel={() => { this.setState({ visible: false }) }} >
|
|
|
|
+ <Spin spinning={this.state.loading}>
|
|
|
|
+ <div className="clearfix">
|
|
|
|
+ <div className="modal-box">
|
|
|
|
+ <span className="modal-box-title">会员等级</span>
|
|
|
|
+ <div className="modal-box-detail">
|
|
|
|
+ <Select placeholder="选择会员等级"
|
|
|
|
+ style={{ width: 120 }}
|
|
|
|
+ value={this.state.RowData.menberType ? this.state.RowData.menberType.toString() : undefined}
|
|
|
|
+ onChange={(e) => {
|
|
|
|
+ this.state.RowData.menberType = e;
|
|
|
|
+ this.setState({ RowData: this.state.RowData });
|
|
|
|
+ }}>
|
|
|
|
+ <Select.Option value="2">Lv.2</Select.Option>
|
|
|
|
+ <Select.Option value="3">Lv.3</Select.Option>
|
|
|
|
+ <Select.Option value="4">Lv.4</Select.Option>
|
|
|
|
+ <Select.Option value="5">Lv.5</Select.Option>
|
|
|
|
+ </Select>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div className="modal-box">
|
|
|
|
+ <span className="modal-box-title">会员时长</span>
|
|
|
|
+ <div className="modal-box-detail" style={{ width: '160px' }}>
|
|
|
|
+ <InputNumber value={this.state.RowData.validMonth} step={1} onChange={(e) => {
|
|
|
|
+ this.state.RowData.validMonth = e;
|
|
|
|
+ this.setState({ RowData: this.state.RowData });
|
|
|
|
+ }} />
|
|
|
|
+ <span> 月</span>
|
|
|
|
+ </div>
|
|
|
|
+ <span className="modal-box-title">实际支付金额</span>
|
|
|
|
+ <div className="modal-box-detail" style={{ width: '160px' }}>
|
|
|
|
+ <InputNumber value={this.state.RowData.paymentValue} step={0.01} onChange={(e) => {
|
|
|
|
+ this.state.RowData.paymentValue = e;
|
|
|
|
+ this.setState({ RowData: this.state.RowData });
|
|
|
|
+ }} />
|
|
|
|
+ <span> 元</span>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div className="modal-box">
|
|
|
|
+ <span className="modal-box-title">支付方式</span>
|
|
|
|
+ <div className="modal-box-detail" style={{ width: '260px' }}>
|
|
|
|
+ <Input value={this.state.RowData.paymentType} onChange={(e) => {
|
|
|
|
+ this.state.RowData.paymentType = e.target.value;
|
|
|
|
+ this.setState({ RowData: this.state.RowData });
|
|
|
|
+ }} />
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div className="modal-box">
|
|
|
|
+ <span className="modal-box-title">支付状态</span>
|
|
|
|
+ <div className="modal-box-detail">
|
|
|
|
+ <Radio.Group value={this.state.RowData.orderState}
|
|
|
|
+ onChange={(e) => {
|
|
|
|
+ this.state.RowData.orderState = e.target.value;
|
|
|
|
+ this.setState({ RowData: this.state.RowData });
|
|
|
|
+ }} >
|
|
|
|
+ <Radio value={0}>未支付</Radio>
|
|
|
|
+ <Radio value={1}>已支付</Radio>
|
|
|
|
+ </Radio.Group>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div className="modal-box">
|
|
|
|
+ <span className="modal-box-title">支付时间</span>
|
|
|
|
+ <div className="modal-box-detail">
|
|
|
|
+ <DatePicker style={{ width: '150px' }}
|
|
|
|
+ showTime
|
|
|
|
+ format="YYYY-MM-DD HH:mm:ss"
|
|
|
|
+ placeholder="选择支付时间"
|
|
|
|
+ value={this.state.RowData.formattedPaymentTime ? moment(this.state.RowData.formattedPaymentTime, "YYYY-MM-DD HH:mm:ss") : undefined}
|
|
|
|
+ onChange={(t, str) => {
|
|
|
|
+ this.state.RowData.formattedPaymentTime = str;
|
|
|
|
+ this.setState({ RowData: this.state.RowData });
|
|
|
|
+ }} />
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ </div>
|
|
|
|
+ <div className="modal-box">
|
|
|
|
+ <Button type="primary" onClick={this.submit}>提交</Button>
|
|
|
|
+ <Button type="ghost" onClick={() => { this.setState({ visible: false }) }}>取消</Button>
|
|
|
|
+ </div>
|
|
|
|
+ </Spin>
|
|
|
|
+ </Modal>
|
|
</div >
|
|
</div >
|
|
);
|
|
);
|
|
}
|
|
}
|