fix(h5): tabbar init error #7290

NervJS · Sep 15, 2020 · d08f5f6 · d08f5f6
1 parent c8ce8bf
commit d08f5f6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/packages/taro-components/src/components/tabbar/tabbar.tsx b/packages/taro-components/src/components/tabbar/tabbar.tsx
@@ -43,6 +43,7 @@ export interface Conf {
  customRoutes: Record<string, string>
  mode: 'hash' | 'browser'
  basename: string
+ homePage: string
  currentPagename: string
 }
 
@@ -91,7 +92,7 @@ export class Tabbar implements ComponentInterface {
  throw new Error('tabBar 配置错误')
  }
 
- this.homePage = addLeadingSlash(this.homePage)
+ this.homePage = addLeadingSlash(this.conf.homePage)
  for (const key in customRoutes) {
  this.customRoutes.push([key, customRoutes[key]])
  }

diff --git a/packages/taro-router/src/tabbar.ts b/packages/taro-router/src/tabbar.ts
@@ -1,4 +1,5 @@
 import { AppConfig } from '@tarojs/taro'
+import { history } from './history'
 
 export function initTabbar (config: AppConfig) {
  if (config.tabBar == null) {
@@ -7,7 +8,9 @@ export function initTabbar (config: AppConfig) {
 
  // TODO: 找到 tabbar 的类型
  const tabbar = document.createElement('taro-tabbar') as any
+ const homePage = config.pages ? config.pages[0] : ''
  tabbar.conf = config.tabBar
+ tabbar.conf.homePage = history.location.pathname === '/' ? homePage : history.location.pathname
  const routerConfig = (config as any).router
  tabbar.conf.mode = routerConfig && routerConfig.mode ? routerConfig.mode : 'hash'
  const container = document.getElementById('container')