From 92a4759e242421f578d463e457fcea33893c6c2a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期六, 14 九月 2024 18:33:12 +0800
Subject: [PATCH] 完成合并并解决冲突
---
pages.json | 37 +++++++++++++++++++++++++++++--------
1 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/pages.json b/pages.json
index 6cb6d79..5a79e6f 100644
--- a/pages.json
+++ b/pages.json
@@ -265,6 +265,14 @@
}
}
// #endif
+ // #ifdef PUB_CUSTOMER
+ , {
+ "path": "order-manage/order-manage-settlement-op-detail",
+ "style": {
+ "navigationBarTitleText": "送货单质检操作明细"
+ }
+ }
+ // #endif
]
},
{
@@ -323,6 +331,13 @@
},
{
"path": "delivery/delivery-supplier-detail",
+ "style": {
+ "navigationBarTitleText": "供应商质检详情",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "delivery/delivery-supplier-detail-list",
"style": {
"navigationBarTitleText": "供应商质检详情",
"enablePullDownRefresh": true
@@ -464,15 +479,21 @@
"style": {
"navigationBarTitleText": "积分兑换",
"navigationStyle": "custom",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": true
}
- },
- {
- "path" : "coupon/good-detail",
- "style" :
- {
- "navigationBarTitleText" : "详情"
- }
+ },
+ {
+ "path": "coupon/good-detail",
+ "style": {
+ "navigationBarTitleText": "详情"
+ }
+ },
+ {
+ "path": "self/member-center",
+ "style": {
+ "navigationBarTitleText": "会员中心",
+ "enablePullDownRefresh": true
+ }
}
// #endif
]
--
Gitblit v1.9.3