fix(router): h5路由方法执行顺序

NervJS · May 28, 2018 · 1f445e0 · 1f445e0
1 parent e1a7fb5
commit 1f445e0
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/packages/taro-router/src/index.js b/packages/taro-router/src/index.js
@@ -77,14 +77,18 @@ const getWrappedComponent = (component, { location }) => {
     }
 
     componentDidMount () {
-      super.componentDidMount && super.componentDidMount()
-      super.componentDidShow && super.componentDidShow()
       let nextStatus = this.props.location.pageId === this.pageId ? 2 : 1
-      if (this.__pageStatus === nextStatus) return
+      if (this.__pageStatus === nextStatus) {
+        super.componentDidMount && super.componentDidMount()
+        super.componentDidShow && super.componentDidShow()
+        return
+      }
       setTimeout(() => {
         this.__pageStatus = 2
         this.defaultShow = true
         this.forceUpdate()
+        super.componentDidMount && super.componentDidMount()
+        super.componentDidShow && super.componentDidShow()
       }, 100)
     }
 
@@ -125,7 +129,7 @@ const getWrappedComponent = (component, { location }) => {
 }
 
 const getCurrentPages = function (opts) {
-  return history.stack[0]
+  return history.now()
 }
 
 /**