Merge branch 'liubiao-main'

pages.json

@@ -1,11 +1,16 @@
 {
 	"pages": [
+	
 		{
 			"path": "pages/common/login/index",
 			"style": {
 				"navigationStyle": "custom"
 			}
 		},
+
+		
+	
+		
 		{
 			"path": "pages/common/index/index",
 			"style": {
@@ -87,15 +92,33 @@
 			}
 		},
 		{
-			"path": "pages/6155/index",
-			"style": {
-				"navigationBarTitleText": "6155"
+			"path" : "pages/common/addBLE/addEquip",
+			"style" : 
+			{
+				"navigationBarTitleText" : "添加设备"
 			}
 		},
 		{
-			"path": "pages/6155/bluetooth/bluetooth",
-			"style": {
-				"navigationStyle": "custom"
+			"path" : "pages/common/addBLE/LinkBle",
+			"style" : 
+			{
+				"navigationBarTitleText" : "扫描到的设备"
+			}
+		},
+		{
+			"path" : "pages/6155/deviceDetail",
+			"style" : 
+			{
+				"navigationBarTitleText" : "HBY 6155"
+			}
+		},
+		{
+			"path" : "pages/6155/ImgCrop",
+			"style" : 
+			{
+				"navigationBarTitleText" : "图像裁剪",
+				"navigationStyle": "custom",
+				"fullscreen": true
 			}
 		},
 		{
@@ -104,8 +127,7 @@
 				"navigationBarTitleText": "地图"
 			}
 		}
-
-	],
+		],
 	"tabBar": {
 		"color": "#fff",
 		"selectedColor": "#BBE600",