From 42b93add91f5dc26443112a1822ef9794428dd1a Mon Sep 17 00:00:00 2001
From: ihzero <ihzero@163.com>
Date: Sun, 12 Nov 2023 18:37:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=A0=87=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                 |  7 ++---
 src/components/Appbar/index.vue             | 10 +++++--
 src/globalMixin.js                          | 14 +++++++++
 src/main.js                                 |  4 +++
 src/mixin.js                                | 33 +++++++++++++++++++++
 src/pages/basics/basics-base.vue            |  2 +-
 src/pages/basics/town-base.vue              |  2 +-
 src/pages/crop/basics-crop.vue              |  2 +-
 src/pages/crop/town-crop.vue                |  2 +-
 src/pages/device/index.vue                  |  2 +-
 src/pages/estate/estate-flows.vue           |  4 +--
 src/pages/estate/estate-industry.vue        |  2 +-
 src/pages/estate/estate-materiels.vue       |  2 +-
 src/pages/estate/estate-price.vue           |  5 ++--
 src/pages/estate/estate-week-price.vue      |  4 +--
 src/pages/index/components/pests-images.vue |  2 +-
 src/pages/index/index.vue                   |  1 -
 src/pages/index/insect-monitors.vue         |  2 +-
 src/pages/index/insecticidal-lamp.vue       |  2 +-
 src/pages/index/pests.vue                   |  2 +-
 src/pages/index/warning-list.vue            |  2 +-
 src/pages/system/account.vue                |  2 +-
 src/pages/system/links.vue                  |  2 +-
 src/pages/system/role.vue                   |  2 +-
 src/pages/yield/basics-yield.vue            |  2 +-
 src/pages/yield/town-yield.vue              |  2 +-
 src/store/mutations.js                      |  3 ++
 src/store/state.js                          |  1 +
 28 files changed, 90 insertions(+), 30 deletions(-)
 create mode 100644 src/globalMixin.js
 create mode 100644 src/mixin.js

diff --git a/src/App.vue b/src/App.vue
index 57bd1b9..9495579 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,13 +1,11 @@
 <script>
 import store from './store/index.js'
 import jwt from '@/api/jwt.js'
