Merge branch 'master' into develop

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*/
+    }
   }
 }

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);
       })

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">

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">

src/store/getters.js

@@ -2,3 +2,5 @@
 export const userInfo = (state)=> state.userInfo
 //token
 export const token = (state)=> state.user_access_token
+
+export const showAppbar = (state)=> state.showAppbar