Merge branch 'master' of http://gogs.ioobot.com:6680/xy/ec-react

src/pages/cart/all/detail/index.js

@@ -1,4 +1,5 @@
-import React, { Component } from 'react' 
+import React, { Component } from 'react'
+import {withRouter} from 'react-router-dom'
 import { Checkbox, WhiteSpace  } from 'antd-mobile' 
 import classNames from 'classnames' 
 
@@ -163,13 +164,16 @@ class CartDetail extends Component {
         console.log('shopping',shopping) 
         window.localStorage.setItem("shopping",JSON.stringify(shopping)) 
         window.localStorage.setItem("sumprice",JSON.stringify(this.state.totalPrice)) 
-        this.props.history.push('/jiesuan')
+        this.props.history.push({
+            pathname: '/cart/order',
+            state:{}
+        })
     } 
 
     render() {
         return (
             <div className="Cart">
-                <div className='section'>
+                <div className='cart-content'>
                     {
                         this.state.cartList.map((ele,index)=>{
                             return(
@@ -233,7 +237,6 @@ class CartDetail extends Component {
                                 'jiesuan-button': true,
                                 'jiesuan-disabled': !this.state.selectedCount
                             })}
-                            disabled={!this.state.isSelectAll}
                             onClick={()=>{this.settleAccounts()}}
                         >
                             <span>下单({this.state.selectedCount})</span>
@@ -245,4 +248,4 @@ class CartDetail extends Component {
     }
 }
 
-export default CartDetail
+export default withRouter(CartDetail)

src/pages/cart/index.js

@@ -2,6 +2,7 @@ import React from 'react'
 import {Switch, Route} from 'react-router-dom'
 
 import All from './all'
+import CartOrder from './order'
 import './index.css'
 
 const Cart = () => (
@@ -9,6 +10,7 @@ const Cart = () => (
         <Switch>
             <Route exact path="/cart" component={All}/>
             <Route exact path="/cart/all" component={All}/>
+            <Route path="/cart/order" component={CartOrder}/>
         </Switch>
     </div>
 )

src/pages/cart/order/index.js

@@ -0,0 +1,29 @@
+import React, {Component} from 'react'
+import './index.css'
+import {NavBar, Icon} from 'antd-mobile'
+import {withRouter} from 'react-router-dom'
+
+class CartOrder extends Component {
+    constructor(props) {
+        super(props)
+        console.log('props',props)
+        this.state = {}
+    }
+
+    render() {
+        return (
+            <div className='order-wrap'>
+                <div className='order-navbar-wrap'>
+                    <NavBar
+                        className='order-navbar'
+                        mode="light"
+                        icon={<Icon type="left"/>}
+                        onLeftClick={() => {this.props.history.goBack()}}
+                    >订单确认</NavBar>
+                </div>
+            </div>
+        )
+    }
+}
+
+export default withRouter(CartOrder)