Przeglądaj źródła

跳转时添加state,根据tabHidden的值显示或隐藏tabbar

Csy817 6 lat temu
rodzic
commit
1fc0dffa99

+ 3 - 2
src/App.js

@@ -47,11 +47,12 @@ class App extends Component {
             pathname = location.pathname,
             state = location.state
 
-        // 有 state 的话,隐藏 tabbar, (进入子界面)
+        // 有 state 的话,根据tabHidden显示或隐藏 tabbar, (进入子界面)
         // 无 state 的话,就显示 tabbar (返回到主界面)
         if (location && state) {
+            let tabHidden = state.tabHidden
             this.setState({
-                tabHidden: true
+                tabHidden
             })
         } else {
             this.setState({

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

@@ -189,7 +189,9 @@ class CartDetail extends Component {
         sessionStorage.setItem("totalCount",JSON.stringify(this.state.selectedCount))
         this.props.history.push({
             pathname: '/cart/orders',
-            state:{}
+            state:{
+                tabHidden:true
+            }
         })
     } 
 

+ 9 - 3
src/pages/cart/orders/index.js

@@ -103,7 +103,9 @@ class CartOrders extends Component {
 
             this.props.history.push({
                 pathname:'/cart/pay',
-                state:{}
+                state:{
+                    tabHidden:true
+                }
             })
         })
     }
@@ -123,7 +125,8 @@ class CartOrders extends Component {
                             this.props.history.push({
                                 pathname:'/cart',
                                 state:{
-                                    updateData:true
+                                    updateData:true,
+                                    tabHidden:false
                                 }
                             })
                         }}
@@ -138,7 +141,10 @@ class CartOrders extends Component {
                                 onClick={() => {
                                     this.props.history.push({
                                         pathname:'/my/tools',
-                                        state: {page: 'address'}})
+                                        state: {
+                                            page: 'address',
+                                            tabHidden:true
+                                        }})
                                 }}>
                                 <div>
                                     <span>承叶子</span>&nbsp;&nbsp;

+ 4 - 2
src/pages/home/all/index.js

@@ -91,7 +91,8 @@ class All extends Component {
                         this.props.history.push({
                             pathname: '/home/kind',
                             state: {
-                                id: kind.id
+                                id: kind.id,
+                                tabHidden:true
                             }
                         })
                     }}/>
@@ -140,7 +141,8 @@ class Like extends Component {
                           this.props.history.push({
                               pathname: '/home/detail',
                               state: {
-                                  id: guess.id
+                                  id: guess.id,
+                                  tabHidden:true
                               }
                           })
                       }}

+ 2 - 1
src/pages/home/kind/index.js

@@ -96,7 +96,8 @@ class KindRender extends Component {
                                   this.props.history.push({
                                       pathname: '/home/detail',
                                       state: {
-                                          id: product.id
+                                          id: product.id,
+                                          tabHidden:true
                                       }
                                   })
 

+ 8 - 4
src/pages/my/all/index.js

@@ -105,7 +105,8 @@ class All extends Component {
                                   this.props.history.push({
                                       pathname: '/my/order',
                                       state: {
-                                          kind: order.id
+                                          kind: order.id,
+                                          tabHidden:true
                                       }
                                   })
                               }}
@@ -130,7 +131,8 @@ class All extends Component {
                                       this.props.history.push({
                                           pathname: '/my/tools',
                                           state: {
-                                              page: tools.id
+                                              page: tools.id,
+                                              tabHidden:true
                                           }
                                       })
                                   }
@@ -151,7 +153,8 @@ class All extends Component {
                                   this.props.history.push({
                                       pathname: '/my/member',
                                       state: {
-                                          page: member.id
+                                          page: member.id,
+                                          tabHidden:true
                                       }
                                   })
                               }}
@@ -171,7 +174,8 @@ class All extends Component {
                                   this.props.history.push({
                                       pathname: '/my/manage',
                                       state: {
-                                          page: shop.id
+                                          page: shop.id,
+                                          tabHidden:true
                                       }
                                   })
                               }}

+ 3 - 1
src/pages/my/manage/index.js

@@ -17,7 +17,9 @@ class Manage extends Component {
         if (location && location.state) {
             this.props.history.push({
                 pathname: '/my/manage/' + location.state.page,
-                state: {}
+                state: {
+                    tabHidden:true
+                }
             })
         }
     }

+ 3 - 1
src/pages/my/member/index.js

@@ -17,7 +17,9 @@ class Member extends Component {
         if (location && location.state) {
             this.props.history.push({
                 pathname: '/my/member/' + location.state.page,
-                state: {}
+                state: {
+                    tabHidden:true
+                }
             })
         }
     }

+ 2 - 1
src/pages/my/order/detail/index.js

@@ -71,7 +71,8 @@ class Detail extends Component {
                     this.props.history.push({
                         pathname: '/home/detail',
                         state: {
-                            id: data.id
+                            id: data.id,
+                            tabHidden:true
                         }
                     })
                 }}>

+ 2 - 1
src/pages/my/order/display/index.js

@@ -241,7 +241,8 @@ class DisplayRender extends Component {
                                                         this.props.history.push({
                                                             pathname: '/my/order/detail',
                                                             state: {
-                                                                data: order
+                                                                data: order,
+                                                                tabHidden:true
                                                             }
                                                         })
                                                     }}>

+ 5 - 2
src/pages/my/order/index.js

@@ -16,13 +16,16 @@ class Order extends Component {
                 this.props.history.push({
                     pathname: '/my/order/display',
                     state: {
-                        kind: location.state.kind
+                        kind: location.state.kind,
+                        tabHidden:true
                     }
                 })
             } else {
                 this.props.history.push({
                     pathname: '/my/order/detail',
-                    state: {}
+                    state: {
+                        tabHidden:true
+                    }
                 })
             }
         }

+ 3 - 1
src/pages/my/tools/index.js

@@ -16,7 +16,9 @@ class Tools extends Component {
         if (location && location.state) {
             this.props.history.push({
                 pathname: '/my/tools/' + location.state.page,
-                state: {}
+                state: {
+                    tabHidden:true
+                }
             })
         }
     }