From a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 七月 2025 18:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 102 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 82 insertions(+), 20 deletions(-)
diff --git a/pages.json b/pages.json
index a606eaf..8fc61af 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",
@@ -233,7 +240,7 @@
}
},
{
- "path": "pages/goods-manager/addGoods/addGoods",
+ "path": "pages/supplier/publish-goods/publishGoods",
"style": {
"enablePullDownRefresh": true,
"navigationBarTitleText": "鏂板鍟嗗搧",
@@ -268,6 +275,42 @@
"path": "pages/userPermissions/userPermissions",
"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/news/news",
+ "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/news/detail",
+ "style": {
+ "navigationBarTitleText": "鏂伴椈璇︽儏",
"componentPlaceholder": {
"u-icon": "view",
"u-button": "view",
@@ -322,6 +365,13 @@
"u-loadmore":"view",
"u-switch": "view"
}
+ }
+ },
+ {
+ "path" : "pages/supplier/publish-goods/goodsInfo",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
}
}
],
@@ -749,6 +799,7 @@
"style": {
"navigationBarTitleText": "娲诲姩",
"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+ "navigationStyle": "custom", // 闅愯棌椤堕儴瀵艰埅鏍�
"componentPlaceholder": {
"u-form": "view",
"u-form-item": "view",
@@ -783,6 +834,14 @@
"u-loadmore": "view"
}
}
+ },
+ {
+ "path" : "myAttention",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍏虫敞鍒楄〃",
+ "enablePullDownRefresh": true
+ }
}
]
},
@@ -792,8 +851,7 @@
{
"path": "shopPage",
"style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
+ "navigationBarTitleText": ""
}
},
{
@@ -993,6 +1051,13 @@
"componentPlaceholder": {
"u-button": "view"
}
+ }
+ },
+ {
+ "path" : "video-search",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
}
}
]
@@ -1435,30 +1500,27 @@
"pages": [{
"path": "healthVideo",
"style": {
- "navigationBarTitleText": "澶у仴搴�"
+ "navigationBarTitleText": "澶у仴搴�",
+ "navigationStyle": "custom"
}
}]
},
{
- "root": "pages/kitchen",
+ "root": "pages/supplier/suppler-order",
"pages": [{
- "path": "KitchenVideo",
+ "path": "suppler-order",
"style": {
- "navigationBarTitleText": "鍘ㄧ"
+ "navigationBarTitleText": "渚涘簲鍟嗙"
+ // "navigationStyle": "custom"
}
- }]
- },
- {
- "root": "pages/supplier",
- "pages": [{
- "path" : "suppler-order/suppler-order",
- "style" :
- {
- "navigationBarTitleText" : ""
+ },{
+ "path": "order-detail",
+ "style": {
+ "navigationBarTitleText": "璁㈠崟璇︽儏"
+ // "navigationStyle": "custom"
}
}]
}
-
// ,
// {
// "root": "pages/commodity-square",
@@ -1498,10 +1560,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