Merge remote-tracking branch 'origin/master'

src/pages/my/manage/orders/index.css

@@ -11,6 +11,7 @@
     position: relative;
     height: 200px;
     width: 100%;
+    background-color: white;
 }
 
 .order-tip {

src/pages/my/manage/orders/index.js

@@ -47,23 +47,23 @@ class Orders extends Component {
                         })
                     }}>
                         <Accordion.Panel header="查询订单"
-                                         className={classNames({'hidden': accordionKey === '1' || accordionKey === '2' || accordionKey === '3' || accordionKey === '4'})}>
+                                         className={classNames({'hidden': accordionKey !== undefined && accordionKey !== '0'})}>
                             <Search/>
                         </Accordion.Panel>
                         <Accordion.Panel header="待发货"
-                                         className={classNames({'hidden': accordionKey === '0' || accordionKey === '2' || accordionKey === '3' || accordionKey === '4'})}>
+                                         className={classNames({'hidden': accordionKey !== undefined && accordionKey !== '1'})}>
                             <Shiping/>
                         </Accordion.Panel>
                         <Accordion.Panel header="待收货"
-                                         className={classNames({'hidden': accordionKey === '0' || accordionKey === '1' || accordionKey === '3' || accordionKey === '4'})}>
+                                         className={classNames({'hidden': accordionKey !== undefined && accordionKey !== '2'})}>
                             <Unbox/>
                         </Accordion.Panel>
                         <Accordion.Panel header="待评价"
-                                         className={classNames({'hidden': accordionKey === '0' || accordionKey === '1' || accordionKey === '2' || accordionKey === '4'})}>
+                                         className={classNames({'hidden': accordionKey !== undefined && accordionKey !== '3'})}>
                             <Completed/>
                         </Accordion.Panel>
                         <Accordion.Panel header="已完成"
-                                         className={classNames({'hidden': accordionKey === '0' || accordionKey === '1' || accordionKey === '2' || accordionKey === '3'})}>
+                                         className={classNames({'hidden': accordionKey !== undefined && accordionKey !== '4'})}>
                             <Commented/>
                         </Accordion.Panel>
                     </Accordion>

src/pages/my/order/display/index.js

@@ -130,8 +130,8 @@ class DisplayRender extends Component {
             <div className={classNames({'content-wrap': button})}>
                 {
                     data.length === 0 ?
-                        <div>
-                            还没有这种订单呢
+                        <div className='order-tip-wrap'>
+                            <div className='order-tip'>还没有这种订单</div>
                         </div>
                         :
                         data.map(order => (
@@ -154,18 +154,27 @@ class DisplayRender extends Component {
                                             data = data.orderProductbyprops
                                             return (
                                                 <div>
-                                                    <div className='order-card-content' onClick={() => {
-                                                        this.props.history.push({
-                                                            pathname: '/my/order/detail',
-                                                            state: {
-                                                                data: order
-                                                            }
-                                                        })
-                                                    }}>
-                                                        {
-                                                            this.orderCardContentRender(data)
-                                                        }
-                                                    </div>
+                                                    {
+                                                        button?
+                                                            <div className='order-card-content' onClick={() => {
+                                                                this.props.history.push({
+                                                                    pathname: '/my/order/detail',
+                                                                    state: {
+                                                                        data: order
+                                                                    }
+                                                                })
+                                                            }}>
+                                                                {
+                                                                    this.orderCardContentRender(data)
+                                                                }
+                                                            </div>
+                                                            :
+                                                            <div className='order-card-content'>
+                                                                {
+                                                                    this.orderCardContentRender(data)
+                                                                }
+                                                            </div>
+                                                    }
                                                 </div>
                                             )
                                         }