From 41020fb0587d0749da756f1c8c4e3e7f7ec26ba6 Mon Sep 17 00:00:00 2001
From: wzl <1720360649@qq.com>
Date: Tue, 19 Dec 2023 19:25:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E8=AF=81=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=BB=9F=E4=B8=80tabbar=E6=A8=A1=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TopNavBar.vue       |  2 ++
 src/router/router.config.js        |  1 +
 src/views/Tabbar.vue               | 18 ++++++++++++------
 src/views/optimize/index.vue       |  6 +-----
 src/views/optimize/scss/index.scss |  3 +--
 src/views/today/index.vue          | 22 +++++++++-------------
 src/views/today/scss/index.scss    |  5 ++---
 7 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/src/components/TopNavBar.vue b/src/components/TopNavBar.vue
index 1591452..7f5cb92 100644
--- a/src/components/TopNavBar.vue
+++ b/src/components/TopNavBar.vue
@@ -3,6 +3,8 @@
   <div class="nav-bar">
     <van-nav-bar
         :title="title"
+        :fixed="true"
+        z-index="998"
         @click-left="onClickLeft"
         @click-right="onClickRight"
     >
diff --git a/src/router/router.config.js b/src/router/router.config.js
index 6d72935..69475c2 100644
--- a/src/router/router.config.js
+++ b/src/router/router.config.js
@@ -15,6 +15,7 @@ export const constantRouterMap = [
       {
         path: '/Tabbar',
         name: 'Index',
+        redirect: '/index',
         component: () => import('@/views/Tabbar.vue'),
         children: [
           {
diff --git a/src/views/Tabbar.vue b/src/views/Tabbar.vue
index 13ca48d..2bba8ba 100644
--- a/src/views/Tabbar.vue
+++ b/src/views/Tabbar.vue
@@ -1,19 +1,22 @@
 <!--  -->
 <template>
   <div>
-    <!-- nav 组件 -->
-    <div></div>
-     <!-- 页面  -->
-    <router-view />
+    <!-- 头部导航 -->
+    <TopNavBar />
+    <!-- 页面  -->
+    <div class="tabbar-container">
+      <router-view />
+    </div>
     <!-- tabbar 组件 -->
     <TabBar />
   </div>
 </template>
 
 <script>
+import TopNavBar from '@/components/TopNavBar';
 import TabBar from '@/components/TabBar';
 export default {
-  components: { TabBar },
+  components: { TopNavBar, TabBar },
   data() {
     return {};
   },
@@ -23,7 +26,10 @@ export default {
 };
 </script>
 <style>
-.van-tabbar{
+.van-tabbar {
   z-index: 999 !important;
 }
+.tabbar-container{
+  padding:100.06px 0px;
+}
 </style>
diff --git a/src/views/optimize/index.vue b/src/views/optimize/index.vue
index a60238a..5a189bf 100644
--- a/src/views/optimize/index.vue
+++ b/src/views/optimize/index.vue
@@ -1,8 +1,6 @@
 <!--  -->
 <template>
   <div class="optimize">
-    <!-- 头部导航 -->
-    <TopNavBar />
     <!-- 专家介绍 -->
     <div class="expert-box">
       <van-swipe indicator-color="white">
@@ -136,7 +134,6 @@
 <script>
   import Vue from 'vue';
   import TabBar from '@/components/TabBar';
-  import TopNavBar from '@/components/TopNavBar';
   import expertImage from "@/assets/optimize/images/3_08.png";
   import { Swipe, SwipeItem, Lazyload } from 'vant';
   Vue.use(Lazyload);
@@ -145,8 +142,7 @@
   });
   export default {
     components: {
-      TabBar, 
-      TopNavBar,
+      TabBar,
       [Swipe.name]: Swipe,
       [SwipeItem.name]: SwipeItem,
       [Lazyload.name]: Lazyload,
diff --git a/src/views/optimize/scss/index.scss b/src/views/optimize/scss/index.scss
index a404080..74850c6 100644
--- a/src/views/optimize/scss/index.scss
+++ b/src/views/optimize/scss/index.scss
@@ -1,5 +1,4 @@
 .optimize {
-    padding: 100.06px 0;
     background-color: #fff;
     min-height: 100vh;
     .expert-box {
@@ -266,4 +265,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/views/today/index.vue b/src/views/today/index.vue
index 5ca5aa4..7133c26 100644
--- a/src/views/today/index.vue
+++ b/src/views/today/index.vue
@@ -1,8 +1,6 @@
 <!-- 今日 -->
 <template>
   <div class="today">
-    <!-- 头部导航 -->
-    <TopNavBar />
     <!-- 今日状态 -->
     <div class="today-status">
       <img class="img" src="@/assets/today/images/2_03.png" />
@@ -109,22 +107,22 @@
           </li>
         </ul>
         <div class="annular">
-          <van-circle 
-              v-model="currentRate1" 
+          <van-circle
+              v-model="currentRate1"
               size="160px"
               color="#179b3b"
               layer-color="#F8F8F8"
-              :rate="90" 
-              :speed="50" 
-              :stroke-width="120" 
+              :rate="90"
+              :speed="50"
+              :stroke-width="120"
           />
-          <van-circle 
-              v-model="currentRate2" 
+          <van-circle
+              v-model="currentRate2"
               size="129px"
               color="#ff5f8b"
               layer-color="#F8F8F8"
-              :rate="80" 
-              :speed="50" 
+              :rate="80"
+              :speed="50"
               :stroke-width="140"
           />
           <p>多走4567步</p>
@@ -209,12 +207,10 @@
 
 <script>
 import TabBar from '@/components/TabBar';
-import TopNavBar from '@/components/TopNavBar';
 import { Calendar, Circle, Checkbox, CheckboxGroup } from 'vant';
 export default {
   components: {
     TabBar,
-    TopNavBar,
     [Circle.name]: Circle,
     [Calendar.name]: Calendar,
     [Checkbox.name]: Checkbox,
diff --git a/src/views/today/scss/index.scss b/src/views/today/scss/index.scss
index 5595967..58df2f1 100644
--- a/src/views/today/scss/index.scss
+++ b/src/views/today/scss/index.scss
@@ -1,5 +1,4 @@
 .today {
-    padding: 100.06px 0;
     background-color: #fff;
     min-height: 100vh;
     .today-status {
@@ -227,7 +226,7 @@
                 }
                 time {
                     color: #fff;
-                    font-size: 24px;    
+                    font-size: 24px;
                     display: block;
                 }
             }
@@ -428,4 +427,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}