From 36f5a552738ff64d35e5508a1db8c2249b9187b0 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 27 六月 2024 14:25:33 +0800
Subject: [PATCH] update1

---
 pages.json |   98 ++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 72 insertions(+), 26 deletions(-)

diff --git a/pages.json b/pages.json
index a99cd4e..65fcb7f 100644
--- a/pages.json
+++ b/pages.json
@@ -1,4 +1,8 @@
 {
+	// 如果您是通过uni_modules形式引入uView,可以忽略此配置
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
 	"pages": [{
 			"path": "pages/login/farmer-login",
 			"style": {
@@ -40,48 +44,90 @@
 			"path": "pages/order/order",
 			"style": {
 				"navigationBarTitleText": "我的订单",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		},
 
 		{
-			"path": "pages/login/farmer-reg",
+			"path": "pages/notice/notice",
 			"style": {
-				"navigationBarTitleText": "申请入住",
+				"navigationBarTitleText": "通知公告",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
-			"path": "pages/farmer/order-settlement/order-settlement",
+			"path": "pages/notice/list",
 			"style": {
-				"navigationBarTitleText": "账单结算",
-				"enablePullDownRefresh": false
+				"navigationBarTitleText": "通知公告",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
-			"path": "pages/farmer/flower-manage/flower-manage",
-			"style": {
-				"navigationBarTitleText": "商品管理",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/farmer/order-sale/order-sale",
-			"style": {
-				"navigationBarTitleText": "售后理赔",
-				"enablePullDownRefresh": false
-			}
-		},
-		{
-			"path": "pages/farmer/order-records/order-records",
-			"style": {
-				"navigationBarTitleText": "扣款记录",
-				"enablePullDownRefresh": false,
-				"navigationBarBackgroundColor": "#E6F2EB"
-				
+			"path" : "pages/user/user-pwd/user-pwd",
+			"style" : 
+			{
+				"navigationBarTitleText" : "修改密码",
+				"enablePullDownRefresh" : false
 			}
 		}
 	],
+
+	"subPackages": [{
+		"root": "sub_pages/farmer",
+		"pages": [{
+				"path": "farmer-info/farmer-info",
+				"style": {
+					"navigationBarTitleText": "信息维护",
+					"enablePullDownRefresh": false
+				}
+			}, {
+				"path": "order-settlement/order-settlement",
+				"style": {
+					"navigationBarTitleText": "账单结算",
+					"enablePullDownRefresh": true
+				}
+			},
+			{
+				"path": "flower-manage/flower-manage",
+				"style": {
+					"navigationBarTitleText": "商品管理",
+					"enablePullDownRefresh": true
+				}
+			},
+			{
+				"path": "order-sale/order-sale",
+				"style": {
+					"navigationBarTitleText": "售后理赔",
+					"enablePullDownRefresh": true
+				}
+			},
+			{
+				"path": "order-records/order-records",
+				"style": {
+					"navigationBarTitleText": "扣款记录",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#E6F2EB"
+
+				}
+			},
+			{
+				"path": "flower-manage/flower-add",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			},
+			{
+				"path": "farmer-reg/farmer-reg",
+				"style": {
+					"navigationBarTitleText": "申请入住",
+					"navigationStyle": "custom"
+				}
+			}
+		]
+
+
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

--
Gitblit v1.9.3