From b8e824eb853b92d9a275803f647da861a626fcdd Mon Sep 17 00:00:00 2001
From: dingtalk_umvbsp <m13724205240@163.com>
Date: Mon, 19 Feb 2024 16:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BA=94=E7=94=A8=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/{patrolGarden => home}/app.vue |  6 +++---
 pages/home/index.vue                 |  7 +++----
 router/home.js                       | 11 +++++++++++
 router/patrolGarden.js               | 11 -----------
 uni.scss                             |  8 ++++++++
 5 files changed, 25 insertions(+), 18 deletions(-)
 rename pages/{patrolGarden => home}/app.vue (87%)

diff --git a/pages/patrolGarden/app.vue b/pages/home/app.vue
similarity index 87%
rename from pages/patrolGarden/app.vue
rename to pages/home/app.vue
index 6d57ef5..78fbff0 100644
--- a/pages/patrolGarden/app.vue
+++ b/pages/home/app.vue
@@ -48,15 +48,15 @@
 		<view class="card">
 			<view class="_title">所有应用</view>
 			<view class="content">
-				<view>
+				<view @click="$u.route({url:'pages/stock/mana'})">
 					<image src="/static/patrolGarden/inventory.svg"/>
 					<text class="name">库存</text>
 				</view>
-				<view>
+				<view @click="$u.route({url:'pages/purchase/apply'})">
 					<image src="/static/patrolGarden/procure.svg"/>
 					<text class="name">采购</text>
 				</view>
-				<view>
+				<view @click="$u.route({url:'/pages/patrolGarden/record'})">
 					<image src="/static/patrolGarden/tour.svg"/>
 					<text class="name">巡园</text>
 				</view>
diff --git a/pages/home/index.vue b/pages/home/index.vue
index a89d498..8ba80e6 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -281,13 +281,12 @@
 				</view>
 
 				<text class="line"/>
-				<text class="plant-nongzi" style="margin-right:64rpx;" @click="$u.route({url:'pages/stock/mana'})">库存</text>
-				<text class="plant-caigou" @click="$u.route({url:'pages/purchase/apply'})">采购</text>
+				<text class="PA-yingyong" @click="$u.route({url:'pages/home/app'})">应用</text>
+				<!-- <text class="plant-nongzi" style="margin-right:64rpx;" @click="$u.route({url:'pages/stock/mana'})">库存</text>
+				<text class="plant-caigou" @click="$u.route({url:'pages/purchase/apply'})">采购</text> -->
 			</view>
 		</view>
 
-		<view @click="$u.route({url:'/pages/patrolGarden/record'})">巡园记录</view>
-
 		<view style="display:flex;">
 			<view class="card mana">
 				<view class="title">
diff --git a/router/home.js b/router/home.js
index e8e8d60..5d5e0b9 100644
--- a/router/home.js
+++ b/router/home.js
@@ -17,6 +17,17 @@ module.exports=[
 			}
 		}
 	},
+	{
+		path:"pages/home/app",
+		style:{
+			navigationBarTitleText:"应用",
+			navigationBarBackgroundColor:"#10C176",
+			navigationBarTextStyle:"white",
+			"app-plus":{
+				"titleNView":true
+			}
+		}
+	},
 	{
 		path:"pages/home/my",
 		style:{
diff --git a/router/patrolGarden.js b/router/patrolGarden.js
index 6aef537..f7743ec 100644
--- a/router/patrolGarden.js
+++ b/router/patrolGarden.js
@@ -30,17 +30,6 @@ module.exports=[
 			}
 		}
 	},
-	{
-		path:"pages/patrolGarden/app",
-		style:{
-			navigationBarTitleText:"巡园应用",
-			navigationBarBackgroundColor:"#10C176",
-			navigationBarTextStyle:"white",
-			"app-plus":{
-				"titleNView":true
-			}
-		}
-	},
 	{
 		path:"pages/patrolGarden/abnoReport",
 		style:{
diff --git a/uni.scss b/uni.scss
index c93d1d5..e9df8e6 100644
--- a/uni.scss
+++ b/uni.scss
@@ -85,6 +85,14 @@ $uni-font-size-paragraph:15px;
 	-webkit-font-smoothing: antialiased;
 	-moz-osx-font-smoothing: grayscale;
 }
+@import url('https://at.alicdn.com/t/c/font_4432735_8j85lsm6nhc.css');
+[class*=PA-]{
+	font-family: "plantApp" !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
 
 .card{
 	background:#fff;