From 0509850596b9d275bc49211af4c39b37d2983c7c Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期一, 23 九月 2024 17:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0

---
 pages.json |   82 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 81 insertions(+), 1 deletions(-)

diff --git a/pages.json b/pages.json
index 87acc7a..5c8e879 100644
--- a/pages.json
+++ b/pages.json
@@ -265,12 +265,27 @@
 					}
 				}
 				// #endif
+				// #ifdef PUB_CUSTOMER 
+				, {
+					"path": "order-manage/order-manage-settlement-op-detail",
+					"style": {
+						"navigationBarTitleText": "送货单质检操作明细"
+					}
+				}
+				// #endif 
 			]
 		},
 		{
 			"root": "sub_pages/partner",
 			"pages": [
 				// #ifdef PUB_PARTNER
+				{
+					"path": "partner-info/partner-info-personal",
+					"style": {
+						"navigationBarTitleText": "个人资料",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path": "partner-info/partner-info",
 					"style": {
@@ -323,6 +338,13 @@
 				},
 				{
 					"path": "delivery/delivery-supplier-detail",
+					"style": {
+						"navigationBarTitleText": "供应商质检详情",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "delivery/delivery-supplier-detail-list",
 					"style": {
 						"navigationBarTitleText": "供应商质检详情",
 						"enablePullDownRefresh": true
@@ -429,13 +451,71 @@
 					"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
+					}
+				},
+				{
+					"path": "self/sign",
+					"style": {
+						"navigationBarTitleText": "签到",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
 				}
 				// #endif
 			]
 		}
 	],
 	"globalStyle": {
-		"navigationBarTextStyle": "black",
+		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "花满芫",
 		"navigationBarBackgroundColor": "#F8F8F8",
 		"backgroundColor": "#F8F8F8",

--
Gitblit v1.9.3