From 32ab1af0797e3e8ab60dc646fc2c30cddf1dfa1f Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 22 七月 2024 11:34:18 +0800
Subject: [PATCH] update需求更新

---
 pages.json |  145 +++++++++++++++++++++++++++++-------------------
 1 files changed, 87 insertions(+), 58 deletions(-)

diff --git a/pages.json b/pages.json
index da87714..d289514 100644
--- a/pages.json
+++ b/pages.json
@@ -3,20 +3,7 @@
 	"easycom": {
 		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
 	},
-	"pages": [
-
-		// #ifdef PUB_CUSTOMER 
-		{
-			"path": "pages/home/home",
-			"style": {
-				"navigationBarTitleText": "首页",
-				"enablePullDownRefresh": true,
-				"navigationStyle": "custom"
-			}
-
-		},
-		// #endif 
-		{
+	"pages": [{
 			"path": "pages/login/supplier-login",
 			"style": {
 				"navigationBarTitleText": "登录",
@@ -32,6 +19,43 @@
 			}
 
 		},
+		// #ifdef PUB_CUSTOMER
+		{
+			"path": "pages/home/home",
+			"style": {
+				"navigationBarTitleText": "首页",
+				"enablePullDownRefresh": true,
+				"navigationStyle": "custom"
+			}
+
+		},
+		{
+			"path": "pages/user/address/address",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"enablePullDownRefresh": false
+			}
+		},
+		// #endif 
+
+		// #ifdef PUB_SUPPLIER
+		{
+			"path": "pages/login/supplier-reg",
+			"style": {
+				"navigationBarTitleText": "申请入驻",
+				"navigationStyle": "custom"
+			}
+		},
+		// #endif 
+
+		// #ifdef PUB_PARTNER
+		{
+			"path": "pages/login/supplier-reg",
+			"style": {
+				"navigationBarTitleText": "申请入驻"
+			}
+		},
+		// #endif 
 		{
 			"path": "pages/user/supplier-user",
 			"style": {
@@ -67,29 +91,19 @@
 				"navigationBarTitleText": "修改密码",
 				"enablePullDownRefresh": false
 			}
-		},
-		{
-			"path": "pages/user/address/address",
-			"style": {
-				"navigationBarTitleText": "收货地址",
-				"enablePullDownRefresh": false
-			}
 		}
+
 	],
 
 	"subPackages": [{
 		"root": "sub_pages/supplier",
-		"pages": [{
+		"pages": [
+			// #ifdef PUB_SUPPLIER
+			{
 				"path": "supplier-info/supplier-info",
 				"style": {
 					"navigationBarTitleText": "信息维护",
 					"enablePullDownRefresh": false
-				}
-			}, {
-				"path": "order-settlement/order-settlement",
-				"style": {
-					"navigationBarTitleText": "账单结算",
-					"enablePullDownRefresh": true
 				}
 			},
 			{
@@ -99,6 +113,22 @@
 					"enablePullDownRefresh": true
 				}
 			},
+			{
+				"path": "flower-manage/flower-add",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			},
+			// #endif
+			{
+				"path": "order-settlement/order-settlement",
+				"style": {
+					"navigationBarTitleText": "账单结算",
+					"enablePullDownRefresh": true
+				}
+			},
+
 			{
 				"path": "order-sale/order-sale",
 				"style": {
@@ -115,20 +145,7 @@
 
 				}
 			},
-			{
-				"path": "flower-manage/flower-add",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path": "supplier-reg/supplier-reg",
-				"style": {
-					"navigationBarTitleText": "申请入住",
-					"navigationStyle": "custom"
-				}
-			},
+
 			{
 				"path": "protocol",
 				"style": {
@@ -141,7 +158,17 @@
 
 	}, {
 		"root": "sub_pages/partner",
-		"pages": [{
+		"pages": [
+			// #ifdef PUB_PARTNER
+			{
+				"path": "partner-info/partner-info",
+				"style": {
+					"navigationBarTitleText": "信息维护",
+					"enablePullDownRefresh": false
+				}
+			},
+
+			{
 				"path": "order-manage/order-manage",
 				"style": {
 					"navigationBarTitleText": "订单管理",
@@ -155,11 +182,15 @@
 					"enablePullDownRefresh": true
 				}
 			}
-
+			// #endif
 		]
 	}, {
 		"root": "sub_pages/customer",
-		"pages": [{
+		"pages": [
+			// #ifdef PUB_CUSTOMER 
+
+
+			{
 				"path": "trade/trade",
 				"style": {
 					"navigationBarTitleText": "交易大厅",
@@ -183,29 +214,27 @@
 			{
 				"path": "trade/detail",
 				"style": {
-					"navigationBarTitleText": "商品详情",
-					"enablePullDownRefresh": false
-					
+					"navigationBarTitleText": "商品详情",
+					"enablePullDownRefresh": false
+
+				}
+			},
+			{
+				"path": "shop/shop",
+				"style": {
+					"navigationBarTitleText": "商家主页"
 				}
 			}
-
+			// #endif 
 		]
 	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uni-app",
+		"navigationBarTitleText": "花满芫",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",
 		"app-plus": {
 			"background": "#efeff4"
 		}
-	},
-	"condition": { //模式配置,仅开发期间生效
-		"current": 0, //当前激活的模式(list 的索引项)
-		"list": [{
-			"name": "", //模式名称
-			"path": "", //启动页面,必选
-			"query": "" //启动参数,在页面的onLoad函数里面得到
-		}]
 	}
 }
\ No newline at end of file

--
Gitblit v1.9.3