From df021b9ebeed53f00136dd1e2d2b8cbbcd17375d Mon Sep 17 00:00:00 2001
From: sin <2943460818@qq.com>
Date: Fri, 12 Apr 2019 19:59:14 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin-web/src/pages/Order/OrderList.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/admin-web/src/pages/Order/OrderList.js b/admin-web/src/pages/Order/OrderList.js
index 3a296525b..c527b88f2 100644
--- a/admin-web/src/pages/Order/OrderList.js
+++ b/admin-web/src/pages/Order/OrderList.js
@@ -51,10 +51,20 @@ const OrderContent = props => {
     });
   };
 
+  const handleCancelOrder = () => {
+    dispatch({
+      type: 'orderList/changeOrderCancelVisible',
+      payload: {
+        orderCancelVisible: true,
+        orderId: id,
+      },
+    });
+  };
+
   const renderStatusButtons = () => {
     let res = '';
     if (status === 1) {
-      res = <Button>取消订单</Button>;
+      res = <Button onClick={() => handleCancelOrder()}>取消订单</Button>;
     } else if (status === 2) {
       res = <Button onClick={() => handleOrderDelivery()}>发货</Button>;
     }
@@ -70,7 +80,6 @@ const OrderContent = props => {
             <div>
               <a>{skuName}</a>
             </div>
-            <div>秋季精选</div>
           </div>
           <div className={styles.contentItem}>
             <div>{quantity}件</div>
@@ -107,7 +116,7 @@ const OrderContent = props => {
         <div className={styles.columnName}>(实付金额)</div>
         <div>{payAmount / 100}元</div>
         <div>
-          <a onClick={() => handleUpdatePayAmount(props)}>修改价格</a>
+          {status === 1 ? <a onClick={() => handleUpdatePayAmount(props)}>修改价格</a> : ''}
         </div>
       </div>
     </div>
@@ -319,11 +328,11 @@ class BasicList extends PureComponent {
             </div>
             <Tabs defaultActiveKey={null} onChange={this.handleTabsChange}>
               <TabPane tab="全部" key={null} />
-              <TabPane tab="待付款" key={0} />
-              <TabPane tab="待发货" key={1} />
-              <TabPane tab="已发货" key={2} />
-              <TabPane tab="已完成" key={3} />
-              <TabPane tab="已关闭" key={4} />
+              <TabPane tab="待付款" key={1} />
+              <TabPane tab="待发货" key={2} />
+              <TabPane tab="已发货" key={3} />
+              <TabPane tab="已完成" key={4} />
+              <TabPane tab="已关闭" key={5} />
             </Tabs>
 
             <OrderList {...this.props} handleEditorClick={this.handleEditorClick} />