fix(router component): 修复redirectTo tabbar暂时改用redirectTo

NervJS · Dec 12, 2018 · b7c6b58 · b7c6b58 · SmallRuralDog · Dec 12, 2018
1 parent 6883a7e
commit b7c6b58
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/packages/taro-components/src/components/tabbar/index.js b/packages/taro-components/src/components/tabbar/index.js
@@ -97,11 +97,9 @@ class Tabbar extends Nerv.Component {
     const { conf, router = {} } = this.props
     function handleSelect (index, e) {
       let list = this.state.list
-      router.navigateTo &&
-        router.navigateTo({
-          url:
-            (/^\//.test(list[index].pagePath) ? '' : '/') + list[index].pagePath
-        })
+      router.redirectTo && router.redirectTo({
+        url: (/^\//.test(list[index].pagePath) ? '' : '/') + list[index].pagePath
+      })
     }
     conf.borderStyle = conf.borderStyle || 'black'
     let containerCls = classNames('weui-tabbar', {

diff --git a/packages/taro-router/src/router/route.tsx b/packages/taro-router/src/router/route.tsx
@@ -66,8 +66,8 @@ class Route extends Component<RouteProps, {}> {
     this.props.collectComponent(ref, this.props.k)
   }
 
-  updateComponent () {
-    this.props.componentLoader()
+  updateComponent (props = this.props) {
+    props.componentLoader()
       .then(({ default: component }) => {
         let WrappedComponent = createWrappedComponent(component)
         this.wrappedComponent = WrappedComponent
@@ -85,12 +85,14 @@ class Route extends Component<RouteProps, {}> {
   }
 
   componentWillReceiveProps (nProps, nContext) {
-    if (this.props.path !== nProps.path) this.updateComponent()
-
     const lastMatched = this.matched
     const nextMatched = this.computeMatch(nProps.currentLocation)
 
-    if (lastMatched === nextMatched) return 
+    if (this.props.path !== nProps.path) {
+      this.updateComponent(nProps)
+    } else if (lastMatched === nextMatched) {
+      return
+    }
 
     this.matched = nextMatched