From 08b73a91cec8c8ef430b8d5bc5b4a631bcbbe7f2 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期日, 21 七月 2024 18:13:49 +0800
Subject: [PATCH] Merge branch 'main' of https://gitee.com/people_3/hmy_farmer
---
pages.json | 115 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 65 insertions(+), 50 deletions(-)
diff --git a/pages.json b/pages.json
index da87714..eb0d466 100644
--- a/pages.json
+++ b/pages.json
@@ -3,20 +3,7 @@
"easycom": {
"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
},
- "pages": [
-
- // #ifdef PUB_CUSTOMER
- {
- "path": "pages/home/home",
- "style": {
- "navigationBarTitleText": "首页",
- "enablePullDownRefresh": true,
- "navigationStyle": "custom"
- }
-
- },
- // #endif
- {
+ "pages": [{
"path": "pages/login/supplier-login",
"style": {
"navigationBarTitleText": "登录",
@@ -32,6 +19,27 @@
}
},
+ // #ifdef PUB_CUSTOMER
+ {
+ "path": "pages/home/home",
+ "style": {
+ "navigationBarTitleText": "首页",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+
+ },
+ // #endif
+
+ // #ifndef PUB_CUSTOMER
+ {
+ "path": "pages/login/supplier-reg",
+ "style": {
+ "navigationBarTitleText": "申请入驻",
+ "navigationStyle": "custom"
+ }
+ },
+ // #endif
{
"path": "pages/user/supplier-user",
"style": {
@@ -79,26 +87,38 @@
"subPackages": [{
"root": "sub_pages/supplier",
- "pages": [{
+ "pages": [
+ // #ifdef PUB__SUPPLIER
+ {
"path": "supplier-info/supplier-info",
"style": {
"navigationBarTitleText": "信息维护",
"enablePullDownRefresh": false
}
- }, {
+ },
+ {
+ "path": "flower-manage/flower-manage",
+ "style": {
+ "navigationBarTitleText": "商品管理",
+ "enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "flower-manage/flower-add",
+ "style": {
+ "navigationBarTitleText": "",
+ "enablePullDownRefresh": false
+ }
+ },
+ // #endif
+ {
"path": "order-settlement/order-settlement",
"style": {
"navigationBarTitleText": "账单结算",
"enablePullDownRefresh": true
}
},
- {
- "path": "flower-manage/flower-manage",
- "style": {
- "navigationBarTitleText": "商品管理",
- "enablePullDownRefresh": true
- }
- },
+
{
"path": "order-sale/order-sale",
"style": {
@@ -115,20 +135,7 @@
}
},
- {
- "path": "flower-manage/flower-add",
- "style": {
- "navigationBarTitleText": "",
- "enablePullDownRefresh": false
- }
- },
- {
- "path": "supplier-reg/supplier-reg",
- "style": {
- "navigationBarTitleText": "申请入住",
- "navigationStyle": "custom"
- }
- },
+
{
"path": "protocol",
"style": {
@@ -141,7 +148,17 @@
}, {
"root": "sub_pages/partner",
- "pages": [{
+ "pages": [
+ // #ifdef PUB_PARTNER
+ {
+ "path": "partner-info/partner-info",
+ "style": {
+ "navigationBarTitleText": "信息维护",
+ "enablePullDownRefresh": false
+ }
+ },
+ // #endif
+ {
"path": "order-manage/order-manage",
"style": {
"navigationBarTitleText": "订单管理",
@@ -183,9 +200,15 @@
{
"path": "trade/detail",
"style": {
- "navigationBarTitleText": "商品详情",
- "enablePullDownRefresh": false
-
+ "navigationBarTitleText": "商品详情",
+ "enablePullDownRefresh": false
+
+ }
+ },
+ {
+ "path": "shop/shop",
+ "style": {
+ "navigationBarTitleText": "商家主页"
}
}
@@ -193,19 +216,11 @@
}],
"globalStyle": {
"navigationBarTextStyle": "black",
- "navigationBarTitleText": "uni-app",
+ "navigationBarTitleText": "花满芫",
"navigationBarBackgroundColor": "#F8F8F8",
"backgroundColor": "#F8F8F8",
"app-plus": {
"background": "#efeff4"
}
- },
- "condition": { //模式配置，仅开发期间生效
- "current": 0, //当前激活的模式(list 的索引项)
- "list": [{
- "name": "", //模式名称
- "path": "", //启动页面，必选
- "query": "" //启动参数，在页面的onLoad函数里面得到
- }]
}
}
\ No newline at end of file
--
Gitblit v1.9.3