From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
pages.json | 181 +++++++++++++++++++++++++++++++-------------
1 files changed, 127 insertions(+), 54 deletions(-)
diff --git a/pages.json b/pages.json
index c752a79..094d7e4 100644
--- a/pages.json
+++ b/pages.json
@@ -3,22 +3,7 @@
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
- "pages": [{
- "path": "pages/login/supplier-login",
- "style": {
- "navigationBarTitleText": "登录",
- "enablePullDownRefresh": false,
- "navigationStyle": "custom"
- }
- },
- {
- "path": "pages/home/supplier-home",
- "style": {
- "navigationBarTitleText": "首页",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
- },
+ "pages": [
// #ifdef PUB_CUSTOMER
{
"path": "pages/home/home",
@@ -35,6 +20,22 @@
}
},
// #endif
+ {
+ "path": "pages/login/supplier-login",
+ "style": {
+ "navigationBarTitleText": "登录",
+ "enablePullDownRefresh": false,
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/home/supplier-home",
+ "style": {
+ "navigationBarTitleText": "首页",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
{
"path": "pages/login/supplier-reg",
"style": {
@@ -98,36 +99,56 @@
"navigationBarTitleText": "订单详情",
"enablePullDownRefresh": false
}
- }
- // #ifdef PUB_PARTNER
- ,
- {
- "path": "sub_pages/partner/delivery/delivery",
- "style": {
- "navigationBarTitleText": "配送质检",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "sub_pages/partner/delivery/delivery-detail",
- "style": {
- "navigationBarTitleText": "质检详情",
- "enablePullDownRefresh": true
- }
- }
- // #endif
- , {
+ }, {
"path": "pages/help/content",
"style": {
"navigationBarTitleText": ""
}
+ },
+ {
+ "path": "pages/order/order-delivery-detail",
+ "style": {
+ "navigationBarTitleText": "配送单详情"
+ }
+ },
+ {
+ "path": "pages/order/order-delivery",
+ "style": {
+ "navigationBarTitleText": "配送单列表"
+ }
+ },
+ {
+ "path": "pages/order/order-sale/order-sale",
+ "style": {
+ "navigationBarTitleText": "售后理赔",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/order/order-sale/order-sale-detail",
+ "style": {
+ "navigationBarTitleText": "理赔单详情"
+ }
+ },
+ {
+ "path" : "pages/user/user-bind-wx/user-bind-wx",
+ "style" :
+ {
+ "navigationBarTitleText" : "绑定微信"
+ }
}
],
"subPackages": [{
"root": "sub_pages/supplier",
- "pages": [
+ "pages": [{
+ "path": "protocol",
+ "style": {
+ "navigationBarTitleText": "协议",
+ "enablePullDownRefresh": false
+ }
+ }
// #ifdef PUB_SUPPLIER
- {
+ ,{
"path": "supplier-info/supplier-info",
"style": {
"navigationBarTitleText": "信息维护",
@@ -150,20 +171,6 @@
},
{
- "path": "order-settlement/order-settlement",
- "style": {
- "navigationBarTitleText": "账单结算",
- "enablePullDownRefresh": true
- }
- },
- {
- "path": "order-sale/order-sale",
- "style": {
- "navigationBarTitleText": "售后理赔",
- "enablePullDownRefresh": true
- }
- },
- {
"path": "order-records/order-records",
"style": {
"navigationBarTitleText": "扣款记录",
@@ -171,14 +178,44 @@
"navigationBarBackgroundColor": "#E6F2EB"
}
},
- // #endif
+
{
- "path": "protocol",
+ "path": "print/print-list",
"style": {
- "navigationBarTitleText": "协议",
+ "navigationBarTitleText": "打印",
"enablePullDownRefresh": false
}
+
+ }, {
+ "path": "order-settlement/order-settlement",
+ "style": {
+ "navigationBarTitleText": "账单结算",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "order-settlement/order-settlement-detail",
+ "style": {
+ "navigationBarTitleText": "结算单详情"
+ }
}
+ // #endif
+ // #ifdef PUB_PARTNER
+ ,{
+ "path": "order-settlement/order-settlement",
+ "style": {
+ "navigationBarTitleText": "账单结算",
+ "enablePullDownRefresh": true
+ }
+ },
+
+ {
+ "path": "order-settlement/order-settlement-detail",
+ "style": {
+ "navigationBarTitleText": "结算单详情"
+ }
+ }
+ // #endif
]
},
{
@@ -193,6 +230,14 @@
}
},
{
+ "path": "partner-info/partner-code",
+ "style": {
+ "navigationBarTitleText": "二维码",
+ "enablePullDownRefresh": false
+ }
+ },
+
+ {
"path": "order-manage/order-manage",
"style": {
"navigationBarTitleText": "订单管理",
@@ -204,6 +249,27 @@
"style": {
"navigationBarTitleText": "加价配置",
"enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "delivery/delivery",
+ "style": {
+ "navigationBarTitleText": "配送质检",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "delivery/delivery-detail",
+ "style": {
+ "navigationBarTitleText": "质检详情",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "delivery/delivery-home",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom"
}
}
// #endif
@@ -268,6 +334,13 @@
}
},
{
+ "path": "self/history",
+ "style": {
+ "navigationBarTitleText": "浏览记录",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
"path": "self/collect",
"style": {
"navigationBarTitleText": "我的收藏",
--
Gitblit v1.9.3