From 0df3c99a23b6774c39abf16af51cf20bbfefc8a5 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 10 五月 2024 15:54:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/pages.json |  500 ++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 324 insertions(+), 176 deletions(-)

diff --git a/h5/pages.json b/h5/pages.json
index 1020956..ac1308a 100644
--- a/h5/pages.json
+++ b/h5/pages.json
@@ -1,179 +1,327 @@
-{
-	"easycom": {
-		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
-	},
-	"pages": [
-		{
-			"path" : "pages/notice/notice",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍏ュ満椤荤煡",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
+{
+	"easycom": {
+		"^u-(.*)": "uview-ui/components/u-$1/u-$1.vue"
+	},
+	"pages": [{
+			"path": "pages/notice/notice",
+			"style": {
+				"navigationBarTitleText": "鍏ュ洯椤荤煡",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "璁垮涓績",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/login/login",
+			"style": {
+				"navigationBarTitleText": "鐧诲綍",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/answer/answer",
+			"style": {
+				"navigationBarTitleText": "绛旈",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/userinfo/userinfo",
+			"style": {
+				"navigationBarTitleText": "涓汉淇℃伅",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/visitorApplication/visitorApplication",
+			"style": {
+				"navigationBarTitleText": "璁垮鐢宠",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/visitorApproval/visitorApproval",
+			"style": {
+				"navigationBarTitleText": "璁垮瀹℃壒",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/visitorSubGuide/index",
+			"style": {
+				"navigationBarTitleText": "棰勭害鎸囧崡",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/laborApplication/laborApplication",
+			"style": {
+				"navigationBarTitleText": "鍔冲姟鐢宠",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/applicationRecord/applicationRecord",
+			"style": {
+				"navigationBarTitleText": "鐢宠璁板綍",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/personnel/personnel",
+			"style": {
+				"navigationBarTitleText": "浜哄憳绠$悊",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/newPersonnel/newPersonnel",
+			"style": {
+				"navigationBarTitleText": "鏂板浜哄憳",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/changePassword/changePassword",
+			"style": {
+				"navigationBarTitleText": "淇敼瀵嗙爜",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/appointmentDetails/appointmentDetails",
+			"style": {
+				"navigationBarTitleText": "棰勭害璇︽儏",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/cropping/cropping",
+			"style": {
+				"navigationBarTitleText": "鍥剧墖瑁佸壀",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		// 浼氳瀹� 
+		{
+			"path": "pages/meeting/index/index",
+			"style": {
+				"navigationStyle": "custom",
+				"mp-alipay": {
+					"transparentTitle": "always",
+					"titlePenetrate": "YES"
+				},
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/meeting/mine/mine",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "white",
+				"navigationBarTitleText": "鎴戠殑",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/meeting/login/login",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "鐧诲綍",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/meeting/personal/personal",
+			"style": {
+				"navigationBarTitleText": "涓汉璧勬枡",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/meeting/myAppointment/myAppointment",
+			"style": {
+				"navigationBarTitleText": "鎴戦绾︾殑浼氳瀹�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/meeting/manage/manage",
+			"style": {
+				"navigationBarTitleText": "鎴戠鐞嗙殑浼氳瀹�",
+				"enablePullDownRefresh": false
+			}
+		},
+		{
+			"path": "pages/meeting/changePassword/changePassword",
+			"style": {
+				"navigationBarTitleText": "淇敼瀵嗙爜",
+				"enablePullDownRefresh": false
+			}
 		},
-		{
-			"path" : "pages/index/index",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍗庢櫉鏂拌兘婧�",
-				"enablePullDownRefresh" : false
-			}
+		{
+			"path": "pages/staff/index",
+			"style": {
+				"navigationBarTitleText": "瀹夋嘲鐗╂祦",
+				"enablePullDownRefresh": false
+			}
+
 		},
-		{
-			"path" : "pages/login/login",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐧诲綍",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path" : "pages/answer/answer",
-			"style" : 
-			{
-				"navigationBarTitleText" : "绛旈",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path" : "pages/userinfo/userinfo",
-			"style" : 
-			{
-				"navigationBarTitleText" : "涓汉淇℃伅",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path" : "pages/visitorApplication/visitorApplication",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁垮鐢宠",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
-		},
-		{
-			"path" : "pages/visitorApproval/visitorApproval",
-			"style" : 
-			{
-				"navigationBarTitleText" : "璁垮瀹℃壒",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/laborApplication/laborApplication",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍔冲姟鐢宠",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/applicationRecord/applicationRecord",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鐢宠璁板綍",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/personnel/personnel",
-			"style" : 
-			{
-				"navigationBarTitleText" : "浜哄憳绠$悊",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/newPersonnel/newPersonnel",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鏂板浜哄憳",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/changePassword/changePassword",
-			"style" : 
-			{
-				"navigationBarTitleText" : "淇敼瀵嗙爜",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/appointmentDetails/appointmentDetails",
-			"style" : 
-			{
-				"navigationBarTitleText" : "棰勭害璇︽儏",
-				"enablePullDownRefresh" : false
-			}
-		},
-		{
-			"path" : "pages/cropping/cropping",
-			"style" : 
-			{
-				"navigationBarTitleText" : "鍥剧墖瑁佸壀",
-				"enablePullDownRefresh" : false,
-				"navigationStyle": "custom"
-			}
-		}
-	],
-	"subPackages": [ 
-		{
-			"root": "n_pages",
-			"pages": [
-				{
-					"path": "login/login",
-					"style": {
-						"navigationBarTitleText" : "鐧诲綍",
-						"enablePullDownRefresh" : false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path": "index/index",
-					"style": {
-						"navigationBarTitleText" : "鍗庢櫉鏂拌兘婧�",
-						"enablePullDownRefresh" : false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path" : "applicationRecord/applicationRecord",
-					"style": {
-						"navigationBarTitleText" : "鐢宠璁板綍",
-						"enablePullDownRefresh" : false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path" : "visitorApproval/visitorApproval",
-					"style": {
-						"navigationBarTitleText" : "璁垮瀹℃壒",
-						"enablePullDownRefresh" : false,
-						"navigationStyle": "custom"
-					}
-				},
-				{
-					"path" : "visitorApplication/visitorApplication",
-					"style": {
-						"navigationBarTitleText" : "璁垮鐢宠",
-						"enablePullDownRefresh" : false,
-						"navigationStyle": "custom"
-					}
-				}
-			]
-		}
-	],
-	"globalStyle": {
-		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "",
-		"navigationBarBackgroundColor": "#ffffff",
-		"backgroundColor": "#ffffff"
-	},
-	"uniIdRouter": {}
+		{
+			"path": "pages/staff/visitorReport",
+			"style": {
+				"navigationBarTitleText": "璁垮鎶ュ",
+				"enablePullDownRefresh": false
+			}
+
+		}
+	    ,{
+            "path" : "pages/staff/snapshot",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "闅愭偅闅忔墜鎷�",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/staff/memberSel",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "閫夋嫨浜哄憳",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/staff/meetingSub",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "棰勭害浼氳瀹�",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/staff/meetingSubOrder",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "纭棰勭害",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+    ],
+	"subPackages": [{
+			"root": "n_pages",
+			"pages": [{
+					"path": "login/login",
+					"style": {
+						"navigationBarTitleText": "鐧诲綍",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "鍗庢櫉鏂拌兘婧�",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "applicationRecord/applicationRecord",
+					"style": {
+						"navigationBarTitleText": "鐢宠璁板綍",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "visitorApproval/visitorApproval",
+					"style": {
+						"navigationBarTitleText": "璁垮瀹℃壒",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "visitorApplication/visitorApplication",
+					"style": {
+						"navigationBarTitleText": "璁垮鐢宠",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+				}
+			]
+		},
+		{
+			"root": "packagesMine",
+			"name": "mine",
+			"pages": [{
+					"path": "notice/notice",
+					"style": {
+						"navigationBarTitleText": "閫氱煡",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "notificationDetails/notificationDetails",
+					"style": {
+						"navigationBarTitleText": "閫氱煡璇︽儏",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "meetingDetails/meetingDetails",
+					"style": {
+						"navigationBarTitleText": "浼氳璇︽儏",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "reservation/reservation",
+					"style": {
+						"navigationBarTitleText": "棰勭害",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "confirmAppointment/confirmAppointment",
+					"style": {
+						"navigationBarTitleText": "纭棰勭害",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path": "selectPersonnel/selectPersonnel",
+					"style": {
+						"navigationBarTitleText": "閫夋嫨浜哄憳",
+						"enablePullDownRefresh": false
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#ffffff",
+		"backgroundColor": "#ffffff"
+	},
+	"uniIdRouter": {}
 }

--
Gitblit v1.9.3