From aa82f2ce6aabe78b47c927d7ae2d3ff08c59baaf Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 09 十月 2024 15:43:26 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
pages.json | 143 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/pages.json b/pages.json
index 7ba042c..f716fba 100644
--- a/pages.json
+++ b/pages.json
@@ -99,7 +99,14 @@
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false
}
- }, {
+ },{
+ "path": "pages/order/comment/order-comment",
+ "style": {
+ "navigationBarTitleText": "商品评价",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
"path": "pages/help/content",
"style": {
"navigationBarTitleText": ""
@@ -140,6 +147,12 @@
"path": "pages/home/components/home-search",
"style": {
"navigationBarTitleText": "搜鲜花"
+ }
+ },
+ {
+ "path": "pages/home/components/home-banner-detail",
+ "style": {
+ "navigationBarTitleText": "公告"
}
}
],
@@ -209,6 +222,31 @@
"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
// #ifdef PUB_PARTNER
@@ -234,12 +272,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": {
@@ -287,6 +340,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
}
},
@@ -354,7 +421,8 @@
{
"path": "shop/shop",
"style": {
- "navigationBarTitleText": "商家主页"
+ "navigationBarTitleText": "商家主页",
+ "enablePullDownRefresh": true
}
},
{
@@ -377,6 +445,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