From 555f249b89631b8c4cb5c343f7128fd7fdc17596 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Sun, 12 Nov 2023 21:45:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/getters.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/store/getters.js b/src/store/getters.js
index bb652fc..877df06 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -1,4 +1,6 @@
 //用户信息
 export const userInfo = (state)=> state.userInfo
 //token
-export const token = (state)=> state.user_access_token
\ No newline at end of file
+export const token = (state)=> state.user_access_token
+
+export const showAppbar = (state)=> state.showAppbar
\ No newline at end of file

From 60448e2979a0b5dcace3d29c08dae19a92859324 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Sun, 12 Nov 2023 21:55:14 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/globalMixin.js | 15 +++++++++++++++
 src/mixin.js       |  4 +---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/globalMixin.js b/src/globalMixin.js
index 6790b21..782a486 100644
--- a/src/globalMixin.js
+++ b/src/globalMixin.js
@@ -1,4 +1,5 @@
 import store from './store/index.js'
+import jwt from '@/api/jwt.js'
 export default {
   onLaunch(e) {
     const { appbar, token } = e.query
@@ -7,8 +8,22 @@ export default {
     }
     if (appbar == 'hidden') {
       store.commit('showAppbar', false)
+      this.hideNavBar()
     } else {
       store.commit('showAppbar', true)
     }
+  },
+  methods: {
+    hideNavBar() {
+      /*#ifdef H5*/
+      this.$nextTick(() => {
+        let head = document.getElementsByTagName('uni-page-head')
+        if (head[0]) {
+          head[0].style.display = 'none'
+        }
+        // console.log(head);
+      })
+      /*#endif*/
+    }
   }
 }
\ No newline at end of file
diff --git a/src/mixin.js b/src/mixin.js
index 5671004..cc31dc8 100644
--- a/src/mixin.js
+++ b/src/mixin.js
@@ -4,7 +4,6 @@ export default {
   data() {
     return {
       h5NavHeightP: 44,
-      // showAppbar:true
     }
   },
   computed: {
@@ -13,7 +12,6 @@ export default {
   onLoad({ appbar }) {
     if (appbar == 'hidden') {
       this.h5NavHeightP = 0
-      // this.showAppbar = false
       this.hideNavBar()
     }
   },
@@ -23,7 +21,7 @@ export default {
       this.$nextTick(() => {
         let head = document.getElementsByTagName('uni-page-head')
         if (head[0]) {
-          head[0].remove()
+          head[0].style.display='none'
         }
         // console.log(head);
       })

From 9abc6b7614b55c0dc10d233ac7c18150ac2f8214 Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Tue, 14 Nov 2023 16:07:25 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/device/warning.vue | 2 +-
 src/pages/system/log.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/device/warning.vue b/src/pages/device/warning.vue
index eae6299..1694d3f 100644
--- a/src/pages/device/warning.vue
+++ b/src/pages/device/warning.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-sticky z-index="99">
+		<u-sticky z-index="99" :h5NavHeight="h5NavHeightP">
 		<view class="secreen-section" style="background-color: #fff;">
 			<u-dropdown class="dropdown-box" :class="[!dropDownShow?'downClose':'']" ref="uDropdown"
 			 @close="dropdownClose" @open="dropdownOpen">
diff --git a/src/pages/system/log.vue b/src/pages/system/log.vue
index 05b2078..c0dbb53 100644
--- a/src/pages/system/log.vue
+++ b/src/pages/system/log.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-sticky z-index="99">
+		<u-sticky z-index="99" :h5NavHeight="h5NavHeightP">
 		<view class="secreen-section" style="background-color: #fff;">
 			<u-dropdown class="dropdown-box" :class="[!dropDownShow?'downClose':'']" ref="uDropdown"
 			 @close="dropdownClose" @open="dropdownOpen">