fix: 修复TabBar组件demo演示页路由跳转失败问题 (#451)

jdf2e · Nov 14, 2022 · bd57056 · bd57056
1 parent 8a30496
commit bd57056
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/packages/tabbar/demo.taro.tsx b/src/packages/tabbar/demo.taro.tsx
@@ -131,7 +131,11 @@ const TabbarDemo = () => {
             // href="https://m.jd.com"
             icon="cart"
           />
-          <TabbarItem tabTitle={translated.e51e4582} to="/" icon="my" />
+          <TabbarItem
+            tabTitle={translated.e51e4582}
+            to="/pages/index/index"
+            icon="my"
+          />
         </Tabbar>
       </div>
     </>

diff --git a/src/packages/tabbaritem/tabbaritem.taro.tsx b/src/packages/tabbaritem/tabbaritem.taro.tsx
@@ -1,5 +1,5 @@
 import React, { FunctionComponent, useEffect } from 'react'
-import { useHistory } from 'react-router-dom'
+import Taro from '@tarojs/taro'
 
 import bem from '@/utils/bem'
 import Icon from '@/packages/icon/index.taro'
@@ -65,17 +65,18 @@ export const TabbarItem: FunctionComponent<Partial<TabbarItemProps>> = (
   }
   const b = bem('tabbar-item')
   const bIcon = bem('tabbar-item__icon-box')
-  const history = useHistory()
 
   useEffect(() => {
     if (active && href) {
       window.location.href = href
       return
     }
     if (active && to) {
-      history.push(to)
+      Taro.navigateTo({
+        url: to,
+      })
     }
-  }, [active, history, href, to])
+  }, [active, href, to])
 
   return (
     <div