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

src/pages/cart/orders/index.js

@@ -82,7 +82,10 @@ class CartOrders extends Component {
                             <Item
                                 arrow="horizontal"
                                 multipleLine
-                                onClick={() => {}}
+                                onClick={() => {this.props.history.push({
+                                    pathname:'/my/tools',
+                                    state:{page:'address'}
+                                })}}
                             >
                                 <div>
                                     <span>承叶子</span>&nbsp;&nbsp;

src/pages/my/tools/index.js

@@ -43,13 +43,14 @@ class Tools extends Component {
 
         return (
             <div className='tools-wrap'>
-                <div className='tools-navbar-wrap'>
+                <div className='tools-navbar-wrap navbar'>
                     <NavBar
                         className='tools-navbar'
                         mode="light"
                         icon={<Icon type="left"/>}
                         onLeftClick={() => {
-                            this.props.history.push({pathname: '/my/all'})
+                            // this.props.history.push({pathname: '/my/all'})
+                            this.props.history.go(-2)
                         }}
                         rightContent={[
                             <Icon key="1" type="ellipsis"/>,