diff --git a/packages/taro-h5/__tests__/ui/tab-bar.test.tsx b/packages/taro-h5/__tests__/ui/tab-bar.test.tsx index 86a40b463291..18b0b8300570 100644 --- a/packages/taro-h5/__tests__/ui/tab-bar.test.tsx +++ b/packages/taro-h5/__tests__/ui/tab-bar.test.tsx @@ -120,7 +120,7 @@ describe('tabbar', () => { it('should be able to switchTab', done => { Taro.switchTab({ - url: '/pages/about/about' + url: '/pages/about/index' }).then((res: any) => { expect(res.errMsg).toBe('switchTab:ok') done() diff --git a/packages/taro-h5/__tests__/utils.ts b/packages/taro-h5/__tests__/utils.ts index 0cae05853bbc..cf60fabfbf29 100644 --- a/packages/taro-h5/__tests__/utils.ts +++ b/packages/taro-h5/__tests__/utils.ts @@ -22,7 +22,7 @@ const appConfig: any = { list: [{ pagePath: '/pages/index/index', text: '首页' }, { - pagePath: '/pages/about/about', text: '关于我们' + pagePath: '/pages/about/index', text: '关于我们' }], mode: 'hash', basename: '/test/app', diff --git a/packages/taro-h5/src/api/ui/fonts.ts b/packages/taro-h5/src/api/ui/fonts.ts index 52764ef11c9c..a090abea4187 100644 --- a/packages/taro-h5/src/api/ui/fonts.ts +++ b/packages/taro-h5/src/api/ui/fonts.ts @@ -15,10 +15,11 @@ export const loadFontFace: typeof Taro.loadFontFace = async options => { try { await fontFace.load() fonts.add(fontFace) - return handle.success({}) + return handle.success({ status: 'loaded' }) } catch (error) { return handle.fail({ - errMsg: error.message || error + status: 'error', + errMsg: error.message || error, }) } } else { @@ -59,6 +60,6 @@ export const loadFontFace: typeof Taro.loadFontFace = async options => { style.innerText = `@font-face{${innerText}}` document.head.appendChild(style) - return handle.success() + return handle.success({ status: 'loaded' }) } } diff --git a/packages/taro-h5/src/api/ui/tab-bar.ts b/packages/taro-h5/src/api/ui/tab-bar.ts index 96019d88db33..d07855e7af93 100644 --- a/packages/taro-h5/src/api/ui/tab-bar.ts +++ b/packages/taro-h5/src/api/ui/tab-bar.ts @@ -217,7 +217,7 @@ export const setTabBarBadge: typeof Taro.setTabBarBadge = (options) => { return new Promise((resolve, reject) => { Taro.eventCenter.trigger('__taroSetTabBarBadge', { index, - text, + text: text.replace(/[\u0391-\uFFE5]/g, 'aa').length > 4 ? '...' : text, successHandler: (res = {}) => handle.success(res, { resolve, reject }), errorHandler: (res = {}) => handle.fail(res, { resolve, reject }) })