From 9e0d2563ee3adc08b27f365e315855d776fd08f0 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 11 七月 2025 10:00:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 163 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 135 insertions(+), 28 deletions(-)
diff --git a/pages.json b/pages.json
index 49495a3..e04b985 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": "娑堟伅"
@@ -65,7 +72,7 @@
{
// "path": "pages/tabbar/category/category",
"path": "pages/commodity-square/commoditySquare",
-
+
"style": {
"navigationBarTitleText": "鍟嗗搧骞垮満",
"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
@@ -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" : ""
}
}
],
@@ -766,6 +816,53 @@
}
},
{
+ "path" : "activity/applayActivityList",
+ "style" :
+ {
+ "navigationBarTitleText": "鐢宠娲诲姩鍒楄〃",
+ "enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+ "componentPlaceholder": {
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view",
+ "u-checkbox-group": "view",
+ "u-checkbox": "view",
+ "u-navbar": "view",
+ "u-button": "view",
+ "u-image": "view",
+ "u-loadmore": "view",
+ "u-empty":"view"
+ }
+ }
+ },
+ {
+ "path" : "activity/addActivity",
+ "style" :
+ {
+ "navigationBarTitleText": "鐢宠娲诲姩",
+ "componentPlaceholder": {
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view",
+ "u-checkbox-group": "view",
+ "u-checkbox": "view",
+ "u-navbar": "view",
+ "u-button": "view",
+ "u-image": "view",
+ "u-loadmore": "view",
+ "u-empty":"view",
+ "u-datetime-picker":"view",
+ "u-radio-group":"view",
+ "u-radio":"view",
+ "u-cell":"view"
+ }
+ }
+ },
+ {
"path": "myCollect/myCollect",
"style": {
"navigationBarTitleText": "鎴戠殑鏀惰棌",
@@ -784,6 +881,14 @@
"u-loadmore": "view"
}
}
+ },
+ {
+ "path" : "myAttention",
+ "style" :
+ {
+ "navigationBarTitleText" : "鍏虫敞鍒楄〃",
+ "enablePullDownRefresh": true
+ }
}
]
},
@@ -793,8 +898,7 @@
{
"path": "shopPage",
"style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom"
+ "navigationBarTitleText": ""
}
},
{
@@ -988,12 +1092,19 @@
},
{
"path" : "video-goods-detail",
- "style" :
+ "style" :
{
"navigationBarTitleText" : "瑙嗛鎺ㄨ崘鍟嗗搧",
"componentPlaceholder": {
"u-button": "view"
}
+ }
+ },
+ {
+ "path" : "video-search",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
}
}
]
@@ -1442,25 +1553,21 @@
}]
},
{
- "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,13 +1605,13 @@
"selectedIconPath": "static/tabbar/home-s.png",
"text": "棣栭〉"
},
- // {
- // // "pagePath": "pages/tabbar/category/category",
- // "pagePath": "pages/commodity-square/commoditySquare",
- // "iconPath": "static/tabbar/category.png",
- // "selectedIconPath": "static/tabbar/category-s.png",
- // "text": "鍟嗗煄"
- // },
+ {
+ // "pagePath": "pages/tabbar/category/category",
+ "pagePath": "pages/kitchen/KitchenVideo",
+ "iconPath": "static/tabbar/category.png",
+ "selectedIconPath": "static/tabbar/category-s.png",
+ "text": "绁炲帹"
+ },
{
"pagePath": "pages/tabbar/video/video",
"iconPath": "static/tabbar/video.png",
@@ -1524,11 +1631,11 @@
}
]
},
- // #todo 涓轰粈涔堣娉ㄩ噴condition涓嬩唬鐮侊紵
+ // #todo 涓轰粈涔堣娉ㄩ噴condition涓嬩唬鐮侊紵
// IOS plus.runtime.arguments 娣诲姞 condition鑺傜偣鍚庯紝 妗嗘灦浼氫慨鏀� runtime.arguments
// 浼氬奖鍝嶄粈涔堝姛鑳斤紵
// -鍦╤5涓敜閱抋pp浼氫竴鐩磋繑鍥為粯璁ゅ�� {"name":"","path":"","query":"","id":0}
- "condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
+ "condition": { //妯″紡閰嶇疆锛屼粎寮�鍙戞湡闂寸敓鏁�
// "current": 0, //褰撳墠婵�娲荤殑妯″紡(list 鐨勭储寮曢」)
// "list": [{
// "name": "", //妯″紡鍚嶇О
@@ -1536,4 +1643,4 @@
// "query": "" //鍚姩鍙傛暟锛屽湪椤甸潰鐨刼nLoad鍑芥暟閲岄潰寰楀埌
// }]
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0