From f32357c9f9a2c1e62ff8512d6cce65f4e65e7754 Mon Sep 17 00:00:00 2001 From: zhengyiming <540361168@qq.com> Date: 星期日, 19 十月 2025 17:11:55 +0800 Subject: [PATCH] fix: bug --- apps/bMiniApp/src/components/Layout/PageLayout.vue | 26 ++++++++++++-------------- 1 files changed, 12 insertions(+), 14 deletions(-) diff --git a/apps/bMiniApp/src/components/Layout/PageLayout.vue b/apps/bMiniApp/src/components/Layout/PageLayout.vue index 474d352..24bff3f 100644 --- a/apps/bMiniApp/src/components/Layout/PageLayout.vue +++ b/apps/bMiniApp/src/components/Layout/PageLayout.vue @@ -16,8 +16,10 @@ </slot> <div class="page-layout-scroll-view-wrapper" :style="{ height: scrollViewHeight }"> - <slot :scrollViewHeight="scrollViewHeight" v-if="isAuth"></slot> - <!-- <template v-if="isAuth"> + <DevelopingLayout v-if="developing"></DevelopingLayout> + <template v-else> + <slot :scrollViewHeight="scrollViewHeight" v-if="isAuth"></slot> + <!-- <template v-if="isAuth"> <slot v-if="useView" :scrollViewHeight="scrollViewHeight"></slot> <scroll-view v-else @@ -28,6 +30,7 @@ <slot :scrollViewHeight="scrollViewHeight"></slot> </scroll-view> </template> --> + </template> </div> <div v-if="!pageHeightWithTabBar" class="safe-area-bottom"></div> </div> @@ -41,10 +44,11 @@ import { commonNavigationBarProps } from '../NavigationBar/commonNavigationBar'; import { useSystemStore } from '@/stores/modules/system'; import Taro from '@tarojs/taro'; -import { TabBarPageRouter } from '@/constants'; +import { TabBarPageRouterList } from '@/constants'; import { useAuth } from '@/hooks'; import { Portal } from 'senin-mini/components'; import { usePickProps } from 'senin-mini/hooks'; +import { DevelopingLayout } from '@12333/components'; defineOptions({ name: 'PageLayout', @@ -69,6 +73,10 @@ type: Number, default: 388, }, + developing: { + type: Boolean, + default: false, + }, }); const _commonNavigationBarProps = usePickProps(props, commonNavigationBarProps); @@ -81,7 +89,7 @@ const router = Taro.useRouter(); const pageHeightWithTabBar = computed(() => - Object.values(TabBarPageRouter).some((x) => x.toLowerCase() === router.path.toLowerCase()) + TabBarPageRouterList.some((x) => x.toLowerCase() === router.path.toLowerCase()) ); const navigationBarHeight = computed( @@ -94,16 +102,6 @@ : systemStore.pageHeight; pageHeight = pageHeight + (props.showNavigationBar ? 0 : navigationBarHeight.value); return pageHeight + 'px'; -}); - -Taro.getSetting({ - success: function (res) { - if (!res.authSetting['scope.userLocation']) { - Taro.authorize({ - scope: 'scope.userLocation', - }); - } - }, }); </script> -- Gitblit v1.9.1