From 75ad2eb9984bac7705b337706efaf6e5dd7091ce Mon Sep 17 00:00:00 2001
From: wupengfei <834520024@qq.com>
Date: 星期五, 22 八月 2025 11:32:28 +0800
Subject: [PATCH] Merge branch 'master' of http://120.26.58.240:8888/r/flexJobMiniApp
---
apps/cMiniApp/src/components/Layout/PageLayout.vue | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/apps/cMiniApp/src/components/Layout/PageLayout.vue b/apps/cMiniApp/src/components/Layout/PageLayout.vue
index 474d352..53b0ee6 100644
--- a/apps/cMiniApp/src/components/Layout/PageLayout.vue
+++ b/apps/cMiniApp/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>
@@ -45,6 +48,7 @@
import { useAuth } from '@/hooks';
import { Portal } from 'senin-mini/components';
import { usePickProps } from 'senin-mini/hooks';
+import { DevelopingLayout } from '@12333/components';
defineOptions({
name: 'PageLayout',
@@ -68,6 +72,10 @@
linearBgHeight: {
type: Number,
default: 388,
+ },
+ developing: {
+ type: Boolean,
+ default: false,
},
});
@@ -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