From 15ae4a0daffaa7fdec2566a2fc96409b90822a09 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 12 十一月 2024 13:13:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-2.0' into master-2.0
---
pages.json | 228 ++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 202 insertions(+), 26 deletions(-)
diff --git a/pages.json b/pages.json
index 4165edf..d5f5488 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": ""
@@ -151,11 +158,69 @@
],
"subPackages": [{
"root": "sub_pages/supplier",
- "pages": [{
+ "pages": [
+ {
+ "path": "wallet/my-wallet",
+ "style": {
+ "navigationBarTitleText": "我的钱包",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "wallet/wallet-withdrao-deposit",
+ "style": {
+ "navigationBarTitleText": "提现到微信",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "wallet/wallet-billing-detail",
+ "style": {
+ "navigationBarTitleText": "账单明细",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "wallet/wallet-withdrao-deposit-record",
+ "style": {
+ "navigationBarTitleText": "提现记录",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "wallet/wallet-deduction-record",
+ "style": {
+ "navigationBarTitleText": "扣款记录",
+ "enablePullDownRefresh": true
+ }
+ },
+
+ {
+ "path": "advertising/advertising",
+ "style": {
+ "navigationBarTitleText": "广告",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "customer_service/customer_service",
+ "style": {
+ "navigationBarTitleText": "客服中心",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
"path": "protocol",
"style": {
"navigationBarTitleText": "协议",
"enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "data-statis/data-statis",
+ "style": {
+ "navigationBarTitleText": "数据统计",
+ "enablePullDownRefresh": true
}
}
// #ifdef PUB_SUPPLIER
@@ -219,23 +284,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 +330,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": {
@@ -281,14 +365,6 @@
"enablePullDownRefresh": false
}
},
- {
- "path": "partner-info/partner-code-v2",
- "style": {
- "navigationBarTitleText": "合伙人推广二维码",
- "enablePullDownRefresh": false
- }
- },
-
{
"path": "order-manage/order-manage",
"style": {
@@ -318,6 +394,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": "",
@@ -337,6 +427,20 @@
"root": "sub_pages/customer",
"pages": [
// #ifdef PUB_CUSTOMER
+ {
+ "path": "setup/setup",
+ "style": {
+ "navigationBarTitleText": "设置",
+ "enablePullDownRefresh": false
+ }
+ },
+ {
+ "path": "setup/account-self",
+ "style": {
+ "navigationBarTitleText": "账户安全",
+ "enablePullDownRefresh": false
+ }
+ },
{
"path": "customer-info/customer-info",
"style": {
@@ -381,7 +485,8 @@
{
"path": "shop/shop",
"style": {
- "navigationBarTitleText": "商家主页"
+ "navigationBarTitleText": "商家主页",
+ "enablePullDownRefresh": true
}
},
{
@@ -404,6 +509,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