From fb48777cd4c3f086f77b5b26e1d03aebf995f4f5 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 18:40:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0

---
 pages.json |  111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 110 insertions(+), 1 deletions(-)

diff --git a/pages.json b/pages.json
index 7ba042c..b15166b 100644
--- a/pages.json
+++ b/pages.json
@@ -141,6 +141,12 @@
 			"style": {
 				"navigationBarTitleText": "搜鲜花"
 			}
+		},
+		{
+			"path": "pages/home/components/home-banner-detail",
+			"style": {
+				"navigationBarTitleText": "公告"
+			}
 		}
 	],
 	"subPackages": [{
@@ -208,6 +214,31 @@
 					"path": "order-settlement/order-settlement-detail",
 					"style": {
 						"navigationBarTitleText": "结算单详情"
+					}
+				},
+				{
+					"path": "order-manage/order-manage",
+					"style": {
+						"navigationBarTitleText": "送货单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "order-manage/order-manage-settlement",
+					"style": {
+						"navigationBarTitleText": "送货单结算明细"
+					}
+				},
+				{
+					"path": "order-manage/order-manage-settlement-op-detail",
+					"style": {
+						"navigationBarTitleText": "送货单质检操作明细"
+					}
+				},
+				{
+					"path": "order-manage/order-manage-flower",
+					"style": {
+						"navigationBarTitleText": "送货单"
 					}
 				}
 				// #endif				
@@ -291,6 +322,20 @@
 					}
 				},
 				{
+					"path": "delivery/delivery-supplier-detail",
+					"style": {
+						"navigationBarTitleText": "供应商质检详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "delivery/delivery-supplier-detail-list",
+					"style": {
+						"navigationBarTitleText": "供应商质检详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
 					"path": "delivery/delivery-home",
 					"style": {
 						"navigationBarTitleText": "",
@@ -354,7 +399,8 @@
 				{
 					"path": "shop/shop",
 					"style": {
-						"navigationBarTitleText": "商家主页"
+						"navigationBarTitleText": "商家主页",
+						"enablePullDownRefresh": true
 					}
 				},
 				{
@@ -377,6 +423,69 @@
 						"navigationBarTitleText": "我的收藏",
 						"enablePullDownRefresh": true
 					}
+				},
+				{
+					"path": "self/feedback",
+					"style": {
+						"navigationBarTitleText": "投诉反馈",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "self/feedback-detail",
+					"style": {
+						"navigationBarTitleText": "投诉反馈"
+					}
+				},
+				{
+					"path": "coupon/coupon-self",
+					"style": {
+						"navigationBarTitleText": "我的优惠券",
+						"enablePullDownRefresh": true
+
+					}
+				},
+				{
+					"path": "coupon/coupon-all",
+					"style": {
+						"navigationBarTitleText": "领券中心",
+						"enablePullDownRefresh": true
+
+					}
+				},
+				{
+					"path": "coupon/good-self",
+					"style": {
+						"navigationBarTitleText": "我的兑换券",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "coupon/point-history",
+					"style": {
+						"navigationBarTitleText": "积分明细"
+					}
+				},
+				{
+					"path": "coupon/good-all",
+					"style": {
+						"navigationBarTitleText": "积分兑换",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "coupon/good-detail",
+					"style": {
+						"navigationBarTitleText": "详情"
+					}
+				},
+				{
+					"path": "self/member-center",
+					"style": {
+						"navigationBarTitleText": "会员中心",
+						"enablePullDownRefresh": true						
+					}
 				}
 				// #endif
 			]

--
Gitblit v1.9.3