Merge remote-tracking branch 'origin/master'

src/app.css

@@ -43,6 +43,7 @@ a {
 .navbar {
     border-bottom: 1px solid #f5f5f9;
     position: fixed;
+    top: 0;
     width: 100%;
     z-index: 2;
 }

src/pages/my/order/index.css

@@ -0,0 +1,31 @@
+.order-my-content {
+    padding-top: 45px;
+}
+
+.order-card {
+    margin-top: 20px;
+    background-color: white;
+}
+
+.order-card-content {
+    height: 100px;
+    background-color: #ebedf0;
+}
+
+.order-card-bottom {
+    display: flex;
+    justify-content: flex-end;
+    align-items: baseline;
+}
+
+.order-card-pay {
+    display: inline-block;
+    font-size: 18px;
+    font-weight: 500;
+    color: black;
+    margin-right: 10px;
+}
+
+.order-card-count {
+    display: inline-block;
+}

src/pages/my/order/index.js

@@ -55,9 +55,8 @@ class Order extends Component {
         let {navTitle, orderStatus} = this.state
         return (
             <div className='order-wrap'>
-                <div className='order-navbar-wrap'>
+                <div className='order-navbar-wrap navbar'>
                     <NavBar
-                        className='order-navbar'
                         mode="light"
                         icon={<Icon type="left"/>}
                         onLeftClick={() => {
@@ -102,13 +101,23 @@ class OrderRender extends Component {
         let {data} = this.props
         console.log(data)
         return (
-            <div>
+            <div className='order-my-content'>
                 {
-                    data.map(order=>(
-                        <div key={order.id}>
-                            {order.productTotalPay}
+                    data.length === 0 ?
+                        <div>
+                            还没有这种订单呢
                         </div>
-                    ))
+                        :
+                        data.map(order => (
+                            <div key={order.id} className='order-card'>
+                                <div className='order-card-top'>JD</div>
+                                <div className='order-card-content'></div>
+                                <div className='order-card-bottom'>
+                                    <div className='order-card-count'>共{order.count}件商品&nbsp;&nbsp;实付款:</div>
+                                    <div className='order-card-pay'>￥{order.productTotalPay}</div>
+                                    </div>
+                            </div>
+                        ))
                 }
             </div>
         )

src/pages/my/tools/index.js

@@ -52,9 +52,6 @@ class Tools extends Component {
                             // this.props.history.push({pathname: '/my/all'})
                             this.props.history.go(-2)
                         }}
-                        rightContent={[
-                            <Icon key="1" type="ellipsis"/>,
-                        ]}
                     >{navTitle}</NavBar>
                 </div>
                 <div className="content-wrap">