diff --git a/packages/uni-h5/dist/uni-h5.es.js b/packages/uni-h5/dist/uni-h5.es.js index 90159e784cc4e10e9ecad3494ec268d5d9a00aa3..0f045ad9dbd260039c0ee4e31498f8e46fd07464 100644 --- a/packages/uni-h5/dist/uni-h5.es.js +++ b/packages/uni-h5/dist/uni-h5.es.js @@ -13933,25 +13933,17 @@ function setupPage(comp) { instance2.root = instance2; const route = usePageRoute(); const pageMeta = usePageMeta(); - onBeforeMount(() => { + onMounted(() => { onPageShow(instance2, pageMeta); const { onLoad, onShow } = instance2; onLoad && invokeArrayFns$1(onLoad, decodedQuery(route.query)); instance2.__isVisible = true; - if (onShow) { - nextTick(() => { - invokeArrayFns$1(onShow); - }); - } + onShow && invokeArrayFns$1(onShow); }); onMounted(() => { onPageReady(instance2); const { onReady } = instance2; - if (onReady) { - nextTick(() => { - invokeArrayFns$1(onReady); - }); - } + onReady && invokeArrayFns$1(onReady); }); onBeforeActivate(() => { if (!instance2.__isVisible) { diff --git a/packages/uni-h5/src/framework/setup/index.ts b/packages/uni-h5/src/framework/setup/index.ts index f67b1900f1dc3eaf4802927dd99dc94c8a2bcffe..e5242dc27c55b0f1561f90575c38ef1b7de1e95f 100644 --- a/packages/uni-h5/src/framework/setup/index.ts +++ b/packages/uni-h5/src/framework/setup/index.ts @@ -90,28 +90,18 @@ export function setupPage(comp: any) { } const pageMeta = usePageMeta() - - onBeforeMount(() => { + // 放在 onMounted 中,可以保证子组件中监听的相关生命周期也可以触发,比如onShow,onPageScroll + onMounted(() => { onPageShow(instance, pageMeta) const { onLoad, onShow } = instance onLoad && invokeArrayFns(onLoad, decodedQuery(route.query)) instance.__isVisible = true - if (onShow) { - // 延迟onShow,保证子组件的首次onShow也能生效 - nextTick(() => { - invokeArrayFns(onShow) - }) - } + onShow && invokeArrayFns(onShow) }) onMounted(() => { onPageReady(instance) const { onReady } = instance - if (onReady) { - // 因为onShow被延迟,故onReady也延迟,否则会出现onReady比onShow还早 - nextTick(() => { - invokeArrayFns(onReady) - }) - } + onReady && invokeArrayFns(onReady) }) onBeforeActivate(() => { if (!instance.__isVisible) {