Merge remote-tracking branch 'origin/master'

src/pages/my/order/detail/index.css

@@ -74,4 +74,22 @@
     line-height: 40px;
     font-size: 15px;
     text-align: center;
+}
+
+.detail-order-wrap {
+    margin-top: 10px;
+    background-color: white;
+}
+
+.detail-order-wrapper {
+    padding: 10px 5px
+}
+
+.detail-order-item {
+    height: 25px;
+    line-height: 25px;
+}
+
+.detail-order-title {
+    font-weight: 600;
 }

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

@@ -107,6 +107,7 @@ class Detail extends Component {
                             }}
                         >订单详情</NavBar>
                     </div>
+                    {/*内容*/}
                     <div className='content-wrap'>
                         <div className='detail-address-wrap'>
                             <div className='detail-address-backgroud-top'>
@@ -149,6 +150,9 @@ class Detail extends Component {
                             </Query>
                             <div className='detail-contact'>联系客服</div>
                         </div>
+                        <div className='detail-order-wrap'>
+                            <Order data={data}/>
+                        </div>
                     </div>
                 </div>
             </div>
@@ -156,4 +160,29 @@ class Detail extends Component {
     }
 }
 
-export default Detail
+export default Detail
+
+class Order extends Component {
+    constructor(props) {
+        super(props)
+        this.state = {
+
+        }
+    }
+
+    render() {
+        let {data} = this.props
+        return (
+            <div className='detail-order-wrapper'>
+                <div className='detail-order-item'>
+                    <span className='detail-order-title'>订单编号：</span>
+                    <span>{data.id}</span>
+                </div>
+                <div className='detail-order-item'>
+                    <span className='detail-order-title'>下单时间：</span>
+                    <span>{data.createdAt}</span>
+                </div>
+            </div>
+        )
+    }
+}

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

@@ -3,6 +3,11 @@
     background-color: white;
 }
 
+.order-card-top {
+    height: 30px;
+    padding: 5px 10px;
+}
+
 .order-card-content {
     height: 100px;
     background-color: #f5f5f9;