From a8a1df6e4870fa975687bfd7bad7d2db6b8f5d63 Mon Sep 17 00:00:00 2001
From: "SD-20230427NBFT\\Administrator" <609306725@qq.com>
Date: Mon, 22 Jul 2024 13:49:44 +0800
Subject: [PATCH] 1111

---
 pages.json | 191 ++++++++++++++++++++++++++---------------------------
 1 file changed, 93 insertions(+), 98 deletions(-)

diff --git a/pages.json b/pages.json
index c321ea0..6c0568a 100644
--- a/pages.json
+++ b/pages.json
@@ -6,96 +6,91 @@
 				"navigationBarTitleText": "%app.name%",
 				"navigationStyle": "custom"
 			}
-		}
-	    ,{
-            "path" : "pages/user/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "%page.user.index.title%",
-                "navigationStyle": "custom"
-	
-            }
-            
-        }
-        ,{
-            "path" : "pages/user/setting/index",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "%pages.user.setting.index.setLang%",
-                "enablePullDownRefresh": false
-            }
-            
-        },
-        {
-        	"path" : "pages/user/account/index",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "账户设置",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/web/index",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "外部页面",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/web/video",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "视频",
-        		"enablePullDownRefresh" : false
-        	}
-        },
-        {
-        	"path" : "pages/user/archives/detail",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "面部档案"
-        	}
-        },
-        {
-        	"path" : "pages/user/photo/detail",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "照片详情"
-        	}
-        },
-        {
-        	"path" : "pages/user/account/logout",
-        	"style" : 
-        	{
-        		"navigationBarTitleText" : "注销账号",
+		}, {
+			"path": "pages/user/index",
+			"style": {
+				"navigationBarTitleText": "%page.user.index.title%",
 				"navigationStyle": "custom"
-        	}
-        }
-       
-    ],
-	"subPackages": [
+
+			}
+
+		}, {
+			"path": "pages/user/setting/index",
+			"style": {
+				"navigationBarTitleText": "%pages.user.setting.index.setLang%",
+				"enablePullDownRefresh": false
+			}
+
+		},
+		{
+			"path": "pages/user/account/index",
+			"style": {
+				"navigationBarTitleText": "账户设置",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/web/index",
+			"style": {
+				"navigationBarTitleText": "外部页面",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/web/video",
+			"style": {
+				"navigationBarTitleText": "视频",
+				"enablePullDownRefresh": false
+			}
+		},
 		{
-			"root": "pagesA",
-			"pages": [{
-					"path": "photo/photo_1",
-					"style": {
-						"navigationBarTitleText": "AI写真",
-						"navigationStyle": "custom"
-					}
-				},
-				{
-						"path": "photo/photo_2",
-						"style": {
-							"navigationBarTitleText": "AI写真",
-							"navigationStyle": "custom"
-						}
-					}
-		
-		
-			]
+			"path": "pages/user/archives/detail",
+			"style": {
+				"navigationBarTitleText": "面部档案"
+			}
+		},
+		{
+			"path": "pages/user/photo/detail",
+			"style": {
+				"navigationBarTitleText": "照片详情"
+			}
+		},
+		{
+			"path": "pages/user/account/logout",
+			"style": {
+				"navigationBarTitleText": "注销账号",
+				"navigationStyle": "custom"
+			}
 		}
+
 	],
+	"subPackages": [{
+		"root": "pagesA",
+		"pages": [{
+				"path": "photo/photo_1",
+				"style": {
+					"navigationBarTitleText": "AI写真",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "photo/photo_2",
+				"style": {
+					"navigationBarTitleText": "AI写真",
+					"navigationStyle": "custom"
+				}
+			},
+			{
+				"path": "photo/face",
+				"style": {
+					"navigationBarTitleText": "上传照片",
+					"navigationStyle": "custom"
+				}
+			}
+
+
+		]
+	}],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "%app.name%",
@@ -108,18 +103,18 @@
 		"borderStyle": "black",
 		"backgroundColor": "#FFFFFF",
 		"list": [{
-			"pagePath": "pages/index/index",
-			"iconPath": "static/img/common/home.png",
-			"selectedIconPath": "static/img/common/home_HL.png",
-			"text": "%tabbar.home%"
-		}, 
-		{
-			"pagePath": "pages/user/index",
-			"iconPath": "static/img/common/user.png",
-			"selectedIconPath": "static/img/common/user_HL.png",
-			"text": "%tabbar.user%"
-		}
+				"pagePath": "pages/index/index",
+				"iconPath": "static/img/common/home.png",
+				"selectedIconPath": "static/img/common/home_HL.png",
+				"text": "%tabbar.home%"
+			},
+			{
+				"pagePath": "pages/user/index",
+				"iconPath": "static/img/common/user.png",
+				"selectedIconPath": "static/img/common/user_HL.png",
+				"text": "%tabbar.user%"
+			}
 		]
 	},
 	"uniIdRouter": {}
-}
+}
\ No newline at end of file