|
@@ -4,6 +4,7 @@ import ajax from 'jquery/src/ajax/xhr.js';
|
|
|
import $ from 'jquery/src/ajax';
|
|
|
import './userList.less';
|
|
|
import moment from 'moment';
|
|
|
+import { getTime } from '../../tools';
|
|
|
|
|
|
|
|
|
const OrderList = React.createClass({
|
|
@@ -28,13 +29,13 @@ const OrderList = React.createClass({
|
|
|
endTime: this.state.searchTime[1]
|
|
|
},
|
|
|
success: function (data) {
|
|
|
- if (!data.data || !data.data.List) {
|
|
|
+ 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];
|
|
|
+ for (let i = 0; i < data.data.list.length; i++) {
|
|
|
+ let thisdata = data.data.list[i];
|
|
|
this.state.data.push({
|
|
|
key: i,
|
|
|
id: thisdata.id,
|
|
@@ -75,7 +76,7 @@ const OrderList = React.createClass({
|
|
|
return {
|
|
|
searchMore: true,
|
|
|
data: [],
|
|
|
- RowData: {},
|
|
|
+ modalData: {},
|
|
|
visible: false,
|
|
|
searchTime: [],
|
|
|
loading: false,
|
|
@@ -128,9 +129,14 @@ const OrderList = React.createClass({
|
|
|
dataIndex: 'formattedPaymentTime',
|
|
|
key: 'formattedPaymentTime',
|
|
|
}, {
|
|
|
- title: '到期时间',
|
|
|
+ title: '有效时间',
|
|
|
dataIndex: 'formattedValidTime',
|
|
|
key: 'formattedValidTime',
|
|
|
+ render: (index, record) => {
|
|
|
+ if (record.paymentTime && record.validMonth && record.orderState == 1) {
|
|
|
+ return getTime(record.paymentTime) + ' -- ' + getTime(record.paymentTime, record.validMonth)
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
],
|
|
|
dataSource: []
|
|
@@ -150,8 +156,45 @@ const OrderList = React.createClass({
|
|
|
this.state.searchTime = [];
|
|
|
this.loadData();
|
|
|
},
|
|
|
+ submit () {
|
|
|
+ if (this.state.modalData.paymentType == 1 && !this.state.modalData.formattedPaymentTime) {
|
|
|
+ message.warning('状态为已支付时支付时间必填');
|
|
|
+ return
|
|
|
+ }
|
|
|
+ this.setState({ loading: true });
|
|
|
+ $.ajax({
|
|
|
+ method: "post",
|
|
|
+ dataType: "json",
|
|
|
+ crossDomain: false,
|
|
|
+ url: globalConfig.context + "/api/admin/member/updateMemberOrder",
|
|
|
+ data: {
|
|
|
+ id: this.state.modalData.id,
|
|
|
+ userId: this.state.modalData.userId,
|
|
|
+ memberRank: this.state.modalData.menberType,
|
|
|
+ validMonth: this.state.modalData.validMonth,
|
|
|
+ paymentValue: this.state.modalData.paymentValue,
|
|
|
+ orderState: this.state.modalData.orderState,
|
|
|
+ paymentTime: this.state.modalData.formattedPaymentTime,
|
|
|
+ paymentType: this.state.modalData.paymentType
|
|
|
+ }
|
|
|
+ }).done(function (data) {
|
|
|
+ if (!data.error.length) {
|
|
|
+ message.success('保存成功!');
|
|
|
+ this.setState({ loading: false, visible: false });
|
|
|
+ this.loadData();
|
|
|
+ } else {
|
|
|
+ message.warning(data.error[0].message);
|
|
|
+ }
|
|
|
+ }.bind(this)).always(function () {
|
|
|
+ this.setState({ loading: false });
|
|
|
+ }.bind(this));
|
|
|
+ },
|
|
|
tableRowClick (record, index) {
|
|
|
- this.state.RowData = record;
|
|
|
+ let theObj = {};
|
|
|
+ for (let item in record) {
|
|
|
+ theObj[item] = record[item]
|
|
|
+ }
|
|
|
+ this.state.modalData = theObj;
|
|
|
this.setState({ visible: true });
|
|
|
},
|
|
|
render () {
|
|
@@ -202,7 +245,7 @@ const OrderList = React.createClass({
|
|
|
visible={this.state.visible}
|
|
|
maskClosable={false}
|
|
|
footer={null}
|
|
|
- afterClose={() => { this.state.RowData = {}; this.state.asist = null; this.state.asistArray = []; }}
|
|
|
+ afterClose={() => { this.state.modalData = {}; }}
|
|
|
onCancel={() => { this.setState({ visible: false }) }} >
|
|
|
<Spin spinning={this.state.loading}>
|
|
|
<div className="clearfix">
|
|
@@ -211,11 +254,12 @@ const OrderList = React.createClass({
|
|
|
<div className="modal-box-detail">
|
|
|
<Select placeholder="选择会员等级"
|
|
|
style={{ width: 120 }}
|
|
|
- value={this.state.RowData.menberType ? this.state.RowData.menberType.toString() : undefined}
|
|
|
+ value={this.state.modalData.menberType ? this.state.modalData.menberType.toString() : undefined}
|
|
|
onChange={(e) => {
|
|
|
- this.state.RowData.menberType = e;
|
|
|
- this.setState({ RowData: this.state.RowData });
|
|
|
+ this.state.modalData.menberType = e;
|
|
|
+ this.setState({ modalData: this.state.modalData });
|
|
|
}}>
|
|
|
+ <Select.Option value="1">Lv.1</Select.Option>
|
|
|
<Select.Option value="2">Lv.2</Select.Option>
|
|
|
<Select.Option value="3">Lv.3</Select.Option>
|
|
|
<Select.Option value="4">Lv.4</Select.Option>
|
|
@@ -226,37 +270,42 @@ const OrderList = React.createClass({
|
|
|
<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 });
|
|
|
+ <InputNumber value={this.state.modalData.validMonth} step={1} onChange={(e) => {
|
|
|
+ this.state.modalData.validMonth = e;
|
|
|
+ this.setState({ modalData: this.state.modalData });
|
|
|
}} />
|
|
|
<span> 月</span>
|
|
|
</div>
|
|
|
- <span className="modal-box-title">实际支付金额</span>
|
|
|
+ <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>{this.state.modalData.price}</span>
|
|
|
<span> 元</span>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div className="modal-box">
|
|
|
+ <span className="modal-box-title">实际支付金额</span>
|
|
|
+ <div className="modal-box-detail" style={{ width: '160px' }}>
|
|
|
+ <InputNumber value={this.state.modalData.paymentValue} step={0.01} onChange={(e) => {
|
|
|
+ this.state.modalData.paymentValue = e;
|
|
|
+ this.setState({ modalData: this.state.modalData });
|
|
|
+ }} />
|
|
|
+ <span> 元</span>
|
|
|
+ </div>
|
|
|
<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 className="modal-box-detail" style={{ width: '160px' }}>
|
|
|
+ <Input value={this.state.modalData.paymentType} onChange={(e) => {
|
|
|
+ this.state.modalData.paymentType = e.target.value;
|
|
|
+ this.setState({ modalData: this.state.modalData });
|
|
|
}} />
|
|
|
</div>
|
|
|
</div>
|
|
|
<div className="modal-box">
|
|
|
<span className="modal-box-title">支付状态</span>
|
|
|
<div className="modal-box-detail">
|
|
|
- <Radio.Group value={this.state.RowData.orderState}
|
|
|
+ <Radio.Group value={this.state.modalData.orderState}
|
|
|
onChange={(e) => {
|
|
|
- this.state.RowData.orderState = e.target.value;
|
|
|
- this.setState({ RowData: this.state.RowData });
|
|
|
+ this.state.modalData.orderState = e.target.value;
|
|
|
+ this.setState({ modalData: this.state.modalData });
|
|
|
}} >
|
|
|
<Radio value={0}>未支付</Radio>
|
|
|
<Radio value={1}>已支付</Radio>
|
|
@@ -270,15 +319,15 @@ const OrderList = React.createClass({
|
|
|
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}
|
|
|
+ value={this.state.modalData.formattedPaymentTime ? moment(this.state.modalData.formattedPaymentTime, "YYYY-MM-DD HH:mm:ss") : undefined}
|
|
|
onChange={(t, str) => {
|
|
|
- this.state.RowData.formattedPaymentTime = str;
|
|
|
- this.setState({ RowData: this.state.RowData });
|
|
|
+ this.state.modalData.formattedPaymentTime = str;
|
|
|
+ this.setState({ modalData: this.state.modalData });
|
|
|
}} />
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div className="modal-box">
|
|
|
+ <div className="modal-box" style={{ marginTop: '100px' }}>
|
|
|
<Button type="primary" onClick={this.submit}>提交</Button>
|
|
|
<Button type="ghost" onClick={() => { this.setState({ visible: false }) }}>取消</Button>
|
|
|
</div>
|