Csy817 пре 6 година
родитељ
комит
2064c48f96

+ 7 - 0
src/app.css

@@ -42,8 +42,15 @@ a {
 
 .navbar {
     border-bottom: 1px solid #f5f5f9;
+    position: fixed;
+    width: 100%;
+    z-index: 2;
 }
 
 .tabbar-route-content {
     margin-bottom: 50px;
+}
+
+.content-wrap {
+    padding-top: 45px;
 }

+ 1 - 1
src/pages/cart/all/detail/index.js

@@ -172,7 +172,7 @@ class CartDetail extends Component {
 
     render() {
         return (
-            <div className="cart-wrap">
+            <div className="cart-content-wrap">
                 <div className='cart-content'>
                     {
                         this.state.cartList.map((ele,index)=>{

+ 1 - 1
src/pages/cart/all/edit/index.js

@@ -184,7 +184,7 @@ class CartEdit extends Component {
         let listLength = cartList.length;
 
         return (
-            <div className="cart-wrap">
+            <div className="cart-content-wrap">
                 <div className='cart-content'>
                     {
                         this.state.cartList.map((ele,index)=>{

+ 2 - 2
src/pages/cart/all/index.css

@@ -35,8 +35,8 @@
     text-align: center;
 }
 
-.cart-content {
-    margin-bottom: 45px;
+.cart-content-wrap {
+    padding: 45px 0;
 }
 
 .cart-list {

+ 11 - 10
src/pages/cart/all/index.js

@@ -78,18 +78,19 @@ class All extends Component {
                         // console.log('cart data',data)
 
                         return (
-                            <div>
-                                <NavBar
-                                    mode="light"
-                                    style={{borderBottom: '1px solid #ebedf0'}}
-                                    rightContent={[
-                                        data.cartList.length ?
-                                            <span key={"1"} onClick={this.changeCartPage}>
+                            <div className='cart-wrap'>
+                                <div className='cart-navbar-wrap navbar'>
+                                    <NavBar
+                                        mode="light"
+                                        rightContent={[
+                                            data.cartList.length ?
+                                                <span key={"1"} onClick={this.changeCartPage}>
                                                 {page === 'detail' ? "编辑" : "完成"}
                                             </span> : ''
-                                    ]}
-                                >购物袋
-                                </NavBar>
+                                        ]}
+                                    >购物袋
+                                    </NavBar>
+                                </div>
                                 {data.cartList.length ?
                                     this.renderPage(data) : <Empty/>
                                 }

+ 0 - 11
src/pages/cart/orders/index.css

@@ -1,14 +1,3 @@
-.orders-navbar-wrap {
-    position: fixed;
-    z-index: 2;
-    width: 100%;
-}
-
-.orders-content-wrap {
-    padding-top: 45px;
-    padding-bottom: 50px;
-}
-
 .orders-content-wrap > div {
     margin-bottom: 10px;
     background: white;

+ 1 - 1
src/pages/cart/orders/index.js

@@ -76,7 +76,7 @@ class CartOrders extends Component {
                         onLeftClick={() => {this.props.history.goBack()}}
                     >订单确认</NavBar>
                 </div>
-                <div className='orders-content-wrap'>
+                <div className='orders-content-wrap content-wrap'>
                     <div className='orders-address'>
                         <List>
                             <Item

+ 6 - 4
src/pages/my/tools/index.js

@@ -57,10 +57,12 @@ class Tools extends Component {
                         ]}
                     >{navTitle}</NavBar>
                 </div>
-                <Switch>
-                    <Route exact path="/my/tools/address" component={Address}/>
-                    <Route path="/my/tools/message" component={Message}/>
-                </Switch>
+                <div className="content-wrap">
+                    <Switch>
+                        <Route exact path="/my/tools/address" component={Address}/>
+                        <Route path="/my/tools/message" component={Message}/>
+                    </Switch>
+                </div>
             </div>
         )
     }