+import globalMixin from './globalMixin'
 export default {
+  mixins: [globalMixin],
   onLaunch: function (e) {
     console.log('App Launch')
-    const { token } = e.query
-    if (token) {
-      jwt.setAccessToken(token)
-    }
     if (!store.state.user_access_token) {
       //未登录
       uni.redirectTo({
@@ -33,6 +31,7 @@ export default {
 <style lang="scss">
 @import 'uview-ui/index.scss';
 /*每个页面公共css */
+
 body,
 uni-page-body {
   background-color: #f8f8f8;
diff --git a/src/components/Appbar/index.vue b/src/components/Appbar/index.vue
index cd0d478..91a9739 100644
--- a/src/components/Appbar/index.vue
+++ b/src/components/Appbar/index.vue
@@ -1,12 +1,14 @@
 <template>
   <u-navbar
-    :title="title"
+    :title="show ? title : ''"
     :background="background"
     :custom-back="goback"
     :title-color="titleColor"
+    :isBack="show"
     :back-icon-color="titleColor"
   >
-    <template #right>
+    <template #right
+      >
       <slot name="right"></slot>
     </template>
   </u-navbar>
@@ -15,6 +17,10 @@
 import { navigateBack } from '@/com/utils.js'
 export default {
   props: {
+    show: {
+      type: Boolean,
+      default: true,
+    },
     title: {
       type: String,
       default: '',
diff --git a/src/globalMixin.js b/src/globalMixin.js
new file mode 100644
index 0000000..6790b21
--- /dev/null
+++ b/src/globalMixin.js
@@ -0,0 +1,14 @@
+import store from './store/index.js'
+export default {
+  onLaunch(e) {
+    const { appbar, token } = e.query
+    if (token) {
+      jwt.setAccessToken(token)
+    }
+    if (appbar == 'hidden') {
+      store.commit('showAppbar', false)
+    } else {
+      store.commit('showAppbar', true)
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 76647a0..bc3cbda 100644
--- a/src/main.js
+++ b/src/main.js
@@ -3,6 +3,10 @@ import App from './App'
 import PortalVue from 'portal-vue'
 import './uni.promisify.adaptor'
 import uView from "uview-ui";
+import mixin from './mixin'
+
+Vue.mixin(mixin)
+
 Vue.use(uView);
 Vue.use(PortalVue)
 import {http,getFullUrl} from '@/api/index.js'
diff --git a/src/mixin.js b/src/mixin.js
new file mode 100644
index 0000000..5671004
--- /dev/null
+++ b/src/mixin.js
@@ -0,0 +1,33 @@
+
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      h5NavHeightP: 44,
+      // showAppbar:true
+    }
+  },
+  computed: {
+    ...mapGetters(['showAppbar'])
+  },
+  onLoad({ appbar }) {
+    if (appbar == 'hidden') {
+      this.h5NavHeightP = 0
+      // this.showAppbar = false
+      this.hideNavBar()
+    }
+  },
+  methods: {
+    hideNavBar() {
+      /*#ifdef H5*/
+      this.$nextTick(() => {
+        let head = document.getElementsByTagName('uni-page-head')
+        if (head[0]) {
+          head[0].remove()
+        }
+        // console.log(head);
+      })
+      /*#endif*/
+    }
+  }
+}
diff --git a/src/pages/basics/basics-base.vue b/src/pages/basics/basics-base.vue
index a1b4c02..213d024 100644
--- a/src/pages/basics/basics-base.vue
+++ b/src/pages/basics/basics-base.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <Appbar title="基地数据">
+    <Appbar :show="showAppbar" title="基地数据">
       <template #right>
         <view
           v-auth="['endpoint.agricultural_basic.create']"
diff --git a/src/pages/basics/town-base.vue b/src/pages/basics/town-base.vue
index a668612..120f7e5 100644
--- a/src/pages/basics/town-base.vue
+++ b/src/pages/basics/town-base.vue
@@ -14,7 +14,7 @@
       </view>
     </view>
     <view class="w-full h-20rpx"></view>
-    <u-sticky>
+    <u-sticky :h5NavHeight="h5NavHeightP">
       <view class="bg-white">
         <view class="flex items-center p-20rpx">
           <u-input
diff --git a/src/pages/crop/basics-crop.vue b/src/pages/crop/basics-crop.vue
index 56b619b..9e95d2b 100644
--- a/src/pages/crop/basics-crop.vue
+++ b/src/pages/crop/basics-crop.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <Appbar title="基地农作物">
+    <Appbar :show="showAppbar" title="基地农作物">
       <template #right>
         <view v-auth="['endpoint.crops.create']" class="text-white mr-20px" @click="handleCreate">新增</view>
       </template>
diff --git a/src/pages/crop/town-crop.vue b/src/pages/crop/town-crop.vue
index 1e9d949..90c8dd9 100644
--- a/src/pages/crop/town-crop.vue
+++ b/src/pages/crop/town-crop.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <Appbar title="城镇农作物">
+    <Appbar :show="showAppbar" title="城镇农作物">
       <template #right>
         <view
           v-auth="['endpoint.town_crops.create']"
diff --git a/src/pages/device/index.vue b/src/pages/device/index.vue
index 460da00..418c9a4 100644
--- a/src/pages/device/index.vue
+++ b/src/pages/device/index.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-navbar title="设备管理" :background="background" :custom-back="goback"
+		<u-navbar :isBack="showAppbar" :title="showAppbar?'设备管理':''" :background="background" :custom-back="goback"
 		 :title-color="titleColor" :back-icon-color="titleColor">
 			<view class="nav_slot_right_box" slot="right">
 				<view v-auth="['endpoint.device.create']" class="custom_btn add_btn" @click="addBtn()">新增</view>
diff --git a/src/pages/estate/estate-flows.vue b/src/pages/estate/estate-flows.vue
index fb6bcf6..1d413c0 100644
--- a/src/pages/estate/estate-flows.vue
+++ b/src/pages/estate/estate-flows.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="bg-page">
-    <u-navbar
-      title="稻虾流向"
+    <u-navbar :isBack="showAppbar"
+      :title="showAppbar?'稻虾流向':''"
       :background="background"
       :custom-back="goback"
       :title-color="titleColor"
diff --git a/src/pages/estate/estate-industry.vue b/src/pages/estate/estate-industry.vue
index 6a52f36..3110560 100644
--- a/src/pages/estate/estate-industry.vue
+++ b/src/pages/estate/estate-industry.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-navbar title="稻虾产业" :background="background" :custom-back="goback"
+		<u-navbar :isBack="showAppbar" :title="showAppbar?'稻虾产业':''" :background="background" :custom-back="goback"
 		 :title-color="titleColor" :back-icon-color="titleColor">
 			<view class="nav_slot_right_box" slot="right">
 				<view v-auth="['endpoint.rice_shrimp_industries.create']" class="custom_btn add_btn" @click="addBtn()">新增</view>
diff --git a/src/pages/estate/estate-materiels.vue b/src/pages/estate/estate-materiels.vue
index 4542020..f377461 100644
--- a/src/pages/estate/estate-materiels.vue
+++ b/src/pages/estate/estate-materiels.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-navbar title="大宗物资" :background="background" :custom-back="goback"
+		<u-navbar :isBack="showAppbar" :title="showAppbar?'大宗物资':''" :background="background" :custom-back="goback"
 		 :title-color="titleColor" :back-icon-color="titleColor">
 			<view class="nav_slot_right_box" slot="right">
 				<view v-auth="['endpoint.materiels.create']" class="custom_btn add_btn" @click="addBtn()">新增</view>
diff --git a/src/pages/estate/estate-price.vue b/src/pages/estate/estate-price.vue
index f5ed310..cd93315 100644
--- a/src/pages/estate/estate-price.vue
+++ b/src/pages/estate/estate-price.vue
@@ -1,7 +1,8 @@
 <template>
   <view class="bg-page">
-    <u-navbar
-      title="稻虾价格"
+    <u-navbar :isBack="showAppbar"
+     
+      :title="showAppbar?'稻虾价格':''"
       :background="background"
       :custom-back="goback"
       :title-color="titleColor"
diff --git a/src/pages/estate/estate-week-price.vue b/src/pages/estate/estate-week-price.vue
index 8ba794a..1be752c 100644
--- a/src/pages/estate/estate-week-price.vue
+++ b/src/pages/estate/estate-week-price.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="bg-page">
-    <u-navbar
-      title="稻虾每周价格"
+    <u-navbar :isBack="showAppbar"
+      :title="showAppbar?'稻虾每周价格':''"
       :background="background"
       :custom-back="goback"
       :title-color="titleColor"
diff --git a/src/pages/index/components/pests-images.vue b/src/pages/index/components/pests-images.vue
index 3dfb5e9..88ceb83 100644
--- a/src/pages/index/components/pests-images.vue
+++ b/src/pages/index/components/pests-images.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-sticky>
+    <u-sticky :h5NavHeight="h5NavHeightP">
       <view class="bg-white">
         <SearchForm
           :schemas="searchFormSchema"
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index 30bd9aa..8a7f589 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -205,7 +205,6 @@ export default {
     },
 
     linknavFn(item) {
-      console.log(item)
       uni.navigateTo({
         url: `${item.url}`,
       })
diff --git a/src/pages/index/insect-monitors.vue b/src/pages/index/insect-monitors.vue
index 5b6f9e9..29d82d1 100644
--- a/src/pages/index/insect-monitors.vue
+++ b/src/pages/index/insect-monitors.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-sticky>
+    <u-sticky :h5NavHeight="h5NavHeightP">
       <view class="bg-white">
         <SearchForm
           :schemas="searchFormSchema"
diff --git a/src/pages/index/insecticidal-lamp.vue b/src/pages/index/insecticidal-lamp.vue
index bff3bbf..b179896 100644
--- a/src/pages/index/insecticidal-lamp.vue
+++ b/src/pages/index/insecticidal-lamp.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-sticky>
+    <u-sticky :h5NavHeight="h5NavHeightP">
       <view class="bg-white">
         <SearchForm
           :schemas="searchFormSchema"
diff --git a/src/pages/index/pests.vue b/src/pages/index/pests.vue
index 076e7ec..4e8216e 100644
--- a/src/pages/index/pests.vue
+++ b/src/pages/index/pests.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-sticky>
+    <u-sticky :h5NavHeight="h5NavHeightP">
       <view class="px-26rpx">
         <u-subsection
           :list="list"
diff --git a/src/pages/index/warning-list.vue b/src/pages/index/warning-list.vue
index eaedce0..df49be6 100644
--- a/src/pages/index/warning-list.vue
+++ b/src/pages/index/warning-list.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-navbar title="预警列表" :background="background" :custom-back="goback"
+		<u-navbar v-if="showAppbar" title="预警列表" :background="background" :custom-back="goback"
 		 :title-color="titleColor" :back-icon-color="titleColor">
 		 </u-navbar>
 		<view class="secreen-section" style="background-color: #fff;">
diff --git a/src/pages/system/account.vue b/src/pages/system/account.vue
index 8b2dda6..51a49ea 100644
--- a/src/pages/system/account.vue
+++ b/src/pages/system/account.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="role-page bg-page">
-		<u-sticky>
+		<u-sticky :h5NavHeight="h5NavHeightP">
 		<view class="top-title-box">
 			<view class="title">账号列表</view>
 			<view class="handle-option">
diff --git a/src/pages/system/links.vue b/src/pages/system/links.vue
index 6e1d4ca..35a9576 100644
--- a/src/pages/system/links.vue
+++ b/src/pages/system/links.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="bg-page">
-		<u-navbar title="友情链接" :background="background" :custom-back="goback"
+		<u-navbar :isBack="showAppbar" :title="showAppbar?'友情链接':''" :background="background" :custom-back="goback"
 		 :title-color="titleColor" :back-icon-color="titleColor">
 			<view class="nav_slot_right_box" slot="right">
 				<view v-auth="['endpoint.friend_links.edit']" class="custom_btn add_btn" @click="addBtn()">新增</view>
diff --git a/src/pages/system/role.vue b/src/pages/system/role.vue
index 24bbc51..7e98cfd 100644
--- a/src/pages/system/role.vue
+++ b/src/pages/system/role.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="role-page bg-page">
-		<u-sticky>
+		<u-sticky :h5NavHeight="h5NavHeightP">
 		<view class="top-title-box">
 			<view class="title">角色列表</view>
 			<view class="handle-option">
diff --git a/src/pages/yield/basics-yield.vue b/src/pages/yield/basics-yield.vue
index 5add64d..79c7a8a 100644
--- a/src/pages/yield/basics-yield.vue
+++ b/src/pages/yield/basics-yield.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <Appbar title="基地产量">
+    <Appbar :show="showAppbar" title="基地产量">
       <template #right>
         <view v-auth="['endpoint.crops_output.create']" class="text-white mr-20px" @click="handleCreate">新增</view>
       </template>
diff --git a/src/pages/yield/town-yield.vue b/src/pages/yield/town-yield.vue
index 91231c9..8f8a25e 100644
--- a/src/pages/yield/town-yield.vue
+++ b/src/pages/yield/town-yield.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <Appbar title="城镇产量">
+    <Appbar :show="showAppbar" title="城镇产量">
       <template #right>
         <view v-auth="['endpoint.town_crops_output.create']" class="text-white mr-20px" @click="handleCreate">新增</view>
       </template>
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 4f8fd16..8bd3b14 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -10,5 +10,8 @@ const mutations = {
 	[types.USERKEY](state, userkey) {
 		state.user_key = userkey
 	},
+	showAppbar: (state, e) => {
+		state.showAppbar = e
+	}
 };
 export default mutations;
diff --git a/src/store/state.js b/src/store/state.js
index 41c7c47..a067abe 100644
--- a/src/store/state.js
+++ b/src/store/state.js
@@ -2,6 +2,7 @@ const state = {
 	userInfo: {},
 	user_access_token: '',
 	user_key:'',
+	showAppbar:true
 };
 
 export default state;
\ No newline at end of file