From 538e4f454ba3126ef92278ab9cb675adb9e3b287 Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期四, 27 三月 2025 09:30:55 +0800
Subject: [PATCH] Merge branch 'master' into dev-1.3
---
apps/taro/src/components/NavigationBar/TransparentNavigationBar.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/apps/taro/src/components/NavigationBar/TransparentNavigationBar.vue b/apps/taro/src/components/NavigationBar/TransparentNavigationBar.vue
index 536f323..bf5f382 100644
--- a/apps/taro/src/components/NavigationBar/TransparentNavigationBar.vue
+++ b/apps/taro/src/components/NavigationBar/TransparentNavigationBar.vue
@@ -25,7 +25,7 @@
import IconArrowWhite from '@/assets/common/icon-navi-arrow-white.png';
import Taro from '@tarojs/taro';
import { goBack } from '@/utils';
-import { TabBarPageRouter } from '@/constants';
+import { TabBarPageRouterForCheck } from '@/constants';
defineOptions({
name: 'TransparentNavigationBar',
@@ -44,7 +44,9 @@
});
const isTabbarPage = computed(() =>
- Object.values(TabBarPageRouter).some((x) => router.path.toLowerCase().includes(x.toLowerCase()))
+ Object.values(TabBarPageRouterForCheck).some((x) =>
+ router.path.toLowerCase().includes(x.toLowerCase())
+ )
);
const barStyle = computed(() => {
--
Gitblit v1.9.1