From c092d3b86a223e279ccf57be27d8f1eb315de089 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 26 二月 2025 17:21:56 +0800
Subject: [PATCH] fix: 对接
---
apps/taro/src/components/Layout/PageLayout.vue | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/apps/taro/src/components/Layout/PageLayout.vue b/apps/taro/src/components/Layout/PageLayout.vue
index 3a89eb7..1b283f0 100644
--- a/apps/taro/src/components/Layout/PageLayout.vue
+++ b/apps/taro/src/components/Layout/PageLayout.vue
@@ -1,7 +1,7 @@
<template>
<Portal.Host>
<div :class="['page-layout-wrapper', { isWeb: isWeb }]" v-bind="$attrs">
- <slot v-if="showNavigationBar" name="navigationBar">
+ <slot v-if="_showNavigationBar" name="navigationBar">
<CommonNavigationBar v-bind="_commonNavigationBarProps" />
</slot>
@@ -42,10 +42,12 @@
import { useSystemStore } from '@/stores/modules/system';
import Taro from '@tarojs/taro';
import { TabBarPageRouter } from '@/constants';
-import { useAuth } from '@/hooks';
+import { useAuth, useTabRouteEnhance } from '@/hooks';
import { Portal } from 'senin-mini/components';
import { usePickProps } from 'senin-mini/hooks';
-import { isWeb } from '@/utils/env';
+import { isWeb, isInAlipay, isInWeChat } from '@/utils/env';
+//@ts-ignore
+import { setPageTitle } from '@/utils';
defineOptions({
name: 'PageLayout',
@@ -72,7 +74,22 @@
},
});
+setPageTitle(props.title);
+
+useTabRouteEnhance();
+
const _commonNavigationBarProps = usePickProps(props, commonNavigationBarProps);
+
+const _showNavigationBar = computed(() => {
+ if (props.showNavigationBar) {
+ // if (isWeb) {
+ // return !isInAlipay && !isInWeChat;
+ // }
+ return true;
+ } else {
+ return false;
+ }
+});
const { isAuth } = useAuth({
needAuth: props.needAuth,
@@ -93,7 +110,7 @@
let pageHeight = pageHeightWithTabBar.value
? systemStore.pageHeightWithTab
: systemStore.pageHeight;
- pageHeight = pageHeight + (props.showNavigationBar ? 0 : navigationBarHeight.value);
+ pageHeight = pageHeight + (_showNavigationBar.value ? 0 : navigationBarHeight.value);
return pageHeight + 'px';
});
</script>
--
Gitblit v1.9.1