merge limo to daylight

2026-09-22 16:37:00 +08:00
parent 0c92868836
commit a7359d443b
73 changed files with 11614 additions and 1040 deletions
@@ -22,16 +22,6 @@
 				"disableSwipeBack": true
 			}
 		},
-		{
-			"path": "pages/roomCalendar/roomCalendar",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
-				"backgroundColor": "#ffffff",
-				"navigationStyle": "custom",
-				"disableSwipeBack": true
-			}
-		},
 		{
 			"path": "pages/dashboard/dashboard",
 			"style": {
@@ -80,10 +70,11 @@
 			}
 		},
 		{
-			"path": "booking/playerRoomCalendar/playerRoomCalendar",
-			"style": {
-				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false,
+			"path" : "booking/playerRoomCalendar/playerRoomCalendar",
+			"style" :
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false,
 				"backgroundColor": "#ffffff",
 				"navigationStyle": "custom",
 				"disableSwipeBack": true
@@ -231,6 +222,37 @@
 				"disableSwipeBack": true
 			}
 		},
+		{
+			"path" : "limo/newLimo/newLimo",
+			"style" : 
+			{
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh" : false,
+				"backgroundColor": "#ffffff",
+				"navigationStyle": "custom",
+				"disableSwipeBack": true
+			}
+		},
+		{
+			"path": "limo/bookingDetail/bookingDetail",
+			"style" :
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false,
+				"navigationStyle": "custom",
+				"disableSwipeBack": true
+			}
+		},
+		{
+			"path": "limo/notification/notification",
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh" : false,
+				"backgroundColor": "#ffffff",
+				"navigationStyle": "custom",
+				"disableSwipeBack": true
+			}
+		},
 		{
 			"path" : "pages/roomCount/roomCount",
 			"style" : 
@@ -242,6 +264,17 @@
 				"disableSwipeBack": true
 			}
 		},
+		{
+			"path" : "pages/roomCalendar/roomCalendar",
+			"style" :
+			{
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh" : false,
+				"backgroundColor": "#ffffff",
+				"navigationStyle": "custom",
+				"disableSwipeBack": true
+			}
+		},
 		{
 			"path" : "pages/playerDetail/playerDetail",
 			"style" : 
@@ -280,31 +313,39 @@
 		"list": [
 			{
 				"pagePath": "pages/dashboard/dashboard",
-				"iconPath": "static/images/ico_home.png",
-				"selectedIconPath": "static/images/ico_home_active.png",
+				"iconPath": "static/icon/tabbar/ico_home.png",
+				"selectedIconPath": "static/icon/tabbar/ico_home_active.png",
 				"text": "%dashboard.title%",
 				"visible":false
 			},
 			{
 				"pagePath": "salessupport/todoList/todoList",
-				"iconPath": "static/images/ico_todo.png",
-				"selectedIconPath": "static/images/ico_todo_active.png",
+				"iconPath": "static/icon/tabbar/ico_todo.png",
+				"selectedIconPath": "static/icon/tabbar/ico_todo_active.png",
 				"text": "%todo.title%",
 				"visible":false
 			},
 			{
 				"pagePath": "pages/findPlayer/findPlayer",
-				"iconPath": "static/images/ico_hotel.png",
-				"selectedIconPath": "static/images/ico_hotel_active.png",
-				"text": "%hotel.title%",
+				"iconPath": "static/icon/tabbar/calendar-check.png",
+				"selectedIconPath": "static/icon/tabbar/calendar-check-fill.png",
+				"text": "%reservations.title%",
 				"visible":false
 			},
+			// approvalRouting
+			// {
+			// 	"pagePath": "pages/approval/approval",
+			// 	"iconPath": "/static/images/task.png",
+			// 	"selectedIconPath": "/static/images/task_active.png",
+			// 	"text": "%approval.title%",
+			// 	"visible":true
+			// },
 			{
 				"pagePath": "pages/roomCalendar/roomCalendar",
 				"iconPath": "static/images/calendar-line.png",
 				"selectedIconPath": "static/images/calendar-fill.png",
 				"text": "%roomCalendar.title%",
-				"visible": false
+				"visible":false
 			},
 			// approvalRouting
 			// {
@@ -316,12 +357,12 @@
 			// },
 			{
 				"pagePath": "pages/setting/setting",
-				"iconPath": "static/images/ico_set.png",
-				"selectedIconPath": "static/images/ico_set_active.png",
+				"iconPath": "static/icon/tabbar/ico_set.png",
+				"selectedIconPath": "static/icon/tabbar/ico_set_active.png",
 				"text": "%setting.title%",
 				"visible":true
 			}
 		]
 	},
 	"uniIdRouter": {}
-}
+}