From c9928dd4f6d25e2339ea1400f59ec58674a927a7 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 20:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
pages.json | 183 +++++++++++++++++++++++++++++++--------------
1 files changed, 125 insertions(+), 58 deletions(-)
diff --git a/pages.json b/pages.json
index dc05e07..608c6c0 100644
--- a/pages.json
+++ b/pages.json
@@ -2,20 +2,20 @@
"easycom": {
"autoscan": true,
"custom": {
- "^u-(.*)": "@/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": [
- "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": {
@@ -69,12 +63,14 @@
}
},
{
- "path": "pages/tabbar/category/category",
+ // "path": "pages/tabbar/category/category",
+ "path": "pages/commodity-square/commoditySquare",
+
"style": {
- "navigationBarTitleText": "鍒嗙被",
- "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
+ "navigationBarTitleText": "鍟嗗搧骞垮満",
+ // "navigationStyle": "custom", // 闅愯棌绯荤粺瀵艰埅鏍�
"navigationBarTextStyle": "black",
- "disableScroll": true,
+ // "disableScroll": true,
"bounce": "none",
"scrollIndicator": "none",
"componentPlaceholder": {
@@ -254,6 +250,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": "鐢ㄦ埛鏉冮檺",
@@ -271,26 +282,26 @@
}
}
},
- {
- "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/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,19 +326,19 @@
}
],
"subPackages": [
- {
- "root": "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": [
@@ -492,7 +503,12 @@
"path": "address/address",
"style": {
"enablePullDownRefresh": true,
- "navigationBarTitleText": "鍦板潃绠＄悊"
+ "navigationBarTitleText": "鍦板潃绠＄悊",
+ "componentPlaceholder": {
+ "u-empty": "view",
+ "u-icon": "view",
+ "u-action-sheet": "view"
+ }
}
},
{
@@ -968,6 +984,16 @@
"style": {
"navigationBarTitleText": "瑙嗛缂栬緫"
}
+ },
+ {
+ "path" : "video-goods-detail",
+ "style" :
+ {
+ "navigationBarTitleText" : "瑙嗛鎺ㄨ崘鍟嗗搧",
+ "componentPlaceholder": {
+ "u-button": "view"
+ }
+ }
}
]
},
@@ -1237,6 +1263,17 @@
}
},
{
+ "path": "invoice/setInvoice",
+ "style": {
+ "navigationBarTitleText": "",
+ "navigationStyle": "custom",
+ "componentPlaceholder": {
+ "u-popup": "view",
+ "u-input": "view"
+ }
+ }
+ },
+ {
"path": "complain/complainList",
"style": {
"navigationBarTitleText": "鎶曡瘔鍒楄〃",
@@ -1379,11 +1416,40 @@
{
"path": "fillorder",
"style": {
- "navigationBarTitleText": "濉啓璁㈠崟"
+ "navigationBarTitleText": "濉啓璁㈠崟",
+ "componentPlaceholder": {
+ "u-image": "view",
+ "u-row": "view",
+ "u-col": "view",
+ "u-input": "view",
+ "u-icon": "view",
+ "u-select": "view",
+ "u-notice-bar": "view"
+ }
}
}
]
+ },
+ {
+ "root": "pages/health",
+ "pages": [{
+ "path": "healthVideo",
+ "style": {
+ "navigationBarTitleText": "澶у仴搴�"
+ }
+ }]
}
+ // ,
+ // {
+ // "root": "pages/commodity-square",
+ // "pages": [{
+ // "path" : "commoditySquare",
+ // "style" :
+ // {
+ // "navigationBarTitleText" : "鍟嗗搧骞垮満"
+ // }
+ // }]
+ // }
],
"globalStyle": {
"navigationBarTextStyle": "black",
@@ -1411,7 +1477,8 @@
"text": "棣栭〉"
},
{
- "pagePath": "pages/tabbar/category/category",
+ // "pagePath": "pages/tabbar/category/category",
+ "pagePath": "pages/commodity-square/commoditySquare",
"iconPath": "static/tabbar/category.png",
"selectedIconPath": "static/tabbar/category-s.png",
"text": "鍟嗗煄"
--
Gitblit v1.8.0