Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wzj-java
uni-app
提交
6d2d2492
U
uni-app
项目概览
wzj-java
/
uni-app
与 Fork 源项目一致
Fork自
DCloud / uni-app
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
1
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
uni-app
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
1
Issue
1
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6d2d2492
编写于
4月 17, 2019
作者:
fxy060608
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix(h5): tabBar 切换丢失滚动位置
上级
d253295d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
50 addition
and
8 deletion
+50
-8
src/core/service/plugins/app/router-guard.js
src/core/service/plugins/app/router-guard.js
+29
-6
src/core/service/plugins/index.js
src/core/service/plugins/index.js
+21
-2
未找到文件。
src/core/service/plugins/app/router-guard.js
浏览文件 @
6d2d2492
...
...
@@ -15,7 +15,28 @@ function removeKeepAliveInclude (componentName) {
}
}
function
switchTab
(
routes
)
{
let
positionStore
=
Object
.
create
(
null
)
export
function
getTabBarScrollPosition
(
id
)
{
return
positionStore
[
id
]
}
function
saveTabBarScrollPosition
(
id
)
{
positionStore
[
id
]
=
{
x
:
window
.
pageXOffset
,
y
:
window
.
pageYOffset
}
}
function
switchTab
(
routes
,
to
,
from
)
{
if
(
to
&&
from
&&
to
.
meta
.
isTabBar
&&
from
.
meta
.
isTabBar
)
{
// tabbar 跳 tabbar
saveTabBarScrollPosition
(
from
.
params
.
__id__
)
}
// 关闭非 tabBar 页面
const
pages
=
getCurrentPages
()
for
(
let
i
=
pages
.
length
-
1
;
i
>=
0
;
i
--
)
{
...
...
@@ -33,11 +54,13 @@ function reLaunch (toName) {
// 关闭所有页面
const
pages
=
getCurrentPages
(
true
)
for
(
let
i
=
pages
.
length
-
1
;
i
>=
0
;
i
--
)
{
callPageHook
(
pages
[
i
],
'
onUnload
'
)
// 重新reLaunch至首页可能会被keepAlive,先手动强制destroy
callPageHook
(
pages
[
i
],
'
onUnload
'
)
// 重新reLaunch至首页可能会被keepAlive,先手动强制destroy
pages
[
i
].
$destroy
()
}
this
.
keepAliveInclude
=
[]
this
.
keepAliveInclude
=
[]
// 清空 positionStore
positionStore
=
Object
.
create
(
null
)
}
let
currentPages
=
[]
...
...
@@ -65,7 +88,7 @@ function beforeEach (to, from, next, routes) {
removeKeepAliveInclude
.
call
(
this
,
fromName
)
if
(
from
.
meta
)
{
if
(
from
.
meta
.
isQuit
)
{
// 如果 redirectTo 的前一个页面是 quit 类型,则新打开的页面也是 quit
to
.
meta
.
isQuit
=
true
to
.
meta
.
isQuit
=
true
to
.
meta
.
isEntry
=
!!
from
.
meta
.
isEntry
}
if
(
from
.
meta
.
isTabBar
)
{
// 如果是 tabBar,需要更新系统组件 tabBar 内的 list 数据
...
...
@@ -78,7 +101,7 @@ function beforeEach (to, from, next, routes) {
break
case
'
switchTab
'
:
switchTab
.
call
(
this
,
routes
)
switchTab
.
call
(
this
,
routes
,
to
,
from
)
break
case
'
reLaunch
'
:
reLaunch
.
call
(
this
,
toName
)
...
...
src/core/service/plugins/index.js
浏览文件 @
6d2d2492
...
...
@@ -16,6 +16,10 @@ import {
createPageMixin
}
from
'
./page
'
import
{
getTabBarScrollPosition
}
from
'
./app/router-guard
'
function
getMinId
(
routes
)
{
let
minId
=
0
routes
.
forEach
(
route
=>
{
...
...
@@ -62,6 +66,17 @@ export default {
if
(
savedPosition
)
{
return
savedPosition
}
else
{
if
(
to
&&
from
&&
to
.
meta
.
isTabBar
&&
from
.
meta
.
isTabBar
)
{
// tabbar 跳 tabbar
const
position
=
getTabBarScrollPosition
(
to
.
params
.
__id__
)
if
(
position
)
{
return
position
}
}
return
{
x
:
0
,
y
:
0
...
...
@@ -101,7 +116,9 @@ export default {
const
appMixin
=
createAppMixin
(
routes
,
entryRoute
)
// mixin app hooks
Object
.
keys
(
appMixin
).
forEach
(
hook
=>
{
options
[
hook
]
=
options
[
hook
]
?
[].
concat
(
appMixin
[
hook
],
options
[
hook
])
:
[
appMixin
[
hook
]]
options
[
hook
]
=
options
[
hook
]
?
[].
concat
(
appMixin
[
hook
],
options
[
hook
])
:
[
appMixin
[
hook
]
]
})
// router
...
...
@@ -117,7 +134,9 @@ export default {
const
pageMixin
=
createPageMixin
()
// mixin page hooks
Object
.
keys
(
pageMixin
).
forEach
(
hook
=>
{
options
[
hook
]
=
options
[
hook
]
?
[].
concat
(
pageMixin
[
hook
],
options
[
hook
])
:
[
pageMixin
[
hook
]]
options
[
hook
]
=
options
[
hook
]
?
[].
concat
(
pageMixin
[
hook
],
options
[
hook
])
:
[
pageMixin
[
hook
]
]
})
}
else
{
if
(
this
.
$parent
&&
this
.
$parent
.
__page__
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录