Merge branch 'main' of http://47.107.152.87:3000/liubiao/APP

# Conflicts:
#	.gitignore
#	pages/common/index/index.vue
#	unpackage/dist/dev/app-plus/app-config-service.js
#	unpackage/dist/dev/app-plus/app-service.js
#	unpackage/dist/dev/app-plus/app-view.js
#	unpackage/dist/dev/app-plus/manifest.json
#	utils/request.js

pages.json

@@ -134,6 +134,37 @@
 			"style": {
 				"navigationBarTitleText": "地图"
 			}
+		},
+		{
+			"path": "pages/common/allType/index",
+			"style": {
+				"navigationBarTitleText": "所有类型"
+			}
+		},
+		{
+			"path": "pages/6170/allShare/index",
+			"style": {
+				"navigationBarTitleText": "所有分享"
+			}
+		},
+		
+		{
+			"path": "pages/6170/share/index",
+			"style": {
+				"navigationBarTitleText": "分享"
+			}
+		},
+		{
+			"path": "pages/6170/shareDevices/index",
+			"style": {
+				"navigationBarTitleText": "分享设备"
+			}
+		},
+		{
+			"path": "pages/6170/shareManagement/index",
+			"style": {
+				"navigationBarTitleText": "分享管理"
+			}
 		}