From e8d258576a34f35cfefbd6bfe07b7f22e72d87d4 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:42:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/v2' into v2
---
pages.json | 110 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 95 insertions(+), 15 deletions(-)
diff --git a/pages.json b/pages.json
index 060f515..498f72e 100644
--- a/pages.json
+++ b/pages.json
@@ -222,20 +222,24 @@
"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
@@ -318,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": "",
@@ -381,7 +399,7 @@
{
"path": "shop/shop",
"style": {
- "navigationBarTitleText": "商家主页",
+ "navigationBarTitleText": "商家主页",
"enablePullDownRefresh": true
}
},
@@ -405,6 +423,68 @@
"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": "会员中心"
+ }
}
// #endif
]
--
Gitblit v1.9.3