From ff71d8ebd86f5e0e93385a6b74647222249b6b41 Mon Sep 17 00:00:00 2001
From: Anne_LXM <liuxiaomei@dcloud.io>
Date: Mon, 5 Aug 2024 19:47:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dpc=E5=B0=8F=E5=B1=8F?=
 =?UTF-8?q?=E6=97=B6=E6=9C=AA=E6=98=BE=E7=A4=BA(=E8=AE=BE=E7=BD=AETabbar)?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/tabBar/API.uvue         | 19 +++++++++++++------
 pages/tabBar/generateMenu.uts |  6 +++---
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/pages/tabBar/API.uvue b/pages/tabBar/API.uvue
index 9bf40b06..3ba5ad78 100644
--- a/pages/tabBar/API.uvue
+++ b/pages/tabBar/API.uvue
@@ -15,12 +15,16 @@
         <uni-collapse-item ref="category" v-for="menuItem in menu" :key="menuItem!.id" :title="menuItem.name"
           class="item">
           <template v-for="childMenuItem in menuItem.items" :key="childMenuItem!.id">
-            <view v-if="childMenuItem.items.length==0" style="padding-left: 18px" class="uni-navigate-item"
-              hover-class="is--active" @click="goPage(`/${childMenuItem.path}`)">
-              <text class="uni-navigate-text" :class="{
-                  'left-win-active': leftWinActive === childMenuItem.path && hasLeftWin,
-                }">{{ childMenuItem.style["navigationBarTitleText"] }}</text>
-              <image :src="arrowRightIcon" class="uni-icon-size"></image>
+            <view v-if="childMenuItem.items.length==0" style="padding-left: 18px;"
+              :class="{'uni-navigate-item':childMenuItem.path !== 'set-tab-bar' || windowWidth <= 790}"
+              hover-class="is--active"
+              @click="goPage(`/${childMenuItem.path}`)">
+              <template v-if="childMenuItem.path !== 'set-tab-bar' || windowWidth <= 790">
+                <text class="uni-navigate-text"
+                  :class="{'left-win-active': leftWinActive === childMenuItem.path && hasLeftWin}"
+                  >{{ childMenuItem.style["navigationBarTitleText"] }}</text>
+                <image :src="arrowRightIcon" class="uni-icon-size"></image>
+              </template>
             </view>
             <uni-collapse v-else style="width: 100%">
               <uni-collapse-item :title="childMenuItem.name" class="item"
@@ -68,6 +72,9 @@
       },
       leftWinActive() : string {
         return state.leftWinActive.slice(1)
+      },
+      windowWidth() : number {
+        return uni.getSystemInfoSync().windowWidth
       }
     },
     methods: {
diff --git a/pages/tabBar/generateMenu.uts b/pages/tabBar/generateMenu.uts
index 268e74db..fc67c999 100644
--- a/pages/tabBar/generateMenu.uts
+++ b/pages/tabBar/generateMenu.uts
@@ -1,5 +1,5 @@
 import { pages, groups } from '@/pages.json'
-import { state } from '@/store/index.uts'
+
 type Group = {
   id : string,
   name : string,
@@ -146,8 +146,8 @@ function removeNullItem(arr : (MenuItem | null)[]) : (MenuItem | null)[] {
 }
 
 function addSetTabBarPage(menuItem : MenuItem) {
-  const { id, name } = menuItem
-  if (id == 'page' && name == '页面和路由' && !state.noMatchLeftWindow) {
+  const { id, name } = menuItem
+  if (id == 'page' && name == '页面和路由') {
     menuItem.items.push({
       id: 'set-tab-bar',
       name: '设置 TabBar',
-- 
GitLab