From 2d4583ff25a4b6a5e6c1dc7ef84ac0b841628662 Mon Sep 17 00:00:00 2001
From: jsy_zjg <31502350@qq.com>
Date: Fri, 20 Dec 2024 10:50:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=86=9C=E6=83=85=E3=80=81?=
 =?UTF-8?q?=E9=A6=96=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                   | 19 +++---
 pages/fourmonitor/camera.vue                 |  1 +
 pages/fourmonitor/index.vue                  |  1 +
 pages/fourmonitor/pest.vue                   | 72 +++-----------------
 pages/fourmonitor/spore.vue                  |  1 +
 pages/fourmonitor/weatherstation.vue         |  1 +
 pages/head/fertilizerapplicator/detail.vue   |  1 +
 pages/head/fertilizerapplicator/detailkl.vue |  1 +
 pages/head/headdevice/detail.vue             |  1 +
 pages/head/index.vue                         | 10 +--
 pages/mine/index.vue                         | 14 ++--
 11 files changed, 37 insertions(+), 85 deletions(-)

diff --git a/pages.json b/pages.json
index 73e2c17..c942c98 100644
--- a/pages.json
+++ b/pages.json
@@ -36,17 +36,20 @@
 		}, {
 			"path": "pages/head/fertilizerapplicator/detail",
 			"style": {
-				"navigationBarTitleText": "施肥机"
+				"navigationBarTitleText": "施肥机",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/head/fertilizerapplicator/detailkl",
 			"style": {
-				"navigationBarTitleText": "施肥机"
+				"navigationBarTitleText": "施肥机",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/head/headdevice/detail",
 			"style": {
-				"navigationBarTitleText": "首部"
+				"navigationBarTitleText": "首部",
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/mine/index",
@@ -175,35 +178,35 @@
 			"path": "pages/fourmonitor/index",
 			"style": {
 				"navigationBarTitleText": "农情",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/fourmonitor/weatherstation",
 			"style": {
 				"navigationBarTitleText": "气象站",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/fourmonitor/pest",
 			"style": {
 				"navigationBarTitleText": "虫情",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/fourmonitor/spore",
 			"style": {
 				"navigationBarTitleText": "孢子",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 		},
 		{
 			"path": "pages/fourmonitor/camera",
 			"style": {
 				"navigationBarTitleText": "摄像头",
-				"enablePullDownRefresh": false
+				"navigationStyle": "custom"
 			}
 		}, {
 			"path": "pages/popup/index-popup",
diff --git a/pages/fourmonitor/camera.vue b/pages/fourmonitor/camera.vue
index 1c4194a..a7ea4b6 100644
--- a/pages/fourmonitor/camera.vue
+++ b/pages/fourmonitor/camera.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="气象站"></custom-nav-bar>
 	<view class="content">
 		<view class="preview" id="video-container"></view>
 		<view>
diff --git a/pages/fourmonitor/index.vue b/pages/fourmonitor/index.vue
index aa7656f..927f7e9 100644
--- a/pages/fourmonitor/index.vue
+++ b/pages/fourmonitor/index.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="农情"></custom-nav-bar>
 	<view class="index-container">
 		<z-paging ref="paging" use-virtual-list @query="queryList" bg-color="#F3F3F3" :loading-more-enabled="false">
 			<template #cell="{item}">
diff --git a/pages/fourmonitor/pest.vue b/pages/fourmonitor/pest.vue
index 20bb0f5..a0acaf0 100644
--- a/pages/fourmonitor/pest.vue
+++ b/pages/fourmonitor/pest.vue
@@ -1,4 +1,12 @@
 <template>
+	<custom-nav-bar :left="true" title="虫情">
+		<!-- <template v-slot:right>
+			<view class="fixed">
+				<view align="right" class="iconfont icon-jia icon" v-hasPermi="['system:permission:add']"
+					@click="onAdd"></view>
+			</view>
+		</template> -->
+	</custom-nav-bar>
 	<view class="page">
 		<uni-row style="height: 40px;margin-left: 10px;">
 			<uni-col :span="12">
@@ -126,7 +134,7 @@
 						<view class="text1">摄像头</view>
 					</uni-col></uni-row>
 				<uni-row class="col2"><uni-col :span="24"><u-button text="拍照" type="info"
-							@click="controlHeadSwitch(item,0,'car')" style="height: ;"></u-button></uni-col></uni-row>
+							@click="controlHeadSwitch(item,0,'car')"></u-button></uni-col></uni-row>
 			</uni-col>
 		</uni-row>
 		<uni-row class="rowheadstyle"> <uni-col :span="24" v-if="itemProperty.aal!=null">
@@ -411,7 +419,7 @@
 	}
 
 	.but1 {
-		width: 130;
+		width: 240px;
 	}
 
 	.demo-uni-col {
@@ -489,66 +497,6 @@
 			}
 		}
 
-		.dialog-body {
-			height: calc(100% - 35px);
-			overflow: hidden;
-			position: relative;
-			background-color: #f7f7f7;
-
-			//扫码的弹窗
-			.scancode-device-info {
-				height: 100%;
-				padding: 0 20px;
-				overflow-x: hidden;
-				overflow-y: auto;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-evenly;
-
-				&>view {
-					width: 100%;
-					line-height: 40px;
-					font-size: 18px;
-					color: gray;
-
-					.label {
-						display: inline-block;
-						width: 30%;
-						color: black;
-						margin-right: 2px;
-						white-space: nowrap;
-					}
-				}
-			}
-		}
-
-		.control-panel {
-			height: 100px;
-			display: flex;
-			align-items: center;
-			flex-wrap: nowrap;
-			justify-content: space-evenly;
-
-			&>view {
-				padding: 6px 10px;
-				color: #007acc;
-				font-size: 14px;
-				border: 1px solid #ccc;
-				border-radius: 4px;
-			}
-		}
-
-		.logs-data-box {
-			width: 90vw;
-			height: calc(90vh - 35px);
-
-			.logs-container {
-				width: 100%;
-				height: calc(100% - 40px);
-				overflow-x: hidden;
-				overflow-y: auto;
-			}
-		}
 
 		.logs-item {
 			margin: 4px 10px;
diff --git a/pages/fourmonitor/spore.vue b/pages/fourmonitor/spore.vue
index ca3f658..bfd73b6 100644
--- a/pages/fourmonitor/spore.vue
+++ b/pages/fourmonitor/spore.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="孢子"></custom-nav-bar>
 	<view class="page">
 		<uni-row style="height: 40px;margin-left: 10px;">
 			<uni-col :span="12">
diff --git a/pages/fourmonitor/weatherstation.vue b/pages/fourmonitor/weatherstation.vue
index c7dd00c..4acf1a2 100644
--- a/pages/fourmonitor/weatherstation.vue
+++ b/pages/fourmonitor/weatherstation.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="气象站"></custom-nav-bar>
 	<view class="page">
 		<uni-row style="height: 30px;">
 			<uni-col :span="24" >
diff --git a/pages/head/fertilizerapplicator/detail.vue b/pages/head/fertilizerapplicator/detail.vue
index 55840db..8af7e12 100644
--- a/pages/head/fertilizerapplicator/detail.vue
+++ b/pages/head/fertilizerapplicator/detail.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="施肥机"></custom-nav-bar>
 	<view>
 		<uni-row style="margin-bottom: 3px;background-color:cadetblue;height: 34px;">
 			<uni-col :span="2">
diff --git a/pages/head/fertilizerapplicator/detailkl.vue b/pages/head/fertilizerapplicator/detailkl.vue
index d5857a3..878fff4 100644
--- a/pages/head/fertilizerapplicator/detailkl.vue
+++ b/pages/head/fertilizerapplicator/detailkl.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="施肥机"></custom-nav-bar>
 	<view>
 		<uni-row style="margin-bottom: 3px;background-color:cadetblue;height: 34px;">
 			<uni-col :span="2">
diff --git a/pages/head/headdevice/detail.vue b/pages/head/headdevice/detail.vue
index 8e3cba9..4948f06 100644
--- a/pages/head/headdevice/detail.vue
+++ b/pages/head/headdevice/detail.vue
@@ -1,4 +1,5 @@
 <template>
+	<custom-nav-bar :left="true" title="首部"></custom-nav-bar>
 	<view>
 		<uni-row style="background-color:cadetblue;height: 40px;">
 			<uni-col :span="2">
diff --git a/pages/head/index.vue b/pages/head/index.vue
index ecc7ace..1f27f1e 100644
--- a/pages/head/index.vue
+++ b/pages/head/index.vue
@@ -1,10 +1,10 @@
 <template>
+	<custom-nav-bar :left="false" leftText="" @leftClick="" title="首部">
+		<template v-slot:left>
+			<view @click="$refs.landRef.open()">地块</view>
+		</template>
+	</custom-nav-bar>
 	<view class="index-container">
-		<custom-nav-bar :left="false" leftText="" @leftClick="" title="首部">
-			<template v-slot:left>
-				<view @click="$refs.landRef.open()">地块</view>
-			</template>
-		</custom-nav-bar>
 		<z-paging ref="paging" use-virtual-list @query="queryList" bg-color="#F3F3F3" :loading-more-enabled="false">
 			<template #cell="{item}">
 				<view class="item-container" @click="onClickItem(item)">
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 6bccd23..ca39b54 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -78,13 +78,7 @@
 						<view>我的权益</view>
 					</view>
 				</view>
-				<!-- <view class="list-cell list-cell-arrow" @click="toPage('video')">
-					<view class="menu-item-box">
-						<view class="iconfont icon-user menu-icon"></view>
-						<view>视频</view>
-					</view>
-				</view> -->
-				<view class="list-cell list-cell-arrow" @click="toPage('help')">
+				<!-- <view class="list-cell list-cell-arrow" @click="toPage('help')">
 					<view class="menu-item-box">
 						<view class="iconfont icon-help menu-icon"></view>
 						<view>常见问题</view>
@@ -95,13 +89,13 @@
 						<view class="iconfont icon-aixin menu-icon"></view>
 						<view>关于我们</view>
 					</view>
-				</view>
-				<view class="list-cell list-cell-arrow" @click="toPage('setting')">
+				</view> -->
+				<!-- <view class="list-cell list-cell-arrow" @click="toPage('setting')">
 					<view class="menu-item-box">
 						<view class="iconfont icon-setting menu-icon"></view>
 						<view>应用设置</view>
 					</view>
-				</view>
+				</view> -->
 			</view>
 			<view class="menu-list">
 				<view class="list-cell list-cell-arrow" style="border-radius: 10px;" @click="toPage('setting')">