From d3d0b4dbb4f1f8c4784c834e0a39feba8aa5afa5 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 10:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 71 ++++++++++++++++++++++++++++++-----
1 files changed, 60 insertions(+), 11 deletions(-)
diff --git a/pages.json b/pages.json
index e738c2e..48cdf4f 100644
--- a/pages.json
+++ b/pages.json
@@ -36,6 +36,13 @@
}
},
{
+ "path": "pages/kitchen/KitchenVideo",
+ "style": {
+ "navigationBarTitleText": "绁炲帹",
+ "navigationStyle": "custom" // 闅愯棌绯荤粺瀵艰埅鏍�
+ }
+ },
+ {
"path": "pages/tabbar/home/title",
"style": {
"navigationBarTitleText": "娑堟伅"
@@ -68,7 +75,7 @@
"style": {
"navigationBarTitleText": "鍟嗗搧骞垮満",
- // "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+ "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"navigationBarTextStyle": "black",
// "disableScroll": true,
"bounce": "none",
@@ -277,14 +284,15 @@
"u-popup": "view",
"u-search": "view",
"u-loading": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view"
}
}
},
{
- "path": "pages/customerManager/customerManager",
+ "path": "pages/news/news",
"style": {
- "navigationBarTitleText": "瀹㈡埛绠＄悊",
+ "navigationBarTitleText": "鏂伴椈",
"componentPlaceholder": {
"u-icon": "view",
"u-button": "view",
@@ -294,12 +302,49 @@
"u-popup": "view",
"u-search": "view",
"u-loading": "view",
- "u-checkbox": "view",
- "u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view"
}
}
},
+ {
+ "path": "pages/news/detail",
+ "style": {
+ "navigationBarTitleText": "鏂伴椈璇︽儏",
+ "componentPlaceholder": {
+ "u-icon": "view",
+ "u-button": "view",
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-popup": "view",
+ "u-search": "view",
+ "u-loading": "view",
+ "u-navbar": "view",
+ "u-loadmore":"view"
+ }
+ }
+ },
+ // {
+ // "path": "pages/customerManager/customerManager",
+ // "style": {
+ // "navigationBarTitleText": "瀹㈡埛绠＄悊",
+ // "componentPlaceholder": {
+ // "u-icon": "view",
+ // "u-button": "view",
+ // "u-form": "view",
+ // "u-form-item": "view",
+ // "u-input": "view",
+ // "u-popup": "view",
+ // "u-search": "view",
+ // "u-loading": "view",
+ // "u-checkbox": "view",
+ // "u-checkbox-group": "view",
+ // "u-navbar": "view",
+ // "u-loadmore":"view"
+ // }
+ // }
+ // },
{
"path": "pages/userPermissions/addStoreMember",
"style": {
@@ -316,7 +361,9 @@
"u-loading": "view",
"u-checkbox": "view",
"u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view",
+ "u-switch": "view"
}
}
}
@@ -745,6 +792,7 @@
"style": {
"navigationBarTitleText": "娲诲姩",
"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+ "navigationStyle": "custom", // 闅愯棌椤堕儴瀵艰埅鏍�
"componentPlaceholder": {
"u-form": "view",
"u-form-item": "view",
@@ -1431,7 +1479,8 @@
"pages": [{
"path": "healthVideo",
"style": {
- "navigationBarTitleText": "澶у仴搴�"
+ "navigationBarTitleText": "澶у仴搴�",
+ "navigationStyle": "custom"
}
}]
}
@@ -1474,10 +1523,10 @@
},
{
// "pagePath": "pages/tabbar/category/category",
- "pagePath": "pages/commodity-square/commoditySquare",
+ "pagePath": "pages/kitchen/KitchenVideo",
"iconPath": "static/tabbar/category.png",
"selectedIconPath": "static/tabbar/category-s.png",
- "text": "鍟嗗煄"
+ "text": "绁炲帹"
},
{
"pagePath": "pages/tabbar/video/video",
--
Gitblit v1.8.0