From be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 02 七月 2025 18:59:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 184 ++++++++++++++++++++++++++++++++-------------
1 files changed, 131 insertions(+), 53 deletions(-)
diff --git a/pages.json b/pages.json
index 8c684d0..99b0f4d 100644
--- a/pages.json
+++ b/pages.json
@@ -2,20 +2,20 @@
"easycom": {
"autoscan": true,
"custom": {
- "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue", //uview,
- "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
+ "^u-(.*)": "@/components/uview-components/uview-ui/components/u-$1/u-$1.vue" //uview,
+ // "^uni-(.*)": "@/uni_modules/uni-$1/components/uni-$1/uni-$1.vue" // uniapp缁勪欢
}
},
- "preloadRule": {
- "pages/tabbar/index/home": // 椤甸潰璺緞
- // 椤甸潰鐨勯涓嬭浇閰嶇疆
- {
- "network": "all", // all(涓嶉檺缃戠粶) wifi(浠厀ifi涓嬮涓嬭浇)
- "packages": [
- "components/uview-components"
- ] // 棰勪笅杞藉垎鍖呯殑 root 鎴� name銆俖_APP__ 琛ㄧず涓诲寘
- }
- },
+ // "preloadRule": {
+ // "pages/tabbar/index/home": // 椤甸潰璺緞
+ // // 椤甸潰鐨勯涓嬭浇閰嶇疆
+ // {
+ // "network": "all", // all(涓嶉檺缃戠粶) wifi(浠厀ifi涓嬮涓嬭浇)
+ // "packages": [
+ // "components/uview-components"
+ // ] // 棰勪笅杞藉垎鍖呯殑 root 鎴� name銆俖_APP__ 琛ㄧず涓诲寘
+ // }
+ // },
"pages": [
// 绗竴涓氨鏄椤�
{
@@ -26,12 +26,6 @@
"navigationStyle": "custom" // 闅愯棌椤堕儴瀵艰埅鏍�
}
},
- // {
- // "path": "pages/tabbar/index/home1",
- // "style": {
- // "navigationBarTitleText": ""
- // }
- // },
{
"path": "pages/tabbar/home/index",
"style": {
@@ -39,6 +33,13 @@
"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"navigationBarTextStyle": "black",
"enablePullDownRefresh": true
+ }
+ },
+ {
+ "path": "pages/kitchen/KitchenVideo",
+ "style": {
+ "navigationBarTitleText": "绁炲帹",
+ "navigationStyle": "custom" // 闅愯棌绯荤粺瀵艰埅鏍�
}
},
{
@@ -69,12 +70,14 @@
}
},
{
- "path": "pages/tabbar/category/category",
+ // "path": "pages/tabbar/category/category",
+ "path": "pages/commodity-square/commoditySquare",
+
"style": {
- "navigationBarTitleText": "鍒嗙被",
+ "navigationBarTitleText": "鍟嗗搧骞垮満",
"navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"navigationBarTextStyle": "black",
- "disableScroll": true,
+ // "disableScroll": true,
"bounce": "none",
"scrollIndicator": "none",
"componentPlaceholder": {
@@ -134,16 +137,6 @@
"navigationStyle": "custom",
"componentPlaceholder": {
"u-popup": "view",
- "u-icon": "view"
- }
- }
- },
- {
- "path": "components/popups/popups",
- "style": {
- "navigationBarTitleText": "",
- "navigationStyle": "custom",
- "componentPlaceholder": {
"u-icon": "view"
}
}
@@ -264,6 +257,21 @@
}
},
{
+ "path": "pages/goods-manager/updateSkus/updateSkus",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "璋冩暣搴撳瓨",
+ "componentPlaceholder": {
+ "u-icon": "view",
+ "u-button": "view",
+ "u-form": "view",
+ "u-form-item": "view",
+ "u-input": "view",
+ "u-popup": "view"
+ }
+ }
+ },
+ {
"path": "pages/userPermissions/userPermissions",
"style": {
"navigationBarTitleText": "鐢ㄦ埛鏉冮檺",
@@ -276,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",
@@ -293,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": {
@@ -315,25 +361,27 @@
"u-loading": "view",
"u-checkbox": "view",
"u-checkbox-group": "view",
- "u-navbar": "view"
+ "u-navbar": "view",
+ "u-loadmore":"view",
+ "u-switch": "view"
}
}
}
],
"subPackages": [
- {
- "root": "components/uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
- "name": "uview-components",
- "pages": [
- {
- "path": "pages/empty-page/empty-page",
- "style": {
- "navigationBarTitleText": "",
- "disableScroll": true
- }
- }
- ]
- },
+ // {
+ // "root": "components/uview-components", // 蹇呴』涓巔reloadRule涓殑鍚嶇О瀹屽叏涓�鑷�
+ // "name": "uview-components",
+ // "pages": [
+ // {
+ // "path": "pages/empty-page/empty-page",
+ // "style": {
+ // "navigationBarTitleText": "",
+ // "disableScroll": true
+ // }
+ // }
+ // ]
+ // },
{
"root": "pages/mine",
"pages": [
@@ -744,6 +792,7 @@
"style": {
"navigationBarTitleText": "娲诲姩",
"enablePullDownRefresh": true, //涓嬫媺鍒锋柊
+ "navigationStyle": "custom", // 闅愯棌椤堕儴瀵艰埅鏍�
"componentPlaceholder": {
"u-form": "view",
"u-form-item": "view",
@@ -988,6 +1037,13 @@
"componentPlaceholder": {
"u-button": "view"
}
+ }
+ },
+ {
+ "path" : "video-search",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
}
}
]
@@ -1424,7 +1480,28 @@
}
}
]
+ },
+ {
+ "root": "pages/health",
+ "pages": [{
+ "path": "healthVideo",
+ "style": {
+ "navigationBarTitleText": "澶у仴搴�",
+ "navigationStyle": "custom"
+ }
+ }]
}
+ // ,
+ // {
+ // "root": "pages/commodity-square",
+ // "pages": [{
+ // "path" : "commoditySquare",
+ // "style" :
+ // {
+ // "navigationBarTitleText" : "鍟嗗搧骞垮満"
+ // }
+ // }]
+ // }
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1452,10 +1529,11 @@
"text": "棣栭〉"
},
{
- "pagePath": "pages/tabbar/category/category",
+ // "pagePath": "pages/tabbar/category/category",
+ "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