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 |  104 ++++++++++++++++++++++++++++++++++------------------
 1 files changed, 68 insertions(+), 36 deletions(-)

diff --git a/pages.json b/pages.json
index 147a0aa..608c6c0 100644
--- a/pages.json
+++ b/pages.json
@@ -63,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": {
@@ -132,16 +134,6 @@
 				}
 			}
 		},
-		// {
-		// 	"path": "components/popups/popups",
-		// 	"style": {
-		// 		"navigationBarTitleText": "",
-		// 		"navigationStyle": "custom",
-		// 		"componentPlaceholder": {
-		// 			"u-icon": "view"
-		// 		}
-		// 	}
-		// },
 		{
 			"path": "components/m-buy/goods",
 			"style": {
@@ -258,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": "鐢ㄦ埛鏉冮檺",
@@ -270,29 +277,31 @@
 					"u-popup": "view",
 					"u-search": "view",
 					"u-loading": "view",
-					"u-navbar": "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"
-				}
-			}
-		},
+		// {
+		// 	"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": {
@@ -309,7 +318,9 @@
 					"u-loading": "view",
 					"u-checkbox": "view",
 					"u-checkbox-group": "view",
-					"u-navbar": "view"
+					"u-navbar": "view",
+					"u-loadmore":"view",
+					"u-switch": "view"
 				}
 			}
 		}
@@ -1418,7 +1429,27 @@
 					}
 				}
 			]
+		},
+		{
+			"root": "pages/health",
+			"pages": [{
+				"path": "healthVideo",
+				"style": {
+					"navigationBarTitleText": "澶у仴搴�"
+				}
+			}]
 		}
+		// ,
+		// {
+		// 	"root": "pages/commodity-square",
+		// 	"pages": [{
+		// 		"path" : "commoditySquare",
+		// 		"style" :
+		// 		{
+		// 			"navigationBarTitleText" : "鍟嗗搧骞垮満"
+		// 		}
+		// 	}]
+		// }
 	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
@@ -1446,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