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 |   96 +++++++++++++++++++++++++++--------------------
 1 files changed, 55 insertions(+), 41 deletions(-)

diff --git a/pages.json b/pages.json
index eb0d466..d289514 100644
--- a/pages.json
+++ b/pages.json
@@ -29,14 +29,30 @@
 			}
 
 		},
+		{
+			"path": "pages/user/address/address",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"enablePullDownRefresh": false
+			}
+		},
 		// #endif 
 
-		// #ifndef PUB_CUSTOMER
+		// #ifdef PUB_SUPPLIER
 		{
 			"path": "pages/login/supplier-reg",
 			"style": {
 				"navigationBarTitleText": "申请入驻",
 				"navigationStyle": "custom"
+			}
+		},
+		// #endif 
+
+		// #ifdef PUB_PARTNER
+		{
+			"path": "pages/login/supplier-reg",
+			"style": {
+				"navigationBarTitleText": "申请入驻"
 			}
 		},
 		// #endif 
@@ -75,42 +91,36 @@
 				"navigationBarTitleText": "修改密码",
 				"enablePullDownRefresh": false
 			}
-		},
-		{
-			"path": "pages/user/address/address",
-			"style": {
-				"navigationBarTitleText": "收货地址",
-				"enablePullDownRefresh": false
-			}
 		}
+
 	],
 
 	"subPackages": [{
 		"root": "sub_pages/supplier",
-		"pages": [
-			// #ifdef PUB__SUPPLIER
+		"pages": [
+			// #ifdef PUB_SUPPLIER
 			{
 				"path": "supplier-info/supplier-info",
 				"style": {
 					"navigationBarTitleText": "信息维护",
 					"enablePullDownRefresh": false
 				}
-			}, 
-			{
-				"path": "flower-manage/flower-manage",
-				"style": {
-					"navigationBarTitleText": "商品管理",
-					"enablePullDownRefresh": true
-				}
-			},
-			{
-				"path": "flower-manage/flower-add",
-				"style": {
-					"navigationBarTitleText": "",
-					"enablePullDownRefresh": false
-				}
-			},	
-			// #endif
+			},
+			{
+				"path": "flower-manage/flower-manage",
+				"style": {
+					"navigationBarTitleText": "商品管理",
+					"enablePullDownRefresh": true
+				}
+			},
+			{
+				"path": "flower-manage/flower-add",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+			},
+			// #endif
 			{
 				"path": "order-settlement/order-settlement",
 				"style": {
@@ -118,7 +128,7 @@
 					"enablePullDownRefresh": true
 				}
 			},
-			
+
 			{
 				"path": "order-sale/order-sale",
 				"style": {
@@ -135,7 +145,7 @@
 
 				}
 			},
-			
+
 			{
 				"path": "protocol",
 				"style": {
@@ -148,16 +158,16 @@
 
 	}, {
 		"root": "sub_pages/partner",
-		"pages": [
-			// #ifdef PUB_PARTNER
-			{
-				"path": "partner-info/partner-info",
-				"style": {
-					"navigationBarTitleText": "信息维护",
-					"enablePullDownRefresh": false
-				}
-			},		
-			// #endif 
+		"pages": [
+			// #ifdef PUB_PARTNER
+			{
+				"path": "partner-info/partner-info",
+				"style": {
+					"navigationBarTitleText": "信息维护",
+					"enablePullDownRefresh": false
+				}
+			},
+
 			{
 				"path": "order-manage/order-manage",
 				"style": {
@@ -172,11 +182,15 @@
 					"enablePullDownRefresh": true
 				}
 			}
-
+			// #endif
 		]
 	}, {
 		"root": "sub_pages/customer",
-		"pages": [{
+		"pages": [
+			// #ifdef PUB_CUSTOMER 
+
+
+			{
 				"path": "trade/trade",
 				"style": {
 					"navigationBarTitleText": "交易大厅",
@@ -211,7 +225,7 @@
 					"navigationBarTitleText": "商家主页"
 				}
 			}
-
+			// #endif 
 		]
 	}],
 	"globalStyle": {

--
Gitblit v1.9.3