From 5027240f2bbc9a7f74b8cc661c265eb9d52eb43a Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期四, 19 六月 2025 09:16:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages.json |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/pages.json b/pages.json
index 47451d7..aae66b9 100644
--- a/pages.json
+++ b/pages.json
@@ -2,8 +2,8 @@
 	"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": {
@@ -26,12 +26,6 @@
 				"navigationStyle": "custom" // 闅愯棌椤堕儴瀵艰埅鏍�
 			}
 		},
-		// {
-		// 	"path": "pages/tabbar/index/home1",
-		// 	"style": {
-		// 		"navigationBarTitleText": ""
-		// 	}
-		// },
 		{
 			"path": "pages/tabbar/home/index",
 			"style": {
@@ -254,6 +248,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": "鐢ㄦ埛鏉冮檺",

--
Gitblit v1.8.0