From 3539d67072a5fd179bd44385ebefce0d1a6e8cb4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期二, 21 四月 2026 16:03:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages.json | 90 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 82 insertions(+), 8 deletions(-)
diff --git a/small-program/pages.json b/small-program/pages.json
index 341b52a..0a9e43e 100644
--- a/small-program/pages.json
+++ b/small-program/pages.json
@@ -27,7 +27,8 @@
{
"path": "pages/message/message",
"style": {
- "navigationBarTitleText": "娑堟伅"
+ "navigationBarTitleText": "娑堟伅",
+ "navigationStyle": "custom"
}
},
{
@@ -99,13 +100,6 @@
}
},
{
- "path": "pages/store-home/store-home",
- "style": {
- "navigationBarTitleText": "闂ㄥ簵棣栭〉",
- "navigationStyle": "custom"
- }
- },
- {
"path": "pages/address/address",
"style": {
"navigationBarTitleText": "鍦板潃"
@@ -128,6 +122,67 @@
"style": {
"navigationBarTitleText": "闂ㄥ簵鍏ラ┗"
}
+ },
+ {
+ "path": "pages/select-city/select-city",
+ "style": {
+ "navigationBarTitleText": "閫夋嫨鍩庡競"
+ }
+ },
+
+ {
+ "path": "pages/shop-index/shop-index",
+ "style": {
+ "navigationBarTitleText": "闂ㄥ簵棣栭〉",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/shop-mine/shop-mine",
+ "style": {
+ "navigationBarTitleText": "闂ㄥ簵鎴戠殑",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/shop-wallet/shop-wallet",
+ "style": {
+ "navigationBarTitleText": "闂ㄥ簵閽卞寘",
+ "navigationStyle": "custom"
+ }
+ }
+ ],
+ "subPackages": [
+ {
+ "root": "shop",
+ "pages": [
+ {
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "鐧诲綍"
+ }
+ },
+ {
+ "path": "pages/store-home/store-home",
+ "style": {
+ "navigationBarTitleText": "闂ㄥ簵棣栭〉",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/mine/mine",
+ "style": {
+ "navigationBarTitleText": "鎴戠殑",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/wallet/wallet",
+ "style": {
+ "navigationBarTitleText": "闂ㄥ簵閽卞寘"
+ }
+ }
+ ]
}
],
"globalStyle": {
@@ -141,6 +196,7 @@
"selectedColor": "#10B2FA",
"borderStyle": "black",
"backgroundColor": "#fff",
+ "custom": true,
"list": [
{
"pagePath": "pages/index/index",
@@ -165,6 +221,24 @@
"iconPath": "static/icon/nav_wode@2x.png",
"selectedIconPath": "static/icon/nav_wode_sel@2x.png",
"text": "鎴戠殑"
+ },
+ {
+ "pagePath": "pages/shop-index/shop-index",
+ "iconPath": "static/icon/nav_home@2x.png",
+ "selectedIconPath": "static/icon/nav_home_sel@2x.png",
+ "text": "闂ㄥ簵棣栭〉"
+ },
+ {
+ "pagePath": "pages/shop-wallet/shop-wallet",
+ "iconPath": "static/icon/nav_home@2x.png",
+ "selectedIconPath": "static/icon/nav_home_sel@2x.png",
+ "text": "闂ㄥ簵閽卞寘"
+ },
+ {
+ "pagePath": "pages/shop-mine/shop-mine",
+ "iconPath": "static/icon/nav_wode@2x.png",
+ "selectedIconPath": "static/icon/nav_wode_sel@2x.png",
+ "text": "闂ㄥ簵鎴戠殑"
}
]
}
--
Gitblit v1.9.3