提交 74142faf 编写于 作者: Q qiang

Merge branch 'dev' into alpha

......@@ -70,8 +70,11 @@ export function isTabBarPage (path = '') {
return false
}
return page.$page.meta.isTabBar
}
if (!/^\//.test(path)) {
path = '/' + path
}
const route = __uniRoutes.find(route => route.path.replace(/^\//, '') === path.replace(/^\//, ''))
const route = __uniRoutes.find(route => route.path === path)
return route && route.meta.isTabBar
} catch (e) {
if (process.env.NODE_ENV !== 'production') {
......
export function parsePullToRefresh (routeOptions) {
const windowOptions = routeOptions.window
if (windowOptions.enablePullDownRefresh) {
if (windowOptions.enablePullDownRefresh || (windowOptions.pullToRefresh && windowOptions.pullToRefresh.support)) {
const pullToRefreshStyles = Object.create(null)
// 初始化默认值
if (plus.os.name === 'Android') {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册