From 9ada36a95459a08c20b71486f6d9d3466f448e43 Mon Sep 17 00:00:00 2001
From: DsAco <2363140194@qq.com>
Date: Thu, 16 Nov 2017 16:03:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=BF=87=E6=9C=9F=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/OrderPanel/OrderPanel.jsx        | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/scripts/components/OrderPanel/OrderPanel.jsx b/src/scripts/components/OrderPanel/OrderPanel.jsx
index 0805468..c7c9895 100644
--- a/src/scripts/components/OrderPanel/OrderPanel.jsx
+++ b/src/scripts/components/OrderPanel/OrderPanel.jsx
@@ -2,14 +2,15 @@ import React, { Component } from 'react'
 import { Link } from 'react-router-dom'
 import { Row, Button, FormControl,Form, FormGroup } from 'react-bootstrap'
 import Moment from 'moment'
-
+import Request from 'superagent'
 export default class extends Component{
 	constructor(props) {
 	  super(props);
 
 	  this.state = {};
 	  this.addTracking = this._addTracking.bind(this)
-	  this.setStatus = this._setStatus.bind(this)
+		this.setStatus = this._setStatus.bind(this)
+		this.closeExpireOrder = this._closeExpireOrder.bind(this)
 	}
 	_addTracking(id) {
 		let trackNo = prompt('输入物流号')
@@ -21,7 +22,16 @@ export default class extends Component{
 		if (confirm(`确定${state === 'closed' ? '关闭':'完成'}这个订单吗?`)) {
 			this.props.setStatus(id,state)
 		}
-
+	}
+	_closeExpireOrder(id) {
+		Request.post(`/api/order/${id}/closeExpire`)
+		.end((err,res) => {
+			if(err) {
+				Toastr.error(`关闭订单失败。`)
+			}else{
+				Toastr.success(`关闭订单成功～`)
+			}
+		})
 	}
 	formatStatus(str,startPay) {
 		switch(str) {
@@ -91,6 +101,7 @@ export default class extends Component{
 												  		<li><Link to={`/order/edit/${order.id}`}>订单详情</Link></li>
 												  		<li><Link to={`/order/toy/${order.items[0].toyId}`}>显示全部订单</Link></li>
 													  	{order.status === 'open' ? <li><a onClick={() => this.setStatus(order.id,'closed')}>关闭订单</a></li> : null}
+												  		<li><a onClick={() => this.closeExpireOrder(order.id)}>关闭过期订单</a></li>
 													  	{order.status === 'paid' ? <li><a onClick={() => this.setStatus(order.id,'done')}>订单完成</a></li> : null}
 													  	{order.status === 'prepaid' ? <li><a onClick={() => this.props.startPay(order.id)}>通知补款</a></li> : null}
 													</ul>