From ce4b9391a433cad82a636ec8a66071880022db42 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期日, 29 九月 2024 16:36:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'remote-v2/master-2.0' into master-2.0
---
pages.json | 137 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 121 insertions(+), 16 deletions(-)
diff --git a/pages.json b/pages.json
index 4165edf..5c8e879 100644
--- a/pages.json
+++ b/pages.json
@@ -219,23 +219,27 @@
{
"path": "order-manage/order-manage",
"style": {
- "navigationBarTitleText": "订单管理",
+ "navigationBarTitleText": "送货单",
"enablePullDownRefresh": true
}
- },
- {
- "path" : "order-manage/order-manage-settlement",
- "style" :
- {
- "navigationBarTitleText" : "配送结算明细"
- }
- },
- {
- "path" : "order-manage/order-manage-flower",
- "style" :
- {
- "navigationBarTitleText" : "配送商品明细"
- }
+ },
+ {
+ "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
// #ifdef PUB_PARTNER
@@ -261,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": {
@@ -314,6 +333,20 @@
"path": "delivery/delivery-detail",
"style": {
"navigationBarTitleText": "质检详情",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "delivery/delivery-supplier-detail",
+ "style": {
+ "navigationBarTitleText": "供应商质检详情",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "delivery/delivery-supplier-detail-list",
+ "style": {
+ "navigationBarTitleText": "供应商质检详情",
"enablePullDownRefresh": true
}
},
@@ -381,7 +414,8 @@
{
"path": "shop/shop",
"style": {
- "navigationBarTitleText": "商家主页"
+ "navigationBarTitleText": "商家主页",
+ "enablePullDownRefresh": true
}
},
{
@@ -404,6 +438,77 @@
"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
+ }
+ },
+ {
+ "path": "self/sign",
+ "style": {
+ "navigationBarTitleText": "签到",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
}
// #endif
]
--
Gitblit v1.9.3