From a7359d443b7a5c0697c449b9272d5eb2b81d4d5b Mon Sep 17 00:00:00 2001
From: Mauve <forever131434@gmail.com>
Date: Tue, 22 Sep 2026 16:37:00 +0800
Subject: [PATCH] merge limo to daylight

---
 App.vue                                       |  424 ++-
 api/bookingApi.js                             |    1 +
 api/commonApi.js                              |    1 -
 api/configApi.js                              |    2 +-
 api/limoApi.js                                |   22 +
 api/notificationApi.js                        |    9 +
 booking/bookingConfirm/bookingConfirm.vue     |    1 +
 booking/bookingDetail/bookingDetail.vue       |    2 +-
 booking/bookingRecord/bookingRecord.vue       |  582 ++-
 booking/newBooking/newBooking.vue             |   24 +-
 .../playerRoomCalendar/playerRoomCalendar.vue |   44 +-
 booking/submitBooking/submitBooking.vue       |  276 +-
 common/config.js                              |    5 +-
 common/countryDialCodes.js                    |  257 ++
 common/request.js                             |   13 +-
 components/header/header.vue                  |   14 +-
 limo/bookingDetail/bookingDetail.vue          |  827 +++++
 limo/newLimo/newLimo.vue                      | 3112 +++++++++++++++++
 limo/notification/notification.vue            |  761 ++++
 locale/en.json                                |   29 +-
 locale/zh-Hant.json                           |  353 +-
 main.js                                       |   11 +
 manifest.json                                 |    6 +-
 .../ios/NetworkUtils.framework/Info.plist     |  Bin 756 -> 757 bytes
 .../ios/NetworkUtils.framework/NetworkUtils   |  Bin 69216 -> 141992 bytes
 .../fixedCoordinateConverter.js               |  344 ++
 pages.json                                    |   91 +-
 pages/dashboard/dashboard.vue                 |  175 +-
 pages/findPlayer/findPlayer.vue               |  308 +-
 pages/login/login.vue                         |   63 +-
 pages/notification/notification.vue           |  232 +-
 pages/playerDetail/playerDetail.vue           |   28 +-
 pages/roomCalendar/roomCalendar.vue           |   27 +-
 pages/samlLogin/samlLogin.vue                 |   52 +-
 pages/setting/setting.vue                     |   20 +-
 salessupport/todoList/todoList.vue            |   36 +-
 static/css/custom.scss                        |  261 +-
 static/css/limo.scss                          |  302 ++
 static/css/todo.scss                          |    2 +-
 static/icon/tabbar/LNRB-select.png            |  Bin 0 -> 2956 bytes
 static/icon/tabbar/LNRB.png                   |  Bin 0 -> 1723 bytes
 static/icon/tabbar/calendar-check-fill.png    |  Bin 0 -> 1339 bytes
 static/icon/tabbar/calendar-check.png         |  Bin 0 -> 1158 bytes
 static/icon/tabbar/ico_home.png               |  Bin 0 -> 865 bytes
 static/icon/tabbar/ico_home_active.png        |  Bin 0 -> 2118 bytes
 static/icon/tabbar/ico_set.png                |  Bin 0 -> 747 bytes
 static/icon/tabbar/ico_set_active.png         |  Bin 0 -> 1992 bytes
 static/icon/tabbar/ico_todo.png               |  Bin 0 -> 672 bytes
 static/icon/tabbar/ico_todo_active.png        |  Bin 0 -> 846 bytes
 static/icon/tabbar/taxi-fill.png              |  Bin 0 -> 883 bytes
 static/icon/tabbar/taxi-line.png              |  Bin 0 -> 630 bytes
 static/images/car_no.png                      |  Bin 0 -> 6146 bytes
 static/images/clock.png                       |  Bin 0 -> 6599 bytes
 static/images/copy.png                        |  Bin 0 -> 3840 bytes
 static/images/hotel_notification.png          |  Bin 0 -> 3551 bytes
 static/images/limo.png                        |  Bin 0 -> 3684 bytes
 static/images/limo_notification.png           |  Bin 0 -> 3906 bytes
 static/images/read_all.png                    |  Bin 0 -> 7241 bytes
 static/images/room_book.png                   |  Bin 1131 -> 692 bytes
 .../components/lu-data-select/props.js        |    7 +-
 uni_modules/uni-datetime-picker/changelog.md  |  173 +
 .../uni-datetime-picker/calendar-item.vue     |  177 +
 .../uni-datetime-picker/calendar.vue          |  947 +++++
 .../uni-datetime-picker/i18n/en.json          |   22 +
 .../uni-datetime-picker/i18n/index.js         |    8 +
 .../uni-datetime-picker/i18n/zh-Hans.json     |   22 +
 .../uni-datetime-picker/i18n/zh-Hant.json     |   22 +
 .../uni-datetime-picker/time-picker.vue       |  940 +++++
 .../uni-datetime-picker.vue                   | 1068 ++++++
 .../components/uni-datetime-picker/util.js    |  421 +++
 uni_modules/uni-datetime-picker/package.json  |  107 +
 uni_modules/uni-datetime-picker/readme.md     |   21 +
 .../uview-ui/components/u-tabs/u-tabs.vue     |    2 +-
 73 files changed, 11614 insertions(+), 1040 deletions(-)
 create mode 100644 api/limoApi.js
 create mode 100644 api/notificationApi.js
 create mode 100644 common/countryDialCodes.js
 create mode 100644 limo/bookingDetail/bookingDetail.vue
 create mode 100644 limo/newLimo/newLimo.vue
 create mode 100644 limo/notification/notification.vue
 create mode 100644 nativeplugins/NetworkUtils/ios/NetworkUtils.framework/fixedCoordinateConverter.js
 create mode 100644 static/css/limo.scss
 create mode 100644 static/icon/tabbar/LNRB-select.png
 create mode 100644 static/icon/tabbar/LNRB.png
 create mode 100644 static/icon/tabbar/calendar-check-fill.png
 create mode 100644 static/icon/tabbar/calendar-check.png
 create mode 100644 static/icon/tabbar/ico_home.png
 create mode 100644 static/icon/tabbar/ico_home_active.png
 create mode 100644 static/icon/tabbar/ico_set.png
 create mode 100644 static/icon/tabbar/ico_set_active.png
 create mode 100644 static/icon/tabbar/ico_todo.png
 create mode 100644 static/icon/tabbar/ico_todo_active.png
 create mode 100644 static/icon/tabbar/taxi-fill.png
 create mode 100644 static/icon/tabbar/taxi-line.png
 create mode 100644 static/images/car_no.png
 create mode 100644 static/images/clock.png
 create mode 100644 static/images/copy.png
 create mode 100644 static/images/hotel_notification.png
 create mode 100644 static/images/limo.png
 create mode 100644 static/images/limo_notification.png
 create mode 100644 static/images/read_all.png
 create mode 100644 uni_modules/uni-datetime-picker/changelog.md
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
 create mode 100644 uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
 create mode 100644 uni_modules/uni-datetime-picker/package.json
 create mode 100644 uni_modules/uni-datetime-picker/readme.md

diff --git a/App.vue b/App.vue
index b00a7cf..66790b8 100644
--- a/App.vue
+++ b/App.vue
@@ -1,6 +1,6 @@
 <script>
 	import config from './common/config.js'
-	import {writeDebugLog,writePublicDebugLog,getSettingByKey,getSettings,verifyToken,logout} from './api/commonApi.js'
+	import {writeDebugLog,getSettings,verifyToken,logout,writePublicDebugLog} from './api/commonApi.js'
 	import { getCfgSettingByKey } from './api/configApi.js'
 	import store from './store/index.js'
 	import FixedCoordinateConverter from './common/fixedCoordinateConverter.js'
@@ -9,7 +9,7 @@
 	import {refreshToken} from './api/commonApi.js'
 	import dayjs from './uni_modules/uview-ui/libs/util/dayjs.js';
 	import { decryptCfgSettingValue } from './common/cfgSettingCrypto.js';
-	import {saveDeviceToken} from './api/notification.js';
+	import { saveDeviceToken, saveNotification } from './api/notificationApi.js';
 	// #ifdef APP-PLUS
 	var networkModule = uni.requireNativePlugin("NetworkUtils-NetworkUtilsModule")
 	// #endif
@@ -17,7 +17,9 @@
 		data() {
 			return {
 				timer: null,          // 定时器引用
-			    backgroundTaskId: 0   // iOS 后台任务ID
+			    backgroundTaskId: 0,   // iOS 后台任务ID
+				lastPushNotificationTitle: '',
+				lastPushNotificationContent: ''
 			}
 		},
 		onLaunch: function() {
@@ -28,22 +30,18 @@
 				type: 'wgs84',
 				success: (res) => {}
 			});
-			/*plus.globalEvent.addEventListener('newintent', (e)=>{  
-			  var args= plus.runtime.arguments;
-			  console.log(args)
-			  uni.showToast({
-			    title: 'APP LAUNCH-newintent'
-			  });
-			  if(args){
-				  var code = this.getSchemeParam('code',args)
-				  uni.showToast({
-				    title: code
-				  });
-				  uni.redirectTo({
-				  	url:'/pages/login/login?code='+encodeURIComponent(code)
-				  })
-			  }
-			});*/
+			// 延迟触发推送注册：避免 plus/原生桥尚未就绪导致 refresh 未真正调到原生（Xcode 看不到 refreshDeviceTokenAsync ENTER）
+			setTimeout(() => {
+				this.refreshPushDeviceTokenAndSync({ requestAuthorization: true }).catch((err) => {
+					console.warn('[APNs] refreshDeviceTokenAsync failed', err)
+				})
+			}, 1200)
+
+			this.setupPushNotificationListener();
+			setTimeout(() => {
+				this.syncPendingPushNotificationsFromNative();
+			}, 2000);
+			
 			// #endif
 		},
 		onShow: function() {
@@ -80,12 +78,248 @@
 			// #endif
 		},
 		beforeDestroy() {
-		    // 组件销毁时清理资源
 			// #ifdef APP-PLUS
-		    this.stopTimer();
+			this.stopTimer();
 			// #endif
 		},
-		methods:{
+		methods: {
+			parsePushMessageReceivedPayload(rawPayload) {
+				const root =
+					rawPayload &&
+					rawPayload.detail != null &&
+					typeof rawPayload.detail === 'object'
+						? rawPayload.detail
+						: rawPayload;
+				if (!root || typeof root !== 'object') {
+					return { notificationTitle: '', notificationContent: '' };
+				}
+				let merged = Object.assign({}, root);
+				let extra = merged.data ?? merged.payload ?? merged.message ?? merged.content;
+				if (typeof extra === 'string') {
+					const text = extra.trim();
+					if (text.startsWith('{') || text.startsWith('[')) {
+						try {
+							extra = JSON.parse(text);
+						} catch (parseError) {
+							extra = null;
+						}
+					} else if (text) {
+						merged._dataStringFallback = text;
+					}
+				}
+				if (extra != null && typeof extra === 'object' && !Array.isArray(extra)) {
+					merged = Object.assign({}, merged, extra);
+				}
+				const aps = merged.aps;
+				let alertBody = '';
+				let alertTitle = '';
+				if (aps && typeof aps.alert === 'object' && aps.alert !== null) {
+					alertTitle = String(aps.alert.title || '').trim();
+					alertBody = String(
+						aps.alert.body ?? aps.alert.subtitle ?? ''
+					).trim();
+				} else if (aps && typeof aps.alert === 'string') {
+					alertBody = String(aps.alert).trim();
+				}
+				const notificationTitle =
+					String(
+						alertTitle ||
+							merged.title ||
+							merged.Title ||
+							merged.notificationTitle ||
+							merged.notification_title ||
+							''
+					).trim();
+				const notificationContent = String(
+					alertBody ||
+						merged.body ||
+						merged.content ||
+						merged.Content ||
+						merged.message ||
+						merged.Message ||
+						merged.text ||
+						merged.description ||
+						merged._dataStringFallback ||
+						''
+				).trim();
+				return { notificationTitle, notificationContent };
+			},
+			getCachedUserId() {
+				const userData = uni.getStorageSync('userData');
+				if (
+					userData != null &&
+					userData !== '' &&
+					userData != undefined &&
+					userData.userId != null &&
+					userData.userId !== ''
+				) {
+					return userData.userId;
+				}
+				return '';
+			},
+			isUserLoggedIn() {
+				const user = uni.getStorageSync('userData');
+				const token = uni.getStorageSync('token');
+				const clientId = uni.getStorageSync('clientId');
+				const timeOut = uni.getStorageSync('timeOut');
+				const now = Math.floor(new Date().getTime() / 1000);
+				let loginTag = false;
+				if (user) {
+					loginTag = user.loginTag === true;
+				}
+				if (
+					token == undefined ||
+					token == null ||
+					token === '' ||
+					clientId == undefined ||
+					clientId == null ||
+					clientId === ''
+				) {
+					loginTag = false;
+				}
+				if (timeOut != null && timeOut !== '' && now >= timeOut) {
+					loginTag = false;
+				}
+				return loginTag === true;
+			},
+			getPushNotificationPageUrl() {
+				return '/limo/notification/notification';
+			},
+			getPushConfirmNo(payload = {}) {
+				const confirmNo = payload.confirmNo || payload.raw?.ConfirmNo || payload.raw?.confirmNo || payload.raw?.confNo;
+				return confirmNo ? String(confirmNo) : '';
+			},
+			getPushTargetUrl(payload = {}) {
+				const confirmNo = this.getPushConfirmNo(payload);
+				if (confirmNo) {
+					return `/limo/bookingDetail/bookingDetail?confNo=${encodeURIComponent(confirmNo)}&from=push`;
+				}
+				return this.getPushNotificationPageUrl();
+			},
+			setPendingPushNavigation(url) {
+				if (!url) {
+					return;
+				}
+				uni.setStorageSync('pendingPushNavigation', url);
+				console.log('[Push] pending navigation saved:', url);
+			},
+			tryConsumePendingPushNavigation() {
+				const pendingUrl = uni.getStorageSync('pendingPushNavigation');
+				if (!pendingUrl) {
+					return false;
+				}
+				if (!this.isUserLoggedIn()) {
+					return false;
+				}
+				uni.removeStorageSync('pendingPushNavigation');
+				console.log('[Push] consume pending navigation:', pendingUrl);
+				this.navTo(pendingUrl, 0, false);
+				return true;
+			},
+			shouldOpenNotificationPageFromPush(payload = {}, meta = {}) {
+				return meta.userTapped === true || payload.userTapped === true;
+			},
+			navigateToNotificationPageFromPush(payload = {}) {
+				const targetUrl = this.getPushTargetUrl(payload);
+				console.log('[Push] navigateToNotificationPageFromPush targetUrl=', targetUrl, 'confirmNo=', this.getPushConfirmNo(payload));
+				if (!this.isUserLoggedIn()) {
+					this.setPendingPushNavigation(targetUrl);
+					uni.redirectTo({
+						url: '/pages/login/login'
+					});
+					return;
+				}
+				this.navTo(targetUrl, 0, false);
+			},
+			queuePushForSaveLater(title, content) {
+				const queue = uni.getStorageSync('pendingPushSaveQueue') || []
+				queue.push({ title, content, at: Date.now() })
+				uni.setStorageSync('pendingPushSaveQueue', queue)
+				console.warn('[Push] userId 未就绪，已暂存待 saveNotification，条数=', queue.length)
+			},
+			async flushPendingPushSaveQueue() {
+				const userId = this.getCachedUserId()
+				if (!userId) {
+					return
+				}
+				const queue = uni.getStorageSync('pendingPushSaveQueue') || []
+				if (!queue.length) {
+					return
+				}
+				uni.removeStorageSync('pendingPushSaveQueue')
+				console.log('[Push] flushPendingPushSaveQueue count=', queue.length)
+				for (const item of queue) {
+					try {
+						await saveNotification({
+							title: item.title,
+							content: item.content,
+							userId
+						})
+						console.log('[Push] saveNotification success (flushed)', item.title)
+					} catch (saveError) {
+						console.error('[Push] saveNotification failed (flushed)', saveError)
+					}
+				}
+			},
+			async persistReceivedPushNotification(notificationTitle, notificationContent) {
+				const userId = this.getCachedUserId();
+				if (!userId) {
+					this.queuePushForSaveLater(notificationTitle, notificationContent)
+					return;
+				}
+				try {
+					await saveNotification({
+						title: notificationTitle,
+						content: notificationContent,
+						userId
+					});
+					console.log('[Push] saveNotification success', {
+						title: notificationTitle,
+						content: notificationContent,
+						userId
+					});
+				} catch (saveError) {
+					console.error('[Push] saveNotification failed', saveError);
+				}
+			},
+			setupGlobalEventListeners() {
+				if (this._globalPushHookRegistered) {
+					return;
+				}
+				this._globalPushHookRegistered = true;
+				uni.$on('onPushMessageReceived', (rawPayload) => {
+					try {
+						const { notificationTitle, notificationContent } =
+							this.parsePushMessageReceivedPayload(rawPayload);
+						this.lastPushNotificationTitle = notificationTitle;
+						this.lastPushNotificationContent = notificationContent;
+						console.log(
+							'[Push] onPushMessageReceived',
+							notificationTitle || '(no title)',
+							notificationContent || '(no content)',
+							rawPayload
+						);
+						this.persistReceivedPushNotification(
+							notificationTitle,
+							notificationContent
+						);
+						const toastText =
+							notificationTitle ||
+							notificationContent ||
+							'Received push message';
+						uni.showToast({
+							title:
+								toastText.length > 36
+									? `${toastText.slice(0, 33)}…`
+									: toastText,
+							icon: 'none',
+							duration: 2800
+						});
+					} catch (handlerError) {
+						console.error('[Push] handler error', handlerError, rawPayload);
+					}
+				});
+			},
 			startTimer() {
 			  // 先清除可能存在的旧定时器
 			  this.stopTimer();
@@ -135,6 +369,10 @@
 					}
 					this.macauString = res.data;
 					uni.setStorageSync("macauString",this.macauString.keyValues);
+					// uni.showToast({
+					// 	title:'Macau String = '+this.macauString.keyValues,
+					// 	icon: "none"
+					// })
 				}catch(e){
 					console.log(e);
 				}finally{
@@ -168,13 +406,14 @@
 				plus.screen.lockOrientation("portrait");
 				// #endif
 				await this.initCfg(); // 获取配置参数						
+				this.setupGlobalEventListeners();
 			},
 			// 初始化方法
 			async initCfg(){
 				// 配置站点信息
 				const cfg = new config();
 				// 判断外网还是内网
-				// 現在內外網改成由後端判斷
+				// 現在內外網改成由後端判斷 
 				
 				// 如果是外网
 				const userData = uni.getStorageSync('userData');
@@ -371,10 +610,6 @@
 			},
 			//根据Permission显示Tabbar
 			showTabbarByPermission(userData){
-				uni.setTabBarItem({
-					index: 3,
-					visible: !!userData && userData.canViewCalendar === true
-				});
 				if(userData!==null && userData!==undefined){
 					console.log('Setting Tabbar');
 					if(userData.canViewDashboard){
@@ -395,6 +630,12 @@
 							visible:true
 						});
 					}
+					if(userData.canViewCalendar){
+						uni.setTabBarItem({
+							index:3,
+							visible:true
+						});
+					}
 				}
 			},
 			// 返回
@@ -421,6 +662,110 @@
 					});
 
 			},
+			/** 从原生读取当前缓存的 APNs DeviceToken，并写入本地 Storage（供业务上报） */
+			syncPushDeviceTokenFromNative() {
+				getDeviceToken({})
+					.then(async (ret) => {
+						console.log('[APNs] getDeviceToken', ret.status, ret.updatedAt);
+						const deviceToken = ret.deviceToken ? String(ret.deviceToken).trim() : '';
+						let useLanguage = 0;
+						//获取AppSetting,后端可以判断发中文还是发英文 英文：0 中文：1 默认为0
+						if(uni.getLocale()!==null && uni.getLocale()!==undefined){
+							useLanguage = uni.getLocale()=='en'? 0 : 1;
+						}
+						if (deviceToken) {
+							const userId = this.getCachedUserId();
+							console.log('[APNs] saveDeviceToken params', {
+								userId,
+								deviceToken,
+								rawUserData: uni.getStorageSync('userData'),
+								rawRet: ret,
+								useLanguage
+							});
+							this.writeLog(
+								userId,
+								'syncPushDeviceTokenFromNative',
+								'',
+								'[APP][App.vue][getDevice Token][Success]' + deviceToken,
+								'',
+								'',
+								1,
+								false
+							);
+							uni.setStorageSync('apnsDeviceToken', deviceToken);
+							uni.setStorageSync('apnsDeviceTokenUpdatedAt', ret.updatedAt || 0);
+							try {
+								const res = await saveDeviceToken({ userId, deviceToken, useLanguage});
+								console.log('[APNs] saveDeviceToken success', res);
+							} catch (saveErr) {
+								console.error('[APNs] saveDeviceToken failed', saveErr);
+							}
+						}
+					})
+					.catch((e) => {
+						console.warn('[APNs] getDeviceToken fail', e);
+						uni.showToast({
+							title: 'error = ' + e,
+							icon: 'none'
+						});
+						const userId = this.getCachedUserId();
+						this.writeLog(
+							userId,
+							'syncPushDeviceTokenFromNative',
+							'',
+							'[APP][App.vue][getDevice Token][Fail] Error Message :' + e,
+							'',
+							'',
+							1,
+							false
+						);
+					});
+			},
+			/**
+			 * 触发 refreshDeviceTokenAsync（重新向 APNs 注册），随后轮询 getDeviceToken。
+			 * @param {{ requestAuthorization?: boolean }} opts 默认可不传；已授权场景可传 { requestAuthorization: false }
+			 */
+			refreshPushDeviceTokenNative(opts) {
+				return refreshDeviceTokenAsync(opts || { requestAuthorization: true })
+			},
+			/** 刷新并尽量拿到新 token（适合服务端返回推送失效时调用） */
+			refreshPushDeviceTokenAndSync(opts) {
+				return refreshDeviceTokenAndFetch(opts || { requestAuthorization: true }).then((ret) => {
+					if (ret.deviceToken) {
+						uni.setStorageSync('apnsDeviceToken', ret.deviceToken)
+						uni.setStorageSync('apnsDeviceTokenUpdatedAt', ret.updatedAt || 0)
+					}
+					return ret
+				})
+			},
+			setupPushNotificationListener() {
+				listenPushNotification((payload, meta) => {
+					this.handlePushNotificationMessage(payload, meta)
+				})
+			},
+			async handlePushNotificationMessage(payload = {}, meta = {}) {
+				const { title, content } = payload
+				this.lastPushNotificationTitle = title
+				this.lastPushNotificationContent = content
+
+
+				await this.persistReceivedPushNotification(title, content)
+
+				console.log('[Push] handlePushNotificationMessage userTapped=', payload.userTapped, meta?.userTapped, 'confirmNo=', this.getPushConfirmNo(payload))
+				if (this.shouldOpenNotificationPageFromPush(payload, meta)) {
+					this.navigateToNotificationPageFromPush(payload)
+				}
+			},
+			async syncPendingPushNotificationsFromNative() {
+				console.log('[Push] syncPendingPushNotificationsFromNative')
+				await syncPendingPushNotifications((payload, meta) => {
+					this.handlePushNotificationMessage(payload, {
+						...meta,
+						showToast: meta?.fromPending ? false : meta?.showToast
+					})
+				}, { showToast: false })
+				await this.flushPendingPushSaveQueue()
+			},
 			checkLocationAndVPN(type){
 				let objVPNData = this.checkVPNOpen();
 				let isOpenVPN = false;
@@ -472,10 +817,9 @@
 									icon: "none"
 								})*/
 								this.writeLog(userId,"getLocationVPN","","[APP][App.vue][checkLocationAndVPN][Success]"+result.isInMacau+ ", city:"+result.city+ ", address:"+result.fullAddress+ ", IP address:"+ipAddress,"","",1,false);
-								/*uni.showToast({
-									title:'是否在澳门：'+isInMacau+'，是否使用VPN：'+isOpenVPN,
-									icon: "none"
-								})*/
+								
+								
+								
 								if(!isInMacau){
 									let macauStringList = uni.getStorageSync("macauString").split(";");
 									for(let i=0;i<macauStringList.length;i++){
@@ -488,8 +832,12 @@
 										}
 									}
 								} 
-								//isInMacau = true;
+								
+								//模擬數據 模拟数据
+								// isInMacau = true;
 								// isOpenVPN = false;
+								//模擬數據 模拟数据
+							
 								if((isInMacau===null||isInMacau===undefined) && isOpenVPN!==null){ //调用地址出错
 									msgType = "1";
 								}
@@ -572,6 +920,8 @@
 						return;
 					}
 				}
+				
+				const token = uni.getStorageSync("token");
 
 				let obj = {};
 				obj.loginId = userId;
@@ -585,8 +935,11 @@
 				//console.log(obj);
 				
 				try{
-					const token = uni.getStorageSync('token');
-					const response = token ? await writeDebugLog(obj) : await writePublicDebugLog(obj);
+					if(token != undefined && token != null && token !=""){
+						const response = await writeDebugLog(obj);
+					}else{
+						const response = await writePublicDebugLog(obj);
+					}
 				}
 				catch(e){
 					console.error(e.errMsg);
@@ -616,7 +969,6 @@
 								index:2,
 								visible:false
 							});
-							uni.setTabBarItem({ index: 3, visible: false });
 							if(siteData.mockSSO==false&&!siteData.internalTag){
 								//this.logoutWithADFSApp()
 								uni.redirectTo({
@@ -737,6 +1089,8 @@
 				}
 			},
 			kickout() {
+				
+			  this.logout();
 			  uni.removeStorageSync("userData");
 			  uni.removeStorageSync("token");
 			  uni.removeStorageSync("idToken");
diff --git a/api/bookingApi.js b/api/bookingApi.js
index 4f8056e..61b6bbf 100644
--- a/api/bookingApi.js
+++ b/api/bookingApi.js
@@ -2,6 +2,7 @@ export const getBookingsMock = (params, config = {}) => uni.$u.http.post('/app/b
 export const saveBooking = (params, config = {}) => uni.$u.http.post('/app/booking/create', params, config)
 export const getBookings = (params, config = {}) => uni.$u.http.post('/app/bookings/search_optimize', params, config)
 export const getBookingByConf = (params, config = {}) => uni.$u.http.post('/app/booking/get_booking_by_conf', params, config)
+export const getLimoBookings = (params, config = {}) => uni.$u.http.post('/limo/search_limo', params, config)
 export const getBookingById = (params, config = {}) => uni.$u.http.post('/app/booking/get_booking_by_id', params, config)
 export const editBooking = (params, config = {}) => uni.$u.http.post('/app/booking/edit', params, config)
 export const getBookingsByGroupId = (params, config = {}) => uni.$u.http.post('/app/booking/get_bookings_by_groupId', params, config)
diff --git a/api/commonApi.js b/api/commonApi.js
index b50f866..f498d62 100644
--- a/api/commonApi.js
+++ b/api/commonApi.js
@@ -1,6 +1,5 @@
 export const writeDebugLog = (params, config = {}) => uni.$u.http.post('/system/write_log', params, config)
 export const writePublicDebugLog = (params, config = {}) => uni.$u.http.post('/system/write_public_log', params, config)
-export const getSettingByKey = (params, config = {}) => uni.$u.http.post('/system/sys_setting/get', params, config)
 export const getSettings = (params, config = {}) => uni.$u.http.post('/system/sys_setting/get_public_login_settings', params, config)
 export const verifyToken = (params, config = {}) => uni.$u.http.post('/app/me', params, config)
 export const refreshToken = (params, config = {}) => uni.$u.http.post('/app/refresh_token?isRenewRefreshToken=false', params, config)
diff --git a/api/configApi.js b/api/configApi.js
index c59439d..c78f24c 100644
--- a/api/configApi.js
+++ b/api/configApi.js
@@ -10,4 +10,4 @@ export const getAvailableRoom = (params, config = {}) => uni.$u.http.post('/app/
 export const getExtendBooking = (params, config = {}) => uni.$u.http.post('/app/config/is_extend_booking', params, config)
 export const getWaitlistBooking = (params, config = {}) => uni.$u.http.post('/app/config/get_waitlist_booking', params, config)
 export const getCfgSettingByKey = (params, config = {}) => uni.$u.http.post('/web/setting/get_public_setting_by_key', params, config)
-export const getCalendarSetting = (params, config = {}) => uni.$u.http.post('/app/setting/get_calendar_setting', params, config)
+export const getCalendarSetting = (params, config = {}) => uni.$u.http.post('/app/setting/get_calendar_setting', params, config)
\ No newline at end of file
diff --git a/api/limoApi.js b/api/limoApi.js
new file mode 100644
index 0000000..484b081
--- /dev/null
+++ b/api/limoApi.js
@@ -0,0 +1,22 @@
+export const getLimoTripPriceList = (params, config = {}) => uni.$u.http.post('/limo/getTripPriceList', params, config)
+export const getLimoLocation = (params, config = {}) =>
+	uni.$u.http.get('/limo/getLocation', { params, ...config })
+export const getLimoCarType= (params, config = {}) =>
+	uni.$u.http.get('/limo/getCarType', { params, ...config })
+export const getLimoGreetType = (params, config = {}) =>
+	uni.$u.http.get('/limo/getGreetType', { params, ...config })
+export const getQualification = (params, config = {}) =>
+	uni.$u.http.get('/limo/checkQualification', { params, ...config })
+export const getLimoOverrider = (params, config = {}) =>
+	uni.$u.http.get('/limo/getOverrider', { params, ...config })
+export const getLimoApprover = (params, config = {}) =>
+	uni.$u.http.get('/limo/playerLimoBooker', { params, ...config })	
+export const getLimoFlightDetails = (params, config = {}) =>
+	uni.$u.http.get('/limo/getFlightDetails', { params, ...config })	
+export const getLimoTodayBooking = (params, config = {}) => uni.$u.http.post('/limo/getTodayBooking', params, config)
+export const createLimoBooking = (params, config = {}) => uni.$u.http.post('/limo/createBooking', params, config)
+export const prepareBooking = (params, config = {}) => uni.$u.http.post('/limo/prepareBooking', params, config)
+export const editLimoBooking = (params, config = {}) => uni.$u.http.post('/limo/updateBooking', params, config)
+export const cancelLimoBooking = (params, config = {}) => uni.$u.http.post('/limo/cancelBooking', params, config)
+export const getLimoBookingById = (params, config = {}) => uni.$u.http.post('/limo/get_limo_booking_by_id', params, config)
+export const getLimoBookingByConf = (params, config = {}) => uni.$u.http.post('/limo/get_limo_booking_by_conf', params, config)
\ No newline at end of file
diff --git a/api/notificationApi.js b/api/notificationApi.js
new file mode 100644
index 0000000..d5fa900
--- /dev/null
+++ b/api/notificationApi.js
@@ -0,0 +1,9 @@
+export const saveNotification = (params, config = {}) => uni.$u.http.post('/notification/saveNotification', params, config)
+export const getNotificationByUserId = (params, config = {}) =>
+	uni.$u.http.get('/notification/get_notification_by_user_id', { params, ...config })
+export const changeNotification = (params, config = {}) => uni.$u.http.post('/notification/change_status', params, config)
+export const readAllNotification = (params, config = {}) => uni.$u.http.post('/notification/read_all', params, config)
+export const countNotification = (params, config = {}) =>
+	uni.$u.http.get('/notification/count_notification_by_user_id', { params, ...config })
+export const saveDeviceToken = (params, config = {}) => uni.$u.http.post('/deviceToken/save_device_token', params, config)
+export const updateDeviceToken = (params, config = {}) => uni.$u.http.post('/deviceToken/update_device_token', params, config)
\ No newline at end of file
diff --git a/booking/bookingConfirm/bookingConfirm.vue b/booking/bookingConfirm/bookingConfirm.vue
index 4002fc0..eb3915b 100644
--- a/booking/bookingConfirm/bookingConfirm.vue
+++ b/booking/bookingConfirm/bookingConfirm.vue
@@ -1883,3 +1883,4 @@
 		border-radius: 22px;
 	}
 </style>
+
diff --git a/booking/bookingDetail/bookingDetail.vue b/booking/bookingDetail/bookingDetail.vue
index 125dd30..1585e29 100644
--- a/booking/bookingDetail/bookingDetail.vue
+++ b/booking/bookingDetail/bookingDetail.vue
@@ -502,7 +502,7 @@
 							this.getBooking(this.opt);
 						}else{
 							this.iconPath = '../../static/images/ico_err.png';
-							this.popMsgStr = this.$t("bookingDetail.changeMiscChargeFail");
+							this.popMsgStr = this.$t("bookingDetail.changeMisChargeFail");
 							this.showMsgBox = true;
 							this.showETAMsg = false;
 							
diff --git a/booking/bookingRecord/bookingRecord.vue b/booking/bookingRecord/bookingRecord.vue
index 2b31fa5..a224f35 100644
--- a/booking/bookingRecord/bookingRecord.vue
+++ b/booking/bookingRecord/bookingRecord.vue
@@ -18,88 +18,138 @@
 				<view style="border:1rpx solid #ccc;border-radius: 14px;padding:4px 12px;" class="hz-flex-row hz-flex-vertical-mid">
 					<image @click="navTo('/pages/findPlayer/findPlayer',1,false)" src="../../static/images/ico_find_player.png" class="hz-nav-btn"></image>
 					<view style="height:20px;border-left:1px solid #ccc;margin-left:8px;margin-right:8px;"></view>
-					<image v-if="userData && userData.canViewCalendar === true" @click="navToPlayerRoomCalendar" src="../../static/images/calendar-line.png" class="hz-nav-btn"></image>
-					<image v-else @click="getDataByPage" src="../../static/images/ico_list.png" class="hz-nav-btn"></image>
+					<image @click="navToPlayerRoomCalendar" src="../../static/images/calendar-line.png" class="hz-nav-btn"></image>
 				</view>
 			</view>
 			</u-navbar>
-			<view class="hz-spacing hz-bg-white" style="margin-top:8px;">
-				<view class="hz-card-profile hz-mr-b-30">
+			
+			<!-- booking record page -->
+			<view class="hz-spacing hz-bg-white mt-[20]">
+				<view class="hz-card-profile mb-[40]">
 					<view class="hz-flex-row">
-						<view style="width:60%">
+						<view class="hz-w-60">
 							<view class="hz-font-color-light hz-font-sm">{{$t("common.playerId")}}</view>
 							<view class="hz-font-bolder hz-font-lg" >{{ playerData.playerId }}</view>
 						</view>
-						<view style="width:40%">
+						<view class="hz-w-40">
 							<view class="hz-font-color-light hz-font-sm">{{$t("common.tier")}}</view>
 							<view class="hz-font-bolder hz-font-lg" >{{ playerData.tierName }}</view>
 						</view>
 					</view>
 					<view class="hz-flex-row hz-mr-t-30">
-						<view style="width:100%">
+						<view class="hz-w-100">
 							<view class="hz-font-color-light hz-font-sm">{{$t("common.name")}}</view>
 							<view class="hz-font-bolder hz-font-lg" >{{playerData.salutation + " " +  playerData.name }}</view>
 						</view>
 					</view>
 				</view>
-				<view v-if="!showEmpty">
-					<!-- 'hz-card-extend' disable extend -->
-					<view  @click="navToDetail(booking)" v-for="(booking,index) in bookingList" :key="index" 
-					:class="getRecordColor(booking)" class="hz-pd-30 hz-font-bold hz-font-sm"  style="margin-top:20rpx;align-items: center;">
-						<view class="hz-flex-row">
-							<view>
-								<view class="hz-font-md">{{$t("common.confirmationNo")}}: {{ getConfirmationNo(booking)}}</view>
+				
+				<view>
+					<view v-for="(record,index) in displayRecordList" :key="`${record.recordType}-${record.id || record.confirmationNo || index}`">
+						<view @click="openRecordDetail(record)" :class="getRecordCardClass(record)" class="hz-card-booking hz-record-card hz-pd-30 hz-font-bold hz-font-sm">
+							<view class="hz-flex-row hz-booking-type-row">
+								<view class="hz-booking-type-wrap">
+									<image :src="getBookingTypeIcon(record)" class="hz-booking-type-icon"></image>
+									<view class="hz-font-md">{{ getBookingTypeLabel(record) }}</view>
+								</view>
+								<view class="hz-font-md hz-text-right" :class="getRecordStatusClass(record)">{{getRecordStatusText(record)}}</view>
 							</view>
-							<view style="margin-left:auto">
-								<view class="hz-font-md" :class="getStatusTextColor(booking)">{{getStatusText(booking)}}</view>
+							<view v-if="isHotelRecord(record)">
+								<view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-50">
+										<view class="hz-font-md">{{$t("common.confirmationNo")}}: {{ getConfirmationNo(record)}}</view>
+									</view>
+									<view class="hz-w-50">
+										<view class="hz-font-md hz-text-right">{{ record.propertyName }}</view>
+									</view>
+								</view>
+								<view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-55">
+										<view class="hz-font-md">{{$t("common.checkInDate")}}: {{ record.checkinDate }}</view>
+									</view>
+								</view>
+								<view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-55">
+										<view class="hz-font-md">{{$t("common.checkOutDate")}}: {{ record.checkoutDate }}</view>
+									</view>
+									<view class="hz-flex-row hz-sharer-wrap" v-if="canShowSharer(record)">
+											<view v-if="hasSharer(record)" class="hz-btn-sharer hz-font-min hz-sharer-tag">{{$t("bookingRecord.sharer").toUpperCase()}}</view> 
+									</view>
+								</view>
+								<!-- <view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-55 hz-font-md" v-show="record.eta!==null && record.eta!=='00:00:00'">{{$t("common.etaTime")}}: {{formatEtaToHHmm(record.eta)}}</view>
+									<view v-if="record.miscCharge != null" class="hz-flex-row hz-sharer-wrap">
+										<view>
+											<view class="hz-font-md">{{$t("common.misCharge")}}: {{ formatWithThousands(record.miscCharge) }}</view>
+										</view>
+									</view>
+								</view> -->
+								<view class="hz-flex-row" style="margin-top:6px;">
+									<view v-show="record.eta!==null && record.eta!=='00:00:00'" class="hz-font-md">{{$t("common.etaTime")}}: {{formatEtaToHHmm(record.eta)}}</view>
+									<span v-show="record.eta!==null && record.eta!=='00:00:00' && record.miscCharge!==null" class="hz-font-md" style="padding:0 6px;">|</span>
+									<view v-show="record.miscCharge!==null" class="hz-font-md">{{$t("common.misCharge")}}: {{formatWithThousands(record.miscCharge)}}</view>
+								</view>
 							</view>
-						</view>
-						<view class="hz-flex-row" style="margin-top:6px;">
-							<view style="width:55%;">
-								<view class="hz-font-md">{{$t("common.checkInDate")}}: {{ booking.checkinDate }}</view>
+							<!-- 不然就是 limo 的 booking -->
+							<view v-else>
+								<view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-100">
+										<view class="hz-font-md">Conf # : {{ getConfirmationNo(record) }}</view>
+									</view>
+								</view>
+								<view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-100">
+										<view class="hz-font-md">{{$t("limoBookingRecord.pickupDatetime")}}: {{ record.pickupDatetime }}</view>
+									</view>
+								</view>
+								<view class="hz-flex-row hz-row-gap">
+									<view class="hz-w-100">
+										<view class="hz-font-md">{{$t("limoBookingRecord.pickup")}}: {{ record.pickup }}</view>
+									</view>
+								</view>
+								<view v-if="record.extraDropoff && record.extraDropoff.length" class="hz-flex-row hz-row-gap">
+								  <view class="hz-w-100">
+								    <view class="hz-font-md">{{$t("limoBookingRecord.extraDropoff")}}:</view>
+								    <view class="hz-font-md" v-for="(dropoffPoint,index) in record.extraDropoff" :key="index">
+								      #{{index + 1}}:{{dropoffPoint}}
+								    </view>
+								  </view>
+								</view>
+								<view class="hz-flex-row hz-row-gap hz-flex-vertical-mid">
+									<view class="hz-w-100 hz-limo-dropoff-wrap">
+										<view class="hz-font-md">
+											{{$t("limoBookingRecord.dropoff")}}: {{record.dropoff}}
+										</view>
+									</view>
+								</view>
 							</view>
-							<view style="width:50%;">
-								<view style="text-align: right;" class="hz-font-md">{{ booking.propertyName }}</view>
-							</view>
-						</view>
-						<view   class="hz-flex-row" style="margin-top:6px;">
-							<view style="width:55%;">
-								<view class="hz-font-md">{{$t("common.checkOutDate")}}: {{ booking.checkoutDate }}</view>
-							</view>
-							<!-- enable sharer and extend 2024-09-27 -->
-							<view class="hz-flex-row" style="width:50%;text-align: right;justify-content: flex-end;" v-if="userData.canNewBooking&&booking.propertyCategory!='OTHER'">
-								<view v-if="(booking.sharer!==null && booking.sharer!=='[]')||booking.isShare" class="hz-btn-sharer hz-font-min" style="width:40%;height:14px;line-height:14px;margin-right: 3px;">{{$t("bookingRecord.sharer").toUpperCase()}}</view> 
-								<!-- <view  @click="navToDetail(booking)" v-if="((booking.lastOperaStatus==='DUE_OUT' || booking.lastOperaStatus==='CHECKED_IN') && booking.confirmationNo!=null && (booking.approveStatus!='W'&&booking.approveStatus!='PN'))" class="hz-btn-extend hz-font-min" style="width:40%;height:14px;line-height:14px;">{{$t("bookingRecord.extend").toUpperCase()}}</view> -->
-								<!-- <view @click="navTo('/booking/bookingGroup/bookingGroup?groupId='+booking.groupId,0,false)" v-if="booking.groupId!==undefined && booking.groupId!==null && booking.groupId!==''" class="hz-btn-group" style="margin-left:8px;">{{$t("bookingRecord.group")}}</view> -->
-							</view>
-						</view>
-						<view class="hz-flex-row" style="margin-top:6px;">
-							<view v-show="booking.eta!==null && booking.eta!=='00:00:00'" class="hz-font-md">{{$t("common.etaTime")}}: {{formatEtaToHHmm(booking.eta)}}</view>
-							<span v-show="booking.eta!==null && booking.eta!=='00:00:00' && booking.miscCharge!==null" class="hz-font-md" style="padding:0 6px;">|</span>
-							<view v-show="booking.miscCharge!==null" class="hz-font-md">{{$t("common.misCharge")}}: {{formatWithThousands(booking.miscCharge)}}</view>
 						</view>
 					</view>
-					<!-- <u-loadmore :status="showLoadMore" :loadmoreText="loadMoreStr" :nomoreText="nomoreStr" :fontSize="14" color="#ccc" :line="true" /> -->
 				</view>
-				<u-empty
-					v-if="showEmpty"
+
+				<!-- <u-empty
+					v-if="isDisplayEmpty"
 					mode="search"
 					:text="dataNotFoundStr"
 				>
-				</u-empty>
+				</u-empty> -->
 			</view>
 			<u-tabbar
 				:fixed="true"
 				:placeholder="true"
 				:safeAreaInsetBottom="true"
 				customStyle="z-index:100;height:58px;"
-				v-if="userData.canNewBooking"
 			>
-				<view class="book hz-flex-row hz-spacing">
-					<view class="hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center" @click="navToNewBooking()">
+				<view v-if="userData.canNewBooking" class="book hz-flex-row hz-spacing hz-book-btn-wrap" :class="{'hz-book-btn-wrap--single': hasSingleBookingPermission}">
+					<view class="hz-btn hz-font-color-white hz-font-sm hz-font-bold hz-text-center" @click="navToNewBooking()">
 						 {{$t("bookingRecord.newsBooking")}}
 					</view>
 				</view>
+				<view v-if="userData.canViewLimo" class="book hz-flex-row hz-spacing hz-book-btn-wrap" :class="{'hz-book-btn-wrap--single': hasSingleBookingPermission}">
+					<view class="hz-btn hz-font-color-white hz-font-sm hz-font-bold hz-text-center" @click="navToNewLimo()">
+						 {{$t("bookingRecord.newLimo")}}
+					</view>
+				</view>
 			</u-tabbar>
 			<u-modal :content="msgStr" :show="showMsg" :confirmText="yesText" :showCancelButton="false" closeOnClickOverlay @confirm="showMsg=false" confirmColor="#C39A4B" @close="showMsg=false"></u-modal>
 		</view>
@@ -109,7 +159,7 @@
 <script>
 	import {playerLookup} from '../../api/mgmApi.js'
 	import {mapOperaStatus,mapApproveStatus} from '../../common/mapping.js'
-	import {getBookingsMock,getBookings} from '../../api/bookingApi.js';
+	import {getBookings, getLimoBookings} from '../../api/bookingApi.js';
 	import dayjs from '../../uni_modules/uview-ui/libs/util/dayjs.js';
 	export default {
 		data() {
@@ -121,15 +171,14 @@
 				dataNotFoundStr:this.$t("common.dataNotFound"),
 				// 界面变量
 				from:'',
-				showEmpty:false,
 				title:'',
-				footFuncHei:100,
-				currentIndex:0,
 				showMsg:false,
 				msgStr:this.$t("bookingRecord.operaProfile"),
 				yesText:this.$t("common.ok"),
 				currentTask:null,
 				getDataByPageRequestId:0,
+				limoBookingList:[
+				]
 			}
 		},
 		onLoad(opt) {
@@ -145,6 +194,8 @@
 			// 检查是否登录
 			this.isLogin();
 			// 拿localstorage中的playerData
+			//修改MiscCharge后 返回页面自动刷新
+			// this.refreshHotelBooking();
 			
 			this.getDataByPage();
 		},
@@ -153,49 +204,109 @@
 			this.pullDownRefresh();
 		},
 		methods: {
-			navToPlayerRoomCalendar(){
-				const userData = uni.getStorageSync("userData");
-				if (!userData || userData.canViewCalendar !== true) return;
-				this.navTo('/booking/playerRoomCalendar/playerRoomCalendar',0,false);
+			updateHotelBookingList(res){
+				if(Array.isArray(res) && res.length > 0){
+					this.bookingList = res;
+				}else{
+					this.bookingList = [];
+				}
 			},
+			updateLimoBookingList(res) {
+				if(this.userData.canViewLimo==false) return;
+				if (Array.isArray(res) && res.length > 0) {
+					let temp = res.map(item => {
+						const pickUpDatetime = item.pickUpDatetime || item.pickUpDateTime || item.pickupDatetime || '';
+						return {
+							id: item.id,
+							recordType: 'limo',
+							confirmationNo: item.confirmationNo,
+							status: item.bookingStatus,
+							pickUpDatetime,
+							pickupDatetime: this.formatDate(pickUpDatetime, 'YYYY-MM-DD HH:mm'),
+							pickup: item.pickUpPoint,
+							dropoff: item.dropOffPoint,
+							extraDropoff:this.getExtraDropOff(item.extraDropOffPoint)
+							// extraDropoff:item.extraDropOffPoint.split(";")
+						}
+					});
+					
+					this.limoBookingList = temp;
+				} else {
+					this.limoBookingList = [];
+				}
+			},
+			openBookingPage(path){
+				uni.showLoading({
+					title: this.$t("common.loading")
+				});
+				this.navTo(path,0,false);
+				uni.hideLoading();
+			},
+			
 			// 數據方法
 			async getDataByPage(){
 				if(this.userData.canViewBooking==false) return;
-				if(this.currentTask){
+				const previousTask = this.currentTask;
+				const requestId = ++this.getDataByPageRequestId;
+				if(previousTask){
 					try{
-						this.currentTask.abort();
+						previousTask.abort();
 					}catch(err){
 					}
 				}
-				const requestId = ++this.getDataByPageRequestId;
+
+				// 一次页面加载会同时发起 Hotel 和 Limo 请求，统一保存并取消它们。
+				const requestTasks = [];
+				const requestController = {
+					abort: () => {
+						requestTasks.forEach(task => {
+							if(task && typeof task.abort === 'function'){
+								try{
+									task.abort();
+								}catch(err){
+								}
+							}
+						});
+					}
+				};
+				const requestConfig = {
+					getTask: task => {
+						if(requestId === this.getDataByPageRequestId){
+							requestTasks.push(task);
+						}else if(task && typeof task.abort === 'function'){
+							task.abort();
+						}
+					}
+				};
+				this.currentTask = requestController;
 				let params = {};
 				uni.showLoading({
 					title: this.$t("common.loading")
 				});
 				try{
 					if(this.playerData.nameIds.length==0){
-						await this.getProfileByPlayerId(requestId)
+						await this.getProfileByPlayerId(requestId, requestConfig)
 					}else{
-						params.member = this.playerData
+						params.member = this.playerData;
 						params.userId =  this.userData.userId;
-						const res = await getBookings(params, {
-							getTask: (task, options) => {
-								this.currentTask = task;
-							}
+						params.profileId = this.playerData.profileId;
+						const limoPromise = getLimoBookings(params, requestConfig).catch((e) => {
+							return null;
 						});
+						const hotelPromise = getBookings(params, requestConfig).catch((e) => {
+							return null;
+						});
+						const [resLimo, resHotel] = await Promise.all([limoPromise, hotelPromise]);
 						if(requestId !== this.getDataByPageRequestId) return;
-						this.currentTask = null;
-						this.bookingList = [];
-						if(res.length>0){
-							if(res!==undefined && res!==null){
-								this.bookingList = res;
-							}
-						}else{
-							
+						if (resLimo) {
+							this.updateLimoBookingList(resLimo);
+						}
+						if (resHotel) {
+							this.updateHotelBookingList(resHotel);
 						}
 					}
 				}catch(e){
-					if(e.errMsg!==undefined && e.errMsg.includes("abort")){
+					if(requestId !== this.getDataByPageRequestId || (e && e.errMsg!==undefined && e.errMsg.includes("abort"))){
 						return;
 					}
 					// console.log(e);
@@ -204,11 +315,38 @@
 					await this.writeLog(this.userData.userId,"save_booking","","[APP][bookingDetail.vue][getDataByPage][Catch Exception]"+e.errMsg,"[RequestData]" +JSON.stringify(params),"",1,false); 
 				}finally{
 					if(requestId === this.getDataByPageRequestId){
-						this.currentTask = null;
+						if(this.currentTask === requestController){
+							this.currentTask = null;
+						}
 						uni.hideLoading();
 					}
 				}
 			},
+			async refreshHotelBooking(){
+				if(this.userData.canViewBooking==false) return;
+				let params = {};
+				uni.showLoading({
+					title: this.$t("common.loading")
+				});
+				try{
+					if(this.playerData.nameIds.length==0){
+						await this.getProfileByPlayerId()
+					}else{
+						params.member = this.playerData;
+						params.userId =  this.userData.userId;
+						params.profileId = this.playerData.profileId;
+						const resHotel = await getBookings(params);
+						this.updateHotelBookingList(resHotel);
+					}
+				}catch(e){
+					console.log(e);
+					// write log
+					uni.$u.toast(e.errMsg,5000);
+					await this.writeLog(this.userData.userId,"save_booking","","[APP][bookingDetail.vue][getDataByPage][Catch Exception]"+e.errMsg,"[RequestData]" +JSON.stringify(params),"",1,false); 
+				}finally{
+					uni.hideLoading();
+				}
+			},
 			pullDownRefresh(){
 				try{
 					this.getDataByPage('refresh');
@@ -217,6 +355,60 @@
 				}
 			},
 			// 界面方法
+			isHotelRecord(record){
+				return record.recordType === 'hotel';
+			},
+			getRecordCardClass(record){
+				return this.getRecordColor(record);
+			},
+			openRecordDetail(record){
+				if(this.isHotelRecord(record)){
+					this.navToDetail(record);
+				}else{
+					this.navToLimoDetail(record);
+				}
+			},
+			getBookingTypeIcon(record){
+				if(this.isHotelRecord(record)){
+					return '../../static/images/ico_hotel_active.png';
+				}
+				return '../../static/icon/tabbar/taxi-fill.png';
+			},
+			getBookingTypeLabel(record){
+				let bookingType = this.$t("limoBookingRecord.bookingType");
+				if(this.isHotelRecord(record)){
+					return bookingType+': Hotel';
+				}
+				return bookingType+': Limo';
+			},
+			getRecordStatusText(record){
+				if(this.isHotelRecord(record)){
+					return this.getStatusText(record);
+				}else{
+					return record.status.replace("_"," ");
+				}
+			},
+			getRecordStatusClass(record){
+				return this.getStatusTextColor(record);
+			},
+			canShowSharer(record){
+				return this.userData && this.userData.canNewBooking && record.propertyCategory!='OTHER';
+			},
+			hasSharer(record){
+				return (record.sharer!==null && record.sharer!=='[]')||record.isShare;
+			},
+			hasEta(record){
+				return record.eta!==undefined && record.eta!==null && record.eta!=='';
+			},
+			getDropOffPointLines(dropOffPoint){
+				if(dropOffPoint === null || dropOffPoint === undefined || dropOffPoint === '') return [''];
+				return String(dropOffPoint).split(/[;；]/).map(item => item.trim()).filter(item => item !== '');
+			},
+			getExtraDropOffPoint(dropOffPoint){
+				if(dropOffPoint === null || dropOffPoint === undefined || dropOffPoint === '') return [''];
+				
+				return String(dropOffPoint).split(/[;；]/).map(item => item.trim()).filter(item => item !== '');
+			},
 			back(){
 				if(this.from==='booking'){
 					this.navTo("/pages/findPlayer/findPlayer",1,false);
@@ -227,6 +419,12 @@
 			navToDetail(booking){
 				this.navTo('/booking/bookingDetail/bookingDetail?id='+booking.id+"&conf="+booking.confirmationNo+"&from=list",0,false)	
 			},
+			navToLimoDetail(limoBooking){
+				this.navTo('/limo/bookingDetail/bookingDetail?id=' + limoBooking.id +'&conf='+limoBooking.confirmationNo+"&from=list",0,false)
+			},
+			navToPlayerRoomCalendar(){
+				this.navTo('/booking/playerRoomCalendar/playerRoomCalendar',0,false)
+			},
 			// ETA 统一显示 HH:mm（兼容 HH:mm:ss / HH:mm）
 			formatEtaToHHmm(eta) {
 				if (eta === null || eta === undefined || eta === '') return '';
@@ -259,81 +457,170 @@
 			  this.title = this.$t("bookingRecord.title");
 			},
 			navToNewBooking(){
-				this.getDataByPage();
-				uni.showLoading({
-					title: this.$t("common.loading")
-				});
-				// remove no opera restrict
-				// if(this.playerData.nameIds.length==0){
-				// 	this.showMsg = true;
-				// }else{
-				// 	this.navTo('/booking/newBooking/newBooking',0,false)
-				// }
-				this.navTo('/booking/newBooking/newBooking',0,false)
-				uni.hideLoading();
+				this.openBookingPage('/booking/newBooking/newBooking');
 			},
-			async getProfileByPlayerId(requestId){
+			navToNewLimo(){
+				this.openBookingPage('/limo/newLimo/newLimo?from=bookingRecord');
+			},
+			async getProfileByPlayerId(requestId = this.getDataByPageRequestId, requestConfig = {}){
 				try{
-					let params = {playerId:this.playerData.playerId,userId:this.userData.userId};
-					const res = await playerLookup(params, {
-						getTask: (task, options) => {
-							this.currentTask = task;
-						}
-					});
+					const params = {playerId:this.playerData.playerId,userId:this.userData.userId};
+					const res = await playerLookup(params, requestConfig);
 					if(requestId !== this.getDataByPageRequestId) return;
 					if(res.success == true){
-						var player = res.data;
+						const player = res.data;
 						if(player !== null){
 							if(player.codedFlag==1){
 								uni.setStorageSync("playerData",player);
 								this.playerData = uni.getStorageSync("playerData");
-								let params = {};
-								params.member = player
-								params.userId =  this.userData.userId;
-								const res = await getBookings(params, {
-									getTask: (task, options) => {
-										this.currentTask = task;
-									}
-								});
+								const bookingParams = {
+									member: player,
+									userId: this.userData.userId
+								};
+								const [resHotel, resLimo] = await Promise.all([
+									getBookings(bookingParams, requestConfig),
+									getLimoBookings(bookingParams, requestConfig)
+								]);
 								if(requestId !== this.getDataByPageRequestId) return;
-								this.currentTask = null;
-								this.bookingList = [];
-								if(res.length>0){
-									if(res!==undefined && res!==null){
-										this.bookingList = res;
-									}
-								}else{
-								}
+								this.updateHotelBookingList(resHotel);
+								this.updateLimoBookingList(resLimo);
 							}
 						}
 					}
 				}catch(e){
-					if(e.errMsg!==undefined && e.errMsg.includes("abort")){
+					if(requestId !== this.getDataByPageRequestId || (e && e.errMsg!==undefined && e.errMsg.includes("abort"))){
 						return;
 					}
 					console.error(e);
 					var request = e.config!=undefined?JSON.stringify(e.config):"";
 					var response = e.data!=undefined?JSON.stringify(e.data):"";
 					await this.writeLog(this.userData.userId,"find_player","","[APP][findPlayer.vue][getProfileByPlayerId][Catch Exception]"+e.errMsg,request,response,1,false); 
-				}finally{
 				}
 			},
+			formatDate(date, format = 'YYYY-MM-DD HH:mm:ss') {
+				const d = new Date(date);
+				if (Number.isNaN(d.getTime())) {
+					return '';
+				}
+				
+				const map = {
+					YYYY: d.getFullYear(),
+					MM: String(d.getMonth() + 1).padStart(2, '0'),
+					DD: String(d.getDate()).padStart(2, '0'),
+					HH: String(d.getHours()).padStart(2, '0'),
+					mm: String(d.getMinutes()).padStart(2, '0'),
+					ss: String(d.getSeconds()).padStart(2, '0')
+				};
+				return format.replace(/YYYY|MM|DD|HH|mm|ss/g, matched => map[matched]);
+			},
+			getExtraDropOff(extraDropOffPoint) {
+				let returnExtraDropOffPoint = null;
+				if(extraDropOffPoint!=undefined && extraDropOffPoint!=null && extraDropOffPoint!=''){
+					returnExtraDropOffPoint = extraDropOffPoint.split(";");
+				}
+				console.log(returnExtraDropOffPoint);
+				return returnExtraDropOffPoint;
+			},
+			/** 用于酒店 / limo 混合列表排序：越大表示时间越晚 */
+			getRecordSortTimeMs(record) {
+				if (!record) {
+					return Number.POSITIVE_INFINITY;
+				}
+				if (record.recordType === 'limo') {
+					const raw = record.pickUpDatetime || record.pickUpDateTime || record.pickupDatetime;
+					if (raw != null && raw !== '') {
+						const n = Number(raw);
+						if (!Number.isNaN(n)) {
+							return n;
+						}
+						const parsedRaw = dayjs(String(raw).trim());
+						if (parsedRaw.isValid()) {
+							return parsedRaw.valueOf();
+						}
+					}
+					if (record.pickupDatetime) {
+						const s = String(record.pickupDatetime).trim();
+						const m = s.match(/^(\d{1,2})\/(\d{1,2})\/(\d{2,4})\s+(\d{1,2}):(\d{2})$/);
+						if (m) {
+							const year = m[3].length === 2 ? 2000 + parseInt(m[3], 10) : parseInt(m[3], 10);
+							const d = new Date(
+								year,
+								parseInt(m[2], 10) - 1,
+								parseInt(m[1], 10),
+								parseInt(m[4], 10),
+								parseInt(m[5], 10)
+							);
+							if (!Number.isNaN(d.getTime())) {
+								return d.getTime();
+							}
+						}
+					}
+						return Number.POSITIVE_INFINITY;
+					}
+				const checkInDate = record.checkinDate || record.checkInDate || record.CheckInDate;
+				if (checkInDate != null && String(checkInDate).trim() !== '') {
+					const parsed = dayjs(String(checkInDate).trim());
+					if (parsed.isValid()) {
+						return parsed.valueOf();
+					}
+				}
+				return Number.POSITIVE_INFINITY;
+			},
+			getRecordSortDateMs(record) {
+				const timeMs = this.getRecordSortTimeMs(record);
+				if (!Number.isFinite(timeMs) || Number.isNaN(timeMs)) {
+					return Number.POSITIVE_INFINITY;
+				}
+				const d = new Date(timeMs);
+				d.setHours(0, 0, 0, 0);
+				return d.getTime();
+			},
+			getRecordTypeSortIndex(record) {
+				return record && record.recordType === 'limo' ? 1 : 0;
+			},
+			compareRecordForDisplay(a, b) {
+				const dateA = this.getRecordSortDateMs(a);
+				const dateB = this.getRecordSortDateMs(b);
+				if (dateA !== dateB) {
+					return dateA - dateB;
+				}
+				const typeDiff = this.getRecordTypeSortIndex(a) - this.getRecordTypeSortIndex(b);
+				if (typeDiff !== 0) {
+					return typeDiff;
+				}
+				if (a && b && a.recordType === 'limo' && b.recordType === 'limo') {
+					const timeA = this.getRecordSortTimeMs(a);
+					const timeB = this.getRecordSortTimeMs(b);
+					if (timeA !== timeB) {
+						return timeA - timeB;
+					}
+				}
+				return 0;
+			}
 		},
 		computed:{
+			hasSingleBookingPermission(){
+				if (!this.userData) return false;
+				return Boolean(this.userData.canNewBooking) !== Boolean(this.userData.canViewLimo);
+			},
+			displayRecordList(){
+				const hotelRecords = this.bookingList.map(item => ({...item, recordType: 'hotel'}));
+				const limoRecords = this.limoBookingList.map(item => ({...item, recordType: 'limo'}));
+				console.log(limoRecords);
+				return hotelRecords.concat(limoRecords).sort((a, b) => this.compareRecordForDisplay(a, b));
+			},
+			isDisplayEmpty(){
+				return this.displayRecordList.length === 0;
+			},
 			getConfirmationNo(){
 				return function (booking) {
 					if(booking!==undefined && booking!==null){
 						if(booking.confirmationNo!==undefined  && booking.confirmationNo!==null && 
-						booking.confirmationNo!=='null' && booking.confirmationNo!=='' && booking.approveStatus!='W'){
+						booking.confirmationNo!=='null' && booking.confirmationNo!=='' && booking.approveStatus!='W' && booking.approveStatus!='AP'){
 							return booking.confirmationNo;
 						}
-						else
-						{
-							return 'N/A';
-						}
-					}else{
-						return 'N/A';
 					}
+					return 'N/A';
 				}
 			},
 			dateFormat() {
@@ -439,7 +726,41 @@
 					if(booking.approveStatus!=null){
 						approveStatus = booking.approveStatus;
 					}
-					// Opera和Approve Status都不为空的情况
+					if(booking.recordType === 'limo'){
+						const noOpera = operaStatus==null || operaStatus==undefined || operaStatus==='' || operaStatus==='null';
+						const noApprove = approveStatus==null || approveStatus==undefined || approveStatus==='' || approveStatus==='null';
+						if(noOpera && noApprove && booking.status!=null && booking.status!==undefined && String(booking.status).trim()!==''){
+							const s = String(booking.status).toUpperCase().replace(/\s+/g,' ');
+							if(s.includes('CANCEL')){
+								return 'hz-status-font-cancel';
+							}
+							if(s.includes('WAITLIST') || s.includes('WAIT LIST')){
+								return 'hz-status-font-waitlist';
+							}
+							if(s.includes('NOT YET')){
+								return 'hz-status-font-waitlist';
+							}
+							if(s.includes('PENDING')){
+								return 'hz-status-font-pending';
+							}
+							if(s.includes('CONFIRM')){
+								return 'hz-status-font-duein';
+							}
+							if(s.includes('DRIVER_DEPARTED')){
+								return 'hz-status-font-duein';
+							}
+							if(s.includes('DRIVER_ASSIGNED')){
+								return 'hz-status-font-duein';
+							}
+							if(s.includes('DRIVER_ARRIVED')){
+								return 'hz-status-font-duein';
+							}
+							if(s.includes('GUEST_PICKED')){
+								return 'hz-status-font-duein';
+							}
+							return '';
+						}
+					}
 					if((operaStatus!=null && operaStatus!=undefined) || (approveStatus!=null && approveStatus!=undefined))
 					{
 						if(approveStatus.toUpperCase()==='PN'||approveStatus.toUpperCase()==='F'){
@@ -553,12 +874,31 @@
 			},
 			getRecordColor(){
 				return function (booking) {
+					if(booking==null){
+						return 'hz-card-booking';
+					}
+					if(booking.recordType === 'limo'){
+						const noApprove = booking.approveStatus==null || booking.approveStatus===undefined || booking.approveStatus==='' || booking.approveStatus==='null';
+						const noOpera = booking.lastOperaStatus==null || booking.lastOperaStatus===undefined || booking.lastOperaStatus==='' || booking.lastOperaStatus==='null';
+						if(noApprove && noOpera && booking.status!=null && booking.status!==undefined && String(booking.status).trim()!==''){
+							const s = String(booking.status).toUpperCase().replace(/\s+/g,' ');
+							if(s.includes('NOT YET') || s.includes('CONFIRM')){
+								return 'hz-card-booking';
+							}
+							if(s.includes('WAITLIST') || s.includes('WAIT LIST') || s.includes('PENDING')){
+								return 'hz-card-waitlist';
+							}
+							return 'hz-card-booking';
+						}
+					}
 					if(booking.approveStatus==='W'|| booking.approveStatus==='WA'){
 						return 'hz-card-waitlist'
 					}else if(booking.approveStatus==='AP'){
 						return 'hz-card-approval'
 					}else if((booking.lastOperaStatus==='DUE_OUT' || booking.lastOperaStatus==='CHECKED_IN') && booking.confirmationNo!=null && (booking.sharer==null || booking.sharer==='[]' || booking.sharer==='')){
 						return 'hz-card-booking'
+					}else if(booking.approveStatus==='AP'){
+						return 'hz-card-approval'
 					}else{
 						return 'hz-card-booking'
 					}
@@ -581,5 +921,7 @@
 </script>
 
 <style lang="scss" scoped>
-
+	.hz-book-btn-wrap--single {
+		width: 95%;
+	}
 </style>
diff --git a/booking/newBooking/newBooking.vue b/booking/newBooking/newBooking.vue
index 8b458c1..8b1b544 100644
--- a/booking/newBooking/newBooking.vue
+++ b/booking/newBooking/newBooking.vue
@@ -458,9 +458,8 @@
 			this.userData = uni.getStorageSync("userData");
 			// this.modelBooking.bookingTypeId = this.userData.bookingTypeId;
 			this.modelBooking.propertyId = this.userData.propertyId;
-			
+		
 			this.modelBooking.teamId = this.userData.teamStructureId;
-			this.modelBooking.sectionName = this.userData.section;
 			this.modelBooking.sectionId = this.userData.sectionId;
 			this.modelBooking.createdBy = this.userData.userId;
 			this.modelBooking.createdByName = this.userData.userName;
@@ -701,7 +700,7 @@
 									}
 								}
 							}
-
+						
 							if (this.maxRange == 0) this.getSetting();
 						}
 					} else {
@@ -776,8 +775,9 @@
 								this.currentTask = task;
 							}
 						});
-
+					
 						this.currentTask = null;
+						
 
 						if (res.success) {
 							item.name = res.data.englishName;
@@ -807,10 +807,10 @@
 				let item = this.modelBooking.sharerList[index];
 				let book = uni.getStorageSync("bookingData")
 				let oldItem = book.sharerList[index];
-				// 姓名被手动修改后，清除不再匹配的玩家 ID。
-				if (item.name != oldItem.name && item.playerId.length > 4) {
-					item.playerId = "";
-				}
+				//清空plaerId
+				// if (item.name != oldItem.name && item.playerId.length == 8) {
+				// 	item.playerId = "";
+				// }
 			},
 			async buildCalendar() {
 				uni.showLoading({
@@ -949,9 +949,9 @@
 							'available': 0,
 						});
 					}
-
+					
 				}
-
+			
 				var isWaitlist = false;
 				var waitlistCount = 0;
 				var criteriaCount = e.length - 1;
@@ -984,7 +984,7 @@
 				let checkDate = JSON.parse(JSON.stringify(e));
 				checkDate.pop();
 				if (!this.checkDate(checkDate)) return false;
-
+			
 				//rebuild special code
 				let specialCode = this.modelBooking.specialCode;
 				let specialName = this.modelBooking.specialName;
@@ -1525,7 +1525,7 @@
 				} else {
 					this.showMsgNoExtend = true;
 				}
-
+			
 
 			},
 			checkConsecutiveNight(checkInDate, night) {
diff --git a/booking/playerRoomCalendar/playerRoomCalendar.vue b/booking/playerRoomCalendar/playerRoomCalendar.vue
index 49822af..b4fc5ff 100644
--- a/booking/playerRoomCalendar/playerRoomCalendar.vue
+++ b/booking/playerRoomCalendar/playerRoomCalendar.vue
@@ -18,19 +18,19 @@
 		<!-- <view class="player-summary"> -->
 			<view class="hz-card-profile mb-[40]" style="margin:9px 9px 6px;">
 				<view class="hz-flex-row">
-						<view style="width:60%">
+					<view class="hz-w-60">
 						<view class="hz-font-color-light hz-font-sm">{{$t("common.playerId")}}</view>
-							<view class="hz-font-bolder hz-font-lg" >{{ safePlayerData.playerId }}</view>
+						<view class="hz-font-bolder hz-font-lg" >{{ playerData.playerId }}</view>
 					</view>
-						<view style="width:40%">
+					<view class="hz-w-40">
 						<view class="hz-font-color-light hz-font-sm">{{$t("common.tier")}}</view>
-							<view class="hz-font-bolder hz-font-lg" >{{ safePlayerData.tierName }}</view>
+						<view class="hz-font-bolder hz-font-lg" >{{ playerData.tierName }}</view>
 					</view>
 				</view>
 				<view class="hz-flex-row hz-mr-t-30">
-						<view style="width:100%">
+					<view class="hz-w-100">
 						<view class="hz-font-color-light hz-font-sm">{{$t("common.name")}}</view>
-							<view class="hz-font-bolder hz-font-lg" >{{ playerName }}</view>
+						<view class="hz-font-bolder hz-font-lg" >{{playerData.salutation + " " +  playerData.name }}</view>
 					</view>
 				</view>
 			</view>
@@ -197,13 +197,11 @@
 			propertyTabItemStyle() {
 				return {
 					height: '70rpx',
-					padding: '0 24rpx',
-					flexShrink: 0,
+					padding: '0',
 				};
 			},
 			propertyTabActiveStyle() {
 				return {
-					whiteSpace: 'nowrap',
 					color: '#C39A4B',
 					fontFamily: 'Inter-Bold',
 					fontSize: '30rpx',
@@ -212,7 +210,6 @@
 			},
 			propertyTabInactiveStyle() {
 				return {
-					whiteSpace: 'nowrap',
 					color: '#111111',
 					fontFamily: 'Inter-Bold',
 					fontSize: '30rpx',
@@ -241,7 +238,6 @@
 				this.navBack();
 			},
 			async loadPropertiesRoomTypes() {
-				if (!this.canLoadPlayerCalendar()) return;
 				try {
 					this.calendarReady = false;
 					uni.showLoading({
@@ -249,19 +245,14 @@
 					});
 					await this.loadCalendarSetting();
 					const res = await getPropertiesRoomTypes({});
-					if (this.isNoPermissionResponse(res)) {
-						this.showCalendarNoPermission();
-						return;
-					}
-					this.propertyList = Array.isArray(res && res.propertyList) ? res.propertyList : [];
-					if (!this.propertyList.length) throw new Error('No calendar properties configured');
+					this.propertyList = res.propertyList;
 					this.selectedPropertyCode = this.getDefaultPropertyCode();
 					this.selectDefaultOptions();
 					this.buildCalendar();
 					await this.loadQualificationData();
 					this.calendarRenderKey += 1;
 					this.$nextTick(() => {
-						this.calendarReady = !this.calendarNoPermission;
+						this.calendarReady = true;
 					});
 				} catch (e) {
 					uni.$u.toast(e.message || e.errMsg || 'Load property room types failed');
@@ -464,12 +455,10 @@
 				}));
 			},
 			refreshCalendar() {
-				if (!this.canLoadPlayerCalendar()) return;
 				this.ensureSelectedOptionsForRefresh(true);
 				this.loadQualificationData();
 			},
 			async loadQualificationData() {
-				if (!this.canLoadPlayerCalendar()) return;
 				const records = [];
 				const dateRange = this.getCalendarDateRange();
 				const requestId = this.startCalendarRequest();
@@ -523,20 +512,7 @@
 				});
 			},
 			isNoPermissionResponse(res) {
-				return res && res.success === false && (res.errorCode || res.code) === 'NO_PERMISSION';
-			},
-			canLoadPlayerCalendar() {
-				this.userData = uni.getStorageSync("userData");
-				if (!this.userData || this.userData.canViewCalendar !== true) {
-					this.showCalendarNoPermission();
-					return false;
-				}
-				if (!this.safePlayerData.playerId) {
-					this.calendarReady = false;
-					uni.$u.toast(this.$t("common.dataNotFound"));
-					return false;
-				}
-				return true;
+				return res && res.success === false && res.errorCode === 'NO_PERMISSION';
 			},
 			showCalendarNoPermission() {
 				this.qualificationMap = {};
diff --git a/booking/submitBooking/submitBooking.vue b/booking/submitBooking/submitBooking.vue
index 4797510..d325089 100644
--- a/booking/submitBooking/submitBooking.vue
+++ b/booking/submitBooking/submitBooking.vue
@@ -139,10 +139,10 @@
 								<!-- <view class="hz-font-bolder hz-font-lg" >{{ handleShowWhenScreenshot(bookingData.eta) }}</view> -->
 							</view>
 						</view>
-						<view v-if="bookingData.miscCharge!=null" class="hz-flex-row">
+						<view v-if="bookingData.mischarge!=null" class="hz-flex-row">
 							<view style="width:100%">
 								<view class="hz-font-color-black hz-font-sm">{{ $t("common.misCharge") }}</view>
-								<view class="hz-font-bolder hz-font-lg">{{ bookingData.miscCharge || "-" }}</view>
+								<view class="hz-font-bolder hz-font-lg">{{ bookingData.mischarge || "-" }}</view>
 							</view>
 						</view>
 					</view>
@@ -254,18 +254,19 @@
 				<!-- Remark -->
 				<view style="margin-bottom: 16px;margin-top: 16px;">
 					<view style="text-align: left;">{{$t("bookingConfirm.approvalRemark")}}</view>
-					<u-checkbox-group placement="row"
-						:value="unqualifiedDateCheckboxStates[currentUnqualifiedIndex] || []"
-						@change="changeOtherRemark"
+					<u-checkbox-group placement="row" @change="changeOtherRemark"
+						v-model="unqualifiedDateCheckboxStates[currentUnqualifiedIndex]"
 						style="flex-direction: unset;display: block;">
 						<view style="width:50%;display: inline-flex;">
 							<u-checkbox activeColor="#C39A4B" labelColor="#333333" shape="circle"
-								customStyle="height:30px;width:100%;" label="Extend" name="Extend"></u-checkbox>
+								customStyle="height:30px;width:100%;" label="Extend" name="Extend" 
+								:value="unqualifiedDateCheckboxStates[currentUnqualifiedIndex] && unqualifiedDateCheckboxStates[currentUnqualifiedIndex].includes('Extend')"></u-checkbox>
 
 						</view>
 						<view style="width:50%;display: inline-flex;position: relative;left:10%;">
 							<u-checkbox activeColor="#C39A4B" labelColor="#333333" shape="circle"
-								customStyle="height:30px;width:100%;" label="Remark" name="Remark"></u-checkbox>
+								customStyle="height:30px;width:100%;" label="Remark" name="Remark" 
+								:value="unqualifiedDateCheckboxStates[currentUnqualifiedIndex] && unqualifiedDateCheckboxStates[currentUnqualifiedIndex].includes('Remark')"></u-checkbox>
 						</view>
 					</u-checkbox-group>
 					<view style="width:100%;margin-top:16px;" v-show="showRemark">
@@ -328,32 +329,41 @@
 						<rich-text v-html="msgStr" style="line-height:26px;"></rich-text>
 					</view>
 					<view style="margin-bottom: 10px;text-align: left;"> {{$t("bookingConfirm.approvalRemark")}}</view>
-					<!-- uView：u-checkbox 必须在 u-checkbox-group 内；房型互斥用 group + 受控 :value -->
-					<u-checkbox-group placement="row"
-						:value="waitlistRoomGroupValue"
-						@change="onWaitlistRoomRemarkGroupChange"
+					<u-radio-group placement="row" @change="changeRoomRemark" v-if="showRadio"
 						style="flex-direction: unset;display: block;">
+						<view style="width:50%;display: inline-flex;">
+							<u-radio activeColor="#C39A4B" labelColor="#333333" shape="circle"
+								customStyle="height:30px;width:100%;" label="2nd Room" name="2nd Room"></u-radio>
+		
+						</view>
+						<view style="width:50%;display: inline-flex;position: relative;left:10%;">
+							<u-radio activeColor="#C39A4B" labelColor="#333333" shape="circle"
+								customStyle="height:30px;width:100%;" label="3rd Room" name="3rd Room"></u-radio>
+						</view>
+					</u-radio-group>
+					<u-checkbox-group placement="row" v-else style="flex-direction: unset;display: block;">
 						<view style="width:50%;display: inline-flex;">
 							<u-checkbox activeColor="#C39A4B" labelColor="#333333" shape="circle"
 								customStyle="height:30px;width:100%;" label="2nd Room" name="2nd Room"></u-checkbox>
+		
 						</view>
 						<view style="width:50%;display: inline-flex;position: relative;left:10%;">
 							<u-checkbox activeColor="#C39A4B" labelColor="#333333" shape="circle"
 								customStyle="height:30px;width:100%;" label="3rd Room" name="3rd Room"></u-checkbox>
 						</view>
 					</u-checkbox-group>
-					<u-checkbox-group placement="row"
-						:value="waitlistOtherRemarkCheckList"
-						@change="changeWaitlistOtherRemark"
+					<u-checkbox-group placement="row" @change="changeOtherRemark"
 						style="flex-direction: unset;display: block;">
 						<view style="width:50%;display: inline-flex;">
 							<u-checkbox activeColor="#C39A4B" labelColor="#333333" shape="circle"
-								customStyle="height:30px;width:100%;" label="Extend" name="Extend"></u-checkbox>
+								customStyle="height:30px;width:100%;" label="Extend" name="Extend" 
+								:value="unqualifiedDateCheckboxStates[currentUnqualifiedIndex] && unqualifiedDateCheckboxStates[currentUnqualifiedIndex].includes('Extend')"></u-checkbox>
 
 						</view>
 						<view style="width:50%;display: inline-flex;position: relative;left:10%;">
 							<u-checkbox activeColor="#C39A4B" labelColor="#333333" shape="circle"
-								customStyle="height:30px;width:100%;" label="Remark" name="Remark"></u-checkbox>
+								customStyle="height:30px;width:100%;" label="Remark" name="Remark" 
+								:value="unqualifiedDateCheckboxStates[currentUnqualifiedIndex] && unqualifiedDateCheckboxStates[currentUnqualifiedIndex].includes('Remark')"></u-checkbox>
 						</view>
 					</u-checkbox-group>
 					<view style="width:100%;margin-top:16px;" v-show="showRemark">
@@ -427,8 +437,7 @@
 				selectedApprover:'',
 				showRemark: false,
 				showWaitlistModal:false,
-				// Waitlist 弹窗 Extend/Remark（必须与 u-checkbox-group 的 :value 绑定，勿用子项 :value）
-				waitlistOtherRemarkCheckList: [],
+				showRadio:false,
 				unqualifiedDateList: [],
 				currentUnqualifiedIndex: 0,
 				unqualifiedDateRemarks: [],
@@ -454,17 +463,6 @@
 			// 數據方法
 			getBooking(){
 				this.bookingData = uni.getStorageSync("bookingData");
-				// 确保 roomRemark 是响应式字段，否则 iOS 上可能出现 u-checkbox 状态未被正确回刷导致“可多选”
-				if (this.bookingData !== null && this.bookingData !== undefined && typeof this.bookingData === 'object') {
-					const hasRoomRemark = Object.prototype.hasOwnProperty.call(this.bookingData, 'roomRemark');
-					if (!hasRoomRemark || this.bookingData.roomRemark === null || this.bookingData.roomRemark === undefined || this.bookingData.roomRemark === 'null') {
-						(this.$set ? this.$set(this.bookingData, 'roomRemark', '') : this.bookingData.roomRemark = '');
-					}
-					const hasOtherRemark = Object.prototype.hasOwnProperty.call(this.bookingData, 'otherRemark');
-					if (!hasOtherRemark || this.bookingData.otherRemark === null || this.bookingData.otherRemark === undefined || this.bookingData.otherRemark === 'null') {
-						(this.$set ? this.$set(this.bookingData, 'otherRemark', '') : this.bookingData.otherRemark = '');
-					}
-				}
 				if(this.bookingData!==null && this.bookingData!==undefined && this.bookingData!==''){
 					this.oldDateList = this.bookingData.dateList;
 					this.checkList = [];
@@ -500,7 +498,11 @@
 					this.submitBooking();
 				}
 			},
-			buildUnqualifiedDateLists() {
+			submitApproval() {
+				// 显示审批模态框
+				this.getApprovalReason();
+				this.showApprovalModal = true;
+				this.showModalBtn = true;
 				this.currentUnqualifiedIndex = 0;
 				this.unqualifiedDateList = [];
 				this.unqualifiedDateRemarks = [];
@@ -508,27 +510,33 @@
 				this.unqualifiedDateApprovers = [];
 				this.unqualifiedDateOtherRemarks = [];
 				this.unqualifiedDateCheckboxStates = [];
-				if (this.checkList != null && this.checkList.length > 0) {
-					if (this.bookingData.bookType == 1) {
-						for (let i = 0; i < this.bookingData.extendDate.length; i++) {
-							for (let j = 0; j < this.checkList.length; j++) {
-								if (i == this.checkList[j] && this.bookingData.extendDate[i].status == 1) {
+				if(this.checkList!=null && this.checkList.length>0){
+					if(this.bookingData.bookType==1){
+						// 把extendDate中的状态都设置成不够分
+						for(let i=0;i<this.bookingData.extendDate.length;i++){
+							for(let j=0;j<this.checkList.length;j++){
+								if(i == this.checkList[j] && this.bookingData.extendDate[i].status==1){
+									console.log(this.bookingData.extendDate[i]);
 									this.unqualifiedDateList.push(this.bookingData.extendDate[i]);
 									this.unqualifiedDateRemarks.push(this.bookingData.extendDate[i].remark || null);
 									this.unqualifiedDateReasons.push('');
+									// 多选 Approver：为每个 index 初始化为数组
 									this.unqualifiedDateApprovers.push([]);
 									this.unqualifiedDateOtherRemarks.push('');
 									this.unqualifiedDateCheckboxStates.push([]);
 								}
 							}
 						}
-					} else {
-						for (let i = 0; i < this.bookingData.dateList.length; i++) {
-							for (let j = 0; j < this.checkList.length; j++) {
-								if (i == this.checkList[j] && this.bookingData.dateList[i].status == 1) {
+					}else{
+						// 把dateList中的状态都设置成不够分
+						for(let i=0;i<this.bookingData.dateList.length;i++){
+							for(let j=0;j<this.checkList.length;j++){
+								if(i == this.checkList[j] && this.bookingData.dateList[i].status==1){
+									// console.log(this.bookingData.dateList[i]);
 									this.unqualifiedDateList.push(this.bookingData.dateList[i]);
 									this.unqualifiedDateRemarks.push(this.bookingData.dateList[i].remark || '');
 									this.unqualifiedDateReasons.push('');
+									// 多选 Approver：为每个 index 初始化为数组
 									this.unqualifiedDateApprovers.push([]);
 									this.unqualifiedDateOtherRemarks.push('');
 									this.unqualifiedDateCheckboxStates.push([]);
@@ -536,16 +544,10 @@
 							}
 						}
 					}
+				}else{
+					return false;
 				}
 			},
-			submitApproval() {
-				// 与 Waitlist 共用：必须先填充 unqualifiedDateList，否则 getWaitlistRemark 无法匹配 Extend
-				this.buildUnqualifiedDateLists();
-				// 显示审批模态框
-				this.getApprovalReason();
-				this.showApprovalModal = true;
-				this.showModalBtn = true;
-			},
 			onApprovalChange(value){
 				this.selectedApprover = value;
 				// 多选：value 为数组，需要拼接 approverName
@@ -1101,7 +1103,7 @@
 											if (this.bookingData.extendDate[i].status == 1) {
 
 												// remarkText只保存remark输入的内容，不加Extend前缀
-												this.bookingData.extendDate[i].remarkText = this.unqualifiedDateRemarks[unqualifiedIndex] || '';
+												this.bookingData.extendData[i].remarkText = this.unqualifiedDateRemarks[unqualifiedIndex] || '';
 
 												// 添加approvalReason字段
 												this.bookingData.extendDate[i].approvalReason = this.unqualifiedDateReasons[unqualifiedIndex] || null;
@@ -1432,64 +1434,40 @@
 			},
 			getWaitlistRemark(type,index){
 				let item = (type==2?this.bookingData.extendDate[index]:this.bookingData.dateList[index]);
-				let unqualifiedIndex = this.unqualifiedDateList.findIndex(uItem => uItem === item);
-				if (unqualifiedIndex === -1 && item.date && item.date.length) {
-					unqualifiedIndex = this.unqualifiedDateList.findIndex((uItem) => {
-						const ud = uItem.date;
-						const id = item.date;
-						return ud && id && ud.length && id.length &&
-							ud[0] === id[0] && ud[ud.length - 1] === id[id.length - 1];
-					});
-				}
-				// 仅一条 Waitlist/Unqualified 时，引用不一致也会导致 findIndex 失败，直接对齐下标 0
-				if (unqualifiedIndex === -1 && this.unqualifiedDateList.length === 1) {
-					unqualifiedIndex = 0;
-				}
-				const checkboxState = unqualifiedIndex !== -1
-					? (this.unqualifiedDateCheckboxStates[unqualifiedIndex] || [])
-					: [];
-				const otherSlot = unqualifiedIndex !== -1
-					? (this.unqualifiedDateOtherRemarks[unqualifiedIndex] || '')
-					: '';
-				const wlTags = this.waitlistOtherRemarkCheckList || [];
-				const globalOther = (this.bookingData && this.bookingData.otherRemark) ? String(this.bookingData.otherRemark) : '';
-				const parseTags = (s) => String(s).split(';').map((x) => x.trim()).filter(Boolean);
-				const hasExtend = checkboxState.includes('Extend') ||
-					parseTags(otherSlot).includes('Extend') ||
-					wlTags.includes('Extend') ||
-					parseTags(globalOther).includes('Extend');
+				let remarkArr = [];
+				let roomRemark = this.bookingData.roomRemark;
+				let otherRemark = this.bookingData.otherRemark;
+				if(roomRemark!=''&&roomRemark!=undefined) remarkArr.push(roomRemark);
+				if(otherRemark!=''&&otherRemark!=undefined) remarkArr.push(otherRemark);
 
-				const roomRemark = this.bookingData.roomRemark;
-				const idxRemark = unqualifiedIndex !== -1 ? this.unqualifiedDateRemarks[unqualifiedIndex] : '';
-				const manualRemark = (idxRemark != null && idxRemark !== '') ? idxRemark : this.freeRemark;
-				const remarkChecked = unqualifiedIndex !== -1 &&
-					(this.unqualifiedDateCheckboxStates[unqualifiedIndex] || []).includes('Remark');
-
-				if (unqualifiedIndex !== -1 && this.unqualifiedDateOtherRemarks[unqualifiedIndex] != null) {
-					this.bookingData.otherRemark = this.unqualifiedDateOtherRemarks[unqualifiedIndex];
+				// 找到对应的unqualifiedDate索引
+				const unqualifiedIndex = this.unqualifiedDateList.findIndex(uItem => uItem === item);
+				let extendStr = '';
+				if (unqualifiedIndex !== -1) {
+					const checkboxState = this.unqualifiedDateCheckboxStates[unqualifiedIndex] || [];
+					if (checkboxState.includes('Extend')) {
+						extendStr = 'Extend';
+					}
 				}
 
-				// 对应 BookingDate 的 remark：勾选 Extend 时放在字符串首位
-				const dateParts = [];
-				if (hasExtend) {
-					dateParts.push('Extend');
-				}
-				if (roomRemark != null && roomRemark !== '' && roomRemark !== undefined) {
-					dateParts.push(roomRemark);
-				}
 				if (item.status == 1 &&
-					item.remarkText != null && item.remarkText !== '' && item.remarkText !== undefined) {
-					dateParts.push(item.remarkText);
-				}
-				if ((remarkChecked || this.showRemark) && manualRemark !== '' && manualRemark != null && item.status == 1) {
-					if (manualRemark !== item.remarkText) dateParts.push(manualRemark);
+				 	item.remarkText != '' && 
+				 	item.remarkText != undefined) {
+					if (extendStr) {
+						remarkArr.push(extendStr + '; ' + item.remarkText);
+					} else {
+						remarkArr.push(item.remarkText);
+					}
+				} else if (item.status == 1 && extendStr) {
+					remarkArr.push(extendStr);
 				}
+				
+				if(this.showRemark&&this.freeRemark!=''&&item.status==1) remarkArr.push(this.freeRemark);
 
-				const dateRemarkJoin = dateParts.join('; ');
-				if (dateRemarkJoin) {
-					this.bookingData.remark = dateRemarkJoin;
-					item.remark = dateRemarkJoin;
-				} else {
+				if(remarkArr.length>0) {
+					this.bookingData.remark = remarkArr.join('; ');
+					item.remark = remarkArr.join('; ');
+				}else{
 					this.bookingData.remark = "";
 					item.remark = "";
 				}
@@ -1585,10 +1563,6 @@
 			},
 
 			showWaitlistPop() {
-				// 关键：直接点「放入 Waitlist」不会经过 submitApproval，必须在此处填充 unqualifiedDateList，
-				// 否则 getWaitlistRemark 里 findIndex 恒为 -1，Extend 永远不会写入 remark
-				this.buildUnqualifiedDateLists();
-				this.waitlistOtherRemarkCheckList = (this.unqualifiedDateCheckboxStates[0] || []).slice();
 				this.showWaitlistModal = true;
 				this.showMsgBox = false;
 			},
@@ -1632,27 +1606,17 @@
 					}
 			    });
 			},
-			onWaitlistRoomRemarkGroupChange(e) {
-				const raw = Array.isArray(e) ? e : (e && Array.isArray(e.detail) ? e.detail : []);
-				const names = raw.map((x) => (x != null ? String(x) : '')).filter(Boolean);
-				if (!this.bookingData) {
-					return;
+			changeRoomRemark(e,item) {
+				if (e) {
+					if(e==item.roomRemark){
+						item.roomRemark=""
+						item.showRadio = true;
+						setTimeout(()=>{item.showRadio = false;this.$forceUpdate()},1)
+					}else{
+						item.roomRemark=e
+					}
 				}
-				if (!Object.prototype.hasOwnProperty.call(this.bookingData, 'roomRemark')) {
-					this.$set(this.bookingData, 'roomRemark', '');
-				}
-				if (names.length === 0) {
-					this.bookingData.roomRemark = '';
-					return;
-				}
-				if (names.length === 1) {
-					this.bookingData.roomRemark = names[0];
-					return;
-				}
-				// 双选时视为互斥：保留本次切换目标（与原先不同的那一项）
-				const prev = this.bookingData.roomRemark;
-				const next = names.find((n) => n !== prev) || names[names.length - 1];
-				this.bookingData.roomRemark = next;
+				this.$forceUpdate()
 			},
 			// changeOtherRemark(e,item) {
 			// 	if (e) {
@@ -1671,41 +1635,27 @@
 			// 		this.$forceUpdate()
 			// 	}
 			// },
-			changeWaitlistOtherRemark(e) {
-				const raw = Array.isArray(e) ? e : (e && Array.isArray(e.detail) ? e.detail : []);
-				const names = raw.map((x) => (x != null ? String(x) : '')).filter(Boolean);
-				this.waitlistOtherRemarkCheckList = names.slice();
-				const extras = names.filter((n) => n !== 'Remark');
-				const str = extras.join('; ');
-				this.showRemark = names.includes('Remark');
-				const n = this.unqualifiedDateCheckboxStates.length;
-				for (let i = 0; i < n; i++) {
-					this.$set(this.unqualifiedDateCheckboxStates, i, names.slice());
-					this.$set(this.unqualifiedDateOtherRemarks, i, str);
-				}
-				if (this.bookingData) {
-					this.bookingData.otherRemark = str;
-				}
-			},
 			changeOtherRemark(e) {
-				const raw = Array.isArray(e) ? e : (e && Array.isArray(e.detail) ? e.detail : []);
-				const idx = this.currentUnqualifiedIndex;
-				if (!raw || raw.length === 0) {
-					this.showRemark = false;
-					this.$set(this.unqualifiedDateOtherRemarks, idx, '');
-					this.$set(this.unqualifiedDateCheckboxStates, idx, []);
-					if (this.bookingData) {
-						this.bookingData.otherRemark = '';
+				if (e) {
+					let str = '';
+					let show = false;
+					for (let i = 0; i < e.length; i++) {
+
+						if (e[i] == 'Remark') {
+							show = true;
+						} else {
+							str = e[i];
+						}
 					}
-					return;
-				}
-				const names = raw.map((x) => (x != null ? String(x) : '')).filter(Boolean);
-				const extras = names.filter((n) => n !== 'Remark');
-				this.showRemark = names.includes('Remark');
-				this.$set(this.unqualifiedDateCheckboxStates, idx, names.slice());
-				this.$set(this.unqualifiedDateOtherRemarks, idx, extras.join('; '));
-				if (this.bookingData) {
-					this.bookingData.otherRemark = extras.join('; ');
+					this.showRemark = show;
+					// 存储到当前索引的otherRemark
+					this.unqualifiedDateOtherRemarks[this.currentUnqualifiedIndex] = str;
+					// 存储checkbox状态
+					this.unqualifiedDateCheckboxStates[this.currentUnqualifiedIndex] = e;
+				} else {
+					this.showRemark = false;
+					this.unqualifiedDateOtherRemarks[this.currentUnqualifiedIndex] = '';
+					this.unqualifiedDateCheckboxStates[this.currentUnqualifiedIndex] = [];
 				}
 			},
 
@@ -1721,16 +1671,6 @@
 			},
 		},
 		computed:{
-			waitlistRoomGroupValue() {
-				if (!this.bookingData || !this.bookingData.roomRemark) {
-					return [];
-				}
-				const r = this.bookingData.roomRemark;
-				if (r === '2nd Room' || r === '3rd Room') {
-					return [r];
-				}
-				return [];
-			},
 			getStatusColor(){
 				return function (booking) {
 					let operaStatus = null;
@@ -2051,4 +1991,4 @@
 		color: #C39A4B;
 		margin-bottom: 15px;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/common/config.js b/common/config.js
index 40beca1..049fa0c 100644
--- a/common/config.js
+++ b/common/config.js
@@ -14,7 +14,7 @@ class config {
 		
 		//this.version = "beta 2.0";
 		//ali ECS
-		// this.internalUrl = 'https://mcrm.willtechmacau.com:9086';
+		// this.internalUrl = 'https://sep.willtechmo.com';
 
 		this.externalUrl = 'https://mp.mixixili.cn';
 		this.debugMode = true;
@@ -36,4 +36,5 @@ class config {
 		this.emailExt = "";// 如果是dev的時候設置成空字符串，讓他們自己輸入
 	}
 }
-export default config
\ No newline at end of file
+export default config
+ 
\ No newline at end of file
diff --git a/common/countryDialCodes.js b/common/countryDialCodes.js
new file mode 100644
index 0000000..c377008
--- /dev/null
+++ b/common/countryDialCodes.js
@@ -0,0 +1,257 @@
+const countryDialCodes = [
+	{ iso2: 'MO', country: 'Macau', code: '+853' },
+	{ iso2: 'CN', country: 'China', code: '+86' },
+	{ iso2: 'HK', country: 'Hong Kong', code: '+852' },
+	{ iso2: 'AF', country: 'Afghanistan', code: '+93' },
+	{ iso2: 'AX', country: 'Aland Islands', code: '+358' },
+	{ iso2: 'AL', country: 'Albania', code: '+355' },
+	{ iso2: 'DZ', country: 'Algeria', code: '+213' },
+	{ iso2: 'AS', country: 'American Samoa', code: '+1' },
+	{ iso2: 'AD', country: 'Andorra', code: '+376' },
+	{ iso2: 'AO', country: 'Angola', code: '+244' },
+	{ iso2: 'AI', country: 'Anguilla', code: '+1' },
+	{ iso2: 'AG', country: 'Antigua and Barbuda', code: '+1' },
+	{ iso2: 'AR', country: 'Argentina', code: '+54' },
+	{ iso2: 'AM', country: 'Armenia', code: '+374' },
+	{ iso2: 'AW', country: 'Aruba', code: '+297' },
+	{ iso2: 'AC', country: 'Ascension Island', code: '+247' },
+	{ iso2: 'AU', country: 'Australia', code: '+61' },
+	{ iso2: 'AT', country: 'Austria', code: '+43' },
+	{ iso2: 'AZ', country: 'Azerbaijan', code: '+994' },
+	{ iso2: 'BS', country: 'Bahamas', code: '+1' },
+	{ iso2: 'BH', country: 'Bahrain', code: '+973' },
+	{ iso2: 'BD', country: 'Bangladesh', code: '+880' },
+	{ iso2: 'BB', country: 'Barbados', code: '+1' },
+	{ iso2: 'BY', country: 'Belarus', code: '+375' },
+	{ iso2: 'BE', country: 'Belgium', code: '+32' },
+	{ iso2: 'BZ', country: 'Belize', code: '+501' },
+	{ iso2: 'BJ', country: 'Benin', code: '+229' },
+	{ iso2: 'BM', country: 'Bermuda', code: '+1' },
+	{ iso2: 'BT', country: 'Bhutan', code: '+975' },
+	{ iso2: 'BO', country: 'Bolivia', code: '+591' },
+	{ iso2: 'BA', country: 'Bosnia and Herzegovina', code: '+387' },
+	{ iso2: 'BW', country: 'Botswana', code: '+267' },
+	{ iso2: 'BR', country: 'Brazil', code: '+55' },
+	{ iso2: 'IO', country: 'British Indian Ocean Territory', code: '+246' },
+	{ iso2: 'VG', country: 'British Virgin Islands', code: '+1' },
+	{ iso2: 'BN', country: 'Brunei', code: '+673' },
+	{ iso2: 'BG', country: 'Bulgaria', code: '+359' },
+	{ iso2: 'BF', country: 'Burkina Faso', code: '+226' },
+	{ iso2: 'BI', country: 'Burundi', code: '+257' },
+	{ iso2: 'KH', country: 'Cambodia', code: '+855' },
+	{ iso2: 'CM', country: 'Cameroon', code: '+237' },
+	{ iso2: 'CA', country: 'Canada', code: '+1' },
+	{ iso2: 'CV', country: 'Cape Verde', code: '+238' },
+	{ iso2: 'BQ', country: 'Caribbean Netherlands', code: '+599' },
+	{ iso2: 'KY', country: 'Cayman Islands', code: '+1' },
+	{ iso2: 'CF', country: 'Central African Republic', code: '+236' },
+	{ iso2: 'TD', country: 'Chad', code: '+235' },
+	{ iso2: 'CL', country: 'Chile', code: '+56' },
+	{ iso2: 'CX', country: 'Christmas Island', code: '+61' },
+	{ iso2: 'CC', country: 'Cocos (Keeling) Islands', code: '+61' },
+	{ iso2: 'CO', country: 'Colombia', code: '+57' },
+	{ iso2: 'KM', country: 'Comoros', code: '+269' },
+	{ iso2: 'CG', country: 'Congo - Brazzaville', code: '+242' },
+	{ iso2: 'CD', country: 'Congo - Kinshasa', code: '+243' },
+	{ iso2: 'CK', country: 'Cook Islands', code: '+682' },
+	{ iso2: 'CR', country: 'Costa Rica', code: '+506' },
+	{ iso2: 'CI', country: 'Cote d\'Ivoire', code: '+225' },
+	{ iso2: 'HR', country: 'Croatia', code: '+385' },
+	{ iso2: 'CU', country: 'Cuba', code: '+53' },
+	{ iso2: 'CW', country: 'Curacao', code: '+599' },
+	{ iso2: 'CY', country: 'Cyprus', code: '+357' },
+	{ iso2: 'CZ', country: 'Czechia', code: '+420' },
+	{ iso2: 'DK', country: 'Denmark', code: '+45' },
+	{ iso2: 'DJ', country: 'Djibouti', code: '+253' },
+	{ iso2: 'DM', country: 'Dominica', code: '+1' },
+	{ iso2: 'DO', country: 'Dominican Republic', code: '+1' },
+	{ iso2: 'EC', country: 'Ecuador', code: '+593' },
+	{ iso2: 'EG', country: 'Egypt', code: '+20' },
+	{ iso2: 'SV', country: 'El Salvador', code: '+503' },
+	{ iso2: 'GQ', country: 'Equatorial Guinea', code: '+240' },
+	{ iso2: 'ER', country: 'Eritrea', code: '+291' },
+	{ iso2: 'EE', country: 'Estonia', code: '+372' },
+	{ iso2: 'SZ', country: 'Eswatini', code: '+268' },
+	{ iso2: 'ET', country: 'Ethiopia', code: '+251' },
+	{ iso2: 'FK', country: 'Falkland Islands', code: '+500' },
+	{ iso2: 'FO', country: 'Faroe Islands', code: '+298' },
+	{ iso2: 'FJ', country: 'Fiji', code: '+679' },
+	{ iso2: 'FI', country: 'Finland', code: '+358' },
+	{ iso2: 'FR', country: 'France', code: '+33' },
+	{ iso2: 'GF', country: 'French Guiana', code: '+594' },
+	{ iso2: 'PF', country: 'French Polynesia', code: '+689' },
+	{ iso2: 'GA', country: 'Gabon', code: '+241' },
+	{ iso2: 'GM', country: 'Gambia', code: '+220' },
+	{ iso2: 'GE', country: 'Georgia', code: '+995' },
+	{ iso2: 'DE', country: 'Germany', code: '+49' },
+	{ iso2: 'GH', country: 'Ghana', code: '+233' },
+	{ iso2: 'GI', country: 'Gibraltar', code: '+350' },
+	{ iso2: 'GR', country: 'Greece', code: '+30' },
+	{ iso2: 'GL', country: 'Greenland', code: '+299' },
+	{ iso2: 'GD', country: 'Grenada', code: '+1' },
+	{ iso2: 'GP', country: 'Guadeloupe', code: '+590' },
+	{ iso2: 'GU', country: 'Guam', code: '+1' },
+	{ iso2: 'GT', country: 'Guatemala', code: '+502' },
+	{ iso2: 'GG', country: 'Guernsey', code: '+44' },
+	{ iso2: 'GN', country: 'Guinea', code: '+224' },
+	{ iso2: 'GW', country: 'Guinea-Bissau', code: '+245' },
+	{ iso2: 'GY', country: 'Guyana', code: '+592' },
+	{ iso2: 'HT', country: 'Haiti', code: '+509' },
+	{ iso2: 'HN', country: 'Honduras', code: '+504' },
+	{ iso2: 'HU', country: 'Hungary', code: '+36' },
+	{ iso2: 'IS', country: 'Iceland', code: '+354' },
+	{ iso2: 'IN', country: 'India', code: '+91' },
+	{ iso2: 'ID', country: 'Indonesia', code: '+62' },
+	{ iso2: 'IR', country: 'Iran', code: '+98' },
+	{ iso2: 'IQ', country: 'Iraq', code: '+964' },
+	{ iso2: 'IE', country: 'Ireland', code: '+353' },
+	{ iso2: 'IM', country: 'Isle of Man', code: '+44' },
+	{ iso2: 'IL', country: 'Israel', code: '+972' },
+	{ iso2: 'IT', country: 'Italy', code: '+39' },
+	{ iso2: 'JM', country: 'Jamaica', code: '+1' },
+	{ iso2: 'JP', country: 'Japan', code: '+81' },
+	{ iso2: 'JE', country: 'Jersey', code: '+44' },
+	{ iso2: 'JO', country: 'Jordan', code: '+962' },
+	{ iso2: 'KZ', country: 'Kazakhstan', code: '+7' },
+	{ iso2: 'KE', country: 'Kenya', code: '+254' },
+	{ iso2: 'KI', country: 'Kiribati', code: '+686' },
+	{ iso2: 'XK', country: 'Kosovo', code: '+383' },
+	{ iso2: 'KW', country: 'Kuwait', code: '+965' },
+	{ iso2: 'KG', country: 'Kyrgyzstan', code: '+996' },
+	{ iso2: 'LA', country: 'Laos', code: '+856' },
+	{ iso2: 'LV', country: 'Latvia', code: '+371' },
+	{ iso2: 'LB', country: 'Lebanon', code: '+961' },
+	{ iso2: 'LS', country: 'Lesotho', code: '+266' },
+	{ iso2: 'LR', country: 'Liberia', code: '+231' },
+	{ iso2: 'LY', country: 'Libya', code: '+218' },
+	{ iso2: 'LI', country: 'Liechtenstein', code: '+423' },
+	{ iso2: 'LT', country: 'Lithuania', code: '+370' },
+	{ iso2: 'LU', country: 'Luxembourg', code: '+352' },
+	{ iso2: 'MG', country: 'Madagascar', code: '+261' },
+	{ iso2: 'MW', country: 'Malawi', code: '+265' },
+	{ iso2: 'MY', country: 'Malaysia', code: '+60' },
+	{ iso2: 'MV', country: 'Maldives', code: '+960' },
+	{ iso2: 'ML', country: 'Mali', code: '+223' },
+	{ iso2: 'MT', country: 'Malta', code: '+356' },
+	{ iso2: 'MH', country: 'Marshall Islands', code: '+692' },
+	{ iso2: 'MQ', country: 'Martinique', code: '+596' },
+	{ iso2: 'MR', country: 'Mauritania', code: '+222' },
+	{ iso2: 'MU', country: 'Mauritius', code: '+230' },
+	{ iso2: 'YT', country: 'Mayotte', code: '+262' },
+	{ iso2: 'MX', country: 'Mexico', code: '+52' },
+	{ iso2: 'FM', country: 'Micronesia', code: '+691' },
+	{ iso2: 'MD', country: 'Moldova', code: '+373' },
+	{ iso2: 'MC', country: 'Monaco', code: '+377' },
+	{ iso2: 'MN', country: 'Mongolia', code: '+976' },
+	{ iso2: 'ME', country: 'Montenegro', code: '+382' },
+	{ iso2: 'MS', country: 'Montserrat', code: '+1' },
+	{ iso2: 'MA', country: 'Morocco', code: '+212' },
+	{ iso2: 'MZ', country: 'Mozambique', code: '+258' },
+	{ iso2: 'MM', country: 'Myanmar (Burma)', code: '+95' },
+	{ iso2: 'NA', country: 'Namibia', code: '+264' },
+	{ iso2: 'NR', country: 'Nauru', code: '+674' },
+	{ iso2: 'NP', country: 'Nepal', code: '+977' },
+	{ iso2: 'NL', country: 'Netherlands', code: '+31' },
+	{ iso2: 'NC', country: 'New Caledonia', code: '+687' },
+	{ iso2: 'NZ', country: 'New Zealand', code: '+64' },
+	{ iso2: 'NI', country: 'Nicaragua', code: '+505' },
+	{ iso2: 'NE', country: 'Niger', code: '+227' },
+	{ iso2: 'NG', country: 'Nigeria', code: '+234' },
+	{ iso2: 'NU', country: 'Niue', code: '+683' },
+	{ iso2: 'NF', country: 'Norfolk Island', code: '+672' },
+	{ iso2: 'KP', country: 'North Korea', code: '+850' },
+	{ iso2: 'MK', country: 'North Macedonia', code: '+389' },
+	{ iso2: 'MP', country: 'Northern Mariana Islands', code: '+1' },
+	{ iso2: 'NO', country: 'Norway', code: '+47' },
+	{ iso2: 'OM', country: 'Oman', code: '+968' },
+	{ iso2: 'PK', country: 'Pakistan', code: '+92' },
+	{ iso2: 'PW', country: 'Palau', code: '+680' },
+	{ iso2: 'PS', country: 'Palestinian Territories', code: '+970' },
+	{ iso2: 'PA', country: 'Panama', code: '+507' },
+	{ iso2: 'PG', country: 'Papua New Guinea', code: '+675' },
+	{ iso2: 'PY', country: 'Paraguay', code: '+595' },
+	{ iso2: 'PE', country: 'Peru', code: '+51' },
+	{ iso2: 'PH', country: 'Philippines', code: '+63' },
+	{ iso2: 'PL', country: 'Poland', code: '+48' },
+	{ iso2: 'PT', country: 'Portugal', code: '+351' },
+	{ iso2: 'PR', country: 'Puerto Rico', code: '+1' },
+	{ iso2: 'QA', country: 'Qatar', code: '+974' },
+	{ iso2: 'RE', country: 'Reunion', code: '+262' },
+	{ iso2: 'RO', country: 'Romania', code: '+40' },
+	{ iso2: 'RU', country: 'Russia', code: '+7' },
+	{ iso2: 'RW', country: 'Rwanda', code: '+250' },
+	{ iso2: 'WS', country: 'Samoa', code: '+685' },
+	{ iso2: 'SM', country: 'San Marino', code: '+378' },
+	{ iso2: 'ST', country: 'Sao Tome and Principe', code: '+239' },
+	{ iso2: 'SA', country: 'Saudi Arabia', code: '+966' },
+	{ iso2: 'SN', country: 'Senegal', code: '+221' },
+	{ iso2: 'RS', country: 'Serbia', code: '+381' },
+	{ iso2: 'SC', country: 'Seychelles', code: '+248' },
+	{ iso2: 'SL', country: 'Sierra Leone', code: '+232' },
+	{ iso2: 'SG', country: 'Singapore', code: '+65' },
+	{ iso2: 'SX', country: 'Sint Maarten', code: '+1' },
+	{ iso2: 'SK', country: 'Slovakia', code: '+421' },
+	{ iso2: 'SI', country: 'Slovenia', code: '+386' },
+	{ iso2: 'SB', country: 'Solomon Islands', code: '+677' },
+	{ iso2: 'SO', country: 'Somalia', code: '+252' },
+	{ iso2: 'ZA', country: 'South Africa', code: '+27' },
+	{ iso2: 'KR', country: 'South Korea', code: '+82' },
+	{ iso2: 'SS', country: 'South Sudan', code: '+211' },
+	{ iso2: 'ES', country: 'Spain', code: '+34' },
+	{ iso2: 'LK', country: 'Sri Lanka', code: '+94' },
+	{ iso2: 'BL', country: 'St. Barthelemy', code: '+590' },
+	{ iso2: 'SH', country: 'St. Helena', code: '+290' },
+	{ iso2: 'KN', country: 'St. Kitts and Nevis', code: '+1' },
+	{ iso2: 'LC', country: 'St. Lucia', code: '+1' },
+	{ iso2: 'MF', country: 'St. Martin', code: '+590' },
+	{ iso2: 'PM', country: 'St. Pierre and Miquelon', code: '+508' },
+	{ iso2: 'VC', country: 'St. Vincent and Grenadines', code: '+1' },
+	{ iso2: 'SD', country: 'Sudan', code: '+249' },
+	{ iso2: 'SR', country: 'Suriname', code: '+597' },
+	{ iso2: 'SJ', country: 'Svalbard and Jan Mayen', code: '+47' },
+	{ iso2: 'SE', country: 'Sweden', code: '+46' },
+	{ iso2: 'CH', country: 'Switzerland', code: '+41' },
+	{ iso2: 'SY', country: 'Syria', code: '+963' },
+	{ iso2: 'TW', country: 'Taiwan', code: '+886' },
+	{ iso2: 'TJ', country: 'Tajikistan', code: '+992' },
+	{ iso2: 'TZ', country: 'Tanzania', code: '+255' },
+	{ iso2: 'TH', country: 'Thailand', code: '+66' },
+	{ iso2: 'TL', country: 'Timor-Leste', code: '+670' },
+	{ iso2: 'TG', country: 'Togo', code: '+228' },
+	{ iso2: 'TK', country: 'Tokelau', code: '+690' },
+	{ iso2: 'TO', country: 'Tonga', code: '+676' },
+	{ iso2: 'TT', country: 'Trinidad and Tobago', code: '+1' },
+	{ iso2: 'TA', country: 'Tristan da Cunha', code: '+290' },
+	{ iso2: 'TN', country: 'Tunisia', code: '+216' },
+	{ iso2: 'TR', country: 'Turkiye', code: '+90' },
+	{ iso2: 'TM', country: 'Turkmenistan', code: '+993' },
+	{ iso2: 'TC', country: 'Turks and Caicos Islands', code: '+1' },
+	{ iso2: 'TV', country: 'Tuvalu', code: '+688' },
+	{ iso2: 'VI', country: 'U.S. Virgin Islands', code: '+1' },
+	{ iso2: 'UG', country: 'Uganda', code: '+256' },
+	{ iso2: 'UA', country: 'Ukraine', code: '+380' },
+	{ iso2: 'AE', country: 'United Arab Emirates', code: '+971' },
+	{ iso2: 'GB', country: 'United Kingdom', code: '+44' },
+	{ iso2: 'US', country: 'United States', code: '+1' },
+	{ iso2: 'UY', country: 'Uruguay', code: '+598' },
+	{ iso2: 'UZ', country: 'Uzbekistan', code: '+998' },
+	{ iso2: 'VU', country: 'Vanuatu', code: '+678' },
+	{ iso2: 'VA', country: 'Vatican City', code: '+39' },
+	{ iso2: 'VE', country: 'Venezuela', code: '+58' },
+	{ iso2: 'VN', country: 'Vietnam', code: '+84' },
+	{ iso2: 'WF', country: 'Wallis and Futuna', code: '+681' },
+	{ iso2: 'EH', country: 'Western Sahara', code: '+212' },
+	{ iso2: 'YE', country: 'Yemen', code: '+967' },
+	{ iso2: 'ZM', country: 'Zambia', code: '+260' },
+	{ iso2: 'ZW', country: 'Zimbabwe', code: '+263' },
+];
+
+export function getCountryDialCodeOptions() {
+	return countryDialCodes.map(item => ({
+		...item,
+		label: item.code,
+		value: item.code,
+	}));
+}
+
+export default countryDialCodes;
diff --git a/common/request.js b/common/request.js
index e930f0f..4439fa9 100644
--- a/common/request.js
+++ b/common/request.js
@@ -121,10 +121,8 @@ module.exports = (vm) => {
 			break;
 		  case 400:
 		    kickout()
-			break;
 		  case 401:
-			if(error.config.url.indexOf('refresh_token')==-1 && error.config.url.indexOf('logout')==-1 && !error.config.custom?.tokenRetried){
-				error.config.custom = {...error.config.custom, tokenRetried: true};
+			if(error.config.url.indexOf('refresh_token')==-1 && error.config.url.indexOf('logout')==-1){
 				return tokenRefresh().then(_ => {
 				  error.config.header.Authorization = uni.getStorageSync("token");
 				  error.config.header.RefreshToken = uni.getStorageSync("refreshToken")
@@ -143,22 +141,19 @@ module.exports = (vm) => {
 	
 }
 function tokenRefresh(){
-	const storedRefreshToken = uni.getStorageSync("refreshToken");
-	if (storedRefreshToken) {
+	let oldToken = uni.getStorageSync("token");
+	if (oldToken !== null && oldToken !== '') {
 		return refreshToken({})
 		  .then((data) => {
-			if (!data?.success || !data.accessToken) throw new Error('Token refresh failed');
 			uni.setStorageSync("token",data.accessToken);
 			uni.setStorageSync("tokenTime",dayjs().unix());
 			return Promise.resolve(true)
 		  })
 		  .catch(error => {
 			kickout()
-			return Promise.reject(error);
 		  })
 	} else {
 		kickout()
-		return Promise.reject(new Error('Missing RefreshToken'));
 	}
 }
 function checkToken(){
@@ -203,4 +198,4 @@ function checkIP(header){
 			}
 		}*/
 	}
-}
+}
\ No newline at end of file
diff --git a/components/header/header.vue b/components/header/header.vue
index c61140a..d65631a 100644
--- a/components/header/header.vue
+++ b/components/header/header.vue
@@ -10,6 +10,13 @@
 			bgColor="#C39A4B"
 			titleStyle="max-width:none;width:auto;font-weight:bold;color:#ffffff;"
 		>
+		<view
+			@tap="goNotification"
+			style="margin-top:2px;margin-left:3px;"
+			slot="left"
+		>
+			<u-icon name="bell" color="#FFFFFF" size="24"></u-icon>
+		</view>
 		<view @tap="logout"
 			style="margin-top:2px;margin-right:3px;"
 			slot="right"
@@ -39,6 +46,11 @@
 			this.isLogin();
 		},
 		methods:{
+			goNotification() {
+				uni.navigateTo({
+					url: '/limo/notification/notification'
+				});
+			},
 			updateUserData() {
 				this.userData = uni.getStorageSync("userData");
 				if (this.userData) {
@@ -109,4 +121,4 @@
 
 <style>
 
-</style>
\ No newline at end of file
+</style>
diff --git a/limo/bookingDetail/bookingDetail.vue b/limo/bookingDetail/bookingDetail.vue
new file mode 100644
index 0000000..6d59b89
--- /dev/null
+++ b/limo/bookingDetail/bookingDetail.vue
@@ -0,0 +1,827 @@
+<template>
+	<view>
+		<view class="hz-page">
+			 <u-navbar
+				@leftClick="back()"
+				:safeAreaInsetTop="true" 
+				:placeholder="true" 
+				:title="title"
+				:fixed="true"
+				:autoBack="false"
+				leftIconColor="#000000"
+				titleStyle="font-weight:bold;"
+				v-if="NotCapping"
+			>
+				<view
+					style="margin-top:2px;margin-right:3px;"
+					slot="right"
+				>
+					<view style="border:1rpx solid #ccc;border-radius: 14px;padding:4px 12px;" class="hz-flex-row hz-flex-vertical-mid">
+						<image @click="navTo('/pages/findPlayer/findPlayer',1,false)" src="../../static/images/ico_find_player.png" class="hz-nav-btn"></image>
+						<view style="height:20px;border-left:1px solid #ccc;margin-left:8px;margin-right:8px;"></view>
+						<image @click="navTo('/booking/bookingRecord/bookingRecord?from=booking',2,false)" src="../../static/images/ico_list.png" class="hz-nav-btn"></image>
+					</view>
+				</view>
+			</u-navbar>
+			
+			<view v-if="limoData" class="hz-spacing hz-bg-white" style="margin-top:8px;">
+				<view class="hz-flex-row" v-if="!NotCapping" style="margin-top:20rpx;justify-content: center;">
+					<image src="../../static/images/mgm_logo_1.png" style="width:130px;height:40px;"></image>
+				</view>
+				<view class="hz-flex-row hz-pd-30 hz-font-md hz-font-bolder hz-card-booking" style="margin-top:20rpx;align-items:center;">
+					<view style="width:72%;">Conf # : {{ getConfirmationNo(limoData) }}</view>
+					<view class="hz-btn-status hz-text-center hz-limo-status-tag" :style="getLimoStatusStyle(limoData.status)">{{ getStatusText(limoData) }}</view>
+				</view>
+				
+				<view class="hz-card-profile hz-mr-b-30 hz-mr-t-30">
+					<view class="hz-flex-row">
+						<view style="width:60%">
+							<view class="hz-font-color-light hz-font-sm">{{$t("common.playerId")}}</view>
+							<view class="hz-font-bolder hz-font-lg" >{{ playerData.playerId }}</view>
+						</view>
+						<view style="width:40%">
+							<view class="hz-font-color-light hz-font-sm">{{$t("common.tier")}}</view>
+							<view class="hz-font-bolder hz-font-lg" >{{ playerData.tierName }}</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view style="width:100%">
+							<view class="hz-font-color-light hz-font-sm">{{$t("common.name")}}</view>
+							<view class="hz-font-bolder hz-font-lg" >{{playerData.salutation + " " + playerData.name }}</view>
+						</view>
+					</view>
+				</view>
+				
+				<view class="hz-pd-30 hz-font-bolder hz-font-md hz-card-extend limo-info-card" style="margin-top:10px;">
+					<view class="limo-info-grid">
+						<view class="limo-info-item">
+							<image src="../../static/images/ico_calendar.png" class="limo-info-icon"></image>
+							<view class="hz-font-bold hz-font-md">{{ getPickupDate(limoData.pickUpDate) }}</view>
+						</view>
+						<view class="limo-info-item">
+							<image src="../../static/images/clock.png" class="limo-info-icon"></image>
+							<view class="hz-font-bold hz-font-md">{{ getPickupTime(limoData.pickUpDate) }}</view>
+						</view>
+						<view class="limo-info-item">
+							<u-icon name="account-fill" size="18" color="#C39A4B" class="limo-info-icon"></u-icon>
+							<view>{{ limoData.noOfPax }} Pax</view>
+						</view>
+						<!-- <view class="limo-info-item">
+							<image src="../../static/images/car_no.png" class="limo-info-icon"></image>
+							<view class="hz-font-bold hz-font-md">{{ getCarNo(limoData.carNo) }}</view>
+						</view> -->
+					</view>
+					<view v-if="canEditLimo(limoData)" @click="editLimoBooking()" class="limo-edit-button">
+						<image src="/static/images/edit.png" mode="aspectFit" class="limo-edit-icon"></image>
+					</view>
+				</view>
+				
+				<view class="hz-spacing hz-mr-t-30" style="margin-bottom:30px;">
+					<view class="hz-flex-row">
+						<view style="width:100%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.pickupPoint")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{limoData.pickUpPoint}}</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view v-if="limoData.flightDetail!=null && limoData.flightDetail != ''" style="width:55%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.flightNo")}}</view>
+								<view class="hz-font-bolder hz-font-lg">
+									<view>
+										{{ limoData.flightDetail }}
+									</view>
+								</view>
+						</view>
+						<view v-if="limoData.greetType!=null && limoData.greetType != ''" style="width:45%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.greetType")}}</view>
+								<view class="hz-font-bolder hz-font-lg">
+									<view>
+										{{ limoData.greetType }}
+									</view>
+								</view>
+						</view>
+					</view>
+					<view v-if="hasExtraDropOffPoint(limoData)" class="hz-flex-row hz-mr-t-30">
+						<view style="width:100%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.extraDropoff")}}</view>
+								<view class="hz-font-bolder hz-font-lg">
+									<view v-for="(extraDropOffPoint,index) in getExtraDropOffPointDisplayItems(limoData.extraDropOffPoint)" :key="'extra-dropoff-'+index">
+										<view>#{{index + 1}} {{extraDropOffPoint.zh}}</view>
+										<view v-if="extraDropOffPoint.en">{{extraDropOffPoint.en}}</view>
+									</view>
+								</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view style="width:100%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.dropoffPoint")}}</view>
+							<view class="hz-font-bolder hz-font-lg">
+								<view v-for="(dropOffPoint,index) in getDropOffPointLines(limoData.dropOffPoint)" :key="'dropoff-'+index">
+									{{dropOffPoint}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view style="width:55%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("bookingConfirm.createdOn")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{limoData.createdAt}}</view>
+						</view>
+						<view style="width:45%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("bookingConfirm.createdBy")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{limoData.createdBy ? limoData.createdBy : '-'}}</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view v-if="NotCapping" style="width:55%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.overrideBy")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{limoData.overrideBy ? limoData.overrideBy : '-'}}</view>
+						</view>
+						<view style="width:45%">
+							<view class="hz-flex-row hz-mr-t-30" @click="copyDriverInfo(limoData)">
+								<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.carTypeAndPlate")}}</view>
+								<image src="/static/images/copy.png" style="height: 20px;width: 20px"></image>
+							</view>
+							<view class="hz-font-bolder hz-font-lg" style="white-space: pre-wrap;">{{formatCarTypeAndCarNo(limoData)}}</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view v-if="NotCapping" style="width:55%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.tripPrice")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{formatTripPrice(limoData.totalAmount)}}</view>
+						</view>
+						<view v-if="!NotCapping" style="width:55%"> 
+						</view>
+						<view style="width:45%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.driverContact")}}</view>
+							<view class="hz-font-bolder hz-font-lg" style="white-space: pre-wrap;">{{GetDriverContact(limoData)}}</view>
+						</view>
+					</view>
+					<view v-if="NotCapping" class="hz-flex-row hz-mr-t-30">
+						<view style="width:55%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.driverSource")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{limoData.driverSource != null && limoData.driverSource != '' ? limoData.driverSource : "N/A"}}</view>
+						</view>
+					</view>
+					<view v-if="limoData.remarks != null && limoData.remarks != '' && NotCapping" class="hz-flex-row hz-mr-t-30">
+						<view style="width:100%">
+							<view class="hz-font-color-black hz-font-sm">{{$t("limoBookingDetail.remark")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{ limoData.remarks }}</view>
+						</view>
+					</view>
+				</view>
+				<view style="height:100rpx;"></view>
+			</view>
+			
+			<u-empty
+				v-if="loadError"
+				mode="search"
+				:text="dataNotFoundStr"
+			>
+			</u-empty>
+			
+			<u-tabbar
+				:fixed="true"
+				:placeholder="true"
+				:safeAreaInsetBottom="true"
+				customStyle="z-index:100;height:58px;"
+				v-if="limoData && showTabbar"
+			>
+				<view class="book hz-flex-row hz-spacing" style="width: 45%;">
+					<view class="hz-btn hz-font-color-white hz-font-sm hz-font-bold hz-text-center" @click="popupLang()">
+						 {{$t("bookingDetail.saveImage")}}
+					</view>
+				</view>
+				<view class="book hz-flex-row hz-spacing" style="width: 45%;" :class="limoData.status !=='PENDING' ? 'hz-disabled' :''">
+					<view class="hz-btn hz-font-color-white hz-font-sm hz-font-bold hz-text-center" @click="cancelLimoBooking()">
+						 {{$t("bookingDetail.cancelBooking")}}
+					</view>
+				</view>
+			</u-tabbar>
+			<u-popup :show="showCancelBookingSuccessPopup" mode="center" round="16px" :closeable="false" @close="closeCancelBookingSuccessPopup">
+				<view class="booking-popup-card booking-popup-card--success"
+					:style="'width:' + windowWidth + 'px;'">
+					<view class="booking-popup-icon-row">
+						<image :src="iconPath" style="width:64px;height:64px;"></image>
+					</view>
+					<view class="booking-popup-title booking-popup-title--success hz-font-md hz-font-bold hz-text-center">
+						Cancel Booking Successfully
+					</view>
+					<view
+						@click="closeCancelBookingSuccessPopup"
+						class="booking-popup-button booking-popup-button--primary booking-popup-button--success hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center"
+					>
+						OK
+					</view>
+				</view>
+			</u-popup>
+			<u-popup :show="showSaveImageSuccessPopup" mode="center" round="16px" :closeable="false" @close="closeSaveImageSuccessPopup">
+				<view class="booking-popup-card booking-popup-card--success"
+					:style="'width:' + windowWidth + 'px;'">
+					<view class="booking-popup-icon-row">
+						<image src="../../static/images/ico_suc.png" style="width:64px;height:64px;"></image>
+					</view>
+					<view class="booking-popup-title booking-popup-title--success hz-font-md hz-font-bold hz-text-center">
+						Image Saved Successfully
+					</view>
+					<view
+						@click="closeSaveImageSuccessPopup"
+						class="booking-popup-button booking-popup-button--primary booking-popup-button--success hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center"
+					>
+						OK
+					</view>
+				</view>
+			</u-popup>
+			<u-picker closeOnClickOverlay :show="showPicker" :defaultIndex="currentLangIndex" :columns="langList" @close="showPicker=false" :cancelText="cancelText" :confirmText="okText" confirmColor="#C39A4B" @cancel="showPicker=false" @confirm="confirmLang" keyName="name"></u-picker>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { getLimoBookingById, getLimoBookingByConf } from '../../api/limoApi.js';
+	import { cancelLimoBooking } from '../../api/limoApi.js';
+	export default {
+		data() {
+			return {
+				playerData:null,
+				userData:null,
+				deviceData:null,
+				limoData:null,
+				loadError:false,
+				dataNotFoundStr:this.$t("common.dataNotFound"),
+				title:'',
+				from:'',
+				conf:'',
+				windowWidth:0,
+				showSaveImageSuccessPopup:false,
+				showCancelBookingSuccessPopup:false,
+				NotCapping:true,
+				showTabbar:true,
+				showWhenScreenshot:true,
+				capture:'',
+				showPicker:false,
+				lang:'',
+				langList:[
+					[{
+						name: 'English',
+						code: 'en'
+					}, {
+						name: '繁體中文',
+						code: 'zh-Hant'
+					}]
+				],
+				currentLangIndex:[0],
+				cancelText:this.$t("common.cancel"),
+				okText:this.$t("common.ok"),
+				iconPath: ''
+			}
+		},
+		onLoad(opt) {
+			this.initUI();
+			this.playerData = uni.getStorageSync("playerData");
+			this.userData = uni.getStorageSync("userData");
+			this.deviceData = uni.getStorageSync("deviceData");
+			this.windowWidth = this.deviceData && this.deviceData.windowWidth ? this.deviceData.windowWidth - 70 : 290;
+			if(opt.from!==undefined && opt.from!='') this.from = opt.from;
+			if(opt.conf!==undefined && opt.conf!='') this.conf = opt.conf;
+			// this.getLimoData();
+			this.getBooking(opt);
+		},
+		onShow() {
+			this.$i18n.locale = uni.getLocale();
+		},
+		methods: {
+			initUI() {
+				this.title = this.$t("bookingDetail.title");
+			},
+			restoreScreenshotView() {
+				this.NotCapping = true;
+				this.showTabbar = true;
+				this.showWhenScreenshot = true;
+			},
+			// #ifdef APP-PLUS
+			async captureWebview() {
+				uni.pageScrollTo({
+					scrollTop: 0
+				});
+				this.NotCapping = false;
+				this.showTabbar = false;
+				this.showWhenScreenshot = false;
+				await uni.$u.sleep(1000);
+				var _this = this;
+				var ws = plus.webview.getTopWebview();
+				var bitmap = new plus.nativeObj.Bitmap('capScreen');
+				ws.draw(bitmap, function(){
+					console.log('截屏绘制图片成功');
+					bitmap.save('_doc/a.png', {},
+						async function(e){
+							console.log('保存图片成功：' + JSON.stringify(e));
+							await uni.$u.sleep(1000);
+							_this.restoreScreenshotView();
+							plus.gallery.save(e.target, () => {
+								plus.nativeUI.toast(_this.$t("common.picSaveSuccess"));
+							}, (err) => {
+								console.log('保存到相册失败：' + JSON.stringify(err));
+							});
+						},
+						function(e){
+							console.log('保存图片失败：' + JSON.stringify(e));
+							_this.restoreScreenshotView();
+						}
+					);
+					_this.capture = bitmap.toBase64Data();
+					bitmap.recycle();
+				}, function(e){
+					console.log('截屏绘制图片失败：' + JSON.stringify(e));
+					_this.restoreScreenshotView();
+				});
+			},
+			// #endif
+			back(){
+				if(this.from==='list'){
+					this.navTo('/booking/bookingRecord/bookingRecord?from=booking',2,false);
+				}else{
+					this.navBack();
+				}
+			},
+			getPickupDate(str){
+				if(!str) return '';
+				let datePart = str.split(' ')[0];
+				// Assume DD/MM/YYYY
+				let parts = datePart.split('/');
+				if(parts.length===3){
+					let dateObj = new Date(parts[2], parts[1]-1, parts[0]);
+					let weeks = ['Sun','Mon','Tue','Wed','Thu','Fri','Sat'];
+					let week = weeks[dateObj.getDay()];
+					return `(${week}) ${parts[2]}-${parts[1]}-${parts[0]}`;
+				}
+				return datePart;
+			},
+			getPickupTime(str){
+				if(!str) return '';
+				return str.split(' ')[1] || '';
+			},
+			getCarNo(carNo){
+				if(carNo!== undefined && carNo !== null && carNo !== ''){
+					return carNo
+				}else{
+					return 'N/A';
+				}
+			},
+			getDropOffPointLines(dropOffPoint){
+				if(dropOffPoint === null || dropOffPoint === undefined || dropOffPoint === '') return [''];
+				return String(dropOffPoint).split(/[;；]/).map(item => item.trim()).filter(item => item !== '');
+			},
+			getExtraDropOffPointDisplayItems(extraDropOffPoint) {
+				return this.getDropOffPointLines(extraDropOffPoint).map((item) => {
+					const parts = String(item).split('/');
+					return {
+						zh: String(parts[0] || '').trim(),
+						en: String(parts.slice(1).join('/') || '').trim()
+					};
+				});
+			},
+			getExtraDropOffPointFromBooking(booking) {
+				if (!booking) {
+					return '';
+				}
+				const value =
+					booking.extraDropOffPoint != null && String(booking.extraDropOffPoint).trim() !== ''
+						? booking.extraDropOffPoint
+						: '';
+				return String(value || '').trim();
+			},
+			hasExtraDropOffPoint(limoData) {
+				return (
+					limoData &&
+					limoData.extraDropOffPoint != null &&
+					String(limoData.extraDropOffPoint).trim() !== ''
+				);
+			},
+			formatDate(date, format = 'YYYY-MM-DD HH:mm:ss') {
+				if(date === null || date === undefined || date === '') return '';
+				let normalizedDate = date;
+				if(typeof normalizedDate === 'string' && /^\d+$/.test(normalizedDate)){
+					normalizedDate = Number(normalizedDate);
+				}
+				if(typeof normalizedDate === 'number' && normalizedDate < 1000000000000){
+					normalizedDate = normalizedDate * 1000;
+				}
+				const d = new Date(normalizedDate);
+				if(Number.isNaN(d.getTime())) return '';
+				
+				const map = {
+					YYYY: d.getFullYear(),
+					MM: String(d.getMonth() + 1).padStart(2, '0'),
+					DD: String(d.getDate()).padStart(2, '0'),
+					HH: String(d.getHours()).padStart(2, '0'),
+					mm: String(d.getMinutes()).padStart(2, '0'),
+					ss: String(d.getSeconds()).padStart(2, '0')
+				};
+				return format.replace(/YYYY|MM|DD|HH|mm|ss/g, matched => map[matched]);
+			},
+			normalizeStatus(status){
+				if(status==null || status===undefined){
+					return '';
+				}
+				return String(status).toUpperCase().replace(/\s+/g,' ').trim();
+			},
+			canEditLimo(limo){
+				return this.normalizeStatus(limo && limo.status) === 'PENDING';
+			},
+			getLimoStatusStyle(status){
+				const normalizedStatus = this.normalizeStatus(status);
+				const style = {
+					minWidth: 'auto',
+					height: 'auto',
+					lineHeight: '1.2',
+					whiteSpace: 'nowrap',
+					paddingTop: '6px',
+					paddingBottom: '6px',
+					paddingLeft: '12px',
+					paddingRight: '12px',
+					flex: 1,
+					borderRadius: '6px',
+					fontSize: '12px',
+					fontWeight: '700',
+					backgroundColor: 'rgb(148, 148, 148)',
+					color: '#ffffff'
+				};
+				if(normalizedStatus === 'CONFIRMED'){
+					style.backgroundColor = '#439048';
+				}
+				if(normalizedStatus === 'DRIVER_DEPARTED'){
+					style.backgroundColor = '#439048';
+				}
+				if(normalizedStatus === 'DRIVER_ASSIGNED'){
+					style.backgroundColor = '#439048';
+				}
+				if(normalizedStatus === 'DRIVER_ARRIVED'){
+					style.backgroundColor = '#439048';
+				}
+				if(normalizedStatus === 'GUEST_PICKED'){
+					style.backgroundColor = '#439048';
+				}
+				
+				return style;
+			},
+			editLimoBooking(){
+				if(!this.canEditLimo(this.limoData)){
+					return;
+				}
+				uni.setStorageSync('limoEditData', this.limoData);
+				this.navTo('/limo/newLimo/newLimo?mode=edit&from=limoDetail',0,false);
+			},
+			async cancelLimoBooking() {
+				if(this.limoData.status !== 'PENDING') return null;
+				
+				let updatedBy = this.limoData.updatedBy;
+				let bookingId = this.limoData.id;
+				
+				let params = {
+					updatedBy: updatedBy,
+					id: bookingId
+				};
+				
+				try {
+					const res = await cancelLimoBooking(params);
+					if(res && res.success) {
+						this.iconPath = '../../static/images/ico_suc.png';
+						this.showCancelBookingSuccessPopup = true;
+					} else {
+						this.iconPath = '../../static/images/ico_err.png';
+					}
+				} catch (e) {
+					console.error(e)
+				}
+			},
+			showSaveImageSuccessDialog(){
+				this.showSaveImageSuccessPopup = true;
+			},
+			popupLang(){
+				this.currentLangIndex = [];
+				for(let i=0;i<this.langList[0].length;i++){
+					if(this.langList[0][i].code === this.$i18n.locale){
+						this.currentLangIndex.push(i);
+						break;
+					}
+				}
+				this.showPicker = true;
+			},
+			async confirmLang(e){
+				this.$i18n.locale = e.value[0].code;
+				this.lang = e.value[0].name;
+				this.title = this.$t("bookingDetail.title");
+				this.cancelText = this.$t("common.cancel");
+				this.okText = this.$t("common.ok");
+				this.showPicker = false;
+				this.captureWebview();
+			},
+			closeSaveImageSuccessPopup(){
+				this.showSaveImageSuccessPopup = false;
+			},
+			closeCancelBookingSuccessPopup(){
+				this.showCancelBookingSuccessPopup = false;
+				this.navTo('/booking/bookingRecord/bookingRecord?from=booking',2,false);
+			},
+			getLimoData(){
+				const limoBookingList = [];
+				getBooking();
+				
+			},
+			async getDataByConfNo(confNo) {
+				if (confNo == null || confNo === '' || confNo === 'null') {
+					return;
+				}
+				await this.getLimoBookingByConf(confNo);
+			},
+			async getLimoBookingByConf(conf,id) {
+				this.loadError = false;
+				uni.showLoading({ title: this.$t("common.loading") });
+				try{
+					let params = {};
+					params.conf = conf;
+					const res = await getLimoBookingByConf(params);
+					if(res!=null && res.success==true){
+						
+						let tempBooking = res.data;
+						
+						let temp = {
+							id: tempBooking.id,
+							confirmationNo: tempBooking.confirmationNo,
+							status: tempBooking.bookingStatus,
+							bookingType: tempBooking.bookingType,
+							serviceType: tempBooking.serviceType,
+							pickUpDate: this.formatDate(tempBooking.pickUpDatetime, 'DD/MM/YYYY HH:mm'),
+							greetType: tempBooking.greetType,
+							signage: tempBooking.signage,
+							tripPrice: tempBooking.tripPrice,
+							tripContact: tempBooking.tripContact,
+							bookingContact: tempBooking.bookingContact,
+							tenOutContact: tempBooking.tenOutContact,
+							guestContact: tempBooking.guestContact,
+							isHighImportance: tempBooking.isHighImportance,
+							isTenOut: tempBooking.isTenOut,
+							isConnectGuestDirectly: tempBooking.isConnectGuestDirectly,
+							noOfPax: tempBooking.noOfPax,
+							pickUpPoint: tempBooking.pickUpPoint,
+							carType: tempBooking.carType,
+							extraDropOffPoint: this.getExtraDropOffPointFromBooking(tempBooking),
+							extraOffPoint: this.getExtraDropOffPointFromBooking(tempBooking),
+							dropOffPoint: tempBooking.dropOffPoint,
+							remarks: tempBooking.remarks,
+							isHourlyRate: tempBooking.isHourlyRate,
+							hourlyRate: tempBooking.hourlyRate,
+							flightDetail: tempBooking.flightDetail,
+							flightEta: tempBooking.flightEta,
+							flightStatus: tempBooking.flightStatus,
+							approver: tempBooking.approver,
+							approverId: tempBooking.approverId,
+							paymentMethod: tempBooking.paymentMethod,
+							createdAt: this.formatDate(tempBooking.createdAt, "YYYY-MM-DD HH:mm:ss"),
+							createdBy: tempBooking.createdBy,
+							overrideBy: tempBooking.overrideBy,
+							carNo:tempBooking.carNo,
+							driverContact:tempBooking.driverContact,
+							driverSource:tempBooking.driverSource,
+							totalAmount:tempBooking.totalAmount
+						}
+						
+						this.limoData = temp;
+						
+					
+					}else{
+						this.loadError = true;
+						uni.$u.toast(res.message,5000);
+					}
+				}catch(e){
+					this.loadError = true;
+					console.error(e);
+					uni.$u.toast(e.errMsg,5000);
+				}finally{
+					uni.hideLoading();
+				}
+			},
+			async getLimoBookingById(id) {
+				this.loadError = false;
+				uni.showLoading({ title: this.$t("common.loading") });
+				try{
+					let params = {};
+					params.id = id;
+					const res = await getLimoBookingById(params);
+					if(res!=null && res.success==true){
+						
+						let tempBooking = res.data;
+						
+						let temp = {
+							id: tempBooking.id,
+							confirmationNo: tempBooking.confirmationNo,
+							status: tempBooking.bookingStatus,
+							bookingType: tempBooking.bookingType,
+							serviceType: tempBooking.serviceType,
+							pickUpDate: this.formatDate(tempBooking.pickUpDatetime, 'DD/MM/YYYY HH:mm'),
+							greetType: tempBooking.greetType,
+							signage: tempBooking.signage,
+							tripPrice: tempBooking.tripPrice,
+							tripContact: tempBooking.tripContact,
+							bookingContact: tempBooking.bookingContact,
+							tenOutContact: tempBooking.tenOutContact,
+							guestContact: tempBooking.guestContact,
+							isHighImportance: tempBooking.isHighImportance,
+							isTenOut: tempBooking.isTenOut,
+							isConnectGuestDirectly: tempBooking.isConnectGuestDirectly,
+							noOfPax: tempBooking.noOfPax,
+							pickUpPoint: tempBooking.pickUpPoint,
+							carType: tempBooking.carType,
+							extraDropOffPoint: this.getExtraDropOffPointFromBooking(tempBooking),
+							extraOffPoint: this.getExtraDropOffPointFromBooking(tempBooking),
+							dropOffPoint: tempBooking.dropOffPoint,
+							remarks: tempBooking.remarks,
+							isHourlyRate: tempBooking.isHourlyRate,
+							hourlyRate: tempBooking.hourlyRate,
+							flightDetail: tempBooking.flightDetail,
+							flightEta: tempBooking.flightEta,
+							flightStatus: tempBooking.flightStatus,
+							approver: tempBooking.approver,
+							approverId: tempBooking.approverId,
+							paymentMethod: tempBooking.paymentMethod,
+							createdAt: this.formatDate(tempBooking.createdAt, "YYYY-MM-DD HH-mm-ss"),
+							createdBy: tempBooking.createdBy,
+							overrideBy: tempBooking.overrideBy,
+							totalAmount:tempBooking.totalAmount
+						}
+						
+						this.limoData = temp;
+					}else{
+						this.loadError = true;
+						uni.$u.toast(res.message,5000);
+					}
+				}catch(e){
+					this.loadError = true;
+					console.error(e);
+					uni.$u.toast(e.errMsg,5000);
+				}finally{
+					uni.hideLoading();
+				}
+			},
+			getBooking(opt) {
+				const confNo =
+					opt.confNo != null && opt.confNo !== '' && opt.confNo !== 'null'
+						? opt.confNo
+						: opt.conf;
+				if (
+					confNo != null &&
+					confNo !== undefined &&
+					confNo !== '' &&
+					confNo !== 'null'
+				) {
+					this.getDataByConfNo(confNo);
+					return;
+				}
+				if (
+					opt.id != null &&
+					opt.id !== undefined &&
+					opt.id !== '' &&
+					opt.id !== 'null'
+				) {
+					this.getLimoBookingById(opt.id);
+				}
+			},
+			formatTripPrice(value) {
+				if (value === null || value === undefined || value === '') return '-';
+				const text = String(value).replace(/,/g, '');
+				const parts = text.split('.');
+				parts[0] = parts[0].replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+				return parts.join('.');
+			},
+			formatCarTypeAndCarNo(limoBooking) {
+				const carType = limoBooking.carType !== null ? limoBooking.carType : 'N/A';
+				const carNo = this.getCarNo(limoBooking.carNo);
+				console.log(limoBooking);
+				return ""+carType + "\n (" + carNo+")";
+			},
+			GetDriverContact(limoBooking) {
+				const driverContact = limoBooking && limoBooking.driverContact != null
+					? String(limoBooking.driverContact).trim()
+					: '';
+				if (!driverContact) {
+					return 'N/A';
+				}
+				const phoneNumbers = driverContact
+					.split(/[,，]/)
+					.map((phoneNumber) => phoneNumber.trim())
+					.filter(Boolean);
+				if (phoneNumbers.length <= 1) {
+					return phoneNumbers[0] || 'N/A';
+				}
+				return phoneNumbers
+					.map((phoneNumber, index) => `Phone No${index + 1}:${phoneNumber}`)
+					.join('\n');
+			},
+			copyDriverInfo(limoBooking){
+				const carType = limoBooking.carType !== null ? limoBooking.carType : 'N/A';
+				const carNo = this.getCarNo(limoBooking.carNo);
+				const driverContact = limoBooking.driverContact != null && limoBooking.driverContact != undefined && limoBooking.driverContact != "" ? limoBooking.driverContact : 'N/A';
+				const locale = this.$i18n && this.$i18n.locale ? this.$i18n.locale : uni.getLocale();
+				const isEnglish = String(locale || '').toLowerCase().startsWith('en');
+				const data = isEnglish
+					? `The details of your reserved limousine service are as follows:\nVehicle Type: ${carType}\nLicense Plate: ${carNo}\nDriver Phone: ${driverContact}`
+					: `阁下预订的贵宾车资料如下：\n車型：${carType}\n車牌號碼：${carNo}\n司機電話：${driverContact}`;
+				uni.setClipboardData({
+					data: data,
+					success: function () {
+					//调用方法成功
+					console.log('success');
+				}
+				})
+			}
+		},
+		computed:{
+			getConfirmationNo(){
+				return function (booking) {
+					if(booking!==undefined && booking!==null){
+						if(booking.confirmationNo!==undefined  && booking.confirmationNo!==null && 
+							booking.confirmationNo!=='null' && booking.confirmationNo!=='' && booking.approveStatus!='W'){
+							return booking.confirmationNo;
+						}
+					}
+					return 'N/A';
+				}
+			},
+			getStatusText(){
+				return function (booking) {
+					console.log(booking);
+					if(booking!==undefined && booking!==null){
+						if(booking.status !==undefined && booking.status!==null) return booking.status.replace("_"," ");
+					}
+				}
+			},
+
+			
+		}
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.limo-info-card {
+		position: relative;
+		padding-right: 54px;
+	}
+	.limo-info-grid {
+		display: grid;
+		grid-template-columns: minmax(0, 1.45fr) minmax(0, 0.9fr);
+		column-gap: 18px;
+		row-gap: 12px;
+	}
+	.limo-info-item {
+		display: flex;
+		align-items: center;
+		min-width: 0;
+		white-space: nowrap;
+	}
+	.limo-info-icon {
+		width: 18px;
+		height: 18px;
+		margin-right: 8px;
+		flex: 0 0 18px;
+	}
+	.limo-edit-button {
+		position: absolute;
+		top: 28px;
+		right: 24px;
+		width: 30px;
+		height: 30px;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+	}
+	.limo-edit-icon {
+		width: 20px;
+		height: 20px;
+	}
+	.booking-popup-card {
+		padding: 20px;
+		background-color: #ffffff;
+		border-radius: 16px;
+	}
+	.booking-popup-icon-row {
+		display: flex;
+		justify-content: center;
+	}
+	.booking-popup-title {
+		margin-top: 20px;
+	}
+	.booking-popup-title--success {
+		line-height: 1.4;
+	}
+	.booking-popup-button {
+		margin-top: 40px;
+	}
+	.booking-popup-button--primary {
+		background-color: #C39A4B;
+	}
+	.booking-popup-button--success {
+		width: 100%;  
+	}
+</style>
diff --git a/limo/newLimo/newLimo.vue b/limo/newLimo/newLimo.vue
new file mode 100644
index 0000000..3531dde
--- /dev/null
+++ b/limo/newLimo/newLimo.vue
@@ -0,0 +1,3112 @@
+<template>
+	<view>
+		<view class="hz-page limo-page-with-tabbar">
+			<u-navbar :safeAreaInsetTop="true" :placeholder="true" :title="title" :fixed="true" :autoBack="true"
+				leftIconColor="#000000" titleStyle="font-weight:bold;">
+				<view style="margin-top:2px;margin-right:3px;" slot="right">
+					<view style="border:1rpx solid #ccc;border-radius: 14px;padding:4px 12px;"
+						class="hz-flex-row hz-flex-vertical-mid">
+						<image @click="navTo('/pages/findPlayer/findPlayer',1,false)"
+							src="../../static/images/ico_find_player.png" class="hz-nav-btn"></image>
+						<view style="height:20px;border-left:1px solid #ccc;margin-left:8px;margin-right:8px;"></view>
+						<image @click="navTo('/booking/bookingRecord/bookingRecord?from=booking',0,false)"
+							src="../../static/images/ico_list.png" class="hz-nav-btn"></image>
+					</view>
+				</view>
+			</u-navbar>
+			<view class="hz-spacing hz-bg-white limo-content-bottom-pad" style="margin-top:8px;">
+				<view class="hz-card-profile hz-mr-b-30">
+					<view class="hz-flex-row">
+						<view style="width:60%">
+							<view class="hz-font-color-light hz-font-sm">{{$t("common.playerId")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{ playerData.playerId }}</view>
+						</view>
+						<view style="width:40%">
+							<view class="hz-font-color-light hz-font-sm">{{$t("common.tier")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{ playerData.tierName }}</view>
+						</view>
+					</view>
+					<view class="hz-flex-row hz-mr-t-30">
+						<view style="width:100%">
+							<view class="hz-font-color-light hz-font-sm">{{$t("common.name")}}</view>
+							<view class="hz-font-bolder hz-font-lg">{{playerData.salutation + " " + playerData.name }}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- Booking Information -->
+				<view class="limo-section">
+					<view class="hz-font-lg hz-font-bold">{{$t("newLimo.sectionBookingInformation")}}</view>
+					<view class="hz-split"></view>
+					<view class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("common.bookingType")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap">
+								<lu-data-select
+									height="36px"
+									placeholder=""
+									:options="bookingTypeOptions"
+									v-model="bookingType"
+									:multiple="false"
+									:filterable="true"
+									:clearable="false"
+									:disabled="isEditMode"
+									@change="onBookingTypeChange"
+								></lu-data-select>
+							</view>
+						</view>
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.serviceType")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap">
+								<lu-data-select
+									height="36px"
+									placeholder=""
+									:options="serviceTypeOptions"
+									v-model="serviceType"
+									:multiple="false"
+									:filterable="true"
+									:clearable="false"
+									:disabled="isEditMode"
+									@change="onServiceTypeChange"
+								></lu-data-select>
+							</view>
+						</view>
+					</view>
+					<view class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.pickUpDate")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap" @click="showDatePicker = true">
+								<view class="hz-flex-row hz-flex-vertical-mid limo-tap-field">
+									<text class="hz-font-m" :style="{flex: 1, color: pickUpDate ? '#333' : '#999'}">{{ pickUpDate || $t("newLimo.selectDate") }}</text>
+									<u-icon name="calendar" size="20" color="#999"></u-icon>
+								</view>
+							</view>
+						</view>
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.pickUpTime")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap" @click="showTimePicker = true">
+								<view class="hz-flex-row hz-flex-vertical-mid limo-tap-field">
+									<text class="hz-font-m" :style="{flex: 1, color: pickUpTime ? '#333' : '#999'}">{{ pickUpTime || $t("newLimo.selectTime") }}</text>
+									<u-icon name="clock" size="16" color="#999"></u-icon>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- Booking Itinerary -->
+				<view class="limo-section">
+					<view class="hz-font-lg hz-font-bold">{{$t("newLimo.sectionBookingItinerary")}}</view>
+					<view class="hz-split"></view>
+					<view class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.carType")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap">
+								<lu-data-select
+									height="36px"
+									placeholder=""
+									:options="carTypeOptions"
+									v-model="carType"
+									:multiple="false"
+									:filterable="true"
+									:clearable="false"
+									:disabled="isEditMode"
+								></lu-data-select>
+							</view>
+						</view>
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.noOfPax")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap">
+								<input
+									v-model="numberOfPax"
+									class="limo-text-input"
+									:class="{ 'limo-text-input--disabled': isEditMode }"
+									type="digit"
+									:disabled="isEditMode"
+								/>
+							</view>
+						</view>
+					</view>
+					<view class="limo-form-col-full">
+						<view class="limo-field-label">{{$t("newLimo.pickUpLocation")}}<span class="mandatory">*</span></view>
+						<view class="limo-control-wrap">
+							<lu-data-select
+								class="limo-location-select"
+								height="36px"
+								placeholder=""
+								:options="pickUpPointOptions"
+								v-model="pickUpPoint"
+								:multiple="false"
+								:filterable="true"
+								:clearable="false"
+								@change="onPickUpPointChange"
+							></lu-data-select>
+						</view>
+					</view>
+					<view v-if="shouldShowOtherPickUpPoint" class="limo-form-col-full">
+						<view class="limo-field-label">Other Pick Up Location</view>
+						<view class="limo-control-wrap">
+							<input v-model="otherPickUpPoint" class="limo-text-input" type="text" />
+						</view>
+					</view>
+					<view v-if="isAirportPickup" class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.flightDetail")}}</view>
+							<view class="limo-control-wrap">
+								<input
+									v-model="flightDetail"
+									class="limo-text-input"
+									type="text"
+									:disabled="isEditMode"
+									@input="onFlightDetailInput"
+								/>
+							</view>
+						</view>
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.eta")}}</view>
+							<view class="limo-control-wrap">
+								<input v-model="eta" class="limo-text-input" type="text" :disabled="isEditMode" />
+							</view>
+						</view>
+					</view>
+					<view v-if="isAirportPickup" class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.flightStatus")}}</view>
+							<view class="limo-control-wrap">
+								<input v-model="flightStatus" class="limo-text-input" type="text" :disabled="isEditMode" />
+							</view>
+						</view>
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.greetType")}}</view>
+							<view class="limo-control-wrap">
+									<lu-data-select
+										class="limo-greet-select"
+										height="36px"
+										placeholder="Select Greet Type"
+										:options="greetTypeOptions"
+										v-model="greetType"
+										:multiple="true"
+									:filterable="true"
+									:clearable="false"
+									:disabled="isEditMode"
+								></lu-data-select>
+							</view>
+						</view>
+					</view>
+					<view v-if="!isAirportPickup && shouldShowGreetLocationFields" class="limo-form-col-full">
+						<view class="limo-field-label">{{$t("newLimo.greetType")}}</view>
+						<view class="limo-control-wrap">
+							<lu-data-select
+								class="limo-greet-select"
+								height="36px"
+								placeholder=""
+								:options="greetTypeOptions"
+								v-model="greetType"
+								:multiple="true"
+								:filterable="true"
+								:clearable="false"
+								:disabled="isEditMode"
+							></lu-data-select>
+						</view>
+					</view>
+					<view v-if="shouldShowGreetLocationFields" class="limo-form-col-full">
+						<view class="limo-field-label">{{$t("newLimo.signage")}}</view>
+						<view class="limo-control-wrap">
+							<input v-model="signage" class="limo-text-input" type="text" :disabled="isEditMode" />
+						</view>
+					</view>
+					<view v-for="(leg, index) in extraDropOffPoints" :key="'extra-drop-'+index" class="limo-form-col-full limo-dropoff-block">
+						<view class="limo-label-row">
+							<view class="limo-field-label">{{$t("newLimo.extraDropOffLocation")}}({{index + 1}})</view>
+							<text
+								class="hz-font-sm hz-font-color-danger"
+								@click.stop="onRemoveDropOffStop(index)"
+							>{{$t("newLimo.removeStop")}}</text>
+						</view>
+						<view class="limo-control-wrap">
+							<lu-data-select
+								class="limo-location-select"
+								height="36px"
+								placeholder=""
+								:options="dropOffPointOptions"
+								v-model="extraDropOffPoints[index]"
+								:multiple="false"
+								:filterable="true"
+								:clearable="false"
+								@change="onExtraDropOffPointChange"
+							></lu-data-select>
+						</view>
+						<view v-if="shouldShowOtherExtraDropOffPoint(index)" class="limo-other-dropoff-field">
+							<view class="limo-field-label">{{$t("newLimo.extraDropOffLocation")}}</view>
+							<view class="limo-control-wrap">
+								<input v-model="otherExtraDropOffPoints[index]" class="limo-text-input" type="text" />
+							</view>
+						</view>
+					</view>
+					<view class="limo-form-col-full limo-dropoff-block">
+						<view class="limo-label-row">
+							<view class="limo-field-label">{{$t("newLimo.dropOffLocation")}}<span class="mandatory">*</span></view>
+							<text
+								class="hz-font-sm hz-font-color-primary"
+								@click.stop="onAddDropOffStop"
+							>{{$t("newLimo.addStop")}}</text>
+						</view>
+						<view class="limo-control-wrap">
+							<lu-data-select
+								class="limo-location-select"
+								height="36px"
+								placeholder=""
+								:options="dropOffPointOptions"
+								v-model="dropOffPoint"
+								:multiple="false"
+								:filterable="true"
+								:clearable="false"
+								@change="onDropOffPointChange"
+							></lu-data-select>
+						</view>
+						<view v-if="shouldShowOtherDropOffPoint" class="limo-other-dropoff-field">
+							<view class="limo-field-label">Other Drop Off Location</view>
+							<view class="limo-control-wrap">
+								<input v-model="otherDropOffPoint" class="limo-text-input" type="text" />
+							</view>
+						</view>
+					</view>
+					
+					<view class="limo-form-col-full limo-dropoff-block">
+						<view class="limo-field-label">{{$t("newLimo.bookingContact")}}</view>
+						<view
+							v-for="(contact, index) in visibleBookingContacts"
+							:key="'booking-contact-'+index"
+							class="limo-booking-contact-row"
+						>
+							<view class="limo-booking-contact-label">Booking Contact #{{index + 1}}</view>
+							<view class="limo-booking-contact-controls">
+								<lu-data-select
+									class="limo-booking-contact-code-picker"
+									:class="{ 'limo-booking-contact-disabled': isEditMode }"
+									height="36px"
+									border="1px solid #e5e5e5"
+									placeholder=""
+									:options="countryCodeOptions"
+									v-model="bookingContacts[index].countryCode"
+									:multiple="false"
+									:filterable="true"
+									:clearable="false"
+									:disabled="isEditMode"
+									@change="onContactCountryCodeChange('booking', index, $event)"
+								></lu-data-select>
+								<input
+									class="limo-text-input limo-booking-contact-phone"
+									:class="{ 'limo-text-input--disabled': isEditMode }"
+									type="number"
+									:value="contact.phoneNumber"
+									:disabled="isEditMode"
+									:placeholder="$t('newLimo.phoneNumber')"
+									@input="onContactPhoneInput('booking', index, $event)"
+								/>
+								<view
+									class="limo-booking-contact-btn"
+									:class="{ 'limo-booking-contact-disabled': isEditMode }"
+									@click.stop="index === 0 ? onAddContact('booking') : onRemoveContact('booking', index)"
+								>
+									{{ index === 0 ? '+' : '-' }}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- Additional Options -->
+				<view class="limo-section">
+					<view class="hz-font-lg hz-font-bold">{{$t("newLimo.additionalOptions")}}</view>
+					<view class="hz-split"></view>
+					<view class="limo-additional-options">
+						<block v-for="option in additionalOptionItems" :key="option.name">
+							<u-checkbox-group
+								:value="option.checked === 1 ? [option.name] : []"
+								placement="row"
+								@change="onAdditionalOptionChange(option.flagKey, option.name, $event)"
+							>
+								<u-checkbox
+									activeColor="#C39A4B"
+									labelColor="#333333"
+									shape="circle"
+									customStyle="width:100%;"
+									:disabled="isEditMode"
+									:label="$t(option.labelKey)"
+									:name="option.name"
+								></u-checkbox>
+							</u-checkbox-group>
+							<block v-if="option.contactType && option.checked === 1">
+								<view
+									v-for="(contact, index) in getVisibleContactList(option.contactType)"
+									:key="option.contactType + '-contact-' + index"
+									class="limo-booking-contact-row"
+								>
+									<view class="limo-booking-contact-label">{{$t(option.contactLabelKey)}}<span class="mandatory">*</span></view>
+									<view class="limo-booking-contact-controls">
+										<lu-data-select
+											class="limo-booking-contact-code-picker"
+											:class="{ 'limo-booking-contact-disabled': isEditMode }"
+											height="36px"
+											border="1px solid #e5e5e5"
+											placeholder=""
+											:options="countryCodeOptions"
+											:value="contact.countryCode"
+											:multiple="false"
+											:filterable="true"
+											:clearable="false"
+											:disabled="isEditMode"
+											@change="onContactCountryCodeChange(option.contactType, index, $event)"
+										></lu-data-select>
+										<input
+											class="limo-text-input limo-booking-contact-phone"
+											:class="{ 'limo-text-input--disabled': isEditMode }"
+											type="number"
+											:value="contact.phoneNumber"
+											:disabled="isEditMode"
+											:placeholder="$t('newLimo.phoneNumber')"
+											@input="onContactPhoneInput(option.contactType, index, $event)"
+										/>
+										<!-- <view
+											v-if="option."
+											class="limo-booking-contact-btn"
+											:class="{ 'limo-booking-contact-disabled': isEditMode }"
+											@click.stop="index === 0 ? onAddContact(option.contactType) : onRemoveContact(option.contactType, index)"
+										>
+											{{ index === 0 ? '+' : '-' }}
+										</view> -->
+									</view>
+								</view>
+							</block>
+						</block>
+					</view>
+				</view>
+
+				<!-- Approval Details -->
+				<view class="limo-section">
+					<view class="hz-font-lg hz-font-bold">{{$t("newLimo.sectionApprovalDetails")}}</view>
+					<view class="hz-split"></view>
+					<view class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.approvedBy")}}</view>
+							<view class="limo-control-wrap">
+								<view
+									v-if="isEditMode"
+									class="limo-text-input limo-text-input--disabled limo-readonly-field"
+								>{{ approvedBy }}</view>
+								<lu-data-select
+									v-else
+									height="36px"
+									placeholder=""
+									:options="approverOptions"
+									v-model="approvedBy"
+									:multiple="false"
+									:filterable="true"
+									:clearable="false"
+									@change="onApprovedByChange"
+								></lu-data-select>
+							</view>
+						</view>
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.paymentMethod")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap">
+								<lu-data-select
+									height="36px"
+									placeholder=""
+									:options="paymentMethodOptionList"
+									v-model="paymentMethod"
+									:multiple="false"
+									:filterable="true"
+									:clearable="false"
+									:allowCustomValue="true"
+									changeType="objectValue"
+									:disabled="isEditMode"
+								></lu-data-select>
+							</view>
+						</view>
+					</view>
+					<view class="limo-form-row">
+						<view class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.tripContact")}}</view>
+							<view class="limo-control-wrap">
+								<input
+									v-model="tripContact"
+									class="limo-text-input"
+									:class="{ 'limo-text-input--disabled': isEditMode }"
+									type="digit"
+									:disabled="isEditMode"
+								/>
+							</view>
+						</view>
+						<view v-if="isOnHireServiceType" class="limo-form-cell">
+							<view class="limo-field-label">{{$t("newLimo.hour")}}<span class="mandatory">*</span></view>
+							<view class="limo-control-wrap">
+								<input v-model="hour" class="limo-text-input" type="digit" :disabled="isEditMode" />
+							</view>
+						</view>
+					</view>
+					<view class="limo-form-col-full">
+						<view class="limo-field-label">{{$t("newLimo.remarks")}}</view>
+						<view class="limo-remark-wrap">
+							<u--textarea v-model="remarks" :maxlength="500" :placeholder="$t('newLimo.remarksPlaceholder')" :count="false" autoHeight></u--textarea>
+						</view>
+					</view>
+				</view>
+
+			</view>
+
+			<u-calendar
+				:show="showDatePicker"
+				:showTitle="false"
+				mode="single"
+				color="#C39A4B"
+				@confirm="onDateConfirm"
+				@close="showDatePicker = false"
+				confirm-text="CONFIRM"
+				text
+				placeholder=""
+			></u-calendar>
+			<u-datetime-picker
+				:show="showTimePicker"
+				v-model="pickUpTimeValue"
+				mode="time"
+				:confirmColor="'#C39A4B'"
+				:cancelColor="'#999999'"
+				:cancelText="'Cancel'"
+				:confirmText="'Confirm'"
+				@confirm="onTimeConfirm"
+				@cancel="showTimePicker = false"
+				@close="showTimePicker = false"
+				placeholder=""
+			></u-datetime-picker>
+
+			<u-tabbar
+				:fixed="true"
+				:placeholder="true"
+				:safeAreaInsetBottom="true"
+				customStyle="z-index:100;height:58px;"
+			>
+				<view @click="saveLimo()" class="book hz-flex-row hz-spacing"
+					:style="submitting ? 'opacity:0.55;pointer-events:none;' : ''">
+					<view class="hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center">
+						{{ submitting ? 'Submitting…' : $t("common.confirm") }}
+					</view>
+				</view>
+			</u-tabbar>
+
+			<u-popup :safeAreaInsetBottom="true" :safeAreaInsetTop="true" :mode="'center'" :round="12"
+				:show="showCriteriaNotQualifiedPopup">
+				<view class="booking-popup-card booking-popup-card--criteria"
+					:style="'width:' + windowWidth + 'px;'">
+					<view class="booking-popup-icon-row">
+						<image src="../../static/images/ico_err.png" style="width:64px;height:64px;"></image>
+					</view>
+					<view class="booking-popup-title booking-popup-title--criteria hz-font-md hz-font-bold hz-text-center">
+						Booking Criteria is not qualified
+					</view>
+					<view class="booking-popup-note booking-popup-note--criteria hz-text-center">
+						<view class="booking-popup-note-text">Player does not met criteria for</view>
+						<view class="booking-popup-note-text">trip "{{ currentBookingTypeLabel }}"</view>
+						<view class="booking-popup-note-text">Please obtain approval from</view>
+						<view class="booking-popup-note-text">your manager</view>
+					</view>
+					<view class="booking-popup-override booking-popup-override--criteria hz-text-center">
+						<view class="booking-popup-field-label hz-font-bold" style="margin-bottom: 8px;">Input Override Name or Employee ID</view>
+						<lu-data-select
+							class="booking-popup-override-select"
+							height="36px"
+							v-model="overrideName"
+							:options="overrideOptions"
+							placeholder="Select name or ID"
+							:filterable="true"
+							:clearable="false"
+							:allowCustomValue="true"
+							labelKey="label"
+							valueKey="value"
+							@inputChange="onOverrideInputChange"
+							@change="onOverrideChange"
+						></lu-data-select>
+					</view>
+					<view
+						@click="!submitting && confirmOverride()"
+						class="booking-popup-button booking-popup-button--primary booking-popup-button--criteria hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center"
+					>
+						{{ submitting ? 'Submitting…' : 'CONFIRM OVERRIDE' }}
+					</view>
+					<view
+						@click="closeCriteriaNotQualifiedPopup"
+						class="booking-popup-button booking-popup-button--secondary booking-popup-button--criteria hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center"
+					>
+						CANCEL
+					</view>
+				</view>
+			</u-popup>
+
+			<u-popup :safeAreaInsetBottom="true" :safeAreaInsetTop="true" :mode="'center'" :round="12"
+				:show="showBookingCreatedPopup">
+				<view class="booking-popup-card booking-popup-card--criteria"
+					:style="'width:' + windowWidth + 'px;'">
+					<view class="booking-popup-icon-row">
+						<image src="../../static/images/warn.png" style="width:64px;height:64px;"></image>
+					</view>
+					<view class="booking-popup-title booking-popup-title--criteria hz-font-md hz-font-bold hz-text-center">
+						Booking Created
+					</view>
+					<view class="booking-popup-note booking-popup-note--criteria hz-text-center">
+						<view v-if="bookingSubmitServerMessage" class="booking-popup-note-text hz-font-bold">
+							{{ bookingSubmitServerMessage }}
+						</view>
+						<view class="booking-popup-note-text">Your booking is created.</view>
+						<view class="booking-popup-note-text">Transportation will confirm the</view>
+						<view class="booking-popup-note-text">booking shortly.</view>
+					</view>
+					<view
+						@click="closeBookingCreatedPopup"
+						class="booking-popup-button booking-popup-button--primary booking-popup-button--criteria hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center"
+					>
+						OK
+					</view>
+				</view>
+			</u-popup>
+			<u-popup :safeAreaInsetBottom="true" :safeAreaInsetTop="true" :mode="'center'" :round="12"
+				:show="showBookingCreatedNoConfirmPopup">
+				<view class="booking-popup-card booking-popup-card--criteria"
+					:style="'width:' + windowWidth + 'px;'">
+					<view class="booking-popup-icon-row">
+						<image src="../../static/images/ico_suc.png" style="width:64px;height:64px;"></image>
+					</view>
+					<view class="booking-popup-title booking-popup-title--criteria hz-font-md hz-font-bold hz-text-center">
+						Booking Confirmed
+					</view>
+					<view
+						@click="closeBookingCreatedPopup"
+						class="booking-popup-button booking-popup-button--primary booking-popup-button--criteria hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center"
+					>
+						OK
+					</view>
+				</view>
+			</u-popup>
+			<u-popup :show="showEditBookingSuccessPopup" mode="center" round="16px" :closeable="false" @close="closeEditBookingSuccessPopup">
+				<view class="booking-popup-card booking-popup-card--success"
+					:style="'width:' + windowWidth + 'px;'">
+					<view class="booking-popup-icon-row">
+						<image src="../../static/images/ico_suc.png" style="width:64px;height:64px;"></image>
+					</view>
+					<view class="booking-popup-title booking-popup-title--success hz-font-md hz-font-bold hz-text-center">
+						Edit Booking Successfully
+					</view>
+					<view @click="closeEditBookingSuccessPopup" class="booking-popup-button booking-popup-button--primary booking-popup-button--success hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center">
+						OK
+					</view>
+				</view>
+			</u-popup>
+			<u-modal :content="msgStr" :show="showMsg" :confirmText="yesText" :showCancelButton="false" closeOnClickOverlay @confirm="showMsg=false" confirmColor="#C39A4B" @close="showMsg=false"></u-modal>
+		</view>
+	</view>
+</template>
+
+<script>
+import {
+	createLimoBooking,
+	prepareBooking,
+	getLimoCarType,
+	getLimoGreetType,
+	getLimoLocation,
+	editLimoBooking,
+	getQualification,
+	getLimoOverrider,
+	getLimoApprover,
+	getLimoFlightDetails
+} from '../../api/limoApi';
+import { getCountryDialCodeOptions } from '../../common/countryDialCodes.js';
+
+const DEFAULT_COUNTRY_CODE = '+853';
+const FREE_OF_CHARGE_OPTION = {
+	value: 'Free of Charge',
+	label: 'Free of Charge'
+};
+const CONTACT_CONFIG = {
+	booking: {
+		listKey: 'bookingContacts',
+		visibleCountKey: 'visibleBookingContactCount',
+		maxCount: 3
+	},
+	tenOut: {
+		listKey: 'tenOutContacts',
+		visibleCountKey: 'visibleTenOutContactCount',
+		maxCount: 1
+	},
+	guest: {
+		listKey: 'guestContacts',
+		visibleCountKey: 'visibleGuestContactCount',
+		maxCount: 1
+	}
+};
+const BOOKING_TYPE_API_BY_CODE = {
+	'0': 'Local',
+	'1': 'Hong Kong',
+	'2': 'China',
+	'3': 'Bus',
+	'4': 'Independent VIP M&G'
+};
+const BOOKING_TYPE_ALIASES = {
+	local: 'Local',
+	'local booking': 'Local',
+	'local limo': 'Local',
+	hk: 'Hong Kong',
+	'hong kong': 'Hong Kong',
+	'hong kong booking': 'Hong Kong',
+	'hong kong limo': 'Hong Kong',
+	china: 'China',
+	'china booking': 'China',
+	'china limo': 'China',
+	bus: 'Bus',
+	'bus booking': 'Bus',
+	'independent vip m&g': 'Independent VIP M&G',
+	'independent vip m&g booking': 'Independent VIP M&G'
+};
+const QUALIFICATION_BOOKING_TYPE_BY_CODE = {
+	...BOOKING_TYPE_API_BY_CODE,
+	'0': 'Local Limo',
+	'1': 'Hong Kong Limo',
+	'2': 'China Limo',
+	'3': 'Bus Limo'
+};
+const BOOKING_TYPE_FIELDS = [
+	'bookingType',
+	'bookingTypes',
+	'bookingTypeId',
+	'bookingTypeIds',
+	'bookingTypeCodes',
+	'bookingTypeCode',
+	'supportedBookingTypes',
+	'limoBookingType',
+	'BookingType',
+	'BookingTypes',
+	'BookingTypeId',
+	'BookingTypeIds'
+];
+
+const isBlank = (value) => value == null || String(value).trim() === '';
+const toStringOrEmpty = (value) => (value == null ? '' : String(value));
+const toTrimmedString = (value) => (isBlank(value) ? '' : String(value).trim());
+const formatEmployeeNameAndId = (name, id) => {
+	const employeeName = toTrimmedString(name);
+	const employeeId = toTrimmedString(id);
+	if (!employeeName) return employeeId;
+	if (
+		!employeeId ||
+		employeeName === employeeId ||
+		employeeName.endsWith(`(${employeeId})`)
+	) return employeeName;
+	return `${employeeName}(${employeeId})`;
+};
+const createEmptyContact = () => ({
+	countryCode: DEFAULT_COUNTRY_CODE,
+	phoneNumber: ''
+});
+const getFirstText = (data, keys) => {
+	for (const key of keys) {
+		if (data && !isBlank(data[key])) {
+			return toTrimmedString(data[key]);
+		}
+	}
+	return '';
+};
+const getResponseRecords = (response) => {
+	if (!response || response.success === false) {
+		return [];
+	}
+	if (Array.isArray(response)) {
+		return response;
+	}
+	if (Array.isArray(response.Records)) {
+		return response.Records;
+	}
+	if (Array.isArray(response.records)) {
+		return response.records;
+	}
+	return response.data && typeof response.data === 'object'
+		? getResponseRecords(response.data)
+		: [];
+};
+const isResponseStatusOk = (response) => {
+	const statusCode = response && response.StatusCode != null
+		? response.StatusCode
+		: response && response.statusCode;
+	return statusCode == null || String(statusCode).toUpperCase() === 'OK';
+};
+
+	export default {
+		data() {
+			return {
+				title: "",
+				showMsg: false,
+				msgStr: '',
+				yesText: this.$t("common.ok"),
+				playerData:'',
+				userData: null,
+				deviceData: null,
+				showDatePicker: false,
+				pickUpDate: '',
+				showTimePicker: false,
+				pickUpTime: '',
+				showCriteriaNotQualifiedPopup: false,
+				showBookingCreatedNoConfirmPopup:false,
+				windowWidth: 0,
+				overrideName: '',
+				overrideInputText: '',
+				overrideOptions: [],
+				pickUpTimeValue: "",
+				hour:"",
+				priceTypeArr: [],
+				showEditBookingSuccessPopup: false,
+				showBookingCreatedPopup: false,
+				editId: null,
+				confirmationNo: '',
+				bookingStatus: '',
+				createdAt: '',
+				createdBy: '',
+				overrideBy: '',
+				submitting: false,
+				bookingSubmitServerMessage: '',
+				submitLoading: false,
+				mode: 'create',
+				serviceType: '',
+				serviceTypeOptions: [
+					{ value: '0', label: 'Single Trip' },
+					{ value: '1', label: 'On Hire' }
+				],
+				approvedBy: '',
+				approverOptions: [],
+				editApproverIdSnapshot: '',
+				editApproverTextSnapshot: '',
+				paymentMethod: '',
+				paymentMethodOptionList: [],
+				hourlyRate: '',
+				hourlyRateOptions: [
+					{ value: '1_hour', label: '1 hour' },
+					{ value: '2_hours', label: '2 hours' },
+					{ value: '3_hours', label: '3 hours' }
+				],
+				tripPrice: '',
+				tripContact: '',
+				bookingContacts: [createEmptyContact(), createEmptyContact(), createEmptyContact()],
+				visibleBookingContactCount: 1,
+				isHighImportance: 0,
+				isTenOut: 0,
+				isContactGuestDirectly: 0,
+				tenOutContacts: [createEmptyContact(), createEmptyContact()],
+				guestContacts: [createEmptyContact(), createEmptyContact()],
+				visibleTenOutContactCount: 1,
+				visibleGuestContactCount: 1,
+				countryCodeOptions: getCountryDialCodeOptions(),
+				remarks: '',
+				greetType: [],
+				greetTypeItemsAll: [],
+				flightDetail: '',
+				flightDetailDebounceTimer: null,
+				eta: '',
+				flightStatus: '',
+				signage: '',
+				numberOfPax: '2',
+				bookingType: '',
+				bookingTypeOptions: [
+					{ value: '0', label: 'Local Booking' },
+					{ value: '1', label: 'Hong Kong Booking' },
+					{ value: '2', label: 'China Booking' }
+				],
+				carType: '',
+				carTypeOptionsAll: [],
+				pickUpPoint: '',
+				pickupPointId: '',
+				pickUpPointOptions: [],
+				otherPickUpPoint: '',
+				dropOffPoint: '',
+				dropOffPointId: '',
+				otherDropOffPoint: '',
+				extraDropOffPoints: [],
+				otherExtraDropOffPoints: [],
+				extraOffPoint: '',
+				extraOffPointId: '',
+				dropOffPointOptions: [],
+			}
+		},
+		computed: {
+			isEditMode() {
+				return this.mode === 'edit';
+			},
+			visibleBookingContacts() {
+				return this.getVisibleContactList('booking');
+			},
+			additionalOptionItems() {
+				return [
+					{
+						flagKey: 'isHighImportance',
+						name: 'highImportance',
+						labelKey: 'newLimo.highImportance',
+						checked: this.isHighImportance
+					},
+					{
+						flagKey: 'isTenOut',
+						name: 'tenOut',
+						labelKey: 'newLimo.tenOut',
+						checked: this.isTenOut,
+						contactType: 'tenOut',
+						contactLabelKey: 'newLimo.tenOutContact'
+					},
+					{
+						flagKey: 'isContactGuestDirectly',
+						name: 'contactGuestDirectly',
+						labelKey: 'newLimo.contactGuestDirectly',
+						checked: this.isContactGuestDirectly,
+						contactType: 'guest',
+						contactLabelKey: 'newLimo.guestContact'
+					}
+				];
+			},
+			isAirportPickup() {
+				const opt = this.selectedPickUpLocationOption;
+				return Boolean(opt && !isBlank(opt.airportCode) && Number(opt.airportCode) !== 0);
+			},
+			isHourlyRateSelected() {
+				return this.isOnHireServiceType || (Array.isArray(this.priceTypeArr) && this.priceTypeArr.includes('hour_rate'));
+			},
+			isOnHireServiceType() {
+				return this.getSelectValue(this.serviceType) === '1';
+			},
+			selectedPickUpLocationOption() {
+				const code = this.getSelectValue(this.pickUpPoint);
+				return (
+					(this.pickUpPointOptions || []).find((x) => String(x.value) === String(code)) || null
+				);
+			},
+			selectedPickUpTripPriceId() {
+				const opt = this.selectedPickUpLocationOption;
+				return opt ? this.parseNumber(opt.tripPriceId) : null;
+			},
+			shouldShowOtherPickUpPoint() {
+				return this.isOtherLocationSelection(this.pickUpPoint, this.pickUpPointOptions);
+			},
+			shouldShowOtherDropOffPoint() {
+				return this.isOtherLocationSelection(this.dropOffPoint, this.dropOffPointOptions);
+			},
+			pickUpPointRegionRaw() {
+				const opt = this.selectedPickUpLocationOption;
+				return opt ? toTrimmedString(opt.region) : '';
+			},
+			dropoffRegionRaw() {
+				const opt = this.getLocationOptionFromSelection(
+					this.dropOffPoint,
+					this.dropOffPointOptions
+				);
+				return opt ? toTrimmedString(opt.region) : '';
+			},
+			carTypeId() {
+				const raw = this.getSelectValue(this.carType);
+				if (raw === '' || raw == null) {
+					return 0;
+				}
+				const n = Number(raw);
+				return Number.isFinite(n) ? n : 0;
+			},
+			greetTypeId() {
+				if (!this.shouldShowGreetLocationFields) {
+					return '';
+				}
+				return this.getMultiSelectValues(this.greetType).join(',');
+			},
+			shouldShowGreetLocationFields() {
+				const opt = this.selectedPickUpLocationOption;
+				return Boolean(opt && toTrimmedString(opt.greetLocation) === '1');
+			},
+			ranking() {
+				const p = this.playerData;
+				if (!p) return '';
+				return String(p.tierName || p.tier || p.ranking || '').trim();
+			},
+			salutation() {
+				const p = this.playerData;
+				if (!p) return '';
+				return String(p.salutation || p.salution || '').trim();
+			},
+			lastName() {
+				const p = this.playerData;
+				if (!p) return '';
+				const fullName = String(p.name || '').trim();
+				if (!fullName) return '';
+				const parts = fullName.split(/\s+/);
+				return parts.length > 1 ? parts[parts.length - 1] : fullName;
+			},
+			employeeId() {
+				const u = this.userData;
+				if (!u) return '';
+				return String(u.userId || u.employeeId || '').trim();
+			},
+			shouldShowTripPriceField() {
+				if (this.isHourlyRateSelected) {
+					return false;
+				}
+				if (!/^other$/i.test(this.pickUpPointRegionRaw)) {
+					return false;
+				}
+				const opt = this.selectedPickUpLocationOption;
+				if (
+					opt &&
+					opt.freeOfCharge != null &&
+					!(Number.isNaN(Number(opt.freeOfCharge))) &&
+					Number(opt.freeOfCharge) === 1
+				) {
+					return false;
+				}
+				return true;
+			},
+			carTypeOptions() {
+				const bt = String(this.bookingType ?? '').trim();
+				const all = this.carTypeOptionsAll || [];
+				if (!bt) {
+					return all;
+				}
+				return all.filter((opt) => this.carTypeOptionMatchesBookingType(opt, bt));
+			},
+			greetTypeOptions() {
+				if (!Array.isArray(this.greetTypeItemsAll)) {
+					return [];
+				}
+				const bt = String(this.bookingType ?? '').trim();
+				const rows = !bt
+					? this.greetTypeItemsAll
+					: this.greetTypeItemsAll.filter((row) => this.rowMatchesGreetTypeBookingType(row, bt));
+				return rows.map((row) => ({
+					value: String(row.id),
+					label:
+						row.greetType != null && String(row.greetType).trim() !== ''
+							? String(row.greetType).trim()
+							: `GreetType ${row.id}`
+				}));
+			},
+			currentBookingTypeLabel() {
+				return this.getSelectLabel(this.bookingTypeOptions, this.bookingType) || '—';
+			},
+			/**
+			 * 与后端 CreateLimoBookingRequest 字段对齐的请求体快照（可直接 JSON 序列化提交）
+			 */
+			limoBookingData() {
+				const p = this.playerData && typeof this.playerData === 'object' ? this.playerData : null;
+				const playerId = p ? toStringOrEmpty(p.playerId) : '';
+				const sal = p ? toTrimmedString(p.salutation) : '';
+				const nm = p ? toTrimmedString(p.name) : '';
+				const playerName = [sal, nm].filter(Boolean).join(' ').trim();
+					const pickUpPointLabel = this.getSelectLabel(this.pickUpPointOptions, this.pickUpPoint);
+					const dropOffPointLabel = this.getSelectLabel(this.dropOffPointOptions, this.dropOffPoint);
+				const carTypeLabel = this.getSelectLabel(this.carTypeOptions, this.carType);
+				const greetTypeText = this.shouldShowGreetLocationFields
+					? this.getMultiSelectLabels(this.greetTypeOptions, this.greetType).join(';')
+					: '';
+				const pax = this.parsePositiveInteger(this.numberOfPax);
+				const approverText = this.getApproverDisplayText();
+				const approverId = this.getApproverIdForSubmit();
+				const pickUpDatetime = this.normalizePickUpDatetime('T', null);
+				const bookingContactText = this.resolveContactText('booking');
+				const tenOutContactText = this.isTenOut === 1 ? this.resolveContactText('tenOut') : '';
+				const guestContactText = this.isContactGuestDirectly === 1 ? this.resolveContactText('guest') : '';
+				const tenOutContact1 = this.isTenOut === 1 ? this.getContactTextAt('tenOut', 0) : '';
+				const tenOutContact2 = this.isTenOut === 1 ? this.getContactTextAt('tenOut', 1) : '';
+				const guestContact1 = this.isContactGuestDirectly === 1 ? this.getContactTextAt('guest', 0) : '';
+				const guestContact2 = this.isContactGuestDirectly === 1 ? this.getContactTextAt('guest', 1) : '';
+				return {
+					playerId,
+					player: playerName,
+					confirmationNo: '',
+					bookingType: toStringOrEmpty(this.bookingType),
+					pickUpPoint: pickUpPointLabel,
+					pickupPointId: this.pickupPointId,
+					tripPriceId: this.selectedPickUpTripPriceId,
+					otherPickUpPoint: this.shouldShowOtherPickUpPoint
+						? String(this.otherPickUpPoint || '').trim()
+						: '',
+					pickUpDatetime,
+						dropOffPoint: dropOffPointLabel,
+						dropOffPointId: this.dropOffPointId,
+						dropOffPointIds: this.dropOffPointId,
+					extraOffPoint: this.resolveExtraDropOffValues('label'),
+					extraOffPointId: this.resolveExtraDropOffValues('id'),
+						otherDropOffPoint: this.resolveOtherDropOffPointsJoined(),
+					bookingStatus: '',
+					serviceType: toStringOrEmpty(this.serviceType),
+					carType: carTypeLabel,
+					noOfPax: pax,
+					greetType: greetTypeText,
+					signage: this.shouldShowGreetLocationFields ? toStringOrEmpty(this.signage) : '',
+					approver: approverText,
+					approverId: approverId,
+					paymentMethod: toStringOrEmpty(this.getSelectValue(this.paymentMethod)),
+					bookingContact: bookingContactText,
+					isHighImportance: this.isHighImportance,
+					isTenOut: this.isTenOut,
+					tenOutContact: tenOutContactText,
+					tenOutContact1,
+					tenOutContact2,
+					isContactGuestDirectly: this.isContactGuestDirectly,
+					guestContact: guestContactText,
+					tripPrice: this.shouldShowTripPriceField ? toStringOrEmpty(this.tripPrice) : '',
+					tripContact: toStringOrEmpty(this.tripContact),
+					isHourlyRate: this.isHourlyRateSelected ? 1 : 0,
+					remarks: toStringOrEmpty(this.remarks),
+					flightDetail: this.isAirportPickup ? toStringOrEmpty(this.flightDetail) : '',
+					flightEta: this.isAirportPickup ? toStringOrEmpty(this.eta) : '',
+					flightStatus: this.isAirportPickup ? toStringOrEmpty(this.flightStatus) : ''
+				};
+			}
+		},
+		onLoad(options) {
+			const mode = options && options.mode ? String(options.mode) : '';
+			this.mode = mode === 'edit' ? 'edit' : 'create';
+			this.title = this.mode === 'edit'
+				? this.$t("newLimo.editTitle")
+				: this.$t("newLimo.createTitle");
+			this.playerData = this.getCachedPlayerData();
+			this.userData = uni.getStorageSync("userData");
+			this.deviceData = uni.getStorageSync("deviceData");
+			this.windowWidth = this.deviceData.windowWidth - 70;
+			this.applyPaymentMethodFromUserData();
+			const limoEditData = this.mode === 'edit' ? uni.getStorageSync('limoEditData') : null;
+			this.getLocation().then(() => {
+				if (limoEditData) {
+					this.populateEditForm(limoEditData);
+				}
+			});
+		},
+		onShow() {
+			this.userData = uni.getStorageSync('userData');
+			this.playerData = this.getCachedPlayerData();
+			this.syncFreeOfChargePaymentMethodOption();
+			if (!this.isEditMode) {
+				this.fetchLimoApprovers();
+			}
+		},
+		beforeDestroy() {
+			this.clearFlightDetailDebounceTimer();
+		},
+		methods: {
+			getCachedPlayerData() {
+				const cachedPlayerData =
+					uni.getStorageSync('playerData') || uni.getStorageSync('PlayerData') || '';
+				if (typeof cachedPlayerData !== 'string') {
+					return cachedPlayerData;
+				}
+				const trimmedPlayerData = cachedPlayerData.trim();
+				if (!trimmedPlayerData) {
+					return '';
+				}
+				try {
+					return JSON.parse(trimmedPlayerData);
+				} catch (e) {
+					return '';
+				}
+			},
+			goToBookingRecord() {
+				this.navTo('/booking/bookingRecord/bookingRecord?from=booking',0,false);
+			},
+			closeBookingCreatedPopup() {
+				this.showBookingCreatedNoConfirmPopup = false;
+				this.showBookingCreatedPopup = false;
+				this.bookingSubmitServerMessage = '';
+				this.goToBookingRecord();
+			},
+			closeCriteriaNotQualifiedPopup() {
+				this.showCriteriaNotQualifiedPopup = false;
+			},
+			closeEditBookingSuccessPopup() {
+				this.showEditBookingSuccessPopup = false;
+				this.goToBookingRecord();
+			},
+			getContactList(type) {
+				const config = CONTACT_CONFIG[type] || CONTACT_CONFIG.booking;
+				return this[config.listKey] || [];
+			},
+			getVisibleContactList(type) {
+				const config = CONTACT_CONFIG[type] || CONTACT_CONFIG.booking;
+				const contacts = this.getContactList(type);
+				const visibleCount = Math.min(
+					Math.max(Number(this[config.visibleCountKey]) || 1, 1),
+					config.maxCount
+				);
+				return contacts.slice(0, visibleCount);
+			},
+			onContactCountryCodeChange(type, index, e) {
+				if (this.isEditMode) return;
+				const contacts = this.getContactList(type);
+				if (!contacts[index]) return;
+				this.$set(contacts[index], 'countryCode', e || DEFAULT_COUNTRY_CODE);
+			},
+			onContactPhoneInput(type, index, e) {
+				if (this.isEditMode) return;
+				const value = e && e.detail ? e.detail.value : e;
+				const phoneNumber = this.normalizePhoneNumber(value);
+				const contacts = this.getContactList(type);
+				if (!contacts[index]) return phoneNumber;
+				this.$set(contacts[index], 'phoneNumber', phoneNumber);
+				return phoneNumber;
+			},
+			onAddContact(type) {
+				if (this.isEditMode) return;
+				const config = CONTACT_CONFIG[type] || CONTACT_CONFIG.booking;
+				const currentCount = Number(this[config.visibleCountKey]) || 1;
+				if (currentCount >= config.maxCount) return;
+				const contacts = this.getContactList(type);
+				if (!contacts[currentCount]) {
+					this.$set(contacts, currentCount, createEmptyContact());
+				}
+				this[config.visibleCountKey] = currentCount + 1;
+			},
+			onRemoveContact(type, index) {
+				if (this.isEditMode) return;
+				const config = CONTACT_CONFIG[type] || CONTACT_CONFIG.booking;
+				const contacts = this.getContactList(type);
+				const currentCount = Number(this[config.visibleCountKey]) || 1;
+				if (index < 1 || index >= currentCount) return;
+				contacts.splice(index, 1);
+				contacts.push(createEmptyContact());
+				this[config.visibleCountKey] = Math.max(1, currentCount - 1);
+			},
+			normalizePhoneNumber(value) {
+				return String(value == null ? '' : value).replace(/\D/g, '');
+			},
+			formatBookingContact(contact) {
+				if (!contact || !contact.phoneNumber) return '';
+				return `${contact.countryCode || DEFAULT_COUNTRY_CODE} ${contact.phoneNumber}`;
+			},
+			resolveContactText(type) {
+				return this.getVisibleContactList(type)
+					.map(contact => this.formatBookingContact(contact))
+					.filter(item => item)
+					.join(',');
+			},
+			getContactTextAt(type, index) {
+				const contacts = this.getVisibleContactList(type);
+				return this.formatBookingContact(contacts[index]);
+			},
+			hasEmptyVisibleContact(type) {
+				return this.getVisibleContactList(type).some(contact => !contact.phoneNumber);
+			},
+			onAdditionalOptionChange(flagKey, optionName, values) {
+				if (this.isEditMode) return;
+				const selectedValues = Array.isArray(values) ? values : [];
+				this[flagKey] = selectedValues.includes(optionName) ? 1 : 0;
+			},
+			onBookingTypeChange() {
+				if (this.isEditMode) return;
+				this.$nextTick(() => {
+					this.pruneCarAndGreetIfNotAllowedForBookingType();
+				});
+			},
+			onApprovedByChange() {
+				if (this.isEditMode) return;
+				this.$nextTick(() => {
+					this.applyTripContactFromSelectedApprover();
+				});
+			},
+			getSelectedApproverOption() {
+				const selectedValue = this.getSelectValue(this.approvedBy);
+				return (
+					(this.approverOptions || []).find(
+						(item) => String(item.value) === String(selectedValue)
+					) || null
+				);
+			},
+			getApproverDisplayText() {
+				const option = this.getSelectedApproverOption();
+				if (option) {
+					return formatEmployeeNameAndId(
+						option.rawEmployeeName || option.label || option.value,
+						option.rawEmployeeId
+					);
+				}
+				return formatEmployeeNameAndId(
+					this.approvedBy,
+					this.editApproverIdSnapshot
+				);
+			},
+			getApproverIdForSubmit() {
+				const option = this.getSelectedApproverOption();
+				if (option && option.rawEmployeeId) {
+					return String(option.rawEmployeeId).trim();
+				}
+				const approverText = String(this.approvedBy ?? '').trim();
+				const snapText = String(this.editApproverTextSnapshot ?? '').trim();
+				const snapId = String(this.editApproverIdSnapshot ?? '').trim();
+				if (approverText === snapText && snapId) {
+					return snapId;
+				}
+				return this.parseEmployeeIdFromOverriderDisplayText(approverText);
+			},
+			applyTripContactFromSelectedApprover() {
+				const option = this.getSelectedApproverOption();
+				const phone = this.getApproverPhone(option);
+				if (phone) {
+					this.tripContact = phone;
+				}
+			},
+			getApproverPhone(source) {
+				return getFirstText(source, [
+					'Phone',
+					'phone',
+					'PhoneNumber',
+					'phoneNumber'
+				]);
+			},
+			buildApproverOptionsFromRecords(approverRecords) {
+				const baseOptions = this.buildOverrideOptionsFromOverriderRecords(approverRecords);
+				if (!baseOptions.length) {
+					return [];
+				}
+				const approverByEmployeeId = {};
+				(approverRecords || []).forEach((record) => {
+					const employeeId = getFirstText(record, ['EmployeeId', 'employeeId']);
+					if (!employeeId) {
+						return;
+					}
+					approverByEmployeeId[employeeId] = {
+						employeeName: getFirstText(record, ['EmployeeName', 'employeeName']),
+						phone: this.getApproverPhone(record)
+					};
+				});
+				return baseOptions.map((option) => {
+					const approver = approverByEmployeeId[option.rawEmployeeId] || {};
+					const employeeName = approver.employeeName || option.rawEmployeeName;
+					const displayText = formatEmployeeNameAndId(employeeName, option.rawEmployeeId);
+					return {
+						...option,
+						value: displayText,
+						label: displayText,
+						rawEmployeeName: employeeName,
+						phone: approver.phone || ''
+					};
+				});
+			},
+			buildCurrentUserApproverOption(approverRecord = null) {
+				const userId = getFirstText(this.userData, ['userId']);
+				if (!userId) {
+					return null;
+				}
+				const userName =
+					getFirstText(approverRecord, ['EmployeeName', 'employeeName']) ||
+					getFirstText(this.userData, ['userName']) ||
+					userId;
+				const label = formatEmployeeNameAndId(userName, userId);
+				const phone =
+					this.getApproverPhone(approverRecord) ||
+					this.getApproverPhone(this.userData);
+				return {
+					value: label,
+					label,
+					rawEmployeeId: userId,
+					rawEmployeeName: userName,
+					phone
+				};
+			},
+			shouldUseCurrentUserAsApprover(approverRecords) {
+				if (!Array.isArray(approverRecords) || approverRecords.length === 0) {
+					return true;
+				}
+				if (approverRecords.length !== 1) {
+					return false;
+				}
+				const userId = getFirstText(this.userData, ['userId']);
+				const employeeId = getFirstText(approverRecords[0], [
+					'EmployeeId',
+					'employeeId',
+					'UserId',
+					'userId'
+				]);
+				return userId !== '' && employeeId !== '' && String(employeeId) === String(userId);
+			},
+			applyCurrentUserApproverFallback(approverRecord = null) {
+				const currentUserOption = this.buildCurrentUserApproverOption(approverRecord);
+				if (!currentUserOption) {
+					this.approverOptions = [];
+					return;
+				}
+				this.approverOptions = [currentUserOption];
+				this.approvedBy = currentUserOption.value;
+				this.applyTripContactFromSelectedApprover();
+			},
+			syncApprovedBySelectionAfterOptionsLoaded() {
+				const current = String(this.getSelectValue(this.approvedBy) ?? '').trim();
+				const snapId = String(this.editApproverIdSnapshot ?? '').trim();
+				const snapText = String(this.editApproverTextSnapshot ?? '').trim();
+				if (snapId) {
+					const byId = (this.approverOptions || []).find(
+						(option) => String(option.rawEmployeeId) === snapId
+					);
+					if (byId) {
+						this.approvedBy = byId.value;
+						this.editApproverTextSnapshot = byId.label;
+						return;
+					}
+				}
+				if (current) {
+					const byValue = (this.approverOptions || []).find(
+						(option) => String(option.value) === current
+					);
+					if (byValue) {
+						this.approvedBy = byValue.value;
+						return;
+					}
+					const byLabel = (this.approverOptions || []).find(
+						(option) =>
+							String(option.label).trim() === current ||
+							String(option.rawEmployeeName).trim() === current ||
+							String(option.rawEmployeeName).trim() === snapText
+					);
+					if (byLabel) {
+						this.approvedBy = byLabel.value;
+						return;
+					}
+				}
+				if (!current && !snapId) {
+					const userId = getFirstText(this.userData, ['userId']);
+					const currentUserOption = (this.approverOptions || []).find(
+						(option) => String(option.rawEmployeeId) === userId
+					);
+					if (currentUserOption) {
+						this.approvedBy = currentUserOption.value;
+					}
+				}
+			},
+			async fetchLimoApprovers() {
+				const userId = getFirstText(this.userData, ['userId']);
+				const playerId = getFirstText(this.playerData, ['playerId', 'PlayerId']);
+				if (!userId || !playerId) {
+					if (userId) {
+						this.applyCurrentUserApproverFallback();
+					} else {
+						this.approverOptions = [];
+					}
+					return;
+				}
+				try {
+					const httpResponse = await getLimoApprover({
+						UserId: userId,
+						PlayerId: playerId
+					});
+					if (httpResponse && httpResponse.success === false) {
+						this.applyCurrentUserApproverFallback();
+						return;
+					}
+					const records = getResponseRecords(httpResponse);
+					if (this.shouldUseCurrentUserAsApprover(records)) {
+						this.applyCurrentUserApproverFallback(records && records.length === 1 ? records[0] : null);
+						return;
+					}
+					const approverOptions = this.buildApproverOptionsFromRecords(records);
+					if (!approverOptions.length) {
+						this.applyCurrentUserApproverFallback();
+						return;
+					}
+					this.approverOptions = approverOptions;
+					this.syncApprovedBySelectionAfterOptionsLoaded();
+					this.applyTripContactFromSelectedApprover();
+				} catch (error) {
+					console.error('[NewLimo] getLimoApprover failed', error);
+					this.approverOptions = [];
+				}
+			},
+			extractBookingTypeKeysFromRow(row) {
+				if (!row || typeof row !== 'object') {
+					return [];
+				}
+				const keys = [];
+				const add = (v) => {
+					if (v === null || v === undefined || v === '') {
+						return;
+					}
+					if (Array.isArray(v)) {
+						v.forEach(add);
+						return;
+					}
+					const raw = typeof v === 'string' ? v.trim() : v;
+					if (raw === '') {
+						return;
+					}
+					const str = typeof raw === 'string' ? raw : String(raw);
+					if (str.includes(',')) {
+						str.split(',').forEach((p) => {
+							const q = String(p).trim();
+							if (q && !keys.includes(q)) {
+								keys.push(q);
+							}
+						});
+						return;
+					}
+					if (!keys.includes(str)) {
+						keys.push(str);
+					}
+				};
+				BOOKING_TYPE_FIELDS.forEach((field) => add(row[field]));
+				return keys;
+			},
+			normalizeBookingTypeToken(value) {
+				return String(value != null ? value : '').trim().toLowerCase();
+			},
+			/**
+			 * 表单 bookingType（0/1/2）映射为接口 bookingType 文案（Local/HK/China）
+			 */
+			resolveBookingTypeApiFilter(bookingTypeSelected) {
+				const bt = toTrimmedString(bookingTypeSelected);
+				if (!bt) {
+					return '';
+				}
+				return BOOKING_TYPE_API_BY_CODE[bt] || BOOKING_TYPE_ALIASES[bt.toLowerCase()] || bt;
+			},
+			resolveBookingTypeApiFilters(bookingTypeSelected) {
+				const selected =
+					bookingTypeSelected != null ? String(bookingTypeSelected).trim() : '';
+				if (!selected) {
+					return [];
+				}
+				const filters = [];
+				const add = (value) => {
+					const text = value != null ? String(value).trim() : '';
+					if (
+						text &&
+						!filters.some(
+							(item) =>
+								this.normalizeBookingTypeToken(item) ===
+								this.normalizeBookingTypeToken(text)
+						)
+					) {
+						filters.push(text);
+					}
+				};
+				const primary = this.resolveBookingTypeApiFilter(selected);
+				add(primary);
+				add(selected);
+				const selectedOption = (this.bookingTypeOptions || []).find(
+					(option) => String(option.value) === selected
+				);
+				if (selectedOption) {
+					add(selectedOption.label);
+				}
+				const primaryLower = this.normalizeBookingTypeToken(primary);
+				if (primaryLower === 'hong kong') {
+					add('HK');
+				}
+				return filters;
+			},
+			rowMatchesGreetTypeBookingType(row, bookingTypeSelected) {
+				const filters = this.resolveBookingTypeApiFilters(bookingTypeSelected);
+				if (!filters.length) {
+					return false;
+				}
+				const keys = this.extractBookingTypeKeysFromRow(row);
+				if (!keys.length) {
+					return false;
+				}
+				const normalizedFilters = filters.map((item) => this.normalizeBookingTypeToken(item));
+				return keys.some((key) =>
+					normalizedFilters.includes(this.normalizeBookingTypeToken(key))
+				);
+			},
+			/**
+			 * 接口可能返回迎宾方式文案（如 "Limo Greet"）或 id，统一为下拉框使用的 value（row.id）
+			 */
+			resolveGreetTypeSelectValueFromApi(raw) {
+				if (raw == null || String(raw).trim() === '' || String(raw).trim().toUpperCase() === 'N/A') {
+					return [];
+				}
+				const rawItems = String(raw)
+					.split(/[;；,]/)
+					.map((item) => String(item).trim())
+					.filter((item) => item !== '');
+				const list = Array.isArray(this.greetTypeItemsAll) ? this.greetTypeItemsAll : [];
+				return rawItems.map((s) => {
+					const byId = list.find((r) => String(r.id) === s);
+					if (byId) {
+						return String(byId.id);
+					}
+					const lower = s.toLowerCase();
+					const byLabel = list.find((r) => {
+						const gt = r.greetType != null ? String(r.greetType).trim() : '';
+						return gt && gt.toLowerCase() === lower;
+					});
+					if (byLabel) {
+						return String(byLabel.id);
+					}
+					return s;
+				});
+			},
+			/**
+			 * 编辑回显时：若接口返回的迎宾方式在列表中存在，但与当前 bookingType 过滤不匹配，
+			 * 则合并 bookingTypes，使该项出现在 greetTypeOptions 中，避免 prune 清空且下拉无选项。
+			 */
+			ensureGreetTypeItemMatchesBookingType(greetId, bookingTypeStr) {
+				const bt = String(bookingTypeStr ?? '').trim();
+				const gid = String(greetId ?? '').trim();
+				if (!bt || !gid) {
+					return;
+				}
+				const list = this.greetTypeItemsAll;
+				if (!Array.isArray(list)) {
+					return;
+				}
+				const ix = list.findIndex((r) => String(r.id) === gid);
+				if (ix < 0) {
+					return;
+				}
+				const row = list[ix];
+				if (this.rowMatchesGreetTypeBookingType(row, bt)) {
+					return;
+				}
+				const apiBookingType = this.resolveBookingTypeApiFilter(bt);
+				if (!apiBookingType) {
+					return;
+				}
+				const merged = { ...row, bookingType: apiBookingType };
+				list.splice(ix, 1, merged);
+			},
+			carTypeOptionMatchesBookingType(option, bookingTypeSelected) {
+				const filters = this.resolveBookingTypeApiFilters(bookingTypeSelected);
+				if (!filters.length || !option) {
+					return false;
+				}
+				const keys = Array.isArray(option.bookingKeys) ? option.bookingKeys : [];
+				if (!keys.length) {
+					return true;
+				}
+				const normalizedFilters = filters.map((item) => this.normalizeBookingTypeToken(item));
+				return keys.some((key) =>
+					normalizedFilters.includes(this.normalizeBookingTypeToken(key))
+				);
+			},
+			/**
+			 * 编辑回显时：若车型在列表中存在，但与当前 bookingType 过滤不匹配，
+			 * 则补充 bookingKeys，使该项出现在 carTypeOptions 中。
+			 */
+			ensureCarTypeOptionMatchesBookingType(carTypeValue, bookingTypeStr) {
+				const bt = String(bookingTypeStr ?? '').trim();
+				const carVal = String(carTypeValue ?? '').trim();
+				if (!bt || !carVal) {
+					return;
+				}
+				const list = this.carTypeOptionsAll;
+				if (!Array.isArray(list)) {
+					return;
+				}
+				const ix = list.findIndex((o) => String(o.value) === carVal);
+				if (ix < 0) {
+					return;
+				}
+				const option = list[ix];
+				if (this.carTypeOptionMatchesBookingType(option, bt)) {
+					return;
+				}
+				const apiBookingType = this.resolveBookingTypeApiFilter(bt);
+				if (!apiBookingType) {
+					return;
+				}
+				const keys = Array.isArray(option.bookingKeys) ? [...option.bookingKeys] : [];
+				const filterLower = apiBookingType.toLowerCase();
+				if (!keys.some((key) => String(key).trim().toLowerCase() === filterLower)) {
+					keys.push(apiBookingType);
+				}
+				list.splice(ix, 1, { ...option, bookingKeys: keys });
+			},
+			pruneCarAndGreetIfNotAllowedForBookingType() {
+				if (this.isEditMode) return;
+				const carVal = this.getSelectValue(this.carType);
+				if (
+					carVal !== '' &&
+					carVal != null &&
+					!(this.carTypeOptions || []).some((o) => String(o.value) === String(carVal))
+				) {
+					this.carType = '';
+				}
+				const allowedGreetValues = (this.greetTypeOptions || []).map((o) => String(o.value));
+				const nextGreetType = this.getMultiSelectValues(this.greetType).filter((value) =>
+					allowedGreetValues.includes(String(value))
+				);
+				if (nextGreetType.length !== this.getMultiSelectValues(this.greetType).length) {
+					this.greetType = nextGreetType;
+				}
+			},
+			onServiceTypeChange() {
+				if (this.isEditMode) return;
+				this.$nextTick(() => {
+					if (!this.isOnHireServiceType) {
+						this.hourlyRate = '';
+					}
+				});
+			},
+			onPickUpPointChange() {
+				this.$nextTick(() => {
+					this.syncPickupPointId();
+					if (!this.shouldShowOtherPickUpPoint) {
+						this.otherPickUpPoint = '';
+					}
+					this.syncGreetLocationFieldsVisibility();
+					this.syncFreeOfChargePaymentMethodOption();
+				});
+			},
+			syncGreetLocationFieldsVisibility() {
+				if (this.isEditMode) return;
+				if (this.shouldShowGreetLocationFields) {
+					return;
+				}
+				this.greetType = [];
+				this.signage = '';
+			},
+			syncPickupPointId() {
+				if (!this.pickUpPoint) {
+					this.pickupPointId = '';
+					return;
+				}
+				this.pickupPointId = this.getLocationIdFromPointSelection(
+					this.pickUpPoint,
+					this.pickUpPointOptions
+				);
+			},
+			clearFlightDetailDebounceTimer() {
+				if (this.flightDetailDebounceTimer != null) {
+					clearTimeout(this.flightDetailDebounceTimer);
+					this.flightDetailDebounceTimer = null;
+				}
+			},
+			onFlightDetailInput() {
+				if (this.isEditMode) return;
+				this.clearFlightDetailDebounceTimer();
+				this.flightDetailDebounceTimer = setTimeout(() => {
+					this.flightDetailDebounceTimer = null;
+					this.fetchLimoFlightDetails();
+				}, 2000);
+			},
+			buildFlightDetailsQueryParams() {
+				const flightNo = String(this.flightDetail ?? '').trim();
+				const pickupDateTime = this.buildPickUpDatetime();
+				const pickUpOpt = this.selectedPickUpLocationOption;
+				const pickupAirportCode =
+					pickUpOpt && pickUpOpt.airportCode != null && pickUpOpt.airportCode !== ''
+						? String(pickUpOpt.airportCode)
+						: '';
+				return {
+					flightNo,
+					pickupDateTime,
+					pickupAirportCode
+				};
+			},
+			applyFlightDetailsFromApiResponse(res) {
+				const list = getResponseRecords(res);
+				if (!list.length) {
+					return;
+				}
+				const row = list[0];
+				const eta = getFirstText(row, ['eta', 'Eta']);
+				const flightStatus = getFirstText(row, ['flightStatus', 'FlightStatus']);
+				if (eta) {
+					this.eta = eta;
+				}
+				if (flightStatus) {
+					this.flightStatus = flightStatus;
+				}
+			},
+			async fetchLimoFlightDetails() {
+				if (!this.isAirportPickup) {
+					return;
+				}
+				const params = this.buildFlightDetailsQueryParams();
+				if ([params.flightNo, params.pickupDateTime, params.pickupAirportCode].some(isBlank)) {
+					return;
+				}
+				try {
+					const res = await getLimoFlightDetails(params);
+					this.applyFlightDetailsFromApiResponse(res);
+				} catch (error) {
+					console.error('[NewLimo] getLimoFlightDetails failed', error);
+				}
+			},
+			onDropOffPointChange() {
+				this.$nextTick(() => {
+					this.syncDropOffPointId();
+					if (!this.shouldShowOtherDropOffPoint) {
+						this.otherDropOffPoint = '';
+					}
+					this.syncFreeOfChargePaymentMethodOption();
+				});
+			},
+			onExtraDropOffPointChange() {
+				if (this.isEditMode) return;
+				this.$nextTick(() => {
+					this.syncExtraDropOffPointData();
+					this.syncOtherExtraDropOffPointInputs();
+					this.syncFreeOfChargePaymentMethodOption();
+				});
+			},
+			syncDropOffPointId() {
+				this.dropOffPointId = this.getLocationIdFromPointSelection(
+					this.dropOffPoint,
+					this.dropOffPointOptions
+				);
+			},
+			syncExtraDropOffPointData() {
+				this.extraOffPoint = this.resolveExtraDropOffValues('label');
+				this.extraOffPointId = this.resolveExtraDropOffValues('id');
+			},
+			syncOtherExtraDropOffPointInputs() {
+				if (!Array.isArray(this.otherExtraDropOffPoints)) {
+					this.otherExtraDropOffPoints = [];
+				}
+				this.extraDropOffPoints.forEach((leg, index) => {
+					if (!this.shouldShowOtherExtraDropOffPoint(index)) {
+						this.$set(this.otherExtraDropOffPoints, index, '');
+					} else if (this.otherExtraDropOffPoints[index] == null) {
+						this.$set(this.otherExtraDropOffPoints, index, '');
+					}
+				});
+				if (this.otherExtraDropOffPoints.length > this.extraDropOffPoints.length) {
+					this.otherExtraDropOffPoints.splice(this.extraDropOffPoints.length);
+				}
+			},
+			applyPaymentMethodFromUserData() {
+				const parts = this.getUserPaymentMethodLabels();
+				this.paymentMethodOptionList = parts.map((label) => ({
+					value: label,
+					label
+				}));
+				this.syncFreeOfChargePaymentMethodOption();
+				if (
+					this.mode === 'create' &&
+					(!this.getSelectValue(this.paymentMethod) ||
+						String(this.getSelectValue(this.paymentMethod)).trim() === '') &&
+					parts.length
+				) {
+					this.paymentMethod = parts[0];
+				}
+			},
+			isFreeOfChargePaymentMethod(value) {
+				return String(value || '').trim().toLowerCase() === 'free of charge';
+			},
+			isFreeOfChargeEligibleTier() {
+				const tierName =
+					this.playerData && this.playerData.tierName != null
+						? String(this.playerData.tierName).trim()
+						: '';
+				const normalizedTierName = tierName.toLowerCase();
+				return ['supreme', 'supreme 88', 'alpha'].includes(normalizedTierName);
+			},
+			isFreeOfChargeLocationSelection(pointVal, options) {
+				const opt = this.getLocationOptionFromSelection(pointVal, options);
+				return (
+					opt &&
+					opt.freeOfCharge != null &&
+					!Number.isNaN(Number(opt.freeOfCharge)) &&
+					Number(opt.freeOfCharge) === 1
+				);
+			},
+			getSelectedFreeOfChargeLocationCount() {
+				let count = 0;
+				if (this.isFreeOfChargeLocationSelection(this.pickUpPoint, this.pickUpPointOptions)) {
+					count += 1;
+				}
+				if (this.isFreeOfChargeLocationSelection(this.dropOffPoint, this.dropOffPointOptions)) {
+					count += 1;
+				}
+				(this.extraDropOffPoints || []).forEach((pointVal) => {
+					if (this.isFreeOfChargeLocationSelection(pointVal, this.dropOffPointOptions)) {
+						count += 1;
+					}
+				});
+				return count;
+			},
+			syncFreeOfChargePaymentMethodOption() {
+				if (this.isEditMode) return;
+				const shouldShowFreeOfCharge =
+					this.isFreeOfChargeEligibleTier() &&
+					this.getSelectedFreeOfChargeLocationCount() >= 2;
+				const nextOptions = (this.paymentMethodOptionList || []).filter(
+					(option) =>
+						!this.isFreeOfChargePaymentMethod(option && option.value) &&
+						!this.isFreeOfChargePaymentMethod(option && option.label)
+				);
+				if (shouldShowFreeOfCharge) {
+					nextOptions.push(FREE_OF_CHARGE_OPTION);
+				}
+				this.paymentMethodOptionList = nextOptions;
+				if (
+					!shouldShowFreeOfCharge &&
+					this.isFreeOfChargePaymentMethod(this.getSelectValue(this.paymentMethod))
+				) {
+					this.paymentMethod = nextOptions.length ? nextOptions[0].value : '';
+				}
+			},
+			getUserPaymentMethodLabels() {
+				const raw = getFirstText(this.userData, ['paymentMethod', 'PaymentMethod']);
+				if (!raw) {
+					return [];
+				}
+				return String(raw)
+					.split(',')
+					.map((s) => s.trim())
+					.filter((s) => s !== '');
+			},
+			getSelectValue(value) {
+				if(Array.isArray(value)){
+					return value.length ? this.getSelectValue(value[0]) : '';
+				}
+				if(value && typeof value === 'object'){
+					return value.value != null ? value.value
+						: (value.id != null ? value.id
+							: (value.code != null ? value.code : ''));
+				}
+				return value != null ? value : '';
+			},
+			getSelectLabel(options, value) {
+				if(Array.isArray(value)){
+					const labels = this.getMultiSelectLabels(options, value);
+					return labels.join(';');
+				}
+				if(value && typeof value === 'object'){
+					return value.label != null ? value.label : String(this.getSelectValue(value) || '');
+				}
+				const selectedValue = this.getSelectValue(value);
+				const found = (options || []).find(
+					(item) => String(item.value) === String(selectedValue)
+				);
+				return found ? found.label : String(selectedValue || '');
+			},
+			getMultiSelectSource(value) {
+				if (Array.isArray(value)) {
+					return value;
+				}
+				if (isBlank(value)) {
+					return [];
+				}
+				if (typeof value === 'string' && /[;；,]/.test(value)) {
+					return value
+						.split(/[;；,]/)
+						.map((item) => String(item).trim())
+						.filter((item) => item !== '');
+				}
+				return [value];
+			},
+			getMultiSelectValues(value) {
+				const source = this.getMultiSelectSource(value);
+				return source
+					.map((item) => this.getSelectValue(item))
+					.map((item) => String(item != null ? item : '').trim())
+					.filter((item) => item !== '');
+			},
+			getMultiSelectLabels(options, value) {
+				const source = this.getMultiSelectSource(value);
+				return source
+					.map((item) => this.getSelectLabel(options || [], item))
+					.map((item) => String(item != null ? item : '').trim())
+					.filter((item) => item !== '');
+			},
+			parseNumber(value) {
+				if (isBlank(value)) {
+					return null;
+				}
+				const numberValue = Number(value);
+				return Number.isNaN(numberValue) ? null : numberValue;
+			},
+			buildPickUpDatetime() {
+				if(this.pickUpDate && this.pickUpTime){
+					return `${this.pickUpDate} ${this.pickUpTime}`;
+				}
+				return this.pickUpDate || this.pickUpTime || '';
+			},
+			buildLimoEditPayload() {
+				const extraDropOffPoints = (this.extraDropOffPoints || [])
+					.filter((item) => !isBlank(item))
+					.map((item, index) => ({
+						sequence: index + 1,
+						pointCode: this.getLocationIdFromPointSelection(item, this.dropOffPointOptions),
+						pointName: this.getSelectLabel(this.dropOffPointOptions, item)
+					}));
+				const primaryDropOff = {
+					pointCode: this.dropOffPointId,
+					pointName: this.getSelectLabel(this.dropOffPointOptions, this.dropOffPoint)
+				};
+				const dropOffPoints = [
+					...extraDropOffPoints,
+					...(primaryDropOff.pointName || primaryDropOff.pointCode
+						? [{
+								sequence: extraDropOffPoints.length + 1,
+								pointCode: primaryDropOff.pointCode,
+								pointName: primaryDropOff.pointName
+							}]
+						: [])
+				];
+				const isHourlyRate = this.isHourlyRateSelected ? 1 : 0;
+				const approverText = this.getApproverDisplayText();
+				const approverIdForSubmit = this.getApproverIdForSubmit();
+				const bookingContactText = this.resolveContactText('booking');
+				const tenOutContactText = this.isTenOut === 1 ? this.resolveContactText('tenOut') : '';
+				const guestContactText = this.isContactGuestDirectly === 1 ? this.resolveContactText('guest') : '';
+				const bookingContact1 = this.getContactTextAt('booking', 0);
+				const bookingContact2 = this.getContactTextAt('booking', 1);
+				const bookingContact3 = this.getContactTextAt('booking', 2);
+				const tenOutContact1 = this.isTenOut === 1 ? this.getContactTextAt('tenOut', 0) : '';
+				const tenOutContact2 = this.isTenOut === 1 ? this.getContactTextAt('tenOut', 1) : '';
+				const guestContact1 = this.isContactGuestDirectly === 1 ? this.getContactTextAt('guest', 0) : '';
+				const guestContact2 = this.isContactGuestDirectly === 1 ? this.getContactTextAt('guest', 1) : '';
+				return {
+					id: this.editId,
+					confirmationNo: this.confirmationNo,
+					bookingStatus: this.bookingStatus,
+					playerId: this.playerData && this.playerData.playerId,
+					playerName: this.playerData && this.playerData.name,
+					tierName: this.playerData && this.playerData.tierName,
+					bookingType: this.getSelectValue(this.bookingType),
+					bookingTypeName: this.getSelectLabel(this.bookingTypeOptions, this.bookingType),
+					serviceType: this.getSelectValue(this.serviceType),
+					serviceTypeName: this.getSelectLabel(this.serviceTypeOptions, this.serviceType),
+					pickUpDate: this.pickUpDate,
+					pickUpTime: this.pickUpTime,
+					pickUpDatetime: this.buildPickUpDatetime(),
+					carTypeCode: this.getSelectValue(this.carType),
+					carType: this.getSelectLabel(this.carTypeOptions, this.carType),
+					noOfPax: this.parseNumber(this.numberOfPax),
+					pickUpPointCode: this.pickupPointId,
+					pickupPointId: this.pickupPointId,
+					pickUpPoint: this.getSelectLabel(this.pickUpPointOptions, this.pickUpPoint),
+					tripPriceId: this.selectedPickUpTripPriceId,
+					otherPickUpPoint: this.shouldShowOtherPickUpPoint
+							? String(this.otherPickUpPoint || '').trim()
+							: '',
+						dropOffPointCode: primaryDropOff.pointCode,
+						dropOffPoint: primaryDropOff.pointName,
+						dropOffPointId: this.dropOffPointId,
+						dropOffPointIds: this.dropOffPointId,
+						extraOffPoint: this.extraOffPoint,
+						extraOffPointId: this.extraOffPointId,
+						otherDropOffPoint: this.resolveOtherDropOffPointsJoined(),
+						dropOffPoints,
+					flightDetail: this.isAirportPickup ? this.flightDetail : '',
+					flightEta: this.isAirportPickup ? this.eta : '',
+					flightStatus: this.isAirportPickup ? this.flightStatus : '',
+					greetType: this.shouldShowGreetLocationFields
+						? (
+								this.getSelectLabel(this.greetTypeOptions, this.greetType) ||
+								String(this.greetType ?? '').trim()
+							)
+						: '',
+					greetTypeId: this.greetTypeId,
+					signage: this.shouldShowGreetLocationFields ? this.signage : '',
+					approverId: approverIdForSubmit,
+					approver: approverText || approverIdForSubmit,
+					paymentMethodCode: this.getSelectValue(this.paymentMethod),
+					paymentMethod: this.getSelectLabel(this.paymentMethodOptionList, this.paymentMethod),
+					isHourlyRate,
+					tripPrice: isHourlyRate ? null : this.shouldShowTripPriceField ? this.parseNumber(this.tripPrice) : null,
+					bookerContact: this.tripContact,
+					bookingContact: bookingContactText,
+					bookingContact1,
+					bookingContact2,
+					bookingContact3,
+					isHighImportance: this.isHighImportance,
+					isTenOut: this.isTenOut,
+					tenOutContact: tenOutContactText,
+					tenOutContact1,
+					tenOutContact2,
+					isContactGuestDirectly: this.isContactGuestDirectly,
+					guestContact: guestContactText,
+					guestContact1,
+					guestContact2,
+					tripContact: this.tripContact,
+					remarks: this.remarks,
+					createdAt: this.createdAt,
+					createdBy: this.createdBy,
+					overrideBy: this.overrideBy,
+					updatedBy: getFirstText(this.userData, ['userId']),
+					updatedByName: getFirstText(this.userData, ['userName'])
+				};
+			},
+			normalizePickUpDatetime(separator = 'T', emptyValue = null) {
+				const d = (this.pickUpDate || '').trim();
+				const t = (this.pickUpTime || '').trim();
+				if (!d || !t) {
+					return emptyValue;
+				}
+				let timeNorm = t;
+				if (/^\d{2}:\d{2}$/.test(t)) {
+					timeNorm = `${t}:00`;
+				}
+				return `${d}${separator}${timeNorm}`;
+			},
+			getLocationIdFromPointSelection(pointVal, options) {
+				const text = toTrimmedString(this.getSelectValue(pointVal));
+				if (!text) {
+					return '';
+				}
+				const opt = this.getLocationOptionFromSelection(pointVal, options);
+				if (opt) {
+					return toTrimmedString(opt.locationId) || '0';
+				}
+				return /^\d+$/.test(text) ? text : '0';
+			},
+			resolveExtraDropOffValues(valueType) {
+				return (this.extraDropOffPoints || [])
+					.map((pointVal) => valueType === 'id'
+						? this.getLocationIdFromPointSelection(pointVal, this.dropOffPointOptions)
+						: this.getSelectLabel(this.dropOffPointOptions, pointVal))
+					.map(toTrimmedString)
+					.filter(Boolean)
+					.join(';');
+			},
+			getLocationOptionFromSelection(pointVal, options) {
+				if (isBlank(pointVal)) {
+					return null;
+				}
+				const optionList = options || [];
+				const raw = this.getSelectValue(pointVal);
+				const text = String(raw).trim();
+				if (!text) {
+					return null;
+				}
+				let opt = optionList.find((o) => String(o.value) === text);
+				if (!opt) {
+					opt = optionList.find((o) => String(o.label).trim() === text);
+				}
+				if (!opt && pointVal && typeof pointVal === 'object' && pointVal.label != null) {
+					opt = optionList.find(
+						(o) => String(o.label).trim() === String(pointVal.label).trim()
+					);
+				}
+				return opt || null;
+			},
+			isOtherLocationOption(option) {
+				if (!option) {
+					return false;
+				}
+				const label = String(option.label || '').trim().toLowerCase();
+				const englishName = String(option.englishName || '').trim().toLowerCase();
+				return (
+					label === 'others' ||
+					label === 'other' ||
+					label.endsWith('/others') ||
+					label.endsWith('/other') ||
+					englishName === 'others' ||
+					englishName === 'other'
+				);
+			},
+			isOtherLocationSelection(pointVal, options) {
+				return this.isOtherLocationOption(this.getLocationOptionFromSelection(pointVal, options));
+			},
+			shouldShowOtherExtraDropOffPoint(index) {
+				if (!Array.isArray(this.extraDropOffPoints)) {
+					return false;
+				}
+				return this.isOtherLocationSelection(this.extraDropOffPoints[index], this.dropOffPointOptions);
+			},
+			resolveOtherDropOffPointsJoined() {
+				const parts = [];
+				(this.extraDropOffPoints || []).forEach((pointVal, index) => {
+					if (!this.isOtherLocationSelection(pointVal, this.dropOffPointOptions)) {
+						return;
+					}
+					const value =
+						this.otherExtraDropOffPoints && this.otherExtraDropOffPoints[index] != null
+							? String(this.otherExtraDropOffPoints[index]).trim()
+							: '';
+					if (value) {
+						parts.push(value);
+					}
+				});
+				if (this.shouldShowOtherDropOffPoint) {
+					const value = String(this.otherDropOffPoint || '').trim();
+					if (value) {
+						parts.push(value);
+					}
+				}
+				return parts.join('; ');
+			},
+			parsePositiveInteger(raw) {
+				if (isBlank(raw)) {
+					return null;
+				}
+				const n = parseInt(String(raw).trim(), 10);
+				return Number.isFinite(n) ? n : null;
+			},
+			ensureOption(options, label, fallbackValue) {
+				if(!label){
+					return fallbackValue || '';
+				}
+				const normalizedLabel = String(label).trim();
+				const found = options.find(item => String(item.label).trim() === normalizedLabel);
+				if(found){
+					return found.value;
+				}
+				const value = fallbackValue || normalizedLabel;
+				const patch =
+					options === this.carTypeOptionsAll ? { bookingKeys: [] } : {};
+				options.push({
+					value,
+					label: normalizedLabel,
+					...patch
+				});
+				return value;
+			},
+			parsePickupDatetime(str){
+				const result = {
+					date: '',
+					time: ''
+				};
+				if(!str){
+					return result;
+				}
+				const parts = String(str).trim().split(/\s+/);
+				const datePart = parts[0] || '';
+				result.time = parts[1] || '';
+				const dateTokens = datePart.split('/');
+				if(dateTokens.length === 3){
+					result.date = `${dateTokens[2]}-${dateTokens[1]}-${dateTokens[0]}`;
+				}else{
+					result.date = datePart;
+				}
+				return result;
+			},
+			parseDelimitedValues(value, separator = ';') {
+				if (isBlank(value)) {
+					return [];
+				}
+				return String(value)
+					.split(separator)
+					.map(toTrimmedString)
+					.filter(Boolean);
+			},
+			normalizeFlagValue(value) {
+				return value === 1 || value === true || String(value).trim() === '1' ? 1 : 0;
+			},
+			getContactTextForEdit(data, joinedKeys, contactKeys) {
+				const joinedValue = getFirstText(data, joinedKeys);
+				if (joinedValue) {
+					return joinedValue;
+				}
+				return (contactKeys || [])
+					.map((key) => getFirstText(data, [key]))
+					.filter(Boolean)
+					.join(',');
+			},
+			parseContactTextItem(value) {
+				const text = String(value || '').trim();
+				if (!text) {
+					return createEmptyContact();
+				}
+				const match = text.match(/^(\+\d+)\s*(.*)$/);
+				if (match) {
+					return {
+						countryCode: match[1],
+						phoneNumber: this.normalizePhoneNumber(match[2])
+					};
+				}
+				return {
+					countryCode: DEFAULT_COUNTRY_CODE,
+					phoneNumber: this.normalizePhoneNumber(text)
+				};
+			},
+			applyContactText(type, value) {
+				const config = CONTACT_CONFIG[type] || CONTACT_CONFIG.booking;
+				const parsedContacts = this.parseDelimitedValues(value, /[;,]/)
+					.slice(0, config.maxCount)
+					.map((item) => this.parseContactTextItem(item));
+				const contacts = Array.from(
+					{ length: config.maxCount },
+					(_, index) => parsedContacts[index] || createEmptyContact()
+				);
+				this[config.listKey] = contacts;
+				this[config.visibleCountKey] = Math.max(1, parsedContacts.length);
+			},
+			resolvePointSelectionsFromJoinedFields(labelText, idText) {
+				const labels = this.parseDelimitedValues(labelText);
+				const ids = this.parseDelimitedValues(idText);
+				const length = Math.max(labels.length, ids.length);
+				const selections = [];
+				for (let index = 0; index < length; index += 1) {
+					const label = labels[index] || ids[index] || '';
+					const id = ids[index] || label;
+					const selection = this.ensureOption(this.dropOffPointOptions, label, id);
+					if (selection !== '') {
+						selections.push(selection);
+					}
+				}
+				return selections;
+			},
+			populateEditForm(data){
+				if(!data) return;
+				const pickupInfo = this.parsePickupDatetime(data.pickUpDate);
+				this.editId = data.id || null;
+				this.confirmationNo = data.confirmationNo || '';
+				this.bookingStatus = data.status || '';
+				this.createdAt = data.createdAt || '';
+				this.createdBy = data.createdBy || '';
+				this.overrideBy = data.overrideBy || '';
+				this.bookingType = data.bookingType || 'local';
+				this.serviceType = data.serviceType || '0';
+				this.pickUpDate = pickupInfo.date;
+				this.pickUpTime = pickupInfo.time;
+				this.carType = this.ensureOption(this.carTypeOptionsAll, data.carType, data.carType);
+				this.ensureCarTypeOptionMatchesBookingType(this.carType, this.bookingType);
+				this.numberOfPax = data.noOfPax != null ? String(data.noOfPax) : '2';
+				this.pickUpPoint = this.ensureOption(this.pickUpPointOptions, data.pickUpPoint, data.pickUpPoint);
+				this.otherPickUpPoint = data.otherPickUpPoint || '';
+				if (!isBlank(data.pickupPointId)) {
+					this.pickupPointId = toTrimmedString(data.pickupPointId);
+				} else {
+					this.syncPickupPointId();
+				}
+				const hasExtraDropOffForEdit = [
+					data.extraOffPoint,
+					data.extraOffPoints,
+					data.extraOffPointId,
+					data.extraOffPointIds
+				].some((value) => !isBlank(value));
+				const legacyDropOffLabels = hasExtraDropOffForEdit
+					? []
+					: this.parseDelimitedValues(data.dropOffPoint || '');
+				const legacyDropOffIds = hasExtraDropOffForEdit
+					? []
+					: this.parseDelimitedValues(data.dropOffPointIds || data.dropOffPointId || '');
+				const dropOffPointLabelForEdit =
+					legacyDropOffLabels.length > 1 ? legacyDropOffLabels[0] : data.dropOffPoint;
+				const dropOffPointIdForEdit =
+					getFirstText(data, ['dropOffPointId']) ||
+					(legacyDropOffIds.length > 1 ? legacyDropOffIds[0] : '') ||
+					getFirstText(data, ['dropOffPointIds']).split(';')[0] ||
+					getFirstText(data, ['dropOffPointCode']) ||
+					dropOffPointLabelForEdit;
+				this.dropOffPoint = this.ensureOption(
+					this.dropOffPointOptions,
+					dropOffPointLabelForEdit,
+					dropOffPointIdForEdit
+				);
+				this.syncDropOffPointId();
+				const extraOffPointTextForEdit = hasExtraDropOffForEdit
+					? data.extraOffPoint || data.extraOffPoints || ''
+					: legacyDropOffLabels.slice(1).join(';');
+				const extraOffPointIdTextForEdit = hasExtraDropOffForEdit
+					? data.extraOffPointId || data.extraOffPointIds || ''
+					: legacyDropOffIds.slice(1).join(';');
+				this.extraDropOffPoints = this.resolvePointSelectionsFromJoinedFields(
+					extraOffPointTextForEdit,
+					extraOffPointIdTextForEdit
+				);
+				const otherDropOffValues = this.parseDelimitedValues(data.otherDropOffPoint || '');
+				let otherDropOffValueIndex = 0;
+				this.otherDropOffPoint = this.shouldShowOtherDropOffPoint
+					? otherDropOffValues[otherDropOffValueIndex++] || ''
+					: '';
+				this.otherExtraDropOffPoints = this.extraDropOffPoints.map((pointVal) => {
+					if (!this.isOtherLocationSelection(pointVal, this.dropOffPointOptions)) {
+						return '';
+					}
+					return otherDropOffValues[otherDropOffValueIndex++] || '';
+				});
+				this.syncOtherExtraDropOffPointInputs();
+				this.syncExtraDropOffPointData();
+				this.syncFreeOfChargePaymentMethodOption();
+				const resolvedGreet = this.resolveGreetTypeSelectValueFromApi(data.greetTypeId || data.greetType);
+				resolvedGreet.forEach((greetId) => {
+					this.ensureGreetTypeItemMatchesBookingType(greetId, this.bookingType);
+				});
+				this.greetType = resolvedGreet;
+				this.signage = data.signage || '';
+				this.syncGreetLocationFieldsVisibility();
+				const approver = toTrimmedString(data.approver);
+				const approverId = toTrimmedString(data.approverId);
+				this.editApproverIdSnapshot = approverId;
+				this.approvedBy = approver;
+				this.editApproverTextSnapshot = String(this.approvedBy).trim();
+				this.paymentMethod = data.paymentMethod
+					? this.ensureOption(
+							this.paymentMethodOptionList,
+							data.paymentMethod,
+							data.paymentMethod
+						)
+					: this.paymentMethodOptionList.length
+						? this.paymentMethodOptionList[0].value
+						: '';
+				this.syncFreeOfChargePaymentMethodOption();
+				if(data.isHourlyRate === 1){
+					this.priceTypeArr = ['hour_rate'];
+					this.hourlyRate = toTrimmedString(data.hourlyRate);
+					this.tripPrice = '';
+				}else{
+					this.priceTypeArr = [];
+					this.hourlyRate = getFirstText(data, ['hourlyRate', 'hour']);
+					this.tripPrice = data.tripPrice || '';
+				}
+				this.tripContact = data.tripContact || '';
+				this.applyContactText(
+					'booking',
+					this.getContactTextForEdit(
+						data,
+						['bookingContact'],
+						['bookingContact1', 'bookingContact2', 'bookingContact3']
+					)
+				);
+				this.isHighImportance = this.normalizeFlagValue(getFirstText(data, ['isHighImportance', 'highImportance']));
+				this.isTenOut = this.normalizeFlagValue(getFirstText(data, ['isTenOut', 'tenOut']));
+				this.applyContactText(
+					'tenOut',
+					this.getContactTextForEdit(
+						data,
+						['tenOutContact', 'tenOutContacts'],
+						['tenOutContact1', 'tenOutContact2']
+					)
+				);
+				this.isContactGuestDirectly = this.normalizeFlagValue(data.isConnectGuestDirectly);
+				this.applyContactText(
+					'guest',
+					this.getContactTextForEdit(
+						data,
+						['guestContact', 'guestContacts'],
+						['guestContact1', 'guestContact2']
+					)
+				);
+				this.remarks = data.remarks || '';
+				this.flightDetail = data.flightDetail || '';
+				this.eta = data.flightEta || '';
+				this.flightStatus = data.flightStatus || '';
+				this.$nextTick(() => {
+					this.pruneCarAndGreetIfNotAllowedForBookingType();
+				});
+			},
+			onAddDropOffStop() {
+				this.extraDropOffPoints.push('');
+				this.otherExtraDropOffPoints.push('');
+				this.syncExtraDropOffPointData();
+				this.syncFreeOfChargePaymentMethodOption();
+			},
+			onRemoveDropOffStop(index) {
+				if (index < 0 || index >= this.extraDropOffPoints.length) return;
+				this.extraDropOffPoints.splice(index, 1);
+				this.otherExtraDropOffPoints.splice(index, 1);
+				this.syncExtraDropOffPointData();
+				this.syncOtherExtraDropOffPointInputs();
+				this.syncFreeOfChargePaymentMethodOption();
+			},
+			onDateConfirm(e) {
+				const raw = (e[0] && (e[0].value != null ? e[0].value : e[0])) || e[0];
+				this.pickUpDate = this.formatDateDisplay(raw);
+				this.showDatePicker = false;
+			},
+			onTimeConfirm(e) {
+				this.pickUpTime = e.value;
+				this.showTimePicker = false;
+			},
+			formatDateDisplay(v) {
+				if (isBlank(v)) return '';
+				if (typeof v === 'string') return v.length >= 10 ? v.substring(0, 10) : v;
+				const d = v instanceof Date ? v : new Date(v);
+				if (Number.isNaN(d.getTime())) return String(v);
+				const y = d.getFullYear();
+				const m = String(d.getMonth() + 1).padStart(2, '0');
+				const day = String(d.getDate()).padStart(2, '0');
+				return y + '-' + m + '-' + day;
+			},
+			async submitEditLimo() {
+					if(this.submitLoading){
+						return;
+					}
+					this.submitLoading = true;
+					this.syncPickupPointId();
+					this.syncDropOffPointId();
+					this.syncExtraDropOffPointData();
+					this.syncOtherExtraDropOffPointInputs();
+					const params = this.buildLimoEditPayload();
+					uni.showLoading({
+						title: this.$t("common.loading")
+					}); 
+					try{
+						const res = await editLimoBooking(params);
+						if(res && res.success === true){
+							uni.removeStorageSync('limoEditData');
+							this.showEditBookingSuccessPopup = true;
+						}else{
+							const message = res && (res.errorCode || res.message) ? (res.errorCode || res.message) : '';
+							this.msgStr = this.$t("common.saveFail") + (message ? '. ' + this.$t("common.errorMsg") + ': ' + message : '');
+							this.showMsg = true;
+						}
+					}catch(e){
+						console.error(e);
+						this.msgStr = e && e.errMsg ? e.errMsg : this.$t("common.saveFail");
+						this.showMsg = true;
+					}finally{
+						uni.hideLoading();
+						this.submitLoading = false;
+					}
+				},
+			validateLimoBookingForSubmit() {
+				const data = this.limoBookingData;
+				if (isBlank(data.playerId)) {
+					return 'Player information is missing.';
+				}
+				if (!data.bookingType) {
+					return 'Please select booking type.';
+				}
+				if (!data.serviceType) {
+					return 'Please select service type.';
+				}
+				if (!data.pickUpDatetime) {
+					return 'Please select pick-up date and time.';
+				}
+				if (isBlank(data.pickUpPoint)) {
+					return 'Please select pick-up location.';
+				}
+				if (isBlank(data.dropOffPoint)) {
+					return 'Please select drop-off location.';
+				}
+				if (
+					this.shouldShowOtherPickUpPoint &&
+					isBlank(data.otherPickUpPoint)
+				) {
+					return 'Please enter other pick-up location.';
+				}
+				if (
+					this.shouldShowOtherDropOffPoint &&
+					isBlank(this.otherDropOffPoint)
+				) {
+					return 'Please enter other drop-off location.';
+				}
+				if (
+					this.extraDropOffPoints.some((pointVal, index) =>
+						this.isOtherLocationSelection(pointVal, this.dropOffPointOptions) &&
+						isBlank(this.otherExtraDropOffPoints && this.otherExtraDropOffPoints[index])
+					)
+				) {
+					return 'Please enter other extra drop-off location.';
+				}
+				// if (this.hasEmptyVisibleContact('booking')) {
+				// 	return 'Please enter booking contact.';
+				// }
+				// if (this.isTenOut === 1 && this.hasEmptyVisibleContact('tenOut')) {
+				// 	return 'Please enter 10 out contact.';
+				// }
+				// if (this.isContactGuestDirectly === 1 && this.hasEmptyVisibleContact('guest')) {
+				// 	return 'Please enter guest contact.';
+				// }
+				if (isBlank(data.carType)) {
+					return 'Please select car type.';
+				}
+				if (data.noOfPax == null || data.noOfPax < 1) {
+					return 'Please enter a valid number of passengers.';
+				}
+				if (isBlank(data.approverId)) {
+					return 'Please select approver.';
+				}
+				if (!data.paymentMethod) {
+					return 'Please select payment method.';
+				}
+				if (this.shouldShowTripPriceField && isBlank(data.tripPrice)) {
+					return 'Please enter trip price.';
+				}
+				return '';
+			},
+			getBookingTypeForQualificationApi() {
+				const code = toTrimmedString(this.bookingType);
+				if (QUALIFICATION_BOOKING_TYPE_BY_CODE[code]) {
+					return QUALIFICATION_BOOKING_TYPE_BY_CODE[code];
+				}
+				return this.getSelectLabel(this.bookingTypeOptions, this.bookingType);
+			},
+			buildQualificationQueryParams() {
+				return {
+					PlayerId: getFirstText(this.playerData, ['playerId', 'PlayerId']),
+					BookingType: this.getBookingTypeForQualificationApi(),
+					BookingDate: this.normalizePickUpDatetime(' ', '')
+				};
+			},
+			unwrapQualificationBody(res) {
+				if (!res || typeof res !== 'object') {
+					return null;
+				}
+				if (res.success === false) {
+					return null;
+				}
+				const inner = res.data;
+				if (inner != null && typeof inner === 'object' && !Array.isArray(inner)) {
+					if (
+						inner.QualificationFlag !== undefined ||
+						inner.qualificationFlag !== undefined ||
+						inner.StatusCode !== undefined ||
+						inner.statusCode !== undefined
+					) {
+						return inner;
+					}
+				}
+				if (
+					res.QualificationFlag !== undefined ||
+					res.qualificationFlag !== undefined ||
+					res.StatusCode !== undefined ||
+					res.statusCode !== undefined
+				) {
+					return res;
+				}
+				return inner != null && typeof inner === 'object' ? inner : null;
+			},
+			parseQualificationFlag(body) {
+				if (!body || typeof body !== 'object') {
+					return null;
+				}
+				const v =
+					body.QualificationFlag !== undefined
+						? body.QualificationFlag
+						: body.qualificationFlag;
+				if (v === undefined || v === null) {
+					return null;
+				}
+				const n = Number(v);
+				return Number.isFinite(n) ? n : null;
+			},
+			pickQualificationErrorMessage(res, body) {
+				return (
+					getFirstText(res, ['message']) ||
+					getFirstText(body, ['StatusDescription', 'statusDescription']) ||
+					'Qualification check failed.'
+				);
+			},
+			buildCreateLimoBookingPayload(overrideExtra = {}) {
+				const raw = this.limoBookingData;
+				const base = {
+					playerId: raw.playerId,
+					player: raw.player,
+					confirmationNo: raw.confirmationNo || '',
+					bookingType: raw.bookingType,
+					pickUpPoint: raw.pickUpPoint,
+					pickUpPointId: raw.pickupPointId,
+					tripPriceId: raw.tripPriceId,
+						otherPickUpPoint: raw.otherPickUpPoint,
+						pickUpDatetime: raw.pickUpDatetime,
+						dropOffPoint: raw.dropOffPoint,
+						dropOffPointId: raw.dropOffPointId,
+						dropOffPointIds: raw.dropOffPointIds,
+						extraOffPoint: raw.extraOffPoint,
+						extraOffPointId: raw.extraOffPointId,
+						otherDropOffPoint: raw.otherDropOffPoint,
+					bookingStatus: raw.bookingStatus || '',
+					serviceType: raw.serviceType,
+					tripType: raw.serviceType,
+					carType: raw.carType,
+					carTypeId: this.carTypeId,
+					noOfPax: raw.noOfPax,
+					greetType: raw.greetType,
+					greetTypeId: this.greetTypeId,
+					signage: raw.signage,
+					approver: raw.approver,
+					approverId: raw.approverId,
+					paymentMethod: raw.paymentMethod,
+					tripPrice: raw.tripPrice,
+					tripContact: raw.tripContact,
+					bookingContact: raw.bookingContact,
+					isHighImportance: raw.isHighImportance,
+					isTenOut: raw.isTenOut,
+					tenOutContact: raw.tenOutContact,
+					isContactGuestDirectly: raw.isContactGuestDirectly,
+					guestContact: raw.guestContact,
+					isHourlyRate: raw.isHourlyRate,
+					remarks: raw.remarks,
+					flightDetail: raw.flightDetail,
+					flightEta: raw.flightEta,
+					flightStatus: raw.flightStatus,
+					createdBy: formatEmployeeNameAndId(
+						getFirstText(this.userData, ['userName']),
+						getFirstText(this.userData, ['userId'])
+					),
+					guestType: '0',
+					pickupRegion: this.pickUpPointRegionRaw,
+					dropoffRegion: this.dropoffRegionRaw,
+					ranking: this.ranking,
+					salution: this.salutation,
+					lastName: this.lastName,
+					bookerContact: this.tripContact,
+					employeeId: this.employeeId,
+					hour: this.hour
+				};
+				if (!isBlank(overrideExtra.overriderId)) {
+					base.overriderId = toTrimmedString(overrideExtra.overriderId);
+				}
+				if (!isBlank(overrideExtra.overriderName)) {
+					base.overriderName = toTrimmedString(overrideExtra.overriderName);
+				}
+				return base;
+			},
+			isCreateBookingResponseSuccess(res) {
+				if (!res || typeof res !== 'object' || res.success === false) return false;
+				if (res.success === true) return true;
+				const code = res.code;
+				return code === 200 || code === '200' || code === 0 || code === '0';
+			},
+			isPrepareBookingResponseSuccess(res) {
+				if (!res || typeof res !== 'object') return false;
+				return res.code === 200 || res.code === '200';
+			},
+			pickSuccessMessageFromResponse(res) {
+				let msg = getFirstText(res, ['message']);
+				const data = res.data;
+				if (!msg && data != null) {
+					if (typeof data === 'string' && !isBlank(data)) {
+						msg = toTrimmedString(data);
+					} else if (typeof data === 'object' && data.confirmationNo != null) {
+						msg = `Confirmation No.: ${data.confirmationNo}`;
+					}
+				}
+				return msg;
+			},
+			pickErrorMessageFromResponse(res) {
+				if (!res || typeof res !== 'object') {
+					return 'Request failed.';
+				}
+				return getFirstText(res, ['message', 'error']) || 'Request failed.';
+			},
+			pickErrorMessageFromHttpError(e) {
+				if (!e) {
+					return 'Network error.';
+				}
+				const body = e.data;
+				if (body != null && typeof body === 'object') {
+					const message = getFirstText(body, ['message', 'error']);
+					if (message) {
+						return message;
+					}
+				}
+				if (typeof body === 'string' && body.trim() !== '') {
+					return body.trim();
+				}
+				if (e.errMsg && String(e.errMsg).indexOf('request:fail') !== -1) {
+					return 'Network error. Please try again.';
+				}
+				if (e.statusCode) {
+					return `Request failed (${e.statusCode}).`;
+				}
+				return 'Request failed.';
+			},
+			async executeCreateLimoBooking(overrideExtra = {}) {
+				if (this.submitting) {
+					return;
+				}
+				this.submitting = true;
+				uni.showLoading({ title: '', mask: true });
+				try {
+					this.syncPickupPointId();
+					this.syncDropOffPointId();
+					this.syncExtraDropOffPointData();
+					this.syncOtherExtraDropOffPointInputs();
+					const payload = this.buildCreateLimoBookingPayload(overrideExtra);
+					const prepareRes = await prepareBooking({
+						playerId: payload.playerId,
+						approverId: payload.approverId
+					});
+					if (!this.isPrepareBookingResponseSuccess(prepareRes)) {
+						this.msgStr = this.pickErrorMessageFromResponse(prepareRes);
+						this.showMsg = true;
+						return;
+					}
+					payload.draftId = prepareRes.data.draftId;
+					const res = await createLimoBooking(payload);
+					if (this.isCreateBookingResponseSuccess(res)) {
+						if(res.autoConfirm ===1){
+							this.bookingSubmitServerMessage = this.pickSuccessMessageFromResponse(res);
+							this.showBookingCreatedNoConfirmPopup = true;
+						}else{
+							this.bookingSubmitServerMessage = this.pickSuccessMessageFromResponse(res);
+							this.showBookingCreatedPopup = true;
+						}
+					} else {
+						this.msgStr = this.pickErrorMessageFromResponse(res);
+						this.showMsg = true;
+					}
+				} catch (e) {
+					console.log(e);
+					this.msgStr = this.pickErrorMessageFromHttpError(e);
+					this.showMsg = true;
+				} finally {
+					this.submitting = false;
+					uni.hideLoading();
+				}
+			},
+			async saveLimo(){
+				if(this.mode === 'edit'){
+					await this.submitEditLimo();
+					return;
+				}
+				if (this.submitting) {
+					return;
+				}
+				const validationError = this.validateLimoBookingForSubmit();
+				if (validationError) {
+					this.msgStr = validationError;
+					this.showMsg = true;
+					return;
+				}
+				const qParams = this.buildQualificationQueryParams();
+				if (!qParams.PlayerId || !qParams.BookingType || !qParams.BookingDate) {
+					this.msgStr = 'Missing data for qualification check.';
+					this.showMsg = true;
+					return;
+				}
+				this.submitting = true;
+				uni.showLoading({ title: '', mask: true });
+				try {
+					const res = await getQualification(qParams);
+					const body = this.unwrapQualificationBody(res);
+					if (res && res.success === false) {
+						this.msgStr = this.pickQualificationErrorMessage(res, body);
+						this.showMsg = true;
+						return;
+					}
+					if (!body) {
+						this.msgStr = 'Qualification check returned no data.';
+						this.showMsg = true;
+						return;
+					}
+					if (!isResponseStatusOk(body)) {
+						this.msgStr =
+							getFirstText(body, ['StatusDescription', 'statusDescription']) ||
+							'Qualification check failed.';
+						this.showMsg = true;
+						return;
+					}
+					const flag = this.parseQualificationFlag(body);
+					if (flag === null) {
+						this.msgStr = 'Invalid qualification response.';
+						this.showMsg = true;
+						return;
+					}
+					if (flag === 1) {
+						uni.hideLoading();
+						this.submitting = false;
+						await this.executeCreateLimoBooking();
+						return;
+					}
+					if (flag === 0) {
+						uni.hideLoading();
+						await this.fetchOverridersAndOpenCriteriaPopup();
+						return;
+					}
+					this.msgStr = 'Unexpected qualification result.';
+					this.showMsg = true;
+				} catch (e) {
+					console.log(e);
+					this.msgStr = this.pickErrorMessageFromHttpError(e);
+					this.showMsg = true;
+				} finally {
+					this.submitting = false;
+					uni.hideLoading();
+				}
+			},
+			unwrapOverriderResponse(httpResponse) {
+				if (!httpResponse || typeof httpResponse !== 'object') {
+					return null;
+				}
+				const responseData = httpResponse.data;
+				if (
+					responseData != null &&
+					typeof responseData === 'object' &&
+					(Array.isArray(responseData.Records) || Array.isArray(responseData.records))
+				) {
+					return responseData;
+				}
+				if (Array.isArray(httpResponse.Records) || Array.isArray(httpResponse.records)) {
+					return httpResponse;
+				}
+				return responseData != null && typeof responseData === 'object' ? responseData : httpResponse;
+			},
+			buildOverrideOptionsFromOverriderRecords(overriderRecords) {
+				if (!Array.isArray(overriderRecords)) {
+					return [];
+				}
+				return overriderRecords
+					.map((employeeRecord) => {
+						const rawEmployeeId = getFirstText(employeeRecord, ['EmployeeId', 'employeeId']);
+						const displayName = getFirstText(employeeRecord, ['EmployeeName', 'employeeName']);
+						const employeeIdAndNameText =
+							getFirstText(employeeRecord, ['EmployeeIdAndName', 'employeeIdAndName']) ||
+							(displayName && rawEmployeeId ? `${displayName}(${rawEmployeeId})` : '');
+						const employeeNameOnly =
+							displayName || this.parseEmployeeNameFromIdAndNameText(employeeIdAndNameText);
+						if ([rawEmployeeId, employeeIdAndNameText, employeeNameOnly].some(isBlank)) {
+							return null;
+						}
+						return {
+							value: employeeIdAndNameText,
+							label: employeeIdAndNameText,
+							rawEmployeeId,
+							rawEmployeeName: employeeNameOnly
+						};
+					})
+					.filter(Boolean);
+			},
+			parseEmployeeNameFromIdAndNameText(combinedDisplayText) {
+				const trimmed = String(combinedDisplayText || '').trim();
+				const match = trimmed.match(/^(.+?)\s*\((\d+)\)\s*$/);
+				return match ? String(match[1]).trim() : '';
+			},
+			parseEmployeeIdFromOverriderDisplayText(displayText) {
+				const trimmed = String(displayText || '').trim();
+				const match = trimmed.match(/\((\d+)\)\s*$/);
+				return match ? match[1] : trimmed;
+			},
+			onOverrideInputChange(value) {
+				this.overrideInputText = toTrimmedString(value);
+			},
+			onOverrideChange(value) {
+				const selectedValue = this.getSelectValue(value);
+				this.overrideName = selectedValue;
+				this.overrideInputText = toTrimmedString(selectedValue);
+			},
+			getOverrideInputValue() {
+				const currentValue = toTrimmedString(this.overrideName);
+				const typedValue = toTrimmedString(this.overrideInputText);
+				return typedValue || currentValue;
+			},
+			pickOverriderStatusMessage(overriderResponseBody, fallbackMessage) {
+				return getFirstText(
+					overriderResponseBody,
+					['StatusDescription', 'statusDescription']
+				) || fallbackMessage;
+			},
+			findOverriderOptionByEmployeeId(overriderOptions, employeeId) {
+				const id = toTrimmedString(employeeId);
+				if (!id) {
+					return null;
+				}
+				return (
+					(overriderOptions || []).find(
+						(option) => String(option.rawEmployeeId || '').trim() === id
+					) || null
+				);
+			},
+			async validateOverrider(overriderId) {
+				const id = toTrimmedString(overriderId);
+				if (!id) {
+					return null;
+				}
+				uni.showLoading({ title: '', mask: true });
+				try {
+					const overriderHttpResponse = await getLimoOverrider({
+						OverriderInfo: id
+					});
+					if (overriderHttpResponse && overriderHttpResponse.success === false) {
+						this.msgStr = this.pickErrorMessageFromResponse(overriderHttpResponse);
+						this.showMsg = true;
+						return null;
+					}
+					const overriderResponseBody = this.unwrapOverriderResponse(overriderHttpResponse);
+					if (!overriderResponseBody || typeof overriderResponseBody !== 'object') {
+						this.msgStr = 'Invalid overrider response.';
+						this.showMsg = true;
+						return null;
+					}
+					if (!isResponseStatusOk(overriderResponseBody)) {
+						this.msgStr = this.pickOverriderStatusMessage(
+							overriderResponseBody,
+							'Cannot Override.'
+						);
+						this.showMsg = true;
+						return null;
+					}
+					const overriderOptions = this.buildOverrideOptionsFromOverriderRecords(
+						getResponseRecords(overriderResponseBody)
+					);
+					const matchedOption = this.findOverriderOptionByEmployeeId(overriderOptions, id);
+					if (!matchedOption) {
+						this.msgStr = 'Cannot Override.';
+						this.showMsg = true;
+						return null;
+					}
+					return matchedOption;
+				} catch (httpError) {
+					console.log(httpError);
+					this.msgStr = this.pickErrorMessageFromHttpError(httpError);
+					this.showMsg = true;
+					return null;
+				} finally {
+					uni.hideLoading();
+				}
+			},
+			async fetchOverridersAndOpenCriteriaPopup() {
+				const overriderInfoParam = getFirstText(this.userData, ['userId']);
+				if (!overriderInfoParam) {
+					this.msgStr = 'User ID is missing for overrider list.';
+					this.showMsg = true;
+					return;
+				}
+				uni.showLoading({ title: '', mask: true });
+				try {
+					const overriderHttpResponse = await getLimoOverrider({
+						OverriderInfo: overriderInfoParam
+					});
+					if (overriderHttpResponse && overriderHttpResponse.success === false) {
+						this.msgStr = this.pickErrorMessageFromResponse(overriderHttpResponse);
+						this.showMsg = true;
+						return;
+					}
+					const overriderResponseBody = this.unwrapOverriderResponse(overriderHttpResponse);
+					if (!overriderResponseBody || typeof overriderResponseBody !== 'object') {
+						this.msgStr = 'Invalid overrider response.';
+						this.showMsg = true;
+						return;
+					}
+					if (!isResponseStatusOk(overriderResponseBody)) {
+						this.msgStr = this.pickOverriderStatusMessage(
+							overriderResponseBody,
+							'Failed to load overriders.'
+						);
+						this.showMsg = true;
+						return;
+					}
+					const employeeRecords = getResponseRecords(overriderResponseBody);
+					this.overrideOptions =
+						this.buildOverrideOptionsFromOverriderRecords(employeeRecords);
+					this.overrideName = '';
+					this.overrideInputText = '';
+					
+					this.showCriteriaNotQualifiedPopup = true;
+					
+				} catch (httpError) {
+					console.log(httpError);
+					this.msgStr = this.pickErrorMessageFromHttpError(httpError);
+					this.showMsg = true;
+				} finally {
+					uni.hideLoading();
+				}
+			},
+			async confirmOverride(){
+				const overrideInputValue = this.getOverrideInputValue();
+				if (isBlank(overrideInputValue)) {
+					uni.showToast({
+						title:'Please select overrider',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				const selectedOverrideOption = this.overrideOptions.find(
+					(option) => String(option.value) === String(overrideInputValue)
+				);
+				const overriderId = selectedOverrideOption && selectedOverrideOption.rawEmployeeId
+					? String(selectedOverrideOption.rawEmployeeId).trim()
+					: this.parseEmployeeIdFromOverriderDisplayText(String(overrideInputValue));
+				const validatedOverrideOption = await this.validateOverrider(overriderId);
+				if (!validatedOverrideOption) {
+					return;
+				}
+				const overriderName =
+					validatedOverrideOption && validatedOverrideOption.rawEmployeeName
+						? String(validatedOverrideOption.rawEmployeeName).trim()
+						: this.parseEmployeeNameFromIdAndNameText(String(overrideInputValue));
+				this.closeCriteriaNotQualifiedPopup();
+				await this.executeCreateLimoBooking({
+					overriderId,
+					overriderName
+				}); 
+				this.overrideName = '';
+				this.overrideInputText = '';
+			},
+			buildLimoCarTypeOptionsFromApi(items) {
+				if (!Array.isArray(items)) {
+					return [];
+				}
+				return items.map((item) => {
+					const label = toTrimmedString(item.carType);
+					const value = item.id != null ? String(item.id) : label;
+					const bookingKeys = this.extractBookingTypeKeysFromRow(item);
+					return { value, label, bookingKeys };
+				});
+			},
+			buildLimoPointOptionsFromApi(items) {
+				if (!Array.isArray(items)) {
+					return [];
+				}
+				return items.map((item) => {
+					const trad = toTrimmedString(item.chineseTradName);
+					const eng = toTrimmedString(item.englishName);
+					let label = '';
+					if (trad && eng) {
+						label = `${trad}/${eng}`;
+					} else {
+						label = trad || eng;
+					}
+					const locationId = toTrimmedString(item.id);
+					const value = locationId || label;
+					const region = toTrimmedString(item.region);
+					const tripPriceId = this.parseNumber(item.tripPriceId);
+					const freeOfCharge = this.parseNumber(item.freeOfCharge);
+					const greetLocation =
+						getFirstText(item, ['greetLocation', 'GreetLocation']) || null;
+					const rawAirportCode = getFirstText(item, [
+						'airportCode',
+						'AirportCode',
+						'AirPortCode'
+					]);
+					return {
+						value,
+						label,
+						locationId: locationId || '0',
+						region,
+						tripPriceId,
+						freeOfCharge,
+						greetLocation,
+						airportCode: rawAirportCode,
+						englishName: eng
+					};
+				});
+			},
+			async getLocation(){
+				const param = { location: '%' };
+				try {
+					const res = await getLimoLocation(param);
+					const list =
+						res && res.success == true && Array.isArray(res.data)
+							? res.data
+							: [];
+					const options = this.buildLimoPointOptionsFromApi(list);
+					this.pickUpPointOptions = options;
+					this.dropOffPointOptions = options;
+				} catch (e) {
+					console.log(e);
+					this.pickUpPointOptions = [];
+					this.dropOffPointOptions = [];
+				} finally {
+					await this.getLimoCarType();
+				}
+			},
+			async getLimoCarType(){
+				const param = {};
+				try {
+					const res = await getLimoCarType(param);
+					const list =
+						res && res.success !== false && Array.isArray(res.data)
+							? res.data
+							: [];
+					this.carTypeOptionsAll = this.buildLimoCarTypeOptionsFromApi(list);
+				} catch (e) {
+					console.log(e);
+					this.carTypeOptionsAll = [];
+				} finally {
+					await this.getGreetType();
+				}
+			},
+			async getGreetType(){
+				const param = {};
+				try {
+					const res = await getLimoGreetType(param);
+					const list =
+						res && res.success !== false && Array.isArray(res.data)
+							? res.data
+							: [];
+					this.greetTypeItemsAll = Array.isArray(list) ? list : [];
+				} catch (e) {
+					console.log(e);
+					this.greetTypeItemsAll = [];
+				}
+			}
+		}
+	}
+	</script>
+
+<style lang="scss" src="../../static/css/limo.scss"></style>
diff --git a/limo/notification/notification.vue b/limo/notification/notification.vue
new file mode 100644
index 0000000..45874a6
--- /dev/null
+++ b/limo/notification/notification.vue
@@ -0,0 +1,761 @@
+<template>
+	<view>
+		<u-navbar
+			:safeAreaInsetTop="true"
+			:placeholder="true"
+			:title="title"
+			:fixed="true"
+			:autoBack="true"
+			leftIconColor="#ffffff"
+			bgColor="#C39A4B"
+			titleStyle="font-weight:bold;color:#ffffff;"
+		>
+			<view
+				v-if="activeTabKey === 'approval' && canViewApproval && hasSelectedDate"
+				class="hz-nav-filter-clear"
+				slot="right"
+				@click="clearDateFilter"
+			>
+				<u-icon
+					size="28px"
+					name="../../static/images/filter-clear.svg"
+				></u-icon>
+			</view>
+			<view
+				v-if="activeTabKey === 'notification' && canViewNotification"
+				class="hz-nav-read-all"
+				slot="right"
+				@click="onReadAllClick"
+			>
+				<image src="/static/images/read_all.png" class="hz-nav-read-all-img"></image>
+			</view>
+		</u-navbar>
+
+		<u-tabs
+			v-if="shouldShowTabs"
+			:list="visibleTabList"
+			lineColor="#C39A4B"
+			lineWidth="36"
+			inactiveStyle="color: #c0c0c0; font-weight: bold;"
+			activeStyle="color: #C39A4B; font-weight: bold;"
+			:scrollable="false"
+			:current="tabIndex"
+			@change="tabChange"
+		>
+		</u-tabs>
+
+		<!-- Limo Notification -->
+		<view v-show="activeTabKey === 'notification' && canViewNotification">
+			<view v-if="!showNotification">
+				<view class="hz-flex-row approval-empty-img-row">
+					<image src="/static/images/datanull.png" class="approval-empty-img"></image>
+				</view>
+				<view class="hz-flex-row hz-font-bolder hz-font-md approval-empty-text-row">
+					{{ dataNull }}
+				</view>
+			</view>
+			<view
+				v-else
+				class="notice-card"
+				v-for="(notice, index) in limoNoticeList"
+				:key="notice.id != null ? notice.id : index"
+				@click="onNoticeCardClick(notice)"
+				:style="getNoticeCardStyle(notice)"
+			>
+				<image class="icon" :src="notice.icon" mode="aspectFill"></image>
+				<view class="info">
+					<view class="notice-type">{{ notice.type }}</view>
+					<view class="notice-title">{{ notice.title }}</view>
+					<view class="notice-desc">{{ notice.desc }}</view>
+					<view class="notice-time">{{ notice.time }}</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- Approval Routing -->
+		<view v-show="activeTabKey === 'approval' && canViewApproval">
+			<view class="hz-spacing hz-mr-t-20 hz-flex-row approval-search-row">
+				<u-search
+					:placeholder="searchHolder"
+					v-model="searchInputStr"
+					:showAction="false"
+					bgColor="#ffffff"
+					:label="searchLabel"
+					borderColor="gray"
+					class="approval-search-input"
+					@search="searchApprovalByPlayerId"
+				></u-search>
+				<u-icon
+					name="calendar"
+					:size="45"
+					:color="calendarIconColor"
+					@click="showCalendar = true"
+				></u-icon>
+			</view>
+
+			<view v-if="!showApprovalList">
+				<view class="hz-flex-row approval-empty-img-row">
+					<image src="/static/images/datanull.png" class="approval-empty-img"></image>
+				</view>
+				<view class="hz-flex-row hz-font-bolder hz-font-md approval-empty-text-row">
+					{{ dataNull }}
+				</view>
+			</view>
+			<view v-else>
+				<uni-card
+					v-for="(approvalRecord, index) in approvalList"
+					:key="index"
+					@click="toDetail(approvalRecord.playerId)"
+				>
+					<view class="notification-content">
+						<view class="icon-container">
+							<image src="/static/images/task.png" class="task-icon"></image>
+						</view>
+						<view class="notification-info">
+							<view class="notification-title">
+								{{ $t("notification.pendingApprovalRequest") }}
+							</view>
+							<view class="notification-date">
+								{{ approvalRecord.createdAt }}
+							</view>
+						</view>
+						<view class="notification-time">
+							{{ getTimeAgo(approvalRecord.createdAt) }}
+						</view>
+					</view>
+					<view class="notification-detail">
+						{{ approvalRecord.memberLastName }}, {{ approvalRecord.playerId }} ({{ approvalRecord.tier }}), {{ approvalRecord.propertyName }}, {{ approvalRecord.roomTypeCode }}, {{ approvalRecord.checkinDate }} to {{ approvalRecord.checkoutDate }}, {{ approvalRecord.booker }}
+					</view>
+				</uni-card>
+			</view>
+		</view>
+
+		<u-empty
+			v-if="!hasAnyViewPermission"
+			mode="list"
+			:text="$t('notification.noPermission')"
+		></u-empty>
+
+		<u-calendar
+			v-if="activeTabKey === 'approval' && canViewApproval"
+			:show="showCalendar"
+			@close="showCalendar = false"
+			:confirmText="confirmText"
+			:confirmDisabledText="confirmText"
+			color="#C39A4B"
+			:allowSameDay="true"
+			:startText="startText"
+			:endText="endText"
+			mode="range"
+			:showMark="false"
+			title=""
+			@confirm="handleFilterDate"
+			:defaultDate="selectedDate"
+		>
+		</u-calendar>
+
+		<u-modal
+			:content="msgStr"
+			:show="showMsg"
+			:confirmText="yesText"
+			:showCancelButton="false"
+			closeOnClickOverlay
+			@confirm="showMsg = false"
+			confirmColor="#C39A4B"
+			@close="showMsg = false"
+		></u-modal>
+	</view>
+</template>
+
+<script>
+	import { getNotificationByUserId, changeNotification, countNotification, readAllNotification } from '../../api/notificationApi.js'
+	import { getApprovalList } from '../../api/approvalApi.js'
+
+	export default {
+		data() {
+			return {
+				title: this.$t('notification.title'),
+				userData: null,
+				tabList: [
+					{ name: this.$t('notification.title'), key: 'notification' },
+					{ name: this.$t('approvalRouting.title'), key: 'approval' }
+				],
+				tabIndex: 0,
+				activeTabKey: 'notification',
+				pendingTabKey: '',
+				limoNoticeList: [],
+				limoEmptyText: this.$t('notification.noData'),
+				searchInputStr: '',
+				approvalList: [],
+				showApprovalList: true,
+				dataNull: this.$t('notification.noData'),
+				searchHolder: this.$t('approval.searchStr'),
+				calendarIconColor: '#000000',
+				showCalendar: false,
+				confirmText: this.$t('common.confirm').toUpperCase(),
+				startText: this.$t('common.start'),
+				endText: this.$t('common.end'),
+				selectedDate: [],
+				searchLabel: this.$t('common.playerId'),
+				msgStr: '',
+				showMsg: false,
+				yesText: this.$t('common.yes'),
+				notificationCount: 0,
+				approvalRoutingCount: 0,
+				showNotification: false
+			}
+		},
+		computed: {
+			effectiveUserData() {
+				return this.getEffectiveUserData(this.userData);
+			},
+			canViewNotification() {
+				return !!(this.effectiveUserData && this.effectiveUserData.canViewNotification === true);
+			},
+			canViewApproval() {
+				return !!(this.effectiveUserData && this.effectiveUserData.canViewApproval === true);
+			},
+			visibleTabList() {
+				return this.tabList.filter((tab) => {
+					if (tab.key === 'notification') {
+						return this.canViewNotification;
+					}
+					if (tab.key === 'approval') {
+						return this.canViewApproval;
+					}
+					return false;
+				}).map((tab) => ({
+					...tab,
+					badge: this.getTabBadge(tab.key)
+				}));
+			},
+			shouldShowTabs() {
+				return this.visibleTabList.length > 1;
+			},
+			pageTitle() {
+				if (this.visibleTabList.length === 1) {
+					return this.visibleTabList[0].name;
+				}
+				return this.$t('notification.title');
+			},
+			hasAnyViewPermission() {
+				return this.visibleTabList.length > 0;
+			},
+			hasSelectedDate() {
+				return Array.isArray(this.selectedDate) && this.selectedDate.length > 0;
+			}
+		},
+		onLoad(options) {
+			if (options && options.tab != null && options.tab !== '') {
+				const tab = Number(options.tab);
+				if (tab === 1) {
+					this.pendingTabKey = 'approval';
+					this.activeTabKey = 'approval';
+				}
+			}
+			this.applyNotificationCountsFromOptions(options || {});
+		},
+		onShow() {
+			this.userData = uni.getStorageSync('userData');
+			this.syncVisibleTabState(this.pendingTabKey || this.activeTabKey);
+			this.syncPageTitle();
+			this.pendingTabKey = '';
+			this.fetchNotificationCounts();
+			this.fetchActiveTabData();
+		},
+		methods: {
+			getEffectiveUserData(userData) {
+				if (userData && userData.data && typeof userData.data === 'object') {
+					return userData.data;
+				}
+				return userData || {};
+			},
+			applyNotificationCountsFromOptions(options) {
+				this.notificationCount = this.parseCountValue(options.notificationCount);
+				this.approvalRoutingCount = this.parseCountValue(options.approvalRoutingCount);
+			},
+			parseCountValue(value) {
+				const count = Number(value);
+				return Number.isFinite(count) && count > 0 ? count : 0;
+			},
+			getTabBadge(tabKey) {
+				const count = tabKey === 'approval'
+					? this.approvalRoutingCount
+					: this.notificationCount;
+				if (count <= 0) {
+					return {
+						show: false,
+						value: 0
+					};
+				}
+				return {
+					show: true,
+					value: count,
+					max: 99,
+					bgColor: '#fa3534',
+					color: '#ffffff',
+					customStyle: {	
+						transform: 'translateY(-2px)',
+						fontSize: '10px',
+						lineHeight: '10px',
+						padding: '1px 4px'
+					}
+				};
+			},
+			parseNotificationCounts(res) {
+				const data = res && res.data && typeof res.data === 'object' ? res.data : (res || {});
+				return {
+					notificationCount: this.parseCountValue(data.notificationCount ?? data.NotificationCount),
+					approvalRoutingCount: this.parseCountValue(data.approvalRoutingCount ?? data.ApprovalRoutingCount)
+				};
+			},
+			async fetchNotificationCounts() {
+				const userId = this.getUserIdFromUserData(this.userData);
+				if (!userId || !this.hasAnyViewPermission) {
+					this.notificationCount = 0;
+					this.approvalRoutingCount = 0;
+					return;
+				}
+				try {
+					const res = await countNotification({ userId });
+					const counts = this.parseNotificationCounts(res);
+					if (this.canViewNotification) {
+						this.notificationCount = counts.notificationCount;
+					}
+					if (this.canViewApproval) {
+						this.approvalRoutingCount = counts.approvalRoutingCount;
+					}
+				} catch (error) {
+					console.error('[Notification] countNotification failed', error);
+				}
+			},
+			syncVisibleTabState(preferredKey) {
+				const tabs = this.visibleTabList;
+				if (!tabs.length) {
+					this.tabIndex = 0;
+					this.activeTabKey = '';
+					this.showCalendar = false;
+					this.syncPageTitle();
+					return;
+				}
+				const nextIndex = tabs.findIndex((tab) => tab.key === preferredKey);
+				this.tabIndex = nextIndex >= 0 ? nextIndex : 0;
+				this.activeTabKey = tabs[this.tabIndex].key;
+				if (this.activeTabKey !== 'approval') {
+					this.showCalendar = false;
+				}
+				this.syncPageTitle();
+			},
+			syncPageTitle() {
+				this.title = this.pageTitle;
+			},
+			fetchActiveTabData() {
+				if (this.activeTabKey === 'notification' && this.canViewNotification) {
+					this.fetchNotificationList();
+					return;
+				}
+				if (this.activeTabKey === 'approval' && this.canViewApproval) {
+					this.getApprovalList();
+				}
+			},
+			getUserIdFromUserData(userData) {
+				const realUserData = this.getEffectiveUserData(userData);
+				if (userData == null || userData === '') {
+					return '';
+				}
+				const userId = realUserData.userId != null && realUserData.userId !== ''
+					? realUserData.userId
+					: realUserData.UserId;
+				return userId != null && userId !== '' ? userId : '';
+			},
+			unwrapNotificationList(response) {
+				if (Array.isArray(response)) {
+					return response;
+				}
+				if (response && Array.isArray(response.notifications)) {
+					return response.notifications;
+				}
+				if (response && Array.isArray(response.data)) {
+					return response.data;
+				}
+				if (response && Array.isArray(response.records)) {
+					return response.records;
+				}
+				if (response && Array.isArray(response.Records)) {
+					return response.Records;
+				}
+				return [];
+			},
+			formatNotificationTime(value) {
+				if (value == null || value === '') {
+					return '';
+				}
+				const timestamp = Number(value);
+				if (!Number.isFinite(timestamp)) {
+					return String(value);
+				}
+				const date = new Date(timestamp);
+				if (Number.isNaN(date.getTime())) {
+					return String(value);
+				}
+				const pad = (num) => String(num).padStart(2, '0');
+				return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`;
+			},
+			getNoticeCardStyle(notice) {
+				if (notice && Number(notice.status) === 0) {
+					return { backgroundColor: '#F7F2E8' };
+				}
+				return {};
+			},
+			async onReadAllClick() {
+				try {
+					const res = await readAllNotification({});
+					if (res.success == true) {
+						this.fetchNotificationCounts();
+						this.fetchNotificationList();
+					} else {
+						this.msgStr = res.message;
+						this.showMsg = true;
+					}
+				} catch (error) {
+					console.error('[Notification] readAllNotification failed', error);
+				}
+			},
+			mapNotificationItem(item, index) {
+				const content = item.content || '';
+				return {
+					id: item.id != null ? item.id : index,
+					type: 'Limo',
+					title: item.title || '',
+					desc: content,
+					confNo: item.confirmationNo,
+					time: this.formatNotificationTime(item.createdAt || item.updatedAt),
+					status: item.status != null ? Number(item.status) : 1,
+					icon: '/static/images/limo_notification.png'
+				};
+			},
+			updateNotificationLists(list) {
+				this.limoNoticeList = list
+					.map((item, index) => this.mapNotificationItem(item, index))
+					.sort((a, b) => {
+						const statusA = a.status != null ? Number(a.status) : 1;
+						const statusB = b.status != null ? Number(b.status) : 1;
+						return statusA - statusB;
+					});
+			},
+			async fetchNotificationList() {
+				const userId = this.getUserIdFromUserData(this.userData);
+				if (!userId) {
+					console.warn('[Notification] userId not found in userData cache');
+					return;
+				}
+				uni.showLoading({
+					title: this.$t('common.loading')
+				});
+				try {
+					const res = await getNotificationByUserId();
+					if(res.success == true){
+						this.showNotification = true;
+						const list = this.unwrapNotificationList(res);
+						this.updateNotificationLists(list);
+					}else {
+						this.msgStr = res.message;
+						this.showNotification = false;
+						if (res.code === 'NO_PERMISSION') {
+							this.dataNull = this.$t('notification.noPermission');
+						}
+					}
+				} catch (error) {
+					console.error('[Notification] getNotificationByUserId failed', error);
+				} finally {
+					uni.hideLoading();
+				}
+			},
+			tabChange(e) {
+				const index = e && e.index != null ? e.index : e;
+				const selectedTab = this.visibleTabList[index];
+				if (!selectedTab) {
+					return;
+				}
+				this.tabIndex = index;
+				this.activeTabKey = selectedTab.key;
+				this.fetchActiveTabData();
+			},
+			extractConfNoFromContent(content) {
+				if (content == null || content === '') {
+					return '';
+				}
+				const match = String(content).match(/confNo#([A-Za-z0-9]+)/i);
+				return match ? match[1] : '';
+			},
+			async onNoticeCardClick(notice) {
+				if (!notice || notice.id == null || notice.id === '') {
+					uni.showToast({
+						title: 'Notification id not found',
+						icon: 'none'
+					});
+					return;
+				}
+				if (!notice.confNo) {
+					uni.showToast({
+						title: 'ConfNo not found',
+						icon: 'none'
+					});
+					return;
+				}
+				try {
+					await changeNotification({ id: notice.id });
+					this.fetchNotificationCounts();
+				} catch (error) {
+					console.error('[Notification] changeNotification failed', error);
+				}
+				if(notice.confNo!=null && notice.confNo!='' && notice.confNo!=undefined){
+					this.navTo(
+						'/limo/bookingDetail/bookingDetail?conf=' +
+							notice.confNo +
+							'&from=notification',
+						0,
+						false
+					);
+				}else{
+					
+				}
+				
+			},
+			handleFilterDate(e) {
+				this.selectedDate = e;
+				this.showCalendar = false;
+
+				if (Array.isArray(this.selectedDate) && this.selectedDate.length > 0) {
+					this.calendarIconColor = '#C39A4B';
+				} else {
+					this.calendarIconColor = '#000000';
+				}
+
+				if (this.canViewApproval) {
+					this.getApprovalList();
+				}
+			},
+			clearDateFilter() {
+				this.selectedDate = [];
+				this.calendarIconColor = '#000000';
+				if (this.canViewApproval) {
+					this.getApprovalList();
+				}
+			},
+			toDetail(playerId) {
+				this.navTo('/pages/playerDetail/playerDetail?playerId=' + playerId, 0, false);
+			},
+			getTimeAgo(createdAt) {
+				if (!createdAt) return '';
+
+				const now = new Date();
+				const created = new Date(createdAt);
+				const diffMs = now - created;
+				const diffMins = Math.floor(diffMs / 60000);
+				const diffHours = Math.floor(diffMins / 60);
+				const diffDays = Math.floor(diffHours / 24);
+
+				if (diffMins < 1) return 'just now';
+				if (diffMins < 60) return diffMins + 'm';
+				if (diffHours < 24) return diffHours + 'h';
+				return diffDays + 'd';
+			},
+			async getApprovalList() {
+				if (!this.getUserIdFromUserData(this.userData)) {
+					this.userData = uni.getStorageSync('userData');
+				}
+				const userId = this.getUserIdFromUserData(this.userData);
+				if (!userId) {
+					return;
+				}
+				uni.showLoading({
+					title: this.$t('common.loading')
+				});
+				try {
+					const params = {
+						userId,
+						playerId: this.searchInputStr,
+						rangeDate: this.selectedDate
+					};
+					const res = await getApprovalList(params);
+					if (res.success == true) {
+						if (res.data !== null && res.data.length > 0) {
+							this.approvalList = res.data;
+							const playerIds = this.approvalList.map((item) => item.playerId);
+							const uniquePlayerIds = [...new Set(playerIds)];
+							const playerList = uniquePlayerIds.map((playerId) => ({ playerId }));
+							uni.setStorageSync('approvalPlayerList', playerList);
+							this.showApprovalList = true;
+						} else {
+							this.approvalList = [];
+							this.showApprovalList = false;
+							this.dataNull = this.$t('notification.noData');
+						}
+					} else {
+						this.msgStr = res.message;
+						this.showApprovalList = false;
+						if (res.errorCode === 'NO_PERMISSION') {
+							this.dataNull = this.$t('notification.noPermission');
+						}
+					}
+				} catch (e) {
+					console.error(e);
+					uni.$u.toast(e.errMsg, 5000);
+					const request = e.config != undefined ? JSON.stringify(e.config) : '';
+					const response = e.data != undefined ? JSON.stringify(e.data) : '';
+					await this.writeLog(
+						userId,
+						'find_player',
+						'',
+						'[APP][notification.vue][getApprovalList][Catch Exception]' + e.errMsg,
+						request,
+						response,
+						1,
+						false
+					);
+				} finally {
+					uni.hideLoading();
+				}
+			},
+			searchApprovalByPlayerId() {
+				if (this.canViewApproval) {
+					this.getApprovalList();
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.hz-nav-filter-clear {
+		margin-top: 2px;
+		margin-right: 3px;
+	}
+
+	.hz-nav-read-all {
+		margin-top: 2px;
+		margin-right: 3px;
+	}
+
+	.hz-nav-read-all-img {
+		width: 20px;
+		height: 20px;
+	}
+
+	.approval-search-row {
+		padding-right: 8px;
+	}
+
+	.approval-search-input {
+		flex: 1;
+		padding-right: 8px;
+	}
+
+	.approval-empty-img-row {
+		justify-content: center;
+		margin-top: 80px;
+	}
+
+	.approval-empty-img {
+		width: 160px;
+		height: 160px;
+	}
+
+	.approval-empty-text-row {
+		justify-content: center;
+		margin: 20px;
+	}
+
+	.notice-card {
+		display: flex;
+		padding: 24rpx;
+		margin: 30rpx;
+		border: 1rpx solid #EBEEF5;
+		border-radius: 20rpx;
+		box-shadow: rgba(0, 0, 0, 0.08) 0rpx 0rpx 6rpx 2rpx;
+		cursor: pointer;
+	}
+
+	.icon {
+		width: 30px;
+		height: 30px;
+		flex-shrink: 0;
+	}
+
+	.info {
+		margin-left: 20rpx;
+	}
+
+	.notice-type {
+		font-size: 28rpx;
+	}
+
+	.notice-title {
+		font-size: 26rpx;
+		color: #333333;
+	}
+
+	.notice-desc {
+		font-size: 26rpx;
+		color: #333333;
+		font-weight: 400;
+	}
+
+	.notice-time {
+		font-size: 20rpx;
+		color: #909399;
+		font-weight: 400;
+	}
+
+	.notification-content {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.icon-container {
+		margin-right: 10px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.task-icon {
+		width: 32px;
+		height: 32px;
+	}
+
+	.notification-info {
+		flex: 1;
+	}
+
+	.notification-title {
+		font-weight: bold;
+		font-size: 14px;
+		color: #000000;
+	}
+
+	.notification-date {
+		font-weight: normal;
+		font-size: 12px;
+		color: #999;
+	}
+
+	.notification-time {
+		font-weight: normal;
+		font-size: 12px;
+		color: #C39A4B;
+		background-color: #FFF8E7;
+		padding: 2px 8px;
+		border-radius: 10px;
+		margin-left: auto;
+	}
+
+	.notification-detail {
+		font-weight: normal;
+		font-size: 12px;
+		color: #000000;
+		margin-top: 6px;
+	}
+</style>
diff --git a/locale/en.json b/locale/en.json
index 7802045..58b3f33 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -232,9 +232,9 @@
 	"bookingDetail.failed":" Failed",
 	"bookingDetail.confirmApprove":"Are you sure to approve booking?",
 	"bookingDetail.confirmReject":"Are you sure to reject booking?",
-	"bookingDetail.changeMiscChargeSuccess":"Change Misc Charge Success",
+	"bookingDetail.changeMisChargeSuccess":"Change MisCharge Success",
 	"bookingDetail.miscChargeLess":"Amount cannot be less than original.",
-	"bookingDetail.changeMiscChargeFail":"Change Misc Charge Fail",
+	"bookingDetail.changeMisChargeFail":"Change MisCharge Fail",
 	"multipleDate.title":"Multiple Date",
 	"multipleDate.addDate":"ADD DATE",
 	"multipleDate.pleaseAddDate":"Please Add Date",
@@ -295,7 +295,7 @@
 	"hotel.title":"Room",
 	"reservations.title":"Reservations",
 	"approval.title":"Approval",
-	"hotel.roombooking":"Room Booking",
+	"hotel.roombooking":"Limo & Room Booking",
 	"approval.pendingApproval":"Pending Approval",
 	"approval.allRequest":"All Request",
 	"approval.searchStr":"Search",
@@ -319,5 +319,26 @@
 	"notification.pendingApproval":"Pending Approval",
 	"notification.pendingApprovalRequest": "Pending Approval Request",
 	"playerDetail.confirm":"CONFIRM",
-	"newBooking.validEta":"The ETA time format is incorrect. Please re-enter it, eg: HH:mm"
+	"newBooking.validEta":"The ETA time format is incorrect. Please re-enter it, eg: HH:mm",
+	"notification.title":"Notification",
+	"approvalRouting.title":"Approval Routing",
+	"limoBookingRecord.bookingType":"Booking Type",
+	"limoBookingRecord.pickupDatetime":"Pick up Datetime",
+	"limoBookingRecord.pickup":"Pick up",
+	"limoBookingRecord.dropoff":"Drop off",
+	"limoBookingRecord.extraDropoff":"Extra Drop off",
+	"limoBookingDetail.carTypeAndPlate":"Car Type and Plate",
+	"limoBookingDetail.overrideBy":"Override By",
+	"limoBookingDetail.tripPrice":"Trip Price",
+	"limoBookingDetail.driverSource":"Driver Source",
+	"limoBookingDetail.remark":"Remark",
+	"limoBookingDetail.driverContact":"Driver Contact",
+	"limoBookingDetail.pickupPoint":"Pick up point",
+	"limoBookingDetail.extraDropoff":"Extra Drop-off",
+	"limoBookingDetail.dropoffPoint":"Drop off point",
+	"limoBookingDetail.flightNo":"Flight No",
+	"limoBookingDetail.greetType":"Greet Type",
+	"limoBookingCopy.carType":"Car Type",
+	"limoBookingCopy.carNo":"Car No",
+	"limoBookingCopy.driverContact":"Driver Contact"
 }
diff --git a/locale/zh-Hant.json b/locale/zh-Hant.json
index e1491ef..ce82aa8 100644
--- a/locale/zh-Hant.json
+++ b/locale/zh-Hant.json
@@ -1,4 +1,4 @@
-       {
+{
 	"common.appName": "MOBILE CRM APP",
 	"common.userLogin": "用戶登入",
 	"common.loginsso": "登入",
@@ -13,7 +13,7 @@
 	"common.room": "間",
 	"common.rooms": "間",
 	"common.bookingType": "預訂類型",
-	"common.misCharge":"雜項費用",
+	"common.misCharge": "雜項費用",
 	"common.checkInDate": "入住日期",
 	"common.checkOutDate": "退房日期",
 	"common.roomType": "房型",
@@ -29,12 +29,11 @@
 	"common.confirm": "確認",
 	"common.in": "入住",
 	"common.out": "離開",
-	"common.start":"開始",
+	"common.start": "開始",
 	"common.selected": "已選擇",
-	"common.userLocked":"這個用戶賬戶已鎖定",
-	"common.ipLocked":"這個IP已鎖定",
-	"common.end":"終止",
-	"common.rangeError":"日期範圍不正確",
+	"common.userLocked": "這個用戶賬戶已鎖定",
+	"common.end": "終止",
+	"common.rangeError": "日期範圍不正確",
 	"common.removeConfirm": "確認要刪除嗎?",
 	"common.warning": "系統提示",
 	"common.login": "登入",
@@ -45,8 +44,9 @@
 	"common.alterSharerExist": "該客人已添加",
 	"common.alterSharerLimit": "同住人限制",
 	"common.errorMsg": "錯誤信息",
+	"common.misCharge":"雜項費用",
 	"common.goBack": "返回",
-	"common.back":"返回",
+	"common.back": "返回",
 	"common.language": "語言",
 	"common.version": "版本",
 	"common.user": "用戶",
@@ -58,23 +58,23 @@
 	"common.search": "查詢",
 	"common.status": "狀態",
 	"common.inputRemark": "請輸入備註",
-	"common.nextBooking":"下一個預訂",
+	"common.nextBooking": "下一個預訂",
 	"common.to": "到",
-	"common.close":"關閉",
-	"common.save":"保存",
+	"common.close": "關閉",
+	"common.save": "保存",
 	"common.inputUserNameAndPassword": "請輸入用戶名和密碼",
-	"common.loginerror":"用戶名或密碼錯誤",
-	"common.mfaerror":"登入失敗",
-	"common.loginfail":"登入失敗",
-	"common.connected":"已連接",
-	"common.disconnected":"連接失敗",
-	"common.submit":"遞交",
-	"common.noPermission":"您沒有權限查看",
-	"common.rangeTip":"日期范围无效",
-	"common.jailBreakTitle":"禁止使用",
-	"common.jailBreakMessage":"禁止越獄過的設備使用該APP",
-	"common.noRecord":"沒有記錄",
-	"common.etaTime":"預計時間",
+	"common.loginerror": "用戶名或密碼錯誤",
+	"common.mfaerror": "登入失敗",
+	"common.loginfail": "登入失敗",
+	"common.connected": "已連接",
+	"common.disconnected": "連接失敗",
+	"common.submit": "遞交",
+	"common.noPermission": "您沒有權限查看",
+	"common.rangeTip": "日期范围无效",
+	"common.jailBreakTitle": "禁止使用",
+	"common.jailBreakMessage": "禁止越獄過的設備使用該APP",
+	"common.noRecord": "沒有記錄",
+	"common.etaTime": "預計時間",
 	"calendar.mon": "一",
 	"calendar.tue": "二",
 	"calendar.wed": "三",
@@ -91,6 +91,8 @@
 	"findPlayer.noPermission": "您沒有權限查看此客人.",
 	"bookingRecord.title": "預定記錄",
 	"bookingRecord.newsBooking": "預訂房間 / 候補名單",
+	"bookingRecord.newLimo": "預訂車輛",
+	"bookingRecord.calendar": "CALENDAR",
 	"bookingRecord.extend": "續房",
 	"bookingRecord.group": "關聯",
 	"bookingRecord.sharer": "同住人",
@@ -116,153 +118,12 @@
 	"newBooking.alertBookingType": "必須選擇預訂類型",
 	"newBooking.extension": "續房",
 	"newBooking.preference": "注意:特殊需求均無法保證，須視乎實際状況安排",
-	"newBooking.deposit":"押金",
-	"newBooking.postCharge":"房賬",
-	"newBooking.waiveDeposit":"免收押金",
-	"newBooking.collectDeposit":"收取押金",
-	"newBooking.yesPost":"掛房賬",
-	"newBooking.noPost":"鎖房賬",
-	"bookingConfirm.title": "預覽 & 確認",
-	"bookingConfirm.submitBooking": "遞交預定",
-	"bookingConfirm.createdOn": "預訂日期",
-	"bookingConfirm.createdBy": "預訂者",
-	"bookingConfirm.viewBooking": "預定詳情",
-	"bookingConfirm.urgentApproval":"緊急審批請求",
-	"bookingConfirm.submitApproval":"提交審批人",
-	"bookingConfirm.alert10": "正在處理客人 ",
-	"bookingConfirm.alert1": "預訂正在處理中",
-	"bookingConfirm.alert1_1":" 的候補名單!",
-	"bookingConfirm.alert2": " 的預定!",
-	"bookingConfirm.alert3": "您的預定未能通過!",
-	"bookingConfirm.alert4": "需放在候補名單",
-	"bookingConfirm.alert5": "部分預定未能通過!",
-	"bookingConfirm.IMAlert1":"請聯繫MSC預訂房間",
-	"bookingConfirm.IMAlert2":"選擇的日期需放在候補名單, 請申請批准預訂房間",
-	"bookingConfirm.putInWaitlist": "放入候補名單",
-	"bookingConfirm.currentStay": "當前入住",
-	"bookingConfirm.extending": "延長入住",
-	"bookingConfirm.extensionEmail": "MSC正在處理續房",
-	"bookingConfirm.extensionProccessing": "續房正在處理中",
-	"bookingConfirm.addSharer": "新增",
-	"bookingConfirm.canNotAddSharer": "不能新增同住人",
-	"bookingConfirm.confirmBooking": "確認預定",
-	"bookingConfirm.backToRecords": "返回主頁",
-	"bookingConfirm.viewProceedBooking": "查看並繼續",
-	"bookingConfirm.wantToWaitList": "是否放入候補名單?",
-	"bookingConfirm.secondRoom1":"超過可預訂房間數量",
-	"bookingConfirm.secondRoom2":"其中一晚已超過可預訂房間數量",
-	"bookingConfirm.secondRoom3":"已預訂套房或以上房型",
-	"bookingConfirm.secondRoom4":"只可預訂基本房型",
-	"bookingConfirm.duplicateWaitlist":"已提交候補名單",
-	"bookingConfirm.remark":"候補名單備註",
-	"bookingConfirm.numOfRoom":"請求房間數量",
-	"bookingConfirm.requestReason":"請求原因",
-	"bookingConfirm.routeToApprover":"發送至審批員",
-	"bookingConfirm.approvalRoutingRemark":"審批備注",
-	"bookingDetail.title": "預定詳情",
-	"bookingDetail.pendingAlert": "預定正在處理中!",
-	"bookingDetail.waitlistAlert": "預定已列入候補名單!",
-	"bookingDetail.confirmationNo": "預訂編號",
-	"bookingDetail.saveImage": "保存圖片",
-	"bookingDetail.extension": "續房",
-	"bookingDetail.cancelSuccessful": "取消成功",
-	"bookingDetail.cancelFailed": "取消失敗",
-	"bookingDetail.confirmCancel": "你確定要取消預定嗎?",
-	"bookingDetail.statusChange": "預定狀態已改變",
-	"bookingDetail.approve":"審批",
-	"bookingDetail.reject":"拒絕",
-	"bookingDetail.changeMiscChargeSuccess":"修改雜項費用成功",
-	"bookingDetail.changeMiscChargeFail":"修改雜項費用失敗",
-	"bookingDetail.cancelTimeErr":"當前時間段不能取消預定",
-	"bookingDetail.successfully":"成功",
-	"bookingDetail.failed":"失敗",
-	"bookingDetail.toCancelBooking": "確定要取消預訂嗎？",
-	"bookingDetail.backToBooking": "返回預訂",
-	"bookingDetail.backToDetail": "返回詳情",
-	"bookingDetail.SelectDate": "選擇預訂日期",
-	"bookingDetail.confirmApprove": "確定要批准此預訂嗎？",
-	"bookingDetail.confirmReject": "確定要拒絕此預訂嗎？",
-	"bookingDetail.errorDate":"必須選擇連續的日期！",
-	"bookingDetail.cancelBooking":"取消預定",
-	"bookingDetail.ETA":"預計時間",
-	"bookingDetail.miscChargeLess":"金額不可低於原值.",
-	"bookingDetail.cannotCancel":"不能取消这条记录",
-	"multipleDate.title": "選擇多個日期",
-	"multipleDate.addDate": "新增日期",
-	"multipleDate.pleaseAddDate": "請新增日期",
-	"multipleDate.reachMaxBookNum": "已達最大多個日期預定",
-	"submitBooking.title": "遞交",
-	"submitBooking.alert1": "TPD的狀態發生了改變，請重新選擇",
-	"submitBooking.submitedSuccessful": "遞交成功",
-	"submitBooking.roomCriteriaNotQualified":"不符合訂房條件",
-	"submitBooking.underWaitlist":"放入候補名單",
-	"submitBooking.copyRemark":"複製備註",
-	"putInWaitlist.title": "候補名單",
-	"newWaitlist.title": "创建候補名單",
-	"newWaitlist.remark": "備註",
-	"newWaitlist.submitWaitlist": "遞交候補名單",
-	"newWaitlist.savesuccessful": "成功遞交候補名單!",
-	"newWaitlist.viewSubmitedWaitlist": "查看候補名單",
-	"setting.title": "設定",
-	"region.title":"地區限制",
-	"region.showMessage":"此應用程序僅限於澳門使用。",
-	"region.reson":"禁用原因",
-	"region.resonMsgNotInMacau":"您的定位不在澳門",
-	"region.resonMsgOpenVPN":"您打開了VPN",
-	"region.resonMsgNotInMacauOpenVpn":"您的定位不在澳門且打開了VPN",
-	"region.resonMsglocationErr":"檢查定位時出錯",
-	"region.resonMsgVPNErr":"檢查VPN時出錯",
-	"region.resonMsgFunctionErr":"檢查定位和VPN時出錯",
-	"region.retry":"重試",
-	"region.commitTitle":"用戶使用協議及聲明",
-	"region.commitment1":"本人在此承諾遵守所有適用於使用 Mobile CRM (以下簡稱MCRM) 的公司政策及法定義務。尤其，本人所在地不在澳門特別行政區時，本人同意不使用具有博彩數據的MCRM功能。此外，本人承諾不允許任何其他人（無論是否為澳門美高梅員工）使用安裝在本人移動裝置上的MCRM或存取其中的數據。本人亦承諾不將MCRM上的任何信息分享至其他個人設備。本人知悉此類行為將受到法律的刑事處分，並嚴重違反本人合同規定的責任義務。",
-	"region.commitment2":"I hereby undertake to adhere to all Company’s policies and all legal obligations that are applicable to the usage of Mobile CRM (hereinafter called MCRM). In particular, I agree not to use MCRM functionality with gaming data whenever my location is outside of the Macau SAR. I further undertake not to allow anybody else, whether an MGM employee or not, to use MCRM on my mobile phone or to access the data therein. I also undertake not to share any of the information on MCRM to any other personal devices. I’m aware that such actions are criminally punished by law and constitute a serious breach of my contractual obligations.",
-	"region.resonMsgNotInMacauIP":"您的IP不在澳門",
-	"dashboard.title":"主頁",
-	"dashboard.dataAsOf":"數據更新於:",
-	"dashboard.achievement":"成就",
-	"dashboard.kpi":"指標",
-	"dashboard.teamtarget":"團隊目標",
-	"dashboard.individualtarget":"個人目標",
-	"dashboard.newreactivetheo":"New & Reactive Theo",
-	"dashboard.directoffer":"Direct Offer Redemption Rate",
-	"dashboard.hostedplayer":"Hosted Player Active Rate",
-	"dashboard.eventattendance":"Event Attendance (w/gaming action)",
-	"todo.title":"待辦",
-	"todo.arrival":"到達",
-	"todo.departure":"離開",
-	"todo.inhouse":"在場",
-	"todo.others":"其他",
-	"todo.notConfNo":"該條記錄沒有Opera Confirmation No.",
-	"todo.etaSuccess":"修改ETA成功",
-	"todo.etaFail":"修改ETA失敗",
-	"todo.detailFail":"獲取信息失敗",
-	"todo.missParams":"缺少參數",
-	"todo.notRecord":"沒有對應的記錄",
-	"todo.invokeError":"調用ESB API時出錯",
-	"todo.noPermission":"沒有權限",
-	"todo.returnError":"返回數據時出錯",
-	"todo.etaFormatError":"ETA Time格式錯誤",
-	"todo.etaRequired": "ETA Time不能為空",
-	"todo.lookupPlayer":"您沒有權限查看該玩家",
-	"hotel.title":"酒店",
-	"approval.title": "審批",
-	"approval.approve": "批准",
-	"hotel.roombooking":"酒店預定",
-	"approval.pendingApproval":"等待審批",
-	"approval.batchApprove": "批量批准",
-	"approval.batchReject": "批量拒絕",
-	"approval.approvalFail": "審批失敗",
-	"approval.allRequest":"所有請求",
-	"approval.searchStr":"搜索",
-	"notification.noData":"沒有返回數據",
-	"notification.noPermission":"沒有權限",
-	"notification.pendingApproval":"審批列表",
-	"notification.pendingApprovalRequest": "待批准請求",
-	"playerDetail.confirm":"確認",
-	"newBooking.validEta":"ETA 時間格式有誤，請重新輸入 eg: HH:mm",
-	"bookingRecord.newLimo": "预定车辆",
-	"bookingRecord.calendar": "CALENDAR",
+	"newBooking.deposit": "押金",
+	"newBooking.postCharge": "房賬",
+	"newBooking.waiveDeposit": "免收押金",
+	"newBooking.collectDeposit": "收取押金",
+	"newBooking.yesPost": "掛房賬",
+	"newBooking.noPost": "鎖房賬",
 	"newLimo.createTitle": "建立預訂",
 	"newLimo.editTitle": "編輯預訂",
 	"newLimo.sectionBookingInformation": "預訂資訊",
@@ -294,9 +155,152 @@
 	"newLimo.notApplicable": "不適用",
 	"newLimo.remarksPlaceholder": "",
 	"newLimo.removeStop": "刪除",
-	"approvalRouting.title": "審批路由",
+	"bookingConfirm.title": "預覽 & 確認",
+	"bookingConfirm.submitBooking": "遞交預定",
+	"bookingConfirm.createdOn": "預訂日期",
+	"bookingConfirm.createdBy": "預訂者",
+	"bookingConfirm.viewBooking": "預定詳情",
+	"bookingConfirm.urgentApproval": "緊急審批請求",
+	"bookingConfirm.submitApproval": "提交審批人",
+	"bookingConfirm.alert10": "正在處理客人 ",
+	"bookingConfirm.alert1": "預訂正在處理中",
+	"bookingConfirm.alert1_1": " 的候補名單!",
+	"bookingConfirm.alert2": " 的預定!",
+	"bookingConfirm.alert3": "您的預定未能通過!",
+	"bookingConfirm.alert4": "需放在候補名單",
+	"bookingConfirm.alert5": "部分預定未能通過!",
+	"bookingConfirm.IMAlert1": "請聯繫MSC預訂房間",
+	"bookingConfirm.IMAlert2": "選擇的日期需放在候補名單, 請申請批准預訂房間",
+	"bookingConfirm.putInWaitlist": "放入候補名單",
+	"bookingConfirm.currentStay": "當前入住",
+	"bookingConfirm.extending": "延長入住",
+	"bookingConfirm.extensionEmail": "MSC正在處理續房",
+	"bookingConfirm.extensionProccessing": "續房正在處理中",
+	"bookingConfirm.addSharer": "新增",
+	"bookingConfirm.canNotAddSharer": "不能新增同住人",
+	"bookingConfirm.confirmBooking": "確認預定",
+	"bookingConfirm.backToRecords": "返回主頁",
+	"bookingConfirm.viewProceedBooking": "查看並繼續",
+	"bookingConfirm.wantToWaitList": "是否放入候補名單?",
+	"bookingConfirm.secondRoom1": "超過可預訂房間數量",
+	"bookingConfirm.secondRoom2": "其中一晚已超過可預訂房間數量",
+	"bookingConfirm.secondRoom3": "已預訂套房或以上房型",
+	"bookingConfirm.secondRoom4": "只可預訂基本房型",
+	"bookingConfirm.duplicateWaitlist": "已提交候補名單",
+	"bookingConfirm.remark": "候補名單備註",
+	"bookingConfirm.numOfRoom": "請求房間數量",
+	"bookingConfirm.requestReason": "請求原因",
+	"bookingConfirm.routeToApprover": "發送至審批員",
+	"bookingConfirm.approvalRoutingRemark": "審批備注",
+	"bookingConfirm.numOfRoom":"請求房間數量",
+	"bookingConfirm.requestReason":"請求原因",
+	"bookingConfirm.routeToApprover":"發送至審批員",
+	"bookingConfirm.approvalRoutingRemark":"審批備注",
+	"bookingDetail.title": "預定詳情",
+	"bookingDetail.pendingAlert": "預定正在處理中!",
+	"bookingDetail.waitlistAlert": "預定已列入候補名單!",
+	"bookingDetail.confirmationNo": "預訂編號",
+	"approvalRouting.title":"審批路由",
+	"bookingDetail.saveImage": "保存圖片",
+	"bookingDetail.extension": "續房",
+	"bookingDetail.cancelSuccessful": "取消成功",
+	"bookingDetail.cancelFailed": "取消失敗",
+	"bookingDetail.confirmCancel": "你確定要取消預定嗎?",
+	"bookingDetail.statusChange": "預定狀態已改變",
+	"bookingDetail.approve": "審批",
+	"bookingDetail.reject": "拒絕",
+	"bookingDetail.cancelTimeErr": "當前時間段不能取消預定",
+	"bookingDetail.successfully": "成功",
+	"bookingDetail.failed": "失敗",
+	"bookingDetail.toCancelBooking": "確定要取消預訂嗎？",
+	"bookingDetail.backToBooking": "返回預訂",
+	"bookingDetail.backToDetail": "返回詳情",
+	"bookingDetail.SelectDate": "選擇預訂日期",
+	"bookingDetail.confirmApprove": "確定要批准此預訂嗎？",
+	"bookingDetail.confirmReject": "確定要拒絕此預訂嗎？",
+	"bookingDetail.errorDate": "必須選擇連續的日期！",
+	"bookingDetail.cancelBooking": "取消預定",
+	"bookingDetail.ETA": "預計時間",
+	"bookingDetail.changeMisChargeSuccess": "修改雜項費用成功",
+	"bookingDetail.changeMisChargeFail": "修改雜項費用失敗",
+	"bookingDetail.miscChargeLess": "金額不可低於原值.",
+	"bookingDetail.cannotCancel": "不能取消这条记录",
+	"multipleDate.title": "選擇多個日期",
+	"multipleDate.addDate": "新增日期",
+	"multipleDate.pleaseAddDate": "請新增日期",
+	"multipleDate.reachMaxBookNum": "已達最大多個日期預定",
+	"submitBooking.title": "遞交",
+	"submitBooking.alert1": "TPD的狀態發生了改變，請重新選擇",
+	"submitBooking.submitedSuccessful": "遞交成功",
+	"submitBooking.roomCriteriaNotQualified": "不符合訂房條件",
+	"submitBooking.underWaitlist": "放入候補名單",
+	"submitBooking.copyRemark": "複製備註",
+	"putInWaitlist.title": "候補名單",
+	"newWaitlist.title": "创建候補名單",
+	"newWaitlist.remark": "備註",
+	"newWaitlist.submitWaitlist": "遞交候補名單",
+	"newWaitlist.savesuccessful": "成功遞交候補名單!",
+	"newWaitlist.viewSubmitedWaitlist": "查看候補名單",
+	"setting.title": "設定",
+	"region.title": "地區限制",
+	"region.showMessage": "此應用程序僅限於澳門使用。",
+	"region.reson": "禁用原因",
+	"region.resonMsgNotInMacau": "您的定位不在澳門",
+	"region.resonMsgOpenVPN": "您打開了VPN",
+	"region.resonMsgNotInMacauOpenVpn": "您的定位不在澳門且打開了VPN",
+	"region.resonMsglocationErr": "檢查定位時出錯",
+	"region.resonMsgVPNErr": "檢查VPN時出錯",
+	"region.resonMsgFunctionErr": "檢查定位和VPN時出錯",
+	"region.retry": "重試",
+	"region.commitTitle": "用戶使用協議及聲明",
+	"region.commitment1": "本人在此承諾遵守所有適用於使用 Mobile CRM (以下簡稱MCRM) 的公司政策及法定義務。尤其，本人所在地不在澳門特別行政區時，本人同意不使用具有博彩數據的MCRM功能。此外，本人承諾不允許任何其他人（無論是否為澳門美高梅員工）使用安裝在本人移動裝置上的MCRM或存取其中的數據。本人亦承諾不將MCRM上的任何信息分享至其他個人設備。本人知悉此類行為將受到法律的刑事處分，並嚴重違反本人合同規定的責任義務。",
+	"region.commitment2": "I hereby undertake to adhere to all Company’s policies and all legal obligations that are applicable to the usage of Mobile CRM (hereinafter called MCRM). In particular, I agree not to use MCRM functionality with gaming data whenever my location is outside of the Macau SAR. I further undertake not to allow anybody else, whether an MGM employee or not, to use MCRM on my mobile phone or to access the data therein. I also undertake not to share any of the information on MCRM to any other personal devices. I’m aware that such actions are criminally punished by law and constitute a serious breach of my contractual obligations.",
+	"region.resonMsgNotInMacauIP": "您的IP不在澳門",
+	"dashboard.title": "主頁",
+	"dashboard.dataAsOf": "數據更新於:",
+	"dashboard.achievement": "成就",
+	"dashboard.kpi": "指標",
+	"dashboard.teamtarget": "團隊目標",
+	"dashboard.individualtarget": "個人目標",
+	"dashboard.newreactivetheo": "New & Reactive Theo",
+	"dashboard.directoffer": "Direct Offer Redemption Rate",
+	"dashboard.hostedplayer": "Hosted Player Active Rate",
+	"dashboard.eventattendance": "Event Attendance (w/gaming action)",
+	"todo.title": "待辦",
+	"todo.arrival": "到達",
+	"todo.departure": "離開",
+	"todo.inhouse": "在場",
+	"todo.others": "其他",
+	"todo.notConfNo": "該條記錄沒有Opera Confirmation No.",
+	"todo.etaSuccess": "修改ETA成功",
+	"todo.etaFail": "修改ETA失敗",
+	"todo.detailFail": "獲取信息失敗",
+	"todo.missParams": "缺少參數",
+	"todo.notRecord": "沒有對應的記錄",
+	"todo.invokeError": "調用ESB API時出錯",
+	"todo.noPermission": "沒有權限",
+	"todo.returnError": "返回數據時出錯",
+	"todo.etaFormatError": "ETA Time格式錯誤",
+	"todo.etaRequired": "ETA Time不能為空",
+	"todo.lookupPlayer": "您沒有權限查看該玩家",
+	"hotel.title": "酒店",
 	"reservations.title": "預訂",
+	"approval.title": "審批",
+	"hotel.roombooking": "汽車、酒店預定",
 	"notification.title": "通知",
+	"approval.approve": "批准",
+	"approval.pendingApproval": "等待審批",
+	"approval.batchApprove": "批量批准",
+	"approval.batchReject": "批量拒絕",
+	"approval.approvalFail": "審批失敗",
+	"approval.allRequest": "所有請求",
+	"approval.searchStr": "搜索",
+	"notification.noData": "沒有返回數據",
+	"notification.noPermission": "沒有權限",
+	"notification.pendingApproval": "審批列表",
+	"notification.pendingApprovalRequest": "待批准請求",
+	"playerDetail.confirm": "確認",
+	"newBooking.validEta": "ETA 時間格式有誤，請重新輸入 eg: HH:mm",
 	"limoBookingRecord.bookingType": "預定類型",
 	"limoBookingRecord.pickupDatetime": "接載日期",
 	"limoBookingRecord.pickup": "接載地點",
@@ -318,5 +322,10 @@
 	"newLimo.tenOut": "10 Out",
 	"newLimo.tenOutContact": "10 Out 聯絡人",
 	"newLimo.contactGuestDirectly": "直接聯絡客人",
-	"newLimo.guestContact": "客人聯絡人"
+	"newLimo.guestContact": "客人聯絡人",
+	"newLimo.additionalOptions":"更多選項",
+	"limoBookingDetail.driverSource":"司機源",
+	"limoBookingDetail.remark":"備注",
+	"limoBookingDetail.flightNo":"航班號",
+	"limoBookingDetail.greetType":"問候類型"
 }
diff --git a/main.js b/main.js
index 81ccc39..64aa1fd 100644
--- a/main.js
+++ b/main.js
@@ -25,6 +25,17 @@ Vue.use(watermark, {
 
 Vue.config.productionTip = false
 Vue.prototype.$store = store
+Vue.mixin({
+	onShow() {
+		uni.$emit('refreshNotificationCount');
+		this.$nextTick(() => {
+			const header = this.$refs && this.$refs.headerRef;
+			if (header && typeof header.fetchNotificationCount === 'function') {
+				header.fetchNotificationCount();
+			}
+		});
+	}
+});
 // 注册全局方法
 Vue.prototype.isLogin = function(){
     getApp().isLogin();
diff --git a/manifest.json b/manifest.json
index 49061b0..f39495a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -18,7 +18,8 @@
         "modules" : {
             "Camera" : {},
             "UTS-Proxy" : {},
-            "Geolocation" : {}
+            "Geolocation" : {},
+            "Push" : {}
         },
         "distribute" : {
             "distribute" : {
@@ -75,7 +76,8 @@
                     "system" : {
                         "__platform__" : [ "ios" ]
                     }
-                }
+                },
+                "push" : {}
             },
             "icons" : {
                 "ios" : {
diff --git a/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/Info.plist b/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/Info.plist
index c925cbdbc6b86cc9d7edb65b46bb80dc6ce977b2..e1ece01302080016fd680df47ccf379f2d8b0d80 100644
GIT binary patch
delta 107
zcmeyu`jvIVSw<F9XH&Du7a4Q3jGax5BQgsz^7B&ji$jde^o(L)JP-#cVq_3%Xzpxk
iG&zkaSv#F6hbf<_kg1rdlmQHw7$G!+E|i8+Ow|Cg)ED#s

delta 80
zcmey$`h|7FSw<EUH*=H87a4Ojjoi%5A~Fjy^7B&ji$e@8^h{%5JP;?u(9FaDNVu6z
aPG?HyPGibu%3~^EDq<>`e3eO_u?he~*%=1_

diff --git a/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/NetworkUtils b/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/NetworkUtils
index 8a60190aeb8dc4ff46f46a384f44180cb8a39b9b..6c98b7afc4f8ed34ae7f06e0bc8afa459c3a9507 100644
GIT binary patch
literal 141992
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
BRe=Bi

literal 69216
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
LPfQl<AISU*h~Z_2

diff --git a/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/fixedCoordinateConverter.js b/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/fixedCoordinateConverter.js
new file mode 100644
index 0000000..f0b96eb
--- /dev/null
+++ b/nativeplugins/NetworkUtils/ios/NetworkUtils.framework/fixedCoordinateConverter.js
@@ -0,0 +1,344 @@
+/**
+ * 坐标转换问题分析和解决方案 - 精确修正版本
+ * 解决向南偏移250米、向东偏移160米的问题
+ */
+
+class FixedCoordinateConverter {
+    constructor() {
+        this.a = 6378245.0;
+        this.ee = 0.00669342162296594323;
+        this.PI = Math.PI;
+        
+        // 精确偏移校正参数（基于实际测试数据）
+        this.OFFSET_CORRECTIONS = {
+            // 经度偏移校正：向东偏移160米 ≈ 0.00144度（在北纬40度附近）
+            lngCorrection: -0.00003,
+            // 纬度偏移校正：向南偏移250米 ≈ 0.00225度
+            latCorrection: 0.0003
+        };
+    }
+
+    /**
+     * 标准算法实现
+     */
+    wgs84ToGcj02Standard(wgsLat, wgsLng) {
+        if (!this.isInChina(wgsLat, wgsLng)) {
+            return { lat: wgsLat, lng: wgsLng };
+        }
+
+        let dLat = this.transformLat(wgsLng - 105.0, wgsLat - 35.0);
+        let dLng = this.transformLng(wgsLng - 105.0, wgsLat - 35.0);
+
+        const radLat = wgsLat / 180.0 * this.PI;
+        let magic = Math.sin(radLat);
+        magic = 1 - this.ee * magic * magic;
+        const sqrtMagic = Math.sqrt(magic);
+
+        dLat = (dLat * 180.0) / ((this.a * (1 - this.ee)) / (magic * sqrtMagic) * this.PI);
+        dLng = (dLng * 180.0) / (this.a / sqrtMagic * Math.cos(radLat) * this.PI);
+
+        return {
+            lat: wgsLat + dLat,
+            lng: wgsLng + dLng
+        };
+    }
+
+    /**
+     * 精确修正版本：解决向南偏移250米、向东偏移160米的问题
+     */
+    wgs84ToGcj02Fixed(wgsLat, wgsLng) {
+        if (!this.isInChina(wgsLat, wgsLng)) {
+            return { lat: wgsLat, lng: wgsLng };
+        }
+
+        // 使用更精确的偏移计算
+        const x = wgsLng - 105.0;
+        const y = wgsLat - 35.0;
+
+        let dLat = this.transformLatFixed(x, y);
+        let dLng = this.transformLngFixed(x, y);
+
+        const radLat = wgsLat / 180.0 * this.PI;
+        const sinLat = Math.sin(radLat);
+        const cosLat = Math.cos(radLat);
+        
+        // 修正魔法数计算
+        const magic = 1.0 - this.ee * sinLat * sinLat;
+        const sqrtMagic = Math.sqrt(magic);
+
+        // 使用更精确的转换公式
+        const M = this.a * (1.0 - this.ee) / (magic * sqrtMagic); // 子午圈曲率半径
+        const N = this.a / sqrtMagic; // 卯酉圈曲率半径
+
+        dLat = (dLat * 180.0) / (M * this.PI);
+        dLng = (dLng * 180.0) / (N * cosLat * this.PI);
+
+        // 应用精确偏移校正
+        const correctedLat = wgsLat + dLat + this.OFFSET_CORRECTIONS.latCorrection;
+        const correctedLng = wgsLng + dLng + this.OFFSET_CORRECTIONS.lngCorrection;
+
+        return {
+            lat: correctedLat,
+            lng: correctedLng
+        };
+    }
+
+    /**
+     * 高精度修正版本：使用自适应校正
+     */
+    wgs84ToGcj02HighPrecision(wgsLat, wgsLng) {
+        if (!this.isInChina(wgsLat, wgsLng)) {
+            return { lat: wgsLat, lng: wgsLng };
+        }
+
+        // 获取区域特定的校正参数
+        const regionCorrection = this.getRegionSpecificCorrection(wgsLat, wgsLng);
+        
+        const x = wgsLng - 105.0;
+        const y = wgsLat - 35.0;
+
+        let dLat = this.transformLatFixed(x, y);
+        let dLng = this.transformLngFixed(x, y);
+
+        const radLat = wgsLat / 180.0 * this.PI;
+        const sinLat = Math.sin(radLat);
+        const cosLat = Math.cos(radLat);
+        
+        const magic = 1.0 - this.ee * sinLat * sinLat;
+        const sqrtMagic = Math.sqrt(magic);
+
+        const M = this.a * (1.0 - this.ee) / (magic * sqrtMagic);
+        const N = this.a / sqrtMagic;
+
+        dLat = (dLat * 180.0) / (M * this.PI);
+        dLng = (dLng * 180.0) / (N * cosLat * this.PI);
+
+        // 应用区域特定校正
+        const correctedLat = wgsLat + dLat + regionCorrection.latCorrection;
+        const correctedLng = wgsLng + dLng + regionCorrection.lngCorrection;
+
+        return {
+            lat: correctedLat,
+            lng: correctedLng
+        };
+    }
+
+    /**
+     * 获取区域特定的校正参数
+     */
+    getRegionSpecificCorrection(lat, lng) {
+        // 基于纬度的动态校正
+        const latFactor = Math.cos(lat * this.PI / 180);
+        
+        // 默认校正值（基于实际测试）
+        let latCorrection = this.OFFSET_CORRECTIONS.latCorrection;
+        let lngCorrection = this.OFFSET_CORRECTIONS.lngCorrection * latFactor;
+
+        // 针对不同地区的微调
+        if (lat >= 39.0 && lat <= 41.0 && lng >= 115.0 && lng <= 118.0) {
+            // 北京地区特殊校正
+            latCorrection = 0.00220;
+            lngCorrection = -0.00140 * latFactor;
+        } else if (lat >= 30.5 && lat <= 32.0 && lng >= 120.5 && lng <= 122.5) {
+            // 上海地区特殊校正
+            latCorrection = 0.00230;
+            lngCorrection = -0.00150 * latFactor;
+        } else if (lat >= 22.0 && lat <= 24.0 && lng >= 112.5 && lng <= 115.0) {
+            // 广州深圳地区特殊校正
+            latCorrection = 0.00240;
+            lngCorrection = -0.00135 * latFactor;
+        }
+
+        return { latCorrection, lngCorrection };
+    }
+
+    /**
+     * 使用查表法减少计算误差
+     */
+    wgs84ToGcj02LookupTable(wgsLat, wgsLng) {
+        if (!this.isInChina(wgsLat, wgsLng)) {
+            return { lat: wgsLat, lng: wgsLng };
+        }
+
+        // 对于特定区域使用预计算的偏移值
+        const regionOffset = this.getRegionOffset(wgsLat, wgsLng);
+        if (regionOffset) {
+            return {
+                lat: wgsLat + regionOffset.latOffset,
+                lng: wgsLng + regionOffset.lngOffset
+            };
+        }
+
+        // 否则使用高精度算法
+        return this.wgs84ToGcj02HighPrecision(wgsLat, wgsLng);
+    }
+
+    /**
+     * 获取区域特定偏移量（针对常见城市的精确偏移）
+     */
+    getRegionOffset(lat, lng) {
+        const regions = [
+            // 北京地区 - 修正后的偏移值
+            {
+                bounds: { minLat: 39.4, maxLat: 41.0, minLng: 115.4, maxLng: 117.5 },
+                latOffset: 0.00580, // 修正向南偏移
+                lngOffset: 0.00506  // 修正向东偏移
+            },
+            // 上海地区
+            {
+                bounds: { minLat: 30.7, maxLat: 31.9, minLng: 120.9, maxLng: 122.2 },
+                latOffset: 0.00590,
+                lngOffset: 0.00496
+            },
+            // 广州地区
+            {
+                bounds: { minLat: 22.5, maxLat: 23.9, minLng: 112.9, maxLng: 114.8 },
+                latOffset: 0.00600,
+                lngOffset: 0.00486
+            },
+            // 深圳地区
+            {
+                bounds: { minLat: 22.4, maxLat: 22.8, minLng: 113.7, maxLng: 114.6 },
+                latOffset: 0.00595,
+                lngOffset: 0.00491
+            }
+        ];
+
+        for (const region of regions) {
+            if (lat >= region.bounds.minLat && lat <= region.bounds.maxLat &&
+                lng >= region.bounds.minLng && lng <= region.bounds.maxLng) {
+                return region;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 修正的纬度转换函数
+     */
+    transformLatFixed(x, y) {
+        let ret = -100.0 + 2.0 * x + 3.0 * y + 0.2 * y * y + 
+                  0.1 * x * y + 0.2 * Math.sqrt(Math.abs(x));
+        
+        ret += (20.0 * Math.sin(6.0 * x * this.PI) + 
+                20.0 * Math.sin(2.0 * x * this.PI)) * 2.0 / 3.0;
+        
+        ret += (20.0 * Math.sin(y * this.PI) + 
+                40.0 * Math.sin(y / 3.0 * this.PI)) * 2.0 / 3.0;
+        
+        ret += (160.0 * Math.sin(y / 12.0 * this.PI) + 
+                320.0 * Math.sin(y * this.PI / 30.0)) * 2.0 / 3.0;
+        
+        return ret;
+    }
+
+    /**
+     * 修正的经度转换函数
+     */
+    transformLngFixed(x, y) {
+        let ret = 300.0 + x + 2.0 * y + 0.1 * x * x + 
+                  0.1 * x * y + 0.1 * Math.sqrt(Math.abs(x));
+        
+        ret += (20.0 * Math.sin(6.0 * x * this.PI) + 
+                20.0 * Math.sin(2.0 * x * this.PI)) * 2.0 / 3.0;
+        
+        ret += (20.0 * Math.sin(x * this.PI) + 
+                40.0 * Math.sin(x / 3.0 * this.PI)) * 2.0 / 3.0;
+        
+        ret += (150.0 * Math.sin(x / 12.0 * this.PI) + 
+                300.0 * Math.sin(x / 30.0 * this.PI)) * 2.0 / 3.0;
+        
+        return ret;
+    }
+
+    transformLat(x, y) {
+        return this.transformLatFixed(x, y);
+    }
+
+    transformLng(x, y) {
+        return this.transformLngFixed(x, y);
+    }
+
+    isInChina(lat, lng) {
+        return lng >= 72.004 && lng <= 137.8347 && 
+               lat >= 0.8293 && lat <= 55.8271;
+    }
+
+    /**
+     * 计算偏移距离（米）
+     */
+    calculateOffsetDistance(originalLat, originalLng, convertedLat, convertedLng) {
+        const latDiffMeters = (convertedLat - originalLat) * 111000;
+        const lngDiffMeters = (convertedLng - originalLng) * 111000 * Math.cos(originalLat * this.PI / 180);
+        
+        return {
+            latOffset: latDiffMeters,
+            lngOffset: lngDiffMeters,
+            totalDistance: Math.sqrt(latDiffMeters * latDiffMeters + lngDiffMeters * lngDiffMeters)
+        };
+    }
+
+    /**
+     * 比较不同算法的转换结果
+     */
+    compareAlgorithms(wgsLat, wgsLng) {
+        const standard = this.wgs84ToGcj02Standard(wgsLat, wgsLng);
+        const fixed = this.wgs84ToGcj02Fixed(wgsLat, wgsLng);
+        const highPrecision = this.wgs84ToGcj02HighPrecision(wgsLat, wgsLng);
+        const lookup = this.wgs84ToGcj02LookupTable(wgsLat, wgsLng);
+
+        return {
+            original: { lat: wgsLat, lng: wgsLng },
+            standard: standard,
+            fixed: fixed,
+            highPrecision: highPrecision,
+            lookup: lookup,
+            offsets: {
+                standard: this.calculateOffsetDistance(wgsLat, wgsLng, standard.lat, standard.lng),
+                fixed: this.calculateOffsetDistance(wgsLat, wgsLng, fixed.lat, fixed.lng),
+                highPrecision: this.calculateOffsetDistance(wgsLat, wgsLng, highPrecision.lat, highPrecision.lng),
+                lookup: this.calculateOffsetDistance(wgsLat, wgsLng, lookup.lat, lookup.lng)
+            }
+        };
+    }
+
+    /**
+     * 验证修正效果
+     */
+    validateCorrection(wgsLat, wgsLng, expectedGcjLat, expectedGcjLng) {
+        const result = this.wgs84ToGcj02Fixed(wgsLat, wgsLng);
+        const error = this.calculateOffsetDistance(expectedGcjLat, expectedGcjLng, result.lat, result.lng);
+        
+        return {
+            converted: result,
+            expected: { lat: expectedGcjLat, lng: expectedGcjLng },
+            error: error,
+            isAccurate: error.totalDistance < 10 // 误差小于10米认为准确
+        };
+    }
+}
+
+// 测试和验证
+const fixedConverter = new FixedCoordinateConverter();
+
+// 测试北京天安门坐标
+const testLat = 39.9093;
+const testLng = 116.3974;
+
+console.log('=== 修正后的坐标转换算法比较 ===');
+const comparison = fixedConverter.compareAlgorithms(testLat, testLng);
+console.log('原始坐标:', comparison.original);
+console.log('标准算法:', comparison.standard);
+console.log('修正算法:', comparison.fixed);
+console.log('高精度算法:', comparison.highPrecision);
+console.log('查表算法:', comparison.lookup);
+console.log('偏移分析:', comparison.offsets);
+
+// 导出修正版本
+if (typeof module !== 'undefined' && module.exports) {
+    module.exports = FixedCoordinateConverter;
+}
+
+if (typeof window !== 'undefined') {
+    window.FixedCoordinateConverter = FixedCoordinateConverter;
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index afcc563..6d7a34c 100644
--- a/pages.json
+++ b/pages.json
@@ -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": {}
-}
+}
\ No newline at end of file
diff --git a/pages/dashboard/dashboard.vue b/pages/dashboard/dashboard.vue
index e7a2b98..410126c 100644
--- a/pages/dashboard/dashboard.vue
+++ b/pages/dashboard/dashboard.vue
@@ -1,7 +1,35 @@
 <template>
 	<view>
 		<view>
-			<mgmHeader ref="headerRef" />
+			<!-- <mgmHeader ref="headerRef" :showNotification="true" /> -->
+			<u-navbar
+				:safeAreaInsetTop="true"  
+				:placeholder="true" 
+				:title="title"
+				:fixed="true"
+				:autoBack="false"
+				leftIconColor="#C39A4B"
+				bgColor="#C39A4B"
+				titleStyle="font-weight:bold;color:#ffffff;"
+			>
+			<view
+				@tap="goNotification"
+				class="notification-bell-wrap"
+				slot="left"
+			>
+				<u-icon name="bell" color="#FFFFFF" size="24"></u-icon>
+				<view v-if="notificationCount > 0" class="notification-badge">
+					<text class="notification-badge-text">{{ notificationBadgeText }}</text>
+				</view>
+			</view>
+			<view @tap="logout"
+				style="margin-top:2px;margin-right:3px;"
+				slot="right"
+			>
+				<image src="../../static/images/ico_exit.png" style="width:24px;height:24px;"></image>
+			</view>
+			</u-navbar>
+			
 			<view v-if="showDashboardView">
 				<view class="hz-font-bolder hz-font-l hz-font-color-black hz-text-right"
 					style="margin-top:36rpx;margin-right:36rpx;">
@@ -109,6 +137,9 @@
 	import {
 		logout
 	} from '../../api/commonApi';
+	import {
+		countNotification
+	} from '../../api/notificationApi';
 	import {
 		formatDate
 	} from '../../common/stringUtils';
@@ -124,6 +155,7 @@
 				showMsg: false,
 				okText: this.$t("common.ok"),
 				dataNull:this.$t("common.dataNotFound"),
+				title:'',
 				userData: null,
 				dashboardData: [],
 				dataAsOf:"",
@@ -132,10 +164,13 @@
 				NFROValue: '0',
 				IMValue: '0',
 				MRIValue: '0',
-				showAchievement: false,
-				showKPI: false,
+				showKPI:false,
+				showAchievement:false,
 				showDashboardView: false,
-				userSegment: null
+				userSegment: null,
+				notificationCount: 0,
+				notificationCountTimer: null,
+				isDashboardActive: false
 			}
 		},
 		onLoad(opt) {
@@ -143,19 +178,84 @@
 			this.initUI();
 		},
 		onShow() {
+			this.isDashboardActive = true;
 			this.playerData = uni.getStorageSync("playerData");
-			this.getTodoDashboardByuserId();
-			this.$nextTick(() => {
-				const header = this.$refs.headerRef;
-				if(header) {
-					header.updateUserData();
-				}
-			});
-			if (this.userData !== null && this.userData !== undefined)
+			this.userData = uni.getStorageSync("userData");
+			if (this.userData !== null && this.userData !== undefined){
 				this.showTabbarByPermission(this.userData);
+				this.title = this.userData.userName+','+this.userData.userId;
+			}
+			this.getTodoDashboardByuserId();
+			this.fetchNotificationCount();
+			this.stopNotificationCountTimer();
+			this.startNotificationCountTimer();
+			},
+			
+		onHide() {
+			this.isDashboardActive = false;
+			this.stopNotificationCountTimer();
+		},
+		onUnload() {
+			this.isDashboardActive = false;
+			this.stopNotificationCountTimer();
 		},
 
 		methods: {
+			goNotification() {
+				uni.navigateTo({
+					url: '/limo/notification/notification'
+				});
+			},
+			getUserIdFromUserData(userData) {
+				if (userData == null || userData === '') {
+					return '';
+				}
+				const userId = userData.userId != null && userData.userId !== ''
+					? userData.userId
+					: userData.UserId;
+				return userId != null && userId !== '' ? userId : '';
+			},
+			parseNotificationCount(res) {
+				if (res == null) {
+					return 0;
+				}
+				const count = res.count ?? res.Count ?? res.data?.count ?? res.data?.Count;
+				return Number(count) || 0;
+			},
+			async fetchNotificationCount() {
+				this.userData = uni.getStorageSync('userData');
+				const userId = this.getUserIdFromUserData(this.userData);
+				if (!userId) {
+					this.notificationCount = 0;
+					return;
+				}
+				try {
+					const res = await countNotification({ userId });
+					this.notificationCount = this.parseNotificationCount(res);
+					console.log('[Dashboard] notification count res=', res, 'notificationCount=', this.notificationCount);
+				} catch (error) {
+					console.error('[Dashboard] countNotification failed', error);
+					this.notificationCount = 0;
+				}
+			},
+			startNotificationCountTimer() {
+				if (!this.notificationCountTimer) {
+					this.notificationCountTimer = setInterval(() => {
+						if (this.isDashboardActive) {
+							this.fetchNotificationCount();
+						}
+					}, 30000);
+				}
+			},
+			stopNotificationCountTimer() {
+				if (this.notificationCountTimer) {
+					clearInterval(this.notificationCountTimer);
+					this.notificationCountTimer = null;
+				}
+			},
+			formatNumber(num) {
+				return num?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") || "0";
+			},
 			normalizeDashboardRecord(record) {
 				record = record || {};
 				return {
@@ -169,9 +269,6 @@
 					userSegment: record.userSegment ?? record.UserSegment,
 				};
 			},
-			formatNumber(num) {
-				return num?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") || "0";
-			},
 			async getTodoDashboardByuserId() {
 				uni.showLoading({
 					title: this.$t("common.loading")
@@ -181,10 +278,6 @@
 					let params = {};
 					requestBody = JSON.stringify(params);
 					const res = await getTodoDashboard(params);
-					this.dashboardData = [];
-					this.dataAsOf = "";
-					this.userSegment = null;
-					this.MFValue = this.IMValue = this.NFROValue = this.MRIValue = "0";
 					if (res.data != null && res.success == true) {
 						const records = Array.isArray(res.data.records)
 							? res.data.records
@@ -194,6 +287,7 @@
 						if (records.length > 0) {
 							this.dashboardData = records.map((record) => this.normalizeDashboardRecord(record));
 							this.showDashboardView = true;
+							
 							// 设置用户类型
 							this.userSegment = this.dashboardData[0].userSegment;
 							this.hasTargetValue = this.dashboardData[0].targetValue !== null && this.dashboardData[0].targetValue !== undefined;
@@ -258,7 +352,7 @@
 						}else if(res.errorCode == 'INVOKE_TODODASHBOARD_API_ERROR'){
 							this.dataNull = this.$t("todo.invokeError");
 						}else {
-							if(String(res.errorCode || res.code || '').toUpperCase().indexOf('NO RECORD') != -1){
+							if(res.errorCode.toUpperCase().indexOf('NO RECORD') != -1){
 								this.dataNull = this.$t("common.noRecord");
 							}else{
 								this.dataNull = this.$t("todo.returnError");
@@ -282,6 +376,12 @@
 			}
 		},
 		computed: {
+			notificationBadgeText() {
+				if (this.notificationCount > 99) {
+					return '99+';
+				}
+				return String(this.notificationCount);
+			},
 			getShowAchievement() {
 				return function(record) {
 					if (record.type == "Achievement" && record.itemName !=="MF Turnover" && record.itemName !=="IM Turnover"
@@ -375,4 +475,39 @@
 	.im-text-gold {
 		color: #cfa34f;
 	}
+
+	.notification-bell-wrap {
+		position: relative;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 2px;
+		margin-left: 3px;
+		width: 24px;
+		height: 24px;
+		overflow: visible;
+	}
+
+	.notification-badge {
+		position: absolute;
+		top: -4px;
+		right: -5px;
+		min-width: 16px;
+		height: 16px;
+		padding: 0 4px;
+		border-radius: 8px;
+		background-color: #fa3534;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		z-index: 10;
+	}
+
+	.notification-badge-text {
+		color: #ffffff;
+		font-size: 10px;
+		line-height: 1;
+		font-weight: bold;
+	}
 </style>
diff --git a/pages/findPlayer/findPlayer.vue b/pages/findPlayer/findPlayer.vue
index fa3cd08..d92f3b8 100644
--- a/pages/findPlayer/findPlayer.vue
+++ b/pages/findPlayer/findPlayer.vue
@@ -1,5 +1,6 @@
 <template>
 	<view>
+		
 		<u-navbar
 			:safeAreaInsetTop="true" 
 			:placeholder="true" 
@@ -10,31 +11,33 @@
 			bgColor="#C39A4B"
 			titleStyle="font-weight:bold;color:#ffffff;"
 		>
-			<view 
-				@click="logout"
-				style="margin-top:2px;margin-right:3px;"
-				slot="right"
-			>
-				<image src="/static/images/ico_exit.png" style="width:24px;height:24px;"></image>
-			</view>
-			<view 
-				v-show="canViewApproval"
-				@click="toNotification"
-				style="margin-top:2px;margin-right:3px; position: relative"
-				slot="left"
-			>
-				<image src="/static/images/160task01.png" style="width:24px;height:24px;"/>
-				<u-badge :value="countAp" type="error" :offset="[-8, -8]" :show="countAp > 0" :absolute="true"></u-badge>
+		<view
+			v-if="showNotificationBell"
+			@click="goNotification"
+			class="notification-bell-wrap"
+			slot="left"
+		>
+			<u-icon name="bell" color="#FFFFFF" size="24"></u-icon>
+			<view v-if="notificationCount > 0" class="notification-badge">
+				<text class="notification-badge-text">{{ notificationBadgeText }}</text>
 			</view>
+		</view>
+		<view @click="logout"
+			style="margin-top:2px;margin-right:3px;"
+			slot="right"
+		>
+			<image src="../../static/images/ico_exit.png" style="width:24px;height:24px;"></image>
+		</view>
 		</u-navbar>
 		
 		<view class="hz-text-center" style="margin-top:120rpx;">
-			<image src="../../static/images/room_book.png" style="width:128rpx;height:128rpx;"></image>
+			<image src="/static/images/limo.png" class="mr-[40]" style="width: 58px; height: 58px;"></image>
+			<image src="/static/images/room_book.png" class="find-player-ico"></image>
 		</view>
 		<view class="hz-font-bolder hz-font-xl hz-text-center hz-font-color-primary">
 			{{$t('hotel.roombooking')}}
 		</view>
-		<view class="hz-font-bolder hz-font-xl hz-text-center hz-font-color-dark" style="margin-top:160rpx;">
+		<view class="hz-font-bolder hz-font-xl hz-text-center hz-font-color-dark mt-[160]">
 			{{$t('findPlayer.title')}}
 		</view>
 		<view style="margin-top:30rpx;margin-right:60rpx;margin-left:60rpx;">
@@ -58,7 +61,8 @@
 
 <script>
 	import { getApprovalCount } from '../../api/approvalApi.js';
-import {playerLookup} from '../../api/mgmApi.js'
+	import {playerLookup} from '../../api/mgmApi.js'
+	import { countNotification } from '../../api/notificationApi.js'
 	import mgmHeader from '@/components/header/header.vue'
 	
 	
@@ -67,25 +71,30 @@ import {playerLookup} from '../../api/mgmApi.js'
 			mgmHeader // 注册组件
 		},
 		data() {
-				return {
-					// 数据变量
-					playerIdStr: this.$t("common.playerId"),
-					searchPlayerId: '',
-					userData:null,
-					deviceData:null,
-					siteData:null,
-					countAp: '',
-					// 定时器变量
-					approvalCountTimer: null,
-					// 页面激活态（避免残留定时器回调在非当前页继续请求）
-					isFindPlayerActive: false,
-					// 界面变量
-					showMsg:false,
-					title: '',
-					msgStr:'',
-					yesText:this.$t("common.ok"),
-					canViewApproval:false
-				}
+			
+			return {
+				// 数据变量
+				playerIdStr: this.$t("common.playerId"),
+				searchPlayerId: '',
+				userData:null,
+				deviceData:null,
+				siteData:null,
+				// 界面变量
+				showMsg:false,
+				title: '',
+				msgStr:'',
+				yesText:this.$t("common.ok"),
+				notificationCount: 0,
+				approvalRoutingCount: 0,
+				limoNotificationCount: 0,
+				countAp: '',
+				// 定时器变量
+				approvalCountTimer: null,
+				notificationCountTimer: null,
+				// 页面激活态（避免残留定时器回调在非当前页继续请求）
+				isFindPlayerActive: false,
+				canViewApproval:false
+			}
 		},
 		onLoad() {
 			// 初始化界面
@@ -95,56 +104,133 @@ import {playerLookup} from '../../api/mgmApi.js'
 		},
 		onShow() {
 			this.isFindPlayerActive = true;
-			this.getApporvalCount();
+			// this.getApporvalCount();
 			this.userData = uni.getStorageSync("userData");
 			this.searchPlayerId = '';
 			this.playerIdStr=this.$t("common.playerId");
 			if(this.userData!==null && this.userData!==undefined){
-				this.title = this.userData.userName+','+this.userData.userId;
-				this.showTabbarByPermission(this.userData);
+				const realUserData = this.getEffectiveUserData(this.userData);
+				this.showTabbarByPermission(realUserData);
+				this.title = realUserData.userName+','+realUserData.userId;
 			}
 			this.isLogin();
-			this.$nextTick(() => {
-				const header = this.$refs.headerRef;
-				if(header) {
-					header.updateUserData();
-				}
-			});
+			this.fetchNotificationCount();
 			
 			// 切回页面时，先停后启，避免存在残留定时器
-			this.stopApprovalCountTimer();
-			this.startApprovalCountTimer();
-			if(this.userData.canViewApproval!==undefined && this.userData.canViewApproval==true) this.canViewApproval = true;
+			this.stopNotificationCountTimer();
+			this.startNotificationCountTimer();
+			this.canViewApproval = this.effectiveUserData.canViewApproval === true;
 		},
 		onHide() {
 			this.isFindPlayerActive = false;
 			// 切到其他页面时立即停止定时器，避免后台持续调用
-			this.stopApprovalCountTimer();
+			// this.stopApprovalCountTimer();
+			this.stopNotificationCountTimer();
 		},
 		onUnload() {
 			this.isFindPlayerActive = false;
 			// 页面销毁时兜底清理
-			this.stopApprovalCountTimer();
+			// this.stopApprovalCountTimer();
+			this.stopNotificationCountTimer();
 		},
 		onReady(){
 		},
 		methods: {
-			startApprovalCountTimer() {
-				if (!this.approvalCountTimer) {
-					this.approvalCountTimer = setInterval(() => {
-						// 双保险：非当前页不请求
+			getEffectiveUserData(userData) {
+				if (userData && userData.data && typeof userData.data === 'object') {
+					return userData.data;
+				}
+				return userData || {};
+			},
+			goNotification() {
+				const url = this.buildNotificationUrl();
+				uni.navigateTo({
+					url
+				});
+			},
+			buildNotificationUrl(extraParams = []) {
+				const params = extraParams.slice();
+				if (this.effectiveUserData.canViewNotification === true) {
+					params.push('notificationCount=' + encodeURIComponent(this.limoNotificationCount));
+				}
+				if (this.effectiveUserData.canViewApproval === true) {
+					params.push('approvalRoutingCount=' + encodeURIComponent(this.approvalRoutingCount));
+				}
+				return params.length
+					? '/limo/notification/notification?' + params.join('&')
+					: '/limo/notification/notification';
+			},
+			getUserIdFromUserData(userData) {
+				const realUserData = this.getEffectiveUserData(userData);
+				if (userData == null || userData === '') {
+					return '';
+				}
+				const userId = realUserData.userId != null && realUserData.userId !== ''
+					? realUserData.userId
+					: realUserData.UserId;
+				return userId != null && userId !== '' ? userId : '';
+			},
+			parseNotificationCounts(res) {
+				const data = res && res.data && typeof res.data === 'object' ? res.data : (res || {});
+				return {
+					count: Number(data.count ?? data.Count) || 0,
+					notificationCount: Number(data.notificationCount ?? data.NotificationCount) || 0,
+					approvalRoutingCount: Number(data.approvalRoutingCount ?? data.ApprovalRoutingCount) || 0,
+				};
+			},
+			async fetchNotificationCount() {
+				this.userData = uni.getStorageSync('userData');
+				const userId = this.getUserIdFromUserData(this.userData);
+				if (!userId) {
+					this.notificationCount = 0;
+					this.limoNotificationCount = 0;
+					this.approvalRoutingCount = 0;
+					return;
+				}
+				try {
+					const res = await countNotification({ userId });
+					const counts = this.parseNotificationCounts(res);
+					this.notificationCount = counts.count;
+					this.limoNotificationCount = counts.notificationCount;
+					this.approvalRoutingCount = counts.approvalRoutingCount;
+				} catch (error) {
+					console.error('[FindPlayer] countNotification failed', error);
+					this.notificationCount = 0;
+					this.limoNotificationCount = 0;
+					this.approvalRoutingCount = 0;
+				}
+			},
+			startNotificationCountTimer() {
+				if (!this.notificationCountTimer) {
+					this.notificationCountTimer = setInterval(() => {
 						if (this.isFindPlayerActive) {
-							this.getApporvalCount();
+							this.fetchNotificationCount();
 						}
-					}, 30000); // 30秒
+					}, 30000);
 				}
 			},
-			stopApprovalCountTimer() {
-				if (this.approvalCountTimer) {
-					clearInterval(this.approvalCountTimer);
-					this.approvalCountTimer = null;
+			stopNotificationCountTimer() {
+				if (this.notificationCountTimer) {
+					clearInterval(this.notificationCountTimer);
+					this.notificationCountTimer = null;
 				}
 			},
+			// startApprovalCountTimer() {
+			// 	if (!this.approvalCountTimer) {
+			// 		this.approvalCountTimer = setInterval(() => {
+			// 			// 双保险：非当前页不请求
+			// 			if (this.isFindPlayerActive) {
+			// 				// this.getApporvalCount();
+			// 			}
+			// 		}, 30000); // 30秒
+			// 	}
+			// },
+			// stopApprovalCountTimer() {
+			// 	if (this.approvalCountTimer) {
+			// 		clearInterval(this.approvalCountTimer);
+			// 		this.approvalCountTimer = null;
+			// 	}
+			// },
 			// 数据方法
 			async getProfileByPlayerId(){
 				if(!this.searchPlayerId){
@@ -155,7 +241,7 @@ import {playerLookup} from '../../api/mgmApi.js'
 					title: this.$t("common.loading")
 				});
 				try{
-					let params = {playerId:this.searchPlayerId,userId:this.userData.userId};
+					let params = {playerId:this.searchPlayerId,userId:this.effectiveUserData.userId};
 					const res = await playerLookup(params);
 					if(res.success == true){
 						if(res.data !== null){
@@ -177,38 +263,39 @@ import {playerLookup} from '../../api/mgmApi.js'
 					uni.$u.toast(e.errMsg,5000);
 					var request = e.config!=undefined?JSON.stringify(e.config):"";
 					var response = e.data!=undefined?JSON.stringify(e.data):"";
-					await this.writeLog(this.userData.userId,"find_player","","[APP][findPlayer.vue][getProfileByPlayerId][Catch Exception]"+e.errMsg,request,response,1,false); 
-				}finally{
-					uni.hideLoading();
-				}
-			},
-			async getApporvalCount(){
-				if (!this.isFindPlayerActive) return;
-				try{
-					let params = {};
-					const res = await getApprovalCount(params);
-					if(res.success == true){
-						if(res.data !== null){
-							this.countAp = res.data;
-						}
-					}
-				}catch(e){
-					console.error(e);
-					uni.$u.toast(e.errMsg,5000);
-					var request = e.config!=undefined?JSON.stringify(e.config):"";
-					var response = e.data!=undefined?JSON.stringify(e.data):"";
-					await this.writeLog(this.userData.userId,"find_player","","[APP][findPlayer.vue][getProfileByPlayerId][Catch Exception]"+e.errMsg,request,response,1,false); 
+					await this.writeLog(this.effectiveUserData.userId,"find_player","","[APP][findPlayer.vue][getProfileByPlayerId][Catch Exception]"+e.errMsg,request,response,1,false); 
 				}finally{
 					uni.hideLoading();
 				}
 			},
+
+			// async getApporvalCount(){
+			// 	if (!this.isFindPlayerActive) return;
+			// 	try{
+			// 		let params = {};
+			// 		const res = await getApprovalCount(params);
+			// 		if(res.success == true){
+			// 			if(res.data !== null){
+			// 				this.countAp = res.data;
+			// 			}
+			// 		}
+			// 	}catch(e){
+			// 		console.error(e);
+			// 		uni.$u.toast(e.errMsg,5000);
+			// 		var request = e.config!=undefined?JSON.stringify(e.config):"";
+			// 		var response = e.data!=undefined?JSON.stringify(e.data):"";
+			// 		await this.writeLog(this.effectiveUserData.userId,"find_player","","[APP][findPlayer.vue][getProfileByPlayerId][Catch Exception]"+e.errMsg,request,response,1,false); 
+			// 	}finally{
+			// 		uni.hideLoading();
+			// 	}
+			// },
 			// 界面方法
 			confirmMsg(){
 				this.msgStr = '';
 				this.showMsg = false;
 			},
 			toNotification(){
-				this.navTo("/pages/notification/notification",0,false)
+				this.navTo(this.buildNotificationUrl(['tab=1']),0,false)
 			},
 			clearSearchInput(){
 				this.searchPlayerId = '';
@@ -222,6 +309,24 @@ import {playerLookup} from '../../api/mgmApi.js'
 			  wv.show();
 			},
 		},
+		computed: {
+			effectiveUserData() {
+				return this.getEffectiveUserData(this.userData);
+			},
+			showNotificationBell() {
+				return !!(
+					this.effectiveUserData &&
+					(this.effectiveUserData.canViewApproval === true ||
+						this.effectiveUserData.canViewNotification === true)
+				);
+			},
+			notificationBadgeText() {
+				if (this.notificationCount > 99) {
+					return '99+';
+				}
+				return String(this.notificationCount);
+			}
+		}
 	}
 </script>
 
@@ -232,4 +337,39 @@ import {playerLookup} from '../../api/mgmApi.js'
 	    border-style: solid;
 		height:30px;
 	}
+
+	.notification-bell-wrap {
+		position: relative;
+		display: inline-flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 2px;
+		margin-left: 3px;
+		width: 24px;
+		height: 24px;
+		overflow: visible;
+	}
+
+	.notification-badge {
+		position: absolute;
+		top: -4px;
+		right: -5px;
+		min-width: 16px;
+		height: 16px;
+		padding: 0 4px;
+		border-radius: 8px;
+		background-color: #fa3534;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-sizing: border-box;
+		z-index: 10;
+	}
+
+	.notification-badge-text {
+		color: #ffffff;
+		font-size: 10px;
+		line-height: 1;
+		font-weight: bold;
+	}
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 116f103..afe43db 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -44,13 +44,13 @@
 		
 		<view style="width: 100%;">
 			<u-popup :show="showCommitment" :round="10" mode="center" customStyle="margin:0rpx 40rpx;">
-					<view class="commitment-dialog" style="padding: 20px 22px 32px 22px;">
-						<h4 class="commitment-title" style="font-size: 18px; display: flex; justify-content: center; padding: 7px;">{{commitTitle}}</h4>
-						<view class="commitment-body" style="height:490px;font-size:13px;color:#333;">
+					<view style="padding: 20px 22px 32px 22px;">
+						<h4 style="font-size: 18px; display: flex; justify-content: center; padding: 7px;">{{commitTitle}}</h4>
+						<view style="height:490px;font-size:13px;color:#333;">
 							<view  style="margin-bottom: 24rpx;line-height: 1.7;">{{commitmentText1}}</view>
 							<view >{{commitmentText2}}</view>
 						</view>
-						<view class="commitment-footer">
+						<view >
 							<view @click="handleConfirm()" class="hz-btn hz-font-color-white hz-font-lg hz-font-bold hz-text-center" >{{confirmText}}</view>
 						</view>
 					</view>
@@ -141,6 +141,18 @@
 					userName : userData.userName
 				};
 				const res = await userConfirm(params);
+				// #ifdef APP-PLUS
+				if (userData != null && userData.userId != null) {
+					const app = getApp();
+					if (app) {
+						app.syncPushDeviceTokenFromNative();
+						await app.syncPendingPushNotificationsFromNative();
+						if (app.tryConsumePendingPushNavigation()) {
+							return;
+						}
+					}
+				}
+				// #endif
 				this.checkInMacau();
 			},
 			checkInMacau(){
@@ -331,6 +343,7 @@
 			async goLogin(){
 				await this.$onLaunched;
 				await this.getSetting();
+				
 				const userData = uni.getStorageSync("userData");
 				let loginTag = false;
 				uni.setStorageSync("todoSwitch","true");
@@ -342,9 +355,10 @@
 				if(loginTag===true){
 					this.redirectByPermission(userData);
 				}
-
+				
 				// 模拟开启，没有code，默认进来的情况
 				if(this.siteData.mockSSO==true && this.code=='' && loginTag===false){
+					
 					// 模拟SSO
 					uni.redirectTo({
 						url:'/pages/ssoLogin/ssoLogin'
@@ -391,45 +405,6 @@
 </script>
 
 <style>
-	/* #ifdef H5 */
-	.commitment-dialog {
-		display: flex;
-		flex-direction: column;
-		box-sizing: border-box;
-		max-height: calc(100vh - 48px);
-		max-height: calc(100dvh - 48px);
-		overflow: hidden;
-	}
-	.commitment-title,
-	.commitment-footer {
-		flex-shrink: 0;
-	}
-	.commitment-body {
-		min-height: 0;
-		overflow-y: scroll;
-		overflow-x: hidden;
-		overflow-wrap: anywhere;
-		padding-right: 10px;
-		scrollbar-gutter: stable;
-	}
-	.commitment-body::-webkit-scrollbar {
-		/* uView globally sets scrollbar width to 0 !important. */
-		width: 2px !important;
-		height: 2px !important;
-		display: block;
-	}
-	.commitment-body::-webkit-scrollbar-track {
-		background: #eee;
-		border-radius: 4px;
-	}
-	.commitment-body::-webkit-scrollbar-thumb {
-		background: #a67c30;
-		border-radius: 4px;
-	}
-	.commitment-footer {
-		padding-top: 16px;
-	}
-	/* #endif */
 	.commit-content{
 		line-height: 1.5; /* 增加行间距提升可读性 */
 	    color: #333; /* 深灰提升阅读舒适度 */
diff --git a/pages/notification/notification.vue b/pages/notification/notification.vue
index 4a5f04f..782b925 100644
--- a/pages/notification/notification.vue
+++ b/pages/notification/notification.vue
@@ -1,235 +1,13 @@
 <template>
-	<view>
-		<u-navbar
-			:safeAreaInsetTop="true" 
-			:placeholder="true" 
-			:title="title"
-			:fixed="true"
-			:autoBack="true"
-			leftIconColor="#000000"
-			bgColor="#ffffff"
-			titleStyle="font-weight:bold;color:#000000;"
-		>
-		<view style="margin-top:2px;margin-right:3px;" slot="right">
-			<u-icon
-			   v-if="hasSelectedDate"
-			   @click="clearDateFilter"
-			   size="28px" name="../../static/images/filter-clear.svg"
-			></u-icon>
-		</view>
-		</u-navbar>
-		<!-- 搜索栏 -->
-		<view class="hz-spacing hz-mr-t-20 hz-flex-row">
-			<u-search :placeholder="searchHolder" v-model="searchInputStr" :showAction="false" bgColor="#ffffff" :label="searchLabel"
-			borderColor="gray" style="padding-right: 8px" @search="searchApprovalByPlayerId()"></u-search>
-			<u-icon name="calendar" :size="45" :color="calendarIconColor" @click="showCalendar = true"></u-icon>
-		</view>
-
-		<view v-if="!showApprovalList">
-			<view class="hz-flex-row" style="justify-content: center;margin-top:80px;">
-				<image src="/static/images/datanull.png" style="width:160px;height:160px;"></image>
-			</view>
-			<view class="hz-flex-row hz-font-bolder hz-font-md" style="justify-content: center;margin:20px;">
-				{{dataNull}}
-			</view>
-		</view>
-		<view v-else>
-			<uni-card v-for="(approvalRecord,index) in approvalList" :key="index" @click="toDetail(approvalRecord.playerId)">
-				<view class="notification-content">
-					<view class="icon-container">
-						<image src="/static/images/task.png" class="task-icon"></image>
-					</view>
-					<view class="notification-info">
-						<view class="notification-title">
-							{{ $t("notification.pendingApprovalRequest") }}
-						</view>
-						<view class="notification-date">
-							{{approvalRecord.createdAt}}
-						</view>
-					</view>
-					<view class="notification-time">
-						{{getTimeAgo(approvalRecord.createdAt)}}
-					</view>
-				</view>
-				<view class="notification-detail">
-					{{approvalRecord.memberLastName}},  {{approvalRecord.playerId}} ({{approvalRecord.tier}}), {{approvalRecord.propertyName}}, {{approvalRecord.roomTypeCode}}, {{approvalRecord.checkinDate}} to {{approvalRecord.checkoutDate}}, {{approvalRecord.booker}}
-				</view>
-			</uni-card>
-		</view>
-		
-		<u-calendar :show="showCalendar" @close="showCalendar = false" :confirmText="confirmText" :confirmDisabledText="confirmText"
-			color="#C39A4B" :allowSameDay="true" :startText="startText" :endText="endText" mode="range" :showMark="false"
-			title="" @confirm="handleFilterDate" :defaultDate="selectedDate">
-			
-		</u-calendar>
-	</view>
-	
+	<view></view>
 </template>
 
 <script>
-	import {getApprovalList} from '../../api/approvalApi.js'
 	export default {
-		data() {
-			return {
-				title:this.$t("notification.pendingApproval"),
-				searchInputStr:'',
-				userData:'',
-				approvalList:[],
-				showApprovalList:true,
-				dataNull:this.$t("notification.noData"),
-				searchHolder:this.$t("approval.searchStr"),
-				calendarIconColor: '#000000',
-				showCalendar: false,
-				confirmText: this.$t("common.confirm").toUpperCase(),
-				startText: this.$t("common.start"),
-				endText: this.$t("common.end"),
-				selectedDate: [],
-				searchLabel: this.$t("common.playerId")
-			}
-		},
-		onShow() {
-			this.userData = uni.getStorageSync("userData");
-			this.getApprovalList();
-		},
-		methods: {
-			handleFilterDate(e) {
-				this.selectedDate = e;
-				this.showCalendar = false;
-				
-				if (Array.isArray(this.selectedDate) && this.selectedDate.length > 0) {
-					this.calendarIconColor = '#C39A4B';
-				} else {
-					this.calendarIconColor = '#000000';
-				}
-				
-				this.getApprovalList();
-			},
-			clearDateFilter() {
-				this.selectedDate = [];
-				this.calendarIconColor = '#000000';
-				this.getApprovalList();
-			},
-			
-			toDetail(playerId){
-				this.navTo("/pages/playerDetail/playerDetail?playerId="+playerId,0,false)
-			},
-			getTimeAgo(createdAt) {
-				if (!createdAt) return '';
-				
-				const now = new Date();
-				const created = new Date(createdAt);
-				const diffMs = now - created;
-				const diffMins = Math.floor(diffMs / 60000);
-				const diffHours = Math.floor(diffMins / 60);
-				const diffDays = Math.floor(diffHours / 24);
-				
-				if (diffMins < 1) return 'just now';
-				if (diffMins < 60) return diffMins + 'm';
-				if (diffHours < 24) return diffHours + 'h';
-				return diffDays + 'd';
-			},
-			async getApprovalList(){
-				uni.showLoading({
-					title: this.$t("common.loading")
-				});
-				try{
-					let params = {
-						userId: this.userData.userId,
-						playerId: this.searchInputStr,
-						rangeDate: this.selectedDate
-					};
-					const res = await getApprovalList(params);
-					if(res.success == true){
-						if(res.data !== null && res.data.length > 0){
-							this.approvalList = res.data;
-							// 提取所有 playerId 到新的 playerList 并去重
-							const playerIds = this.approvalList.map(item => item.playerId);
-							const uniquePlayerIds = [...new Set(playerIds)];
-							this.playerList = uniquePlayerIds.map(playerId => ({ playerId }));
-							uni.setStorageSync("approvalPlayerList",this.playerList);
-							this.showApprovalList = true;
-						} else {
-							this.showApprovalList = false;
-							this.dataNull = this.$t("notification.noData");
-						}
-					}else{
-						this.msgStr = res.message;
-						this.showMsg = true;
-						this.showApprovalList = false;
-						if(res.errorCode==="NO_PERMISSION") this.dataNull = this.$t("notification.noPermission");
-					}
-				}catch(e){
-					console.error(e);
-					uni.$u.toast(e.errMsg,5000);
-					var request = e.config!=undefined?JSON.stringify(e.config):"";
-					var response = e.data!=undefined?JSON.stringify(e.data):"";
-					await this.writeLog(this.userData.userId,"find_player","","[APP][findPlayer.vue][getProfileByPlayerId][Catch Exception]"+e.errMsg,request,response,1,false); 
-				}finally{
-					uni.hideLoading();
-				}
-			},
-			// 搜索玩家審批請求
-			searchApprovalByPlayerId() {
-				this.getApprovalList();
-			}
-		},
-		computed: {
-			hasSelectedDate() {
-				return Array.isArray(this.selectedDate) && this.selectedDate.length > 0;
-			}
+		onLoad() {
+			uni.redirectTo({
+				url: '/limo/notification/notification?tab=1'
+			});
 		}
 	}
 </script>
-
-<style lang="scss" scoped>
-	.notification-content {
-		display: flex;
-		align-items: center;
-		position: relative;
-	}
-	
-	.icon-container {
-		margin-right: 10px;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-	}
-	
-	.task-icon {
-		width: 32px;
-		height: 32px;
-	}
-	
-	.notification-info {
-		flex: 1;
-	}
-	
-	.notification-title {
-		font-weight: bold;
-		font-size: 14px;
-		color: #000000;
-	}
-	
-	.notification-date {
-		font-weight: normal;
-		font-size: 12px;
-		color: #999;
-	}
-	
-	.notification-time {
-		font-weight: normal;
-		font-size: 12px;
-		color: #C39A4B;
-		background-color: #FFF8E7;
-		padding: 2px 8px;
-		border-radius: 10px;
-		margin-left: auto;
-	}
-	
-	.notification-detail {
-		font-weight: normal;
-		font-size: 12px;
-		color: #000000;
-		margin-top: 6px;
-	}
-</style>
diff --git a/pages/playerDetail/playerDetail.vue b/pages/playerDetail/playerDetail.vue
index 7381585..17b8ccf 100644
--- a/pages/playerDetail/playerDetail.vue
+++ b/pages/playerDetail/playerDetail.vue
@@ -370,7 +370,7 @@
 				const currentRoom = this.roomList[this.currentRoomIndex];
 				if (currentRoom && currentRoom.id) {
 					const approvalData = this.approvalGamingDataList.find(
-						item => item.bookingId == currentRoom.id
+						item => (item.bookingId != null ? item.bookingId : item.BookingId) == currentRoom.id
 					);
 					return approvalData || {};
 				}
@@ -401,6 +401,26 @@
 				return value;
 			},
 			// 将形如：2025-03-18 +12 (W +2) | 2025-03-16 + 16 ... 按日期升序排序
+			normalizeApprovalGamingData(item) {
+				if (!item) return {};
+				return {
+					bookingId: item.bookingId != null ? item.bookingId : item.BookingId,
+					playerId: item.playerId != null ? item.playerId : item.PlayerId,
+					currentTripTheoWinAmount: item.currentTripTheoWinAmount != null ? item.currentTripTheoWinAmount : item.CurrentTripTheoWinAmount,
+					last2DayTheoWinAmount: item.last2DayTheoWinAmount != null ? item.last2DayTheoWinAmount : item.Last2DayTheoWinAmount,
+					r3TheoWin: item.r3TheoWin != null ? item.r3TheoWin : item.R3TheoWin,
+					r3TPD: item.r3TPD != null ? item.r3TPD : item.R3TPD,
+					r3ActualWin: item.r3ActualWin != null ? item.r3ActualWin : item.R3ActualWin,
+					r6TheoWin: item.r6TheoWin != null ? item.r6TheoWin : item.R6TheoWin,
+					r6TPD: item.r6TPD != null ? item.r6TPD : item.R6TPD,
+					r6ActualWin: item.r6ActualWin != null ? item.r6ActualWin : item.R6ActualWin,
+					r12TheoWin: item.r12TheoWin != null ? item.r12TheoWin : item.R12TheoWin,
+					r12TPD: item.r12TPD != null ? item.r12TPD : item.R12TPD,
+					r12ActualWin: item.r12ActualWin != null ? item.r12ActualWin : item.R12ActualWin,
+					overlapBooking: item.overlapBooking != null ? item.overlapBooking : item.OverlapBooking,
+					roomCount: item.roomCount != null ? item.roomCount : item.RoomCount
+				};
+			},
 			sortRoomCountByDate(roomCountValue) {
 				if (roomCountValue === null || roomCountValue === undefined || roomCountValue === '') return '-';
 				const input = String(roomCountValue).trim();
@@ -524,7 +544,9 @@
 					if (res.success == true) {
 						if (res.data !== null) {
 							this.bookingListData = res.data.bookingsViewList;
-							this.approvalGamingDataList = res.data.approvalGamingData || [];
+							this.approvalGamingDataList = Array.isArray(res.data.approvalGamingData)
+								? res.data.approvalGamingData.map(item => this.normalizeApprovalGamingData(item))
+								: [];
 							const routingList = res.data.cfgApprovalRoutingList;
 							if (Array.isArray(routingList) && routingList.length > 0) {
 								this.approvalRoutingList = routingList;
@@ -983,4 +1005,4 @@
 	.dataMargin {
 		margin-bottom: 3px;
 	}
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/roomCalendar/roomCalendar.vue b/pages/roomCalendar/roomCalendar.vue
index 0b58e38..12636f0 100644
--- a/pages/roomCalendar/roomCalendar.vue
+++ b/pages/roomCalendar/roomCalendar.vue
@@ -165,13 +165,11 @@
 			propertyTabItemStyle() {
 				return {
 					height: '78rpx',
-					padding: '0 24rpx',
-					flexShrink: 0,
+					padding: '0',
 				};
 			},
 			propertyTabActiveStyle() {
 				return {
-					whiteSpace: 'nowrap',
 					color: '#C39A4B',
 					fontFamily: 'Inter-Bold',
 					fontSize: '30rpx',
@@ -180,7 +178,6 @@
 			},
 			propertyTabInactiveStyle() {
 				return {
-					whiteSpace: 'nowrap',
 					color: '#111111',
 					fontFamily: 'Inter-Bold',
 					fontSize: '30rpx',
@@ -197,12 +194,6 @@
 			this.title = this.$t("roomCalendar.title");
 			this.userData = uni.getStorageSync("userData");
 			this.showTabbarByPermission(this.userData);
-			if (!this.userData || this.userData.canViewCalendar !== true) {
-				this.calendarNoPermission = true;
-				this.calendarReady = false;
-				return;
-			}
-			this.calendarNoPermission = false;
 			this.loadPropertiesRoomTypes();
 		},
 		onUnload() {
@@ -211,10 +202,6 @@
 		},
 		methods: {
 			async loadPropertiesRoomTypes() {
-				if (!this.userData || this.userData.canViewCalendar !== true) {
-					this.showCalendarNoPermission();
-					return;
-				}
 				try {
 					this.calendarReady = false;
 					uni.showLoading({
@@ -222,19 +209,14 @@
 					});
 					await this.loadCalendarSetting();
 					const res = await getPropertiesRoomTypes({});
-					if (this.isNoPermissionResponse(res)) {
-						this.showCalendarNoPermission();
-						return;
-					}
-					this.propertyList = Array.isArray(res && res.propertyList) ? res.propertyList : [];
-					if (!this.propertyList.length) throw new Error('No calendar properties configured');
+					this.propertyList = res.propertyList;
 					this.selectedPropertyCode = this.propertyList[0].code;
 					this.selectDefaultOptions();
 					this.buildCalendar();
 					await this.loadAvailabilityData();
 					this.calendarRenderKey += 1;
 					this.$nextTick(() => {
-						this.calendarReady = !this.calendarNoPermission;
+						this.calendarReady = true;
 					});
 				} catch (e) {
 					uni.$u.toast(e.message || e.errMsg || 'Load property room types failed');
@@ -437,7 +419,6 @@
 				}));
 			},
 			refreshCalendar() {
-				if (!this.userData || this.userData.canViewCalendar !== true || this.calendarNoPermission) return;
 				this.ensureSelectedOptionsForRefresh(true);
 				this.loadAvailabilityData();
 			},
@@ -520,7 +501,7 @@
 				});
 			},
 			isNoPermissionResponse(res) {
-				return res && res.success === false && (res.errorCode || res.code) === 'NO_PERMISSION';
+				return res && res.success === false && res.errorCode === 'NO_PERMISSION';
 			},
 			showCalendarNoPermission() {
 				this.availabilityMap = {};
diff --git a/pages/samlLogin/samlLogin.vue b/pages/samlLogin/samlLogin.vue
index 66725f2..c752c2f 100644
--- a/pages/samlLogin/samlLogin.vue
+++ b/pages/samlLogin/samlLogin.vue
@@ -1,7 +1,6 @@
 <!--sso login-->
 <template>
   <view class="container">
-    <web-view :src="url"></web-view>
   </view>
 </template>
 <script>
@@ -11,26 +10,46 @@
 				url:'',
 				intervalId:null,
 				newUrl:'',
-				siteData:null
+				siteData:null,
+				samlWebview:null
 			}
 		},
 		onLoad(options) {
-			this.siteData = uni.getStorageSync("siteData"); 
-			if(options && options.uid && options.pwd){
-				let username = options.uid.replaceAll(" ", "+");
-				let password = options.pwd.replaceAll(" ", "+");
-				this.url = this.siteData.internalUrl + this.siteData.apiPath + "/app/sso/login_saml_with_mfa?username="+encodeURIComponent(username)+"&password="+encodeURIComponent(password);
-			}
-			if (options && options.url){
-				this.url = options.url;
-			}
-			this.listenUrl()
-		},
+				this.siteData = uni.getStorageSync("siteData"); 
+				if(options && options.uid && options.pwd){
+					let username = options.uid.replaceAll(" ", "+");
+					let password = options.pwd.replaceAll(" ", "+");
+					const loginUrl = this.siteData.internalUrl + this.siteData.apiPath + "/app/sso/login_saml_with_mfa?username="+encodeURIComponent(username)+"&password="+encodeURIComponent(password);
+					this.url = loginUrl;
+					this.openWebview(loginUrl);
+				}
+				if (options && options.url){
+					this.url = options.url;
+					this.openWebview(options.url);
+				}
+				this.listenUrl()
+			},
 		onShow() {
 			this.siteData = uni.getStorageSync("siteData");
 		},
 		methods: {
-			 listenUrl() {
+				openWebview(loginUrl) {
+					// #ifdef APP-PLUS
+					const wv = plus.webview.create(loginUrl, 'saml-login-webview', {
+						'uni-app': 'none',
+						top: '0px',
+						bottom: '0px',
+						additionalHttpHeaders: {
+							'Origin': 'MGM_MCRM_APP'
+						}
+					});
+					this.samlWebview = wv;
+					const pages = getCurrentPages();
+					const page = pages[pages.length - 1];
+					page.$getAppWebview().append(wv);
+					// #endif
+				},
+				listenUrl() {
 				 var that = this;
 				 var count = 0;
 				 this.intervalId = setInterval(() => {
@@ -75,6 +94,11 @@
 				 }
 			 },
 			 getCurrentUrl(){
+				 if (this.samlWebview) {
+					 var url = this.samlWebview.getURL();
+					 console.log("=======当前地址======", url);
+					 return url;
+				 }
 				 var pages = getCurrentPages();
 				 var page = pages[pages.length - 1];
 				 var currentWebview = page.$getAppWebview();
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 9d67798..48decfa 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -217,6 +217,7 @@
 
 <script>
 	import {logout} from '../../api/commonApi.js'
+	import {updateDeviceToken} from '../../api/notificationApi.js'
 	
 	export default {
 		data() {
@@ -251,19 +252,6 @@
 				single: "2021-04-3",
 				today: new Date(),
 				range: [],
-				selectData:[{
-						value: '1',
-						label: 'Corso'
-					},
-					{
-						value: '2',
-						label: 'Mauve',
-					},
-					{
-						value: '3',
-						label: 'Calmi',
-					}
-				],
 			}
 		},
 		onLoad() {
@@ -356,7 +344,7 @@
 			showDelegate() {
 				this.showMsgBox = true;
 			},
-			confirmLang(e){
+			async confirmLang(e){
 				uni.setLocale(e.value[0].code);
 				this.$i18n.locale = e.value[0].code;
 				this.lang = e.value[0].name;
@@ -378,6 +366,10 @@
 						// ignore
 					}
 				});
+				//这里加上接口，切换语言时 更新DeviceToken中的useLanguage字段
+				const useLanguage = e.value[0].code === 'en'? 0 : 1;
+				console.log(useLanguage);
+				await updateDeviceToken({userId : this.userData.userId,useLanguage});
 				// #endif
 				this.showPicker = false;
 			},
diff --git a/salessupport/todoList/todoList.vue b/salessupport/todoList/todoList.vue
index 14a6ba2..efc09fd 100644
--- a/salessupport/todoList/todoList.vue
+++ b/salessupport/todoList/todoList.vue
@@ -10,7 +10,7 @@
 			 			height: navbarHeight+'px',
 						backgroundColor: bgColor,
 			 		}"></view>
-				<view :class="[true && 'u-navbar--fixed']">
+				<view :class="[true && 'u-navbar--fixed']"> 
 					<u-status-bar :bgColor="bgColor"></u-status-bar>
 					<view class="u-navbar__content" :style="{
 			 				height: navbarHeight,
@@ -117,8 +117,6 @@
 											<image
 												v-show="index == 0 && currentIndex !== 2 && rowRecord.hasLimoRecord =='-1'"
 												src="../../static/images/limo_warn.png" class="icon-img-limo"></image>
-											<span v-show="index === 0 && rowRecord.isQueue"> (In Queue) </span>
-											<span v-show="index === 0 && rowRecord.roomReady"> (Room Ready) </span>
 										</span>
 									</view>
 									<!-- 直接使用v-if配合CSS动画类 -->
@@ -237,7 +235,7 @@
 											</u-col>
 											<u-col span="6">
 												<view class="hz-font-12px">R6M TPD: {{formatNumber(rowRecord.detailData.r6MTPD)}}</view>
-												<view class="hz-font-12px">R6M Win: {{formatNumber(rowRecord.detailData.r6MWin)}}</view>
+												<view class="hz-font-12px">R6M Win: {{formatNumber(rowRecord.detailData.r6MWin)}}</view>:
 												<view class="hz-font-12px">R6M RI:
 													{{getPercentFormat(rowRecord.detailData.r6MRIPercentage)}}</view>
 												<view v-show="currentIndex === 2 && filterType ==='MASS'" class="hz-font-12px">R6M Theo : {{formatNumber(rowRecord.detailData.r6MTheo)}}
@@ -320,9 +318,6 @@
 										</view>
 									</view>
 								</view>
-								<view v-if="currentIndex === 2 && rowRecord.roomReady" class="hz-font-12px todo-description-text" >
-									[Room Ready]
-								</view>
 							</uni-card>
 							<template v-slot:right>
 								<view v-if="currentIndex === 0" class="hz-flex-row" style="height:100%;align-items: center;margin-left:15px;"
@@ -447,7 +442,7 @@
 		getSetting,
 		getExtendBooking
 	} from '../../api/configApi.js';
-	import { normalizeApiKeys } from '../../common/normalizeApiKeys.js';
+	import { normalizeApiKeys, getApiRecords } from '../../common/normalizeApiKeys.js';
 	export default {
 		components: {
 			mgmHeader, // 注册组件
@@ -736,7 +731,12 @@
 				return num?.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",") || "0";
 			},
 			formarHour(num){
-				let hourStr = num > 1 ? num + ' hours' : num + ' hour';
+				let hourStr = '';
+				if(num!==null && num!==0){
+					hourStr = num > 1 ? num + ' hours' : num + ' hour';
+				}else{
+					hourStr = 0 + ' hour'
+				}
 				return hourStr;
 			},
 			checkPassEtaTime(record) {
@@ -1042,7 +1042,7 @@
 							if (i.keys == "VIEW_YESTERDAY_TODOLIST_START") {
 								dbStart = i.keyValues;
 							}else if(i.keys == "VIEW_YESTERDAY_TODOLIST_END"){
-								dbEnd = i.keyValues	
+								dbEnd = i.keyValues
 							}
 						}
 						let today = new Date();
@@ -1254,6 +1254,7 @@
 					
 					if (requestSeq !== this.todoListRequestSeq) return;
 					this.currentTask = null;
+					
 					const records = res && res.data && Array.isArray(res.data.records) ? res.data.records : [];
 					if (res && res.success == true && records.length > 0) {
 						this.showTodoListView=true;
@@ -1272,8 +1273,8 @@
 							}))
 						}));
 					}else{
-						const errorCode = res && (res.errorCode || res.code) ? String(res.errorCode || res.code).toUpperCase() : '';
-						if(errorCode.indexOf('NO RECORD') !== -1 || (res && res.success == true && records.length === 0)){
+						const errorCode = res && res.errorCode ? res.errorCode.toUpperCase() : "";
+						if(errorCode.indexOf('NO RECORD') != -1 || (res && res.success == true && records.length == 0)){
 							this.dataNull = this.$t("common.noRecord");
 						}else{
 							this.dataNull = this.$t("todo.returnError");
@@ -1283,7 +1284,6 @@
 					}
 				} catch (e) {
 					
-					if (requestSeq !== this.todoListRequestSeq) return;
 					if (e.errMsg && e.errMsg.includes("abort")) {
 						
 					} else if (e.data!==null&&e.data!==undefined&&e.data.message!==undefined){
@@ -1330,6 +1330,7 @@
 						const res = await getTodoDetail(params);
 						if (res != null && res.success == true) {
 							record.detailData = normalizeApiKeys(res.data);
+							console.log(record.detailData.r3MTOD);
 							if(record.detailData.descriptions!==null){
 								for(let i=0;i<record.detailData.descriptions.length;i++){
 									if(record.detailData.descriptions[i].itemRecordType == 'Offer'){
@@ -1599,7 +1600,8 @@
 			getETALable() {
 				return function(record) {
 					if (this.currentIndex !== 1 && this.currentIndex !== 2) {
-						return record.eta;
+						console.log(record);
+						return record.eTA;
 					} else if (record.bigLossFlag === 1) {
 						return "BIGLOSS";
 					} else if (record.bigWinFlag === 1) {
@@ -1657,7 +1659,11 @@
 			},
 			getPercentFormat() {
 				return function(val) {
-					return Math.trunc((val * 100)) + "%";
+					if(val){
+						return Math.trunc((val * 100)) + "%";
+					}else{
+						return "0%"
+					}
 				}
 			},
 			getOtherDescription(){
diff --git a/static/css/custom.scss b/static/css/custom.scss
index 936191d..ed7ad75 100644
--- a/static/css/custom.scss
+++ b/static/css/custom.scss
@@ -373,6 +373,241 @@ page{
 	border-top:1rpx solid #f4f4f4;
 	width:100%;
 }
+
+/* bookingRecord.vue */
+.hz-nav-right {
+	margin-top: 2px;
+	margin-right: 3px;
+}
+
+.hz-nav-right-group {
+	border: 1rpx solid #ccc;
+	border-radius: 14px;
+	padding: 4px 12px;
+}
+
+.hz-nav-right-divider {
+	height: 20px;
+	border-left: 1px solid #ccc;
+	margin-left: 8px;
+	margin-right: 8px;
+}
+
+.hz-record-card {
+	margin-top: 20rpx;
+	align-items: center;
+}
+
+.hz-row-gap {
+	margin-top: 6px;
+}
+
+.hz-w-40 {
+	width: 40%;
+}
+
+.hz-w-50 {
+	width: 50%;
+}
+
+.hz-w-55 {
+	width: 55%;
+}
+
+.hz-w-60 {
+	width: 60%;
+}
+
+.hz-w-100 {
+	width: 100%;
+}
+
+.hz-sharer-wrap {
+	width: 50%;
+	text-align: right;
+	justify-content: flex-end;
+}
+
+.hz-sharer-tag {
+	width: 40%;
+	height: 14px;
+	line-height: 14px;
+	margin-right: 3px;
+}
+
+.hz-limo-dropoff-wrap {
+	padding-right: 50rpx;
+}
+
+.hz-book-btn-wrap {
+	width: 45%;
+}
+
+.hz-limo-status {
+	color: #ff9b9b;
+}
+
+.hz-booking-type-row {
+	justify-content: space-between;
+	align-items: center;
+}
+
+.hz-booking-type-wrap {
+	display: flex;
+	align-items: center;
+	gap: 8rpx;
+}
+
+.hz-booking-type-icon {
+	width: 24px;
+	height: 24px;
+}
+
+/* newLimo.vue */
+.limo-text-input[disabled],
+.limo-text-input--disabled {
+	background-color: #F5F7FA;
+	color: #4D4D4D;
+}
+
+.limo-booking-contact-row {
+	align-items: stretch;
+	display: flex;
+	flex-direction: row;
+	width: 100%;
+}
+
+.limo-booking-contact-row + .limo-booking-contact-row {
+	margin-top: 5px;
+}
+
+.limo-booking-contact-label {
+	color: #4D4D4D;
+	align-self: center;
+	flex: 0 0 38%;
+	font-size: 26rpx;
+	font-weight: 600;
+	white-space: nowrap;
+}
+
+.limo-booking-contact-controls {
+	align-items: stretch;
+	display: flex;
+	flex: 0 0 62%;
+	flex-direction: row;
+	gap: 2%;
+	justify-content: flex-end;
+	min-height: 36px;
+	min-width: 0;
+}
+
+.limo-booking-contact-code-picker {
+	align-self: stretch;
+	flex: 0 0 38%;
+	min-width: 0;
+	min-height: 36px;
+}
+
+.limo-booking-contact-code-picker ::v-deep .lu-data-select-box {
+	align-items: center;
+	background-color: #ffffff;
+	border: 1px solid #e5e5e5 !important;
+	border-radius: 4rpx;
+	box-sizing: border-box;
+	color: #4D4D4D;
+	display: flex;
+	font-size: 24rpx;
+	font-weight: 600;
+	height: 36px !important;
+	justify-content: center;
+	min-height: 36px !important;
+	padding: 0 5% !important;
+	width: 100%;
+}
+
+.limo-booking-contact-code-picker ::v-deep .wid {
+	align-items: center;
+	display: flex;
+	flex: 1;
+	min-width: 0;
+	overflow: hidden;
+}
+
+.limo-booking-contact-code-picker ::v-deep .lu-select-text,
+.limo-booking-contact-code-picker ::v-deep .lu-data-select-input,
+.limo-booking-contact-code-picker ::v-deep .placeholder-class {
+	color: #4D4D4D !important;
+	font-size: 24rpx !important;
+	font-weight: 600 !important;
+	flex: 1;
+	min-width: 0;
+	padding: 0 !important;
+	text-align: center;
+}
+
+.limo-booking-contact-code-picker ::v-deep .lu-data-select-close {
+	margin-left: 4%;
+}
+
+.limo-text-input.limo-booking-contact-phone {
+	background-color: #ffffff;
+	border: 1px solid #e5e5e5;
+	border-radius: 4rpx;
+	box-sizing: border-box;
+	color: #4D4D4D;
+	flex: 0 0 47%;
+	font-size: 24rpx;
+	font-weight: 600;
+	height: 36px;
+	min-width: 0;
+	min-height: 36px;
+	padding: 0 3%;
+}
+
+.limo-booking-contact-btn {
+	align-items: center;
+	background-color: #ffffff;
+	border: 1px solid #e5e5e5;
+	border-radius: 4rpx;
+	box-sizing: border-box;
+	color: #4D4D4D;
+	display: flex;
+	flex: 0 0 10%;
+	font-size: 28rpx;
+	font-weight: 700;
+	height: 36px;
+	justify-content: center;
+	min-height: 36px;
+}
+
+.limo-booking-contact-disabled {
+	background-color: #F5F7FA;
+	color: #4D4D4D;
+	pointer-events: none;
+}
+
+.limo-booking-contact-disabled ::v-deep .lu-data-select-box {
+	background-color: #F5F7FA;
+	color: #4D4D4D;
+}
+
+.limo-additional-options {
+	display: flex;
+	flex-direction: column;
+}
+
+.limo-additional-options ::v-deep .u-checkbox-group {
+	margin-bottom: 5px;
+}
+
+.limo-additional-options .limo-booking-contact-row {
+	margin-bottom: 5px;
+}
+
+.limo-additional-options .limo-booking-contact-row + .limo-booking-contact-row {
+	margin-top: 0;
+}
+
 /* textarea */
 .uni-textarea{
 	width:100%;
@@ -445,4 +680,28 @@ page{
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
+
+.find-player-ico {
+	width: 64px;
+	height: 64px;
+}
+
+// spacing utilities
+@for $i from 0 through 2000 {
+	.p-\[#{$i}\] { padding: #{$i}rpx !important; }
+	.px-\[#{$i}\] { padding-left: #{$i}rpx !important; padding-right: #{$i}rpx !important; }
+	.py-\[#{$i}\] { padding-top: #{$i}rpx !important; padding-bottom: #{$i}rpx !important; }
+	.pt-\[#{$i}\] { padding-top: #{$i}rpx !important; }
+	.pr-\[#{$i}\] { padding-right: #{$i}rpx !important; }
+	.pb-\[#{$i}\] { padding-bottom: #{$i}rpx !important; }
+	.pl-\[#{$i}\] { padding-left: #{$i}rpx !important; }
+	.m-\[#{$i}\] { margin: #{$i}rpx !important; }
+	.mx-\[#{$i}\] { margin-left: #{$i}rpx !important; margin-right: #{$i}rpx !important; }
+	.my-\[#{$i}\] { margin-top: #{$i}rpx !important; margin-bottom: #{$i}rpx !important; }
+	.mt-\[#{$i}\] { margin-top: #{$i}rpx !important; }
+	.mr-\[#{$i}\] { margin-right: #{$i}rpx !important; }
+	.mb-\[#{$i}\] { margin-bottom: #{$i}rpx !important; }
+	.ml-\[#{$i}\] { margin-left: #{$i}rpx !important; }
+}
diff --git a/static/css/limo.scss b/static/css/limo.scss
new file mode 100644
index 0000000..cdc4a32
--- /dev/null
+++ b/static/css/limo.scss
@@ -0,0 +1,302 @@
+.mandatory {
+	color: #ff0000;
+	margin-left: 3px;
+}
+.limo-field-label {
+	font-size: 28rpx;
+	color: #808080;
+	font-weight: 600;
+	line-height: 1.4;
+}
+.limo-section {
+	margin-top: 20px;
+}
+.limo-form-row {
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	margin-top: 4px;
+}
+.limo-form-cell {
+	width: 50%;
+	box-sizing: border-box;
+	padding-bottom: 16px;
+	padding-right: 8px;
+}
+.limo-form-cell:nth-child(2n) {
+	padding-right: 0;
+	padding-left: 8px;
+}
+.limo-form-col-full {
+	margin-top: 0;
+	padding-bottom: 16px;
+}
+.limo-control-wrap {
+	margin-top: 4px;
+	width: 100%;
+}
+.limo-tap-field {
+	box-sizing: border-box;
+	height: 36px;
+	min-height: 36px;
+	border: 1rpx solid #dcdfe6;
+	border-radius: 8rpx;
+	padding: 0 16rpx;
+	background-color: #fff;
+	gap: 8px;
+}
+.limo-tap-field text {
+	font-size: 13px;
+	color: #333333;
+	font-weight: 400;
+}
+.limo-tap-field ::v-deep .u-icon {
+	flex-shrink: 0;
+}
+.limo-text-input {
+	box-sizing: border-box;
+	width: 100%;
+	height: 36px;
+	min-height: 36px;
+	border: 1rpx solid #dcdfe6;
+	border-radius: 8rpx;
+	padding: 0 16rpx;
+	background-color: #fff;
+	font-size: 13px;
+	color: #333333;
+	font-weight: 400;
+}
+.limo-readonly-field {
+	display: flex;
+	align-items: center;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+.limo-page-with-tabbar .limo-text-input[disabled],
+.limo-page-with-tabbar .limo-text-input--disabled {
+	background-color: #F5F7FA !important;
+	border-color: #E4E7ED !important;
+	color: #333333 !important;
+	-webkit-text-fill-color: #333333;
+	opacity: 1;
+}
+.limo-page-with-tabbar {
+	box-sizing: border-box;
+}
+.limo-content-bottom-pad {
+	padding-bottom: 64rpx;
+}
+.limo-label-row {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
+.limo-dropoff-block {
+	margin-top: 0;
+}
+.limo-other-dropoff-field {
+	margin-top: 12rpx;
+}
+.limo-remark-wrap {
+	margin-top: 4px;
+	padding-bottom: 16rpx;
+}
+.limo-hourly-row {
+	margin-top: 4px;
+	min-height: 36px;
+	display: flex;
+	align-items: center;
+}
+.limo-control-wrap ::v-deep .lu-data-select .lu-data-select-box {
+	height: 36px !important;
+	min-height: 36px !important;
+	box-sizing: border-box;
+	padding: 0 7px !important;
+}
+.limo-control-wrap ::v-deep .limo-location-select.lu-data-select .lu-data-select-box {
+	height: auto !important;
+	min-height: 36px !important;
+}
+.limo-control-wrap ::v-deep .limo-location-select.lu-data-select .lu-data-select-content {
+	min-height: 36px;
+	align-items: stretch;
+}
+.limo-control-wrap ::v-deep .limo-location-select.lu-data-select .wid {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+}
+.limo-control-wrap ::v-deep .limo-location-select.lu-data-select .lu-select-text {
+	white-space: normal !important;
+	word-break: break-word !important;
+	overflow: visible !important;
+	text-overflow: clip !important;
+	line-height: 18px !important;
+	padding: 8px 0 !important;
+	padding-right: 8px !important;
+}
+.limo-control-wrap ::v-deep .limo-location-select.lu-data-select .lu-data-select-close {
+	align-self: center;
+}
+.limo-control-wrap ::v-deep .limo-greet-select.lu-data-select .lu-data-select-box {
+	height: auto !important;
+	min-height: 36px !important;
+	box-sizing: border-box;
+	padding: 0 7px !important;
+}
+.limo-control-wrap ::v-deep .limo-greet-select.lu-data-select .lu-data-select-content {
+	min-height: 36px;
+	align-items: center;
+}
+.limo-control-wrap ::v-deep .limo-greet-select.lu-data-select .wid1 {
+	display: flex;
+	align-items: center;
+	min-width: 0;
+	flex: 1;
+}
+.limo-control-wrap ::v-deep .limo-greet-select.lu-data-select .lu-data-multiple {
+	min-height: 36px;
+	padding: 3px 0;
+	box-sizing: border-box;
+	align-items: center;
+}
+.limo-control-wrap ::v-deep .limo-greet-select.lu-data-select .lu-data-select-input-multiple {
+	height: 24px !important;
+	min-height: 24px !important;
+	line-height: 24px !important;
+	padding: 0 !important;
+	margin: 2px !important;
+	background-color: transparent !important;
+}
+.limo-control-wrap ::v-deep .limo-greet-select.lu-data-select .lu-data-select-close {
+	align-self: center;
+}
+.limo-page-with-tabbar ::v-deep .lu-data-select .lu-select-text,
+.limo-page-with-tabbar ::v-deep .lu-data-select .lu-data-select-input,
+.limo-page-with-tabbar ::v-deep .lu-data-select .lu-data-select-input-multiple,
+.limo-page-with-tabbar ::v-deep .lu-data-select .placeholder-class,
+.limo-remark-wrap ::v-deep .u-textarea__field,
+.limo-remark-wrap ::v-deep textarea {
+	font-size: 13px !important;
+	color: #333333 !important;
+	font-weight: 400 !important;
+}
+.limo-page-with-tabbar ::v-deep .lu-data-select .arrow {
+	border-left: 6px solid transparent;
+	border-right: 6px solid transparent;
+	border-top: 6px solid #a8abb2;
+}
+.limo-page-with-tabbar ::v-deep .lu-data-select .arrow::before {
+	top: -6px;
+	left: -5px;
+	border-left: 5px solid transparent;
+	border-right: 5px solid transparent;
+	border-top: 5px solid rgb(255, 255, 255);
+}
+.limo-remark-wrap ::v-deep .u-textarea {
+	border-radius: 8rpx;
+}
+.limo-remark-wrap ::v-deep .u-textarea__field,
+.limo-remark-wrap ::v-deep textarea {
+	min-height: 160rpx !important;
+}
+
+/* lu-data-select 下拉面板优化（仅作用于本页） */
+.limo-page-with-tabbar ::v-deep .lu-select__selector {
+	border: none;
+	border-radius: 12rpx;
+	box-shadow: 0 8rpx 24rpx rgba(0, 0, 0, 0.12), 0 2rpx 6rpx rgba(0, 0, 0, 0.06);
+	overflow: hidden;
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector .lu-popper__arrow {
+	display: none;
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector_bottom {
+	top: calc(100% + 6rpx);
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector_top {
+	bottom: calc(100% + 6rpx);
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector .lu-select__selector-item {
+	padding: 10px 14px;
+	font-size: 13px;
+	color: #303133;
+	transition: background-color 0.15s ease;
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector .lu-select__selector-item:first-child {
+	margin-top: 4px;
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector .lu-select__selector-item:last-child {
+	margin-bottom: 4px;
+}
+.limo-page-with-tabbar ::v-deep .lu-select__selector .lu-select_selector-item_active {
+	background-color: rgba(195, 154, 75, 0.1);
+	color: #C39A4B;
+	font-weight: 500;
+}
+.booking-popup-card {
+	padding: 20px;
+	background-color: #ffffff;
+	border-radius: 16px;
+}
+.booking-popup-icon-row {
+	display: flex;
+	justify-content: center;
+}
+.booking-popup-title {
+	margin-top: 20px;
+}
+.booking-popup-note {
+	margin-top: 10px;
+}
+.booking-popup-note-text {
+	color: #333333;
+	font-size: 14px;
+	line-height: 22px;
+	font-weight: 400;
+}
+.booking-popup-override {
+	margin-top: 10px;
+}
+.booking-popup-field-label {
+	font-size: 14px;
+	color: #666666;
+}
+.booking-popup-override-select {
+	margin-top: 8px;
+}
+.booking-popup-button {
+	margin-top: 20px;
+}
+.booking-popup-button--primary {
+	background-color: #C39A4B;
+}
+.booking-popup-button--secondary {
+	margin-top: 10px;
+}
+.booking-popup-card--criteria {
+	min-height: 0;
+}
+.booking-popup-card--success {
+	min-height: 0;
+}
+.booking-popup-title--criteria {
+	line-height: 26px;
+}
+.booking-popup-title--success {
+	line-height: 1.4;
+}
+.booking-popup-note--criteria {
+	line-height: 22px;
+}
+.booking-popup-override--criteria {
+	margin-bottom: 0;
+}
+.booking-popup-button--criteria {
+	width: 100%;
+}
+.booking-popup-button--success {
+	width: 100%;
+}
diff --git a/static/css/todo.scss b/static/css/todo.scss
index c1e32d9..24b0738 100644
--- a/static/css/todo.scss
+++ b/static/css/todo.scss
@@ -452,4 +452,4 @@
 		position:relative;
 		top:5px;
 	}
-	
\ No newline at end of file
+	
diff --git a/static/icon/tabbar/LNRB-select.png b/static/icon/tabbar/LNRB-select.png
new file mode 100644
index 0000000000000000000000000000000000000000..8bd920242a410eb1a0f43e1a4057c41632a0eedd
GIT binary patch
literal 2956
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
C6QtSz

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/LNRB.png b/static/icon/tabbar/LNRB.png
new file mode 100644
index 0000000000000000000000000000000000000000..29028294d49d0a594f26d7839662c7e80e230441
GIT binary patch
literal 1723
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
R%r5`{002ovPDHLkV1h91M>YTe

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/calendar-check-fill.png b/static/icon/tabbar/calendar-check-fill.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b2bb4181e4ccbe0d6158382a70c9220587b2700
GIT binary patch
literal 1339
zcmV-B1;qM^P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000E=Nkl<ZcmeEL
zU5Fc16h3FNtKFgxRZy_BNI|X7RfIMfyP(~YS*(Aks9mAmOsK_&;vW^%6|@Kz@uB`~
z(rT4T)up1_BxSc?Z4y@$MBhYIq+tD_(3jd(*(AqvCUcW%X7V>PB)iyf&zy7rzH`30
zGk5O2(O`-HE)wYX0Qwq%x&0$oh=diqV2Sv_>zY6zZLBL-27VP0+mBOcAHfhT5wV?h
zo!DIyzzW0}cu2&y+4P@m4BvQN6Cl8d3fF0?vTn5#!)bSl(=`Fq=qd$H8eLmRk8TVi
zf}!x7*s83Z?ubA!9lt%FHVzh2##tiRp+J$~5g<AdL@W#&kQiHh*uHMFi(9I;1oEl)
z9wMBz9j$1I7Ea{~+t=~J<mf~@$d&~1DdP|V?rs5c3V==q6JU%c9*~|dq~h;3skMrm
z5-3g@FCoA~Rx7>`&@2$#hlH<iwweeJ#?0KtAOeh01>@TQuor>u=lpRNJK-2luP@pe
zm+~Y~c-vS*2v4fkMDUt!=0;-4>=XgatMafl-<<PNGxt%<%x+>odu#XvPf1L*yu<J$
z03~>X+YGXBqWAP<b{88~;*t2%GWg=OIqNGqF`Tw;X5|JRwm}D>46obv1<FO>i#IpP
zG&!PLMatSU%C73tC#(<i9eN+YvN;<hSs0#pnnv~ak6`mx`|i53(UXfn2?y3X8l70b
zBXio32R%9SI}h=Le1{$u+gazw7K~<i8^&{|5FxK{|6TTvGd8Q(MF2JJ2CJre`KhY<
zcjfo*N97$Ua=o&Zb`!wLHL8;5g-e5cWy9zTfR}*%BcfHdSyL_oP|<kyRP{I(<SQFW
zU!bkEXb4^Lx(Za|rK0~&1QzF*TpWRZk4wKsV1|hoSOTY>6W|5gWBlda%%bz!XErE<
zUJ~GsDw@$`W?wyMEY)p)R#*hiviox^O%tza61tg5s|NYW_%8lp$_a-m@}<KdFgHZn
zDvU%{BH$6PD0pwNHJZpCP<4e#<8efMRpo=|zyx?%J#$m?=zMhh^tq^+xfcjNb_T?O
zKA<PEhg4ZHWjp~0_05W^@Tmh6K!8W>J%kkk@7nI+vQMoHZ$YDp%!iiEmqN;TnhDpp
zq+Av>1t!1&TwRF_7K;b&sI6k7X7)}Xj4_!huD4P#H7c8vm#s{QmoNxOIM-3R{3RcQ
ztd@*OESV{a7Lmt>r_4QKhb>_dkhoR@(%i|kaie6EaPTjL{n#jM(JlgnRFMjwvQi`X
zrkFOi^Rdh@&o)Om_~(3Lxw?79<|3d0{_N`6UBM84vG()S`5DhPcX!vdb!&~twZ+xk
zUGO`1+2SZEYxr$rBrXCQep~lFH(Fp>Z0T?P^vyps2IV4v6B8Al0#l6*`<>^<a?*;e
zArKb<smB3rHxT?G_M#AurCeJ6tXC|a1Y}vjFJbLC(W_%G%lIr}=kU&{zr1{U5|D<v
znf-u|Mcxs+pTZx&x1x#c1?wwkJWUBmqgXPx4FR^WEz4zA9j0)aoe|%BDqj0X$P2b5
z0qMZ&nrRxS@R=kYlYB3P0Hz~aX|4Ef=dUdR0noP{I}<ZA@zTQb%PXj@Aq{T<#NjYS
zFa>*l*}`S~_-<K0KGV^tcSJx)h{%g{YvSlH`grE+SR(Uzm?D^hJu)_XUVL>bT@mOM
xw3qFcJc0iJ00960Y1ief00006Nkl<Z0|47b(0_8G4K@G(002ovPDHLkV1luKd5{1A

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/calendar-check.png b/static/icon/tabbar/calendar-check.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea63bfcfaebc41ca5de6f759255dc9fd2ee0c392
GIT binary patch
literal 1158
zcmV;11bO?3P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm000C#Nkl<ZcmeF0
zSEv+87=>qdAC_Hq+3>I|y9=AyRS`uWL=<ztfEf`nrxz6jQ4|$LK@dd+MKB;n#2hh$
z`lN`UASP7Is0a!Md=SHT`cBF3?e3YmU3F)?;BZdWU)|NG{?oZ@KF`(h-zNi=K7d(|
zz>g#@QU!su#2SlbG0>Dz?&hhO&<oPYte3?=SJM3|PsM~@kVa;`EC#+X>Dt&Vu2E<;
zY+RB^76VrJ4;pPeDGemDp;QCkAwLHmhQpx4P=aHglm-$Jq<x5J7W@_#MJWclp>h#U
zhaKVXu(lxWPKeKhmtbdD5XB6vWb1wK7np=wEIi>!X&@29uPiwTm%~&PGBAd%MnQ*%
z1pVP!=&**s_ZpA}G7+Rbfan2qP#z;)qk5fYKo`~`(|JE}J-8L#gtY}}Z$`WU)ZV9x
zu$b~U7(<$Y_4NE23Rfxm!6#7Akx(t#SnVvd8ZLf}P#<_53g1v{gfS!;s86q!&|wh4
zOX#qRU=x&}VnQ!SBS}wV4mQfIi2sEjAjyDEAJ^#=!D(o5pT<BaV~PpAAdNJ=lPI5o
z4u879)ky|)D|730D|2zB>I-IIyK|$(Nd|t3)>IXGwENy=e7FCsDwU}GIVw$&WWa7P
zgucE{THo!J18GEv<r`ZNb*n=~F#~!^`aWrWw^t6SyR?`AJtgz!aIR9da>%9qiWx}T
z?xR`$$w0<K(ShySLvK{#2rMD%Bk(Bf3%yWo11rdO91Mm~27Vx;?_nV<W#wq-u#jLo
z^g;*&O~~LjyaRi|>d=#2dw#50v4D6Y^hO8+ZOKCK>*6-zF3`axZ}<FsR!)LJ5W>JZ
zGI<0Az5MMYXa|-2Dr);#I*;~b7z`l{DEa1Or0GGb+?N!4p(X=HP&>>em;!?$gaIX_
zPrnufH=v-;QB4^t7In@~QxKY=3@9&M$TDF+K;E)Kb3DP$dGtO&l7Tm-ht6ZuEE?+b
zuo1m94WgH@hQza>4{Q!Lw@5R|fKG>KCB@&crg+T;tKo2Hj|R<5_{VH@&BRfdWZ+!1
zrmARMRaLaqbH*ib)&;IkGN2FnSNRT_VA6C(zFGE4(>wp?N7XdTm3;iZN;07HOixbN
zNz;A$1H!e-Rcp)*W-!f>DmSwzmrF9B4pS-I{G_Hbw$Rr54pmv8_bNTr-4xF~Mx6m;
zNHg$^o)e%$cY^b<2h=MARjok(3G_x;7r%XujAz+%7(<!?b<`xQ?k0*wO?U4mkU9Nd
zaGW?KFQfMq?tpeWe;IAPo>0Y6$bfq5e%_NnldV+mp_%H|w33<2Wm*0odKP*`(b)Da
z)~=7@Vg}S{4~6ao2dK*hH>T=>W0qn-0@@ooCv}eg#e!x~uhAhXO=;^I)1I$>)EP34
zQVqB*bs_16O*7UZ&wpu2Q`#@wV5QVGHBgFXS^Ly^1MdI;0RR6(#76l5000I_L_t&o
Y0E2iOaHSq+G5`Po07*qoM6N<$f*0EiXaE2J

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/ico_home.png b/static/icon/tabbar/ico_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..b005820cb639cc27b2371b548878ac0dc390d44b
GIT binary patch
literal 865
zcmV-n1D^beP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&8%ab#RA@u(m|MtAK@`V-pCl2INJ4}ZN#veHlH`)yB|af3Axetml2THxDIu5K
zLKKBOxV(AuL|&v6PrP|i9_*#rwHmYco_+SrIp3E(bso++Gi(08wbraPd$-ZaM_VV?
zPYuxO2*!-S3g9^K3pfp2jsY7BU>R^9=%Pf=2Hu2*hyk$Fi0|qUI~{l%5+XFf5+lA_
zj>w6?yHF4z0Tu!efbL4%QD7Lb!4f<c_z(gj6u<)G`JPJDG2o#2{xZq`IWZtY0L(Yy
zdntiZefC>|UjXw$LsSJ2K~in{C}AgneHrQT6p(1?Q7N6O0L(Sw`zkdjfxQK}{RCJP
z3ZhW}$!GC=KPBW8u*dUYJ_4lNR*pm?0JDtv0c!WNz%Ebm=`?YGbn8kGWdUXy@dMSa
z=Ybt1#i!Hn0;|>9-@y1XCAJK}3?qJ!+VBFfy+QHmvYWs<W#cC>)fd7SV44v>SZ#C>
z*j7<|y8If@u5A4PBvlKWoe#hiBYvpb;1aMkkoeS$+*UU$o8L^|$b~2Zm;~GdhAYEY
zfGvT=r{*N8+A*I^$<2hw1DIeuKSGJU3T%obJ}VL*f#q50lm#G_K+4=GCH97ur!hIi
zQ5)3;?-PJkE(jOEI3s?vG9Z;=eN4p;+t;mItP{cpkb8;b{1|2MwpHeu$zhk+e;{mt
zGr&%zP#VqJW-4~<bq83Jl?@tTNOC~GsEKk0?9=}mkWb7Z&(8AELo#Be`e9^}(x2pe
z9)L@vT;iGm@G8ec-+}(=|8@#J1{UWm?g#+#tRc@Fe}}6I9R?;RlX{prI-Gd`y@3OO
zbnd+IFu8`G%b6hi=?J6||C*HbTgg4?nO<AeiEU$f0P<-0-1BhkHZQwe)648x_-?d}
zF^SwEPXO_%{g9t7Ewg7d0D*D6g-cVTQve*XqM<$8;Q>UvL_v=lz;(VtRv~?e>j)@s
z=Qhte0?Jc$3aP7$zDfj7p{!;rWisu=a)@2GR^7<#KB4VK1Ms{l1f3Q%0zs8|8vDNi
rJe}0KX+?dYb;>+<t^qt96>ZudKrzfQQ+npD00000NkvXXu0mjfz|@7<

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/ico_home_active.png b/static/icon/tabbar/ico_home_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..04668760e45615ab2bdbb5735cc5a239c3d3d9f2
GIT binary patch
literal 2118
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

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/ico_set.png b/static/icon/tabbar/ico_set.png
new file mode 100644
index 0000000000000000000000000000000000000000..256a5686c8f7ebc990381068ef1a9cf817c06609
GIT binary patch
literal 747
zcmV<H0u=p;P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%rAb6VRA@u(SzAs6F$_#k2Am8y8E`VFt2Hua>~XSQ(W2(3Qa9^(#_#ND-1s`(
zxc=h~z*z8cjPX3ikl$>*k1;;Z8(uoB-)Vu*NrhU@ZV|GvDeTXzr?a)h8oSmJ0A3UK
z5VujFqP&3EwYmVj8Q;&CmH3dovaSk%_5Z5_VA&P-kYzK7WmTRrt6H$$-Fzm?-0`9a
zJIwm5_f--80MaItX$cXTB1haQO2H`zcGzrcq>OcEtPFr<Us+NUdus@Tx~G~|BI~Lw
zYmqSEBLH5w4@`M3?qgk`s<_>!=O6-nY{BFZ0muSvMbXuFXx%^nJo_w8BISHfv|4pj
zGLdq7*;n^MO<g6(Jt1kD_5i5K5?`oxqZ&6e-Dp_pGXOIOd6pEXx(%{MwVCs>e^}82
zK#Ek%?&}452c=CGU-TU$U={>Rx!&ulG3F~atToj_rb=`KeWiCo%EQ)s)`ScIlcz+m
z?zL(q+RU;3ojs3|7MmX!z;C&XF{U7U{^tN#Rj&9m0>Kz=aiMA;`GJQOC`O6^uB7E~
zpg|Qin_rJgqo@Y_Dt;`hRI4$Xvb-fwePJ<3L9kY0wcJ-)iAseRIUYp0m6*Nui25NE
z#8qPS-7wCW3sqS{Qx+OKSMEg9p#PTxjWB0THtR~O<0E>HrranCuz}j9+7&lbW$i5o
zaxYrYvNYzcAc`(sJ^^a8=?z`sgd}AEX0nRvSg}TS+ZVZCsOL%{kwbL2@E2W`c=2t5
zezA$ZFYLNn^o0aXMKsVHtyv?d)w}!+fmxuMQCNR(gI2!}$bY-f-z{L%Yz08Y-6(-w
z0Q^O8)KXXXQN^<%z5KG-cvQxsx^!6p4I%9Cma|)gY?@|wq87}`w}g<4P5_MYL!RFO
d975}a&@V}(<T0JIPAdQa002ovPDHLkV1g0tR>1%O

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/ico_set_active.png b/static/icon/tabbar/ico_set_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..54e3c9bb4f539409a40cc03222d9345ff847afca
GIT binary patch
literal 1992
zcmbVN3s4kg9A6NTmx`bz_HbKBF}&M*3b*6Q5r=_rXn4qBX1BMy2dB5U+wQ_0kSRom
zjhYxTW9BnO2$Uexe1xx5R5C=JNE=MS!W7d=MaM^d%i~5Hd$}{a`|a-U`~CmF|7+iy
zmio%zfKdSu1Px9~)Te>FOg#O3!8ODCP6@dAvx%8J1O<kQrx&zx)kp~PxnVP!1d|~J
zBN$qWlZ=Iux@Z=lA!uT(i^Yk#lmJ_(ESp1%T-&`Dfo-G~$xs_)1~#6`wk76s)b#vR
zBauIs(2z*%BzU3=0|YcB;INCfJ9x~cMS6HKuohpV2;2h^=4z2R(I9LxOoQVYj)FB(
zxrC6(<Z!e`ipP+uXth$M84oLD3MDF2q6(!%uEb<&Or?hV4g?tFNGq16pWJ5-JZX_^
zL0~Zybvm6=r&7vrS*Tp2(V#K~s!&J(Lc-@c1l%QY@ZtRodWt7F8!Olt2P`t;7A8l~
zBEZ>R6*TLib?|+W0x?5fIE%`qGEr3zkR&`fHixtK7$*sovQsqW5O{!<d$4RaBQSh6
z^EcF<&yN@Y(KQ%6HXiE>O?yo6LP9Q((HD@%qIqK;OQC5L&*X3fm5>YE3>Vd~SUgAJ
z0>c>@#@?T+Y5gw43YByM9BIG_n?n>a?x8J|9v3Jr0`jJk$W#)A(kPc>@@P!0iIT-&
zGFdOwz>qd;-eaK}OcC=46x0og3;4f+NdmJn9E}6XHX6^OP}Y%!z@9*2@r<3}fMMXB
zvd0U90ZVf50`4HFB)t{^s--p?iK%0(a)n$qK|&G=jYMV95Rw=Yw@8$fLS?a9h-kT$
z>ff(th#WDu{rk!Pxqm8W1MP*|pO{B%I<Y9QL>mv%mDkr3)2TQ6R(2cQQwJDMi1n>S
z2r;n~iS)g;J#hqjX`R^=ApM7Q_riF_DmZbDipv7g`VR$#0{2m|7kibUe-+vD?V-Ny
zhl61tE<J+?Ja|SK<pA@G1A{8h`7D@{-uX%TIAeBU+stIH0}j5Ld%XT)z}coR7Oo;p
z*kS$7cgwdW9qOEtRcH_Q4_;?2?o7|S;CHjc-95?@fw-()+lQDXYbF)O&T`j|9^|DT
z3k3(pzZm@Xh(<p2@_=DpknW9JZ;gO=?c=TkTcxS99GM|I_KaS6-Z^PV(O2EM1q)o&
z`^un`fs0oAvFSS58Gm1?|Cwzy&wo@_HxN1zMw-_qFLxgJ)_i3@S=Kq`DQ*lqFIF|<
zFl;ZW2>-aK^=g-H<~UO_GO@7s*oJ1^_(iQ-gH9HXoRi`^hzJX1rK@S!z6-C_&E6kn
zs+J|gH5E$t?FX-^PsM%{Roc<@gLxsnTz7cu{6=Sn|NVl?vlEAmo^)^VHp|8VHOBNt
zeVo_r74-aj`pVKRsg~g9zV8^(9_dxz*4l8IShM<wZ|6ugQB1$Owt^3`gvsMRtGfH!
zri0;pOGBwwLR+(TMVH%%uYa0j+Fw86o1)Bp!CkqxoE>{T^z=)WVY`FhX?W&pb@HV#
zw}u@s*XyyJ=jvOkn(x1V$f6iEP&d9(g-u=15ln<Aq{~*NoJbrroUYAXf9zcPSXbQ=
zb6xeiTL+K-LJlo%*)-HAVo!bI*5VM$*}&tO**mbKA@1)MZ#j5L8X4ZTbgkd{Q&Y_D
z^t#PKg!cf$QK7}BsIG1A%_ToCYbZZb6;M0hZ3>N?-F&iseZ}P~nI8yuG9$`=Y-;=U
zL!Gy!Ch9`<hIW1WHSN-$KCQZ&Hh5m-=I*vC)RNiM4f&X-nwx%Ka8Y)k47$)7o7V`f
z@j(hA^*0`vX!ibT`16uopUer`TmX}kt;&s;QuA+T4FB3^dw~7jKkm(F_rD%kId9gI
UIq4B!ivQZAgj9X)%jTj#0WnR{F#rGn

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/ico_todo.png b/static/icon/tabbar/ico_todo.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdf48053320f7bd62a5ff93633c7fb16b1b42ea0
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px%T1iAfRA@u(nLkJ!K@i4&ift;v%EBrT#LC8AOeF>bVxeLoHYyU(+CSI`CZrIw
z5ev1l5kXW$l1{L&5bO+?+B!wB(Hp&!Wx2bZz4zXoC%4smx3lwo-^|?X-dz(VA5A6a
zPbHw}3|1L<4;fej`hjjwF;~D*utwHr9zG?M1hkkL{bk{D!umbnkIT14fDo)HN-h#9
z^V`5g+Io$EM<oG`FVmIQ?+4&t5(gKkL_R8!xKx|v<ML&5Fa@Ofmbt_VaDmzaY)2*u
zm#;Jd_F5P2t1lO*%h4Usp)9c^vrC}InsnjTO@IlMRmUu_UX%dA6%o=Y+C3Fq0N;Uw
zn02{jz>~Auyb=(FN*xJxY;}fe+*-Skj*h?8n-}mAXa@cQ|I2n0&xPGbcuxZxWfCv~
z$SE@#r4rB!oEzkCfv><#88Xlb{0hpYEhKvn3<9#5#f{u=VkwJjU@eACEASiW3g;ex
zFTwfeG^IJ^D!>F2A!8P?Goa77HVo`LI%}>127p6@&?Yby{@)EA3rCH)$>7YirPvm7
z6(D?m0^bZ`t3XTeBsFhblixoS<i#X+0Rk%JBW*HntN;s2@`VYIo%JN>ET1i+a@LnK
zzt1Qn142;R<gxLNXa^YgVIJBRCP45%0W;w_C$6n(^b{&UL(pYY35X)3j)W_up7Uzl
z>Vd{HvRd<oWk5@y9(Lv{&CIVB?Q>2&i23?REpyjBU~lWb;I-OI<deQ1Jp0xN5W68j
z9!l~Ys&5in0eKSl!m0##g{uL^RR$UmR4<oR2E4-60OKdop{y~eeVWez0000<MNUMn
GLSTXfCL$03

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/ico_todo_active.png b/static/icon/tabbar/ico_todo_active.png
new file mode 100644
index 0000000000000000000000000000000000000000..7874502ad61135af768bbb8a32118341259c9a7a
GIT binary patch
literal 846
zcmV-U1F`&xP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&2uVaiRA@u(n7eP&P!z_$6VncrSb6*bu)xv@i6&{YKpR_ZVS!e(v`!H)RSXQM
zz=A4O3@{Ws15m_3ihw@izycy}2P9NjpeszMLP8)AOH&_Yqf~K7<5%-S&X(MJ&iQ`l
zVc#1<n}4Xy^&<pmb_K%<{1+9_Gh!BulqVR%Tx=|N(vwY<&8}PMwUWGAZr_{Mtna#-
z90X|Amk>faHkMOO+e-fe(P~uAEjamg1kf|dNif;O8_d^A0A}C_(WFzLYU@sZ%GbB^
z?+l=dTxskS*e#43KLjHgmGgOD0NZ7^Jg`0^^+DiQZbg^xWAJcX*6x*Bs9GhRs!+26
zZUC$~P(%d;*%JgqEgG9Q66c<OYB&Hu4`TAtkSD<on{`#11$eMlyH<1Is{#PlnTy@=
z^ouV$0Z~wn?<d;z4#3_<0f2#r0`R6s&fN|Iv7(9>H-RGroN{_n?PLXlX!c}Vmm&6~
zAmHW@!0%f&VB)vTTeSi|0hmv)gHE8W2f(~o?Ccy$3_tr`P^48N?yd#VY5*%F2m{fx
z3uXnNXT)hRCfWsHEfV2@o>A?yb#%BR9S{V5!i>W$4?w^=f%|)8?Y${>W#-r(L+E%4
z;Al(C0D(?3^F9!!D+Lj-u}MaM?^yn&x%MHO>iqWO_dFQ=PU6k=y3c^^Xq}OUz<l3!
zWHu-jA76T0`b}5GM*v)3CF>4=io0z=kuDIibv|N{9G90eCGiC%nIWQ4H<>T(sXu@f
zi6>&Rc5_RpDqSY95tDOMTbXz9#A)hbju>a6>71>7N`jUZ@d^{Jd&zu*D`15)2oWhN
zFWT;}=5g5oZut@4kRh%R_O)nmGBK{b{rjT&cc{IBG-w8Fvepddtbj-t6JPQwxN?6p
z0D@|^*@pn(eIQ^%g)P+9EwrqPCm5Iy*ad;iiyK|L6X)lCZRf<zztiR)w|#+B_%&v}
z8%t{=wags>tT(D6rVQ{QzdHQbQ3q$^Bl(X`wypr2oHTPi1ZZaV&DdcD!U_b;K-;&_
YACU3#K;k)cmH+?%07*qoM6N<$g6yGrqW}N^

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/taxi-fill.png b/static/icon/tabbar/taxi-fill.png
new file mode 100644
index 0000000000000000000000000000000000000000..fd05104b62c94e407d5ba70ec8071c6b166a423b
GIT binary patch
literal 883
zcmV-(1C0EMP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0009hNkl<ZcmeEK
zy-yTT5TDt@gxVOeu+{=%Vk2m{Lkj`#E+!Nd8i|F%HX7r{A7G;rjZtjKeIzCnRvHuK
zPE8~MR|r%VLgIg*(aPAMfgR=r7T)p}_U-KlxnwtQ*qPb)elx!}likM|(BxN2V808P
zRv@iF$Q_8Rg{*Rcf=I}`x0XjnU<)x}B_)vXhAZK;D==Fr=DEkqEWcTlepirv99|e!
zrSRi(x$xMk<_CP1Z#~u`U`-Uy7(}mm)d<TWmUsriVFb7fHoo~%DP(nm_!5|#9BhLO
zl^Cp*C8^O$fR%;Hg?7Jyz69vs|4R&VlqK0gbZnK@hW&#269BmA0zn+hj@B>^A)tqH
zEVjcDu*$_jAUG+5uGlMMvK^&vWLjJV0Pwg~&hJTL?+PI8-2Ip5%ujzHrmN@b+rL2c
zLWV~$F2f$zt_0?*=TGqN56Nq7+m3Dboj4iDJaTk#=QirIO2r<bdx_!Y6uwp4aF-5Y
zy4S3K6VKw5)8@PH0Qer{3t?0?W!;m&e6{}|zmIRp6Um0BvK^;R20U@&)9~CxUz^*v
zVR;g;*D_Z&9&i37Sjw5T+NKrzEq85d8WF$BfvDxcb=h`wZvu$7oeAR3eK-yvwB&>U
zo`G}`dAE^5z$z7nxP6Xnucco(vtHe{lhLvxQ<I$ZPbpgaT&1AAkrV=GfV=k*$0d+t
zRmA6VK%3x(Yzti>z^qS+2aX`YeJkL9TT#tNpa)JKn|IeoRrnMF!r4rc64>u*1+Bm$
zpH;f~6*s_%FSA578paJmV4085-C47~m>aEqWWAHKUt|e8Lg8u?;9b9?WJ+{X@db2*
z#nmPdFt5a>YZKtF^Ns@+=NQ39E-bD#0ZzArKTr!+Dc{9Eee|=w#J(<;up<<15CS66
zE<jx1UHiaB2TN3=VcehuqDnY2oRmOhTiGB`T7d>PF0y6X72u;oEWgI>hO5g^n}9B0
z((}9s%y=Xb?BwYI(11%T4~2kDG|R!{glE|IihYR=j;WQ0LZH{I-{ZdQWN~`_tnek8
zJqHspIS1c76au`qsYXg*zst1_00960A!T;500006Nkl<Z0|4$?x^S<?!3_Wa002ov
JPDHLkV1n(undkrj

literal 0
HcmV?d00001

diff --git a/static/icon/tabbar/taxi-line.png b/static/icon/tabbar/taxi-line.png
new file mode 100644
index 0000000000000000000000000000000000000000..59cc4b4c010bf239a93c74dfa758b4f1c00991e4
GIT binary patch
literal 630
zcmV-+0*U>JP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0006jNkl<ZcmeEL
zy)H#T5MCY!o%rjBg6I@lQ7IIJP$|%8Bogo80jSUj55Vj2eF-vm&HkO;J;#;3nJ;I~
z?AdSTn>mra?xY#>PZKco0NVuG1Ts5N@)i0(Eh)g``BqXuel;B!nt%>XE4n3R0@uj=
z47lENEG3zX=K(BNK$OJ_I0xGyumse$Wh6NM0xo`w5ikpiGoWwd6y`!nV+8DmNGh)H
zg}6fk*nL~T3P>j^f!v_}u^o7PrEt+LB)~5I5i|rYRgBz(B==6iCqV1|g=DVe+c~z7
z$2kR`fPHL~#?BBjR>NlwLUNzT8|k|Qu>0HcLHKrO5UOT&t_@^Tr{EHBiVf1(5kkgl
z`piYh9O|EPO~5>MZ35Elj>xrIzMYd3AV%_O0xn0MFovCYG{*G((enP9f+k?qs+6i-
z=a$-W=9cBy_eK*SH~e|O2^e}rF%zhD?uq5~_9#Yxmtg3{Q~^^c_zrjh7JyRLnKwlM
z3w}ezYXE(UU}D^68M!+1rU<xE%H;QCC7cw>;!P2dR8?OOrwBMuiaJtasi7?16alZO
zY#O)+=r7{>4&)lSI`gIoV4*B{9S)0UVz@=DGjFPZBGr~8i4joy#2MoE>WvZLB^Y|K
z2^gmd#GW2YJr~uRfB6dW%e1YYhb=qizAv*9Rfjf#C*+p}ljs()zAdT_O#pw)m_fDQ
z?=t^m%osww8gmBg&;;~aWp1)2Ah(0L`#%8y0RR7|4D3(<000I_L_t&o0H5BPVP#FR
Q_y7O^07*qoM6N<$f;g@iH~;_u

literal 0
HcmV?d00001

diff --git a/static/images/car_no.png b/static/images/car_no.png
new file mode 100644
index 0000000000000000000000000000000000000000..b1e73eaf3b6f54ac5b509d74ddf9629731e5f85b
GIT binary patch
literal 6146
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
XC*3JJ5?q%DC=gXeO@$&kv%voWqaV-9

literal 0
HcmV?d00001

diff --git a/static/images/clock.png b/static/images/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7cf880fc162ef87eee3573f7f1fdecaa6929efc
GIT binary patch
literal 6599
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

literal 0
HcmV?d00001

diff --git a/static/images/copy.png b/static/images/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..d9c8f037da5d065ed50b92057aa3927b25b6a2df
GIT binary patch
literal 3840
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
XekAEMp7huom;vc)8)?<tAVmHj_5t~#

literal 0
HcmV?d00001

diff --git a/static/images/hotel_notification.png b/static/images/hotel_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..6831d131502991636e6607366258fe98a3c0ae20
GIT binary patch
literal 3551
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
Z{{eJElk(tKvE%>%002ovPDHLkV1lwY#?Sx&

literal 0
HcmV?d00001

diff --git a/static/images/limo.png b/static/images/limo.png
new file mode 100644
index 0000000000000000000000000000000000000000..e083e10efed74d39e426e9fc53b08e61d201e86c
GIT binary patch
literal 3684
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
X2xC8A^Cph=GX(VR8EKbkK92k!c*z#(

literal 0
HcmV?d00001

diff --git a/static/images/limo_notification.png b/static/images/limo_notification.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a627844929fe95ebe23cc4e6dc19c061dbb1aa7
GIT binary patch
literal 3906
zcmV-I554e-P)<h;3K|Lk000e1NJLTq001`t001`#1^@s6sN2#;00009a7bBm000XU
z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH01k9TSaefwW^{L9
za%BKUX=iO=p0So=000iXNkl<Zcmcgy-H%;W6<=$gbMH)NS{Shv35^aCAMmR+DiMX!
zz9<UlM52fRDIuW(50pnkLesy1_Q8-6k%Af%P#oo>>I<b+fj&q<qYpkf7(Of??X=UG
zxpVJ1XS?@aAA6lUGquFPZtt9P_t_uo^S9Ps=OUa%d*-376VMyo><XN6fLD6JNd%aH
z_o;b+*|6Wy2AY=|4+ppHI52%S^YBa$BU5F6>@JVE6P=#`*8sTiAAR5t(CY#|b|A)U
z7>wLGyuLTR*m^GW!%gUub#%7p(c$Xr_<@<wv%hMZhqvASyBT=5%pKZy_0I5g7Z!fP
zb%MO&%CbGA+t>%hX1w7m(Z;J|B0N3d3nZd_x)K*m0}WM@WWhK#aV~=*2|>oba^V9r
z(7^63w?DoAteFdp-G>f#x^C2zXDK6k@Tvl2!sBgAM=E+lG+k&caY5f(jEOuj+kteN
z`FR~k@@|#_lTEW{%Z>wg|4-%)J@EC1Tmjp$8^1NJA<B?QQussE5%RpX3C%N9L5obH
znzYFh5;N6iOoP_Y@d$N4{H<~S<+nX`i{00?7z-M6C2n^ko~8x$IZR7<-AaTif=&I>
z<CPiv;XYa;jWl`yaV;0NLoe&mSX4noTIec*;V)rIF%tTMLJsZw+I=md8jWoa3qIsV
zjUt5XRW)Lf1kh?0R%tSrH}@G*^8EJq7F-Rjmf(y0KA33T3q6D8?k#s5*u(1wRJ{MH
z$)a%26l(&+BeVtELO?YvJ0ersFa|6mL6zj0ofeWBZp^;<5wNeeJRq+tYx%f;y$G{a
zXa1sXw;Y^JW?4FSv+Llb3pVIn(p0#jx;XX4=CUIM8`6#0P~#jjGNMHWr+y^3Wdl~p
zaep#fMqyAiruz&+Oq+aA9?8HWtX0B<>yPc!-e8jd>WsTdqFH<?YXXe0#j%EwE32}N
zGAICqsx}pxd~dC#NNi!nuQH}>r*U}fsTX|GUU_KWHB+weQER@ThfybKS?99<aMS@q
zCs+%j{XEl)reCo^&@hKAk6^+8VmqirLU?~vbjJ1wT}z0GpQeC`vbT0~>9N`BIt6$(
zKTq@tLlkhCZqZAoJj>BhoTfAbK>r9JQ4mM=E%OviSjo^Siwl3EN^CnFuPlVoV%`O=
z26a6Z_`yx6vWb6^Um0I;n1zH^17K;(=tg5u;9LF7sWw0`U;N8SxXC_6^95$O&*jLK
zkt@@y&&m+Oz+G8}+s&>tlhlbBV3W#|w}Y6gWI+b2hVn?#__5Oy&<y&~w`5hy8JUiv
zGYT8VPY8^7s}unel=Mq1D3Ri`y$?~H<VWmG2Il-kwrx_g$R-k!mUQ5iAGI#EF(g)a
zb4Q_LY2fkNTOWp@hQl3y{P`4gOWHca19M{;KsDyXaSP;HsH8|RQR-6sz(@V4heM7~
zCN=b$*}FtT(<H9=iAxN!^p-I*+#F&X5u;2S(S*IUSEEA%#XfHkHd|G&PMw38&Ccel
zGKo_=i&pVAG8S*=dSmDc6Z>N7eim(j>-<ucSVFRv8rO9f!n(edfyt_Lnvmlap`eWj
zjA&_A$vvRXtofqAH=(DRuEGBJqz~u871uwwqJ{?jCFpcVR%fi=gDY=%WW~9MAHCI&
zzzOy-BF8h1s9j}?RjW)QAOj}|qZy2uMpWd74vl##cTq3li4TmyV6e0z@n>R;o{z5B
zAJ@C$I}ZkCoE)lnXH>hg_W+92lG<3!Wqv?i*BXS&s2smRN~dt_Bj1L)uE<`S3f_F}
zZ%}s5%+Q%yJ?O)Rjh{{-q-kncvvCUguTK+lC@$NRKBbFfm7>XfSSp$E4E`(#{_BNj
z3ebdvRYUIliA%4?l&uye9DeK$Sc7l1h(&W~9Zq|*CAIUfzyIkx*!talDGUD0mu`d?
z9{r6k9NP&&8;9=3hIn&e$U1SE2??h8%CRPz2TIZ!`^&<?y2)=Ptu=K6r%xV(G559!
z-Wre%lsk%#nlMOmpb2&&Z(ZjEoIdq-T9>r<&43w&N#sc!l3WO#vMypiLpqTop$zh2
z*P)dH=LczA-B8MP$)z{M4WTGY_{;C_4dKA&b<)OGOT1am{Jmx^J_j<#m8T<5{m{pC
z<GiT7L9qOYo<wdI7`8H#yl#s*6DTQmfhbLt$7Tt^L>!E5oI=u?Pg+~snN5tU9ZMb>
zm~nEtW=H3v4eF@@DNW0k0&wogDV(3P+Pjw04jqD$(;-0CmRF*US$b<80y@M00`W~l
zi(Yc+_p;Xhu#2Ow%VYT-IFm`zWbG?KBu1~qaG^rZlP^4Z4`l7#1c6Tv5({VvpYuzx
zu#A|ol`1`u*yj~7?auLQD9Q$eBws56h|HaM4aVI`>{pIsqDFkLjOEA+daBRhf_zNk
z%m|nc4-=y&{rssnar~SQCGCv`-|N5egix7J0$Sf>zcnR}QaP5iMG7y#$)mNOK*R+f
z{X9emk8RDm4e+_^ej#hwU~KPUh5oY|TUC7(?Z%702s8hAf{V2rnU>F{BO(WJ%}_YM
zVo1tW4~`=m=Bf~2HI9^BcrTl*ABm`|9<<MGM6;TtnuAwBRI^M+bRLCmk!XDJ=1@{q
zgIH>U_p*_(l!3{P=`+PJPA>TLg2b%Dw&s8Ufm)MOk<`2%;JHvlQVAPA|EnLsNZF%=
z+YeO$K;@cqLq0ySsi(*7JRDn&vsjJz%dYzgTFyX%TE<^VC=J1qNzp7G3Cy{KDY?>^
zc3~~#fOVNzkCK~npMrA3RlZ*Zt=7C|MlS>nu6zJwXpV?kg#;v^A>jJ2_|svXI4^`v
zU;7TUH3=5ultyeLu71yE$pE5CL&7kQ5g@5oYcm()9>RrR*o7ZF|KhZU!yDnn-`)gr
zatA(j=6$kmL{FUp{ibjH44b-6M4x=;-|)(F_u_KgF&U3VWXy*d`*z5QNNf-Vt-_JS
zT}E?1v>`6`5!PSu@#ORoMdKzX>kC7?a%yFmOX)%)Xe~5|V|H+15`Zg;w8jTETm-#7
zF2hk2ykjk>uq9K;Nu$rq@d&Nkh*{dmZ<#l(TM`Kowta|4DfeuSE2hZ@C16wV6-ZBX
zcHlVe6XsU~g8wxm%*7CUq@G-aibBLpY~lgiJ|~FDp`ZPfGYFH*;jknFu%LhL*LOmZ
zH09vsXZON6qkT|62KHUxOob(=32yj5KGKJO{P{;=dJ$i2!t>L2M9KSQL5wWGQ({lp
z;Juopw`pW-rBSz`ozTdGO-$V~treV4j(6tauTS5~>4(6frmd#Bh+q!-x=*CAI&s9m
z{NxeR8d*aSZZ1`bcp6#Tw`{}Wfo@Y~b%Pe`q?{mKAe9?vT4-O7eG+Dl%^>*~<a2Sm
z<uudV;Azf!2+Q9Lh4b3_4_{>VlYFoh88}ZzvyQ|(gO)%sQBpTGDKzoOYA@z{U;gTy
z@Gcsj;XAH2KKU`Hdo8!n%Ae;1+UFD&ObtcALM?}!78NmxEpI81{1R4C*Z<oze8@hS
zH3evVSV+{Dks0`;w3iFX2%2%oMzUz~O>9ef&|icX5C0VC^=59U`MuJ%TnwwEH1RFs
z=F7hi-I1}O37AhSsJOsFpb{Uc3|oma+8i`jH-sX3-4qX=S!2`|7v^BBf5cMA00LPs
zNhG=7m=3VmJ+ywB5!an+F&FDJ-moY3mqo_F4!IT-kzh8Lpe5)kf_g!6$F-Phu$azs
zvC(O~2O0K3@6jd(>FO{GT$oBeoCCasj`YOqKGDAy=T8X&Yn=vU7RdTWz5uiFUBQg6
zn@z66M_}{&5R*BnM&Ed8FPu7lT{x_ELJnEOshP*1Q_345U0X5-5h#GZgmln;H3`h1
zB+foovEiSG?tybZc74kG;|XNp)yLD4g~N8ZrO3=*2twkqESSPeWjMV*JLvT{7v0il
zLZB75J+l_HhjHWH>yPWHd!!?Qo-n{0P}7*kMv7VvGG%0JmladS5$kQvL+{mJDi1|+
ziD*7ehCMa!TuF=l^<WThjyhMn>A_+T_>}}0qw!fdnXDAkS^=GHMBXK!o-ioGLDc!i
zUA(hnX^<W@0r{OgCrq4HL4J*F-N5O-(gutDh%^UXHCi66mIkv;Jf}!*=FqFJs6XU%
zNy7z?7am&*7rPVjIMnxD<WYhM%ot>oL31Y46+xv&My~YHGa(|@80+5B%$6Morrow%
zre_=9>|H!L$JHp#sU(jBmb^;LsWuU_NoM9<jy18gr&T<gkkfqnl>@3U5VQTF?v=7g
zJy{4XXn+fN?>KJp<mtHK!|H)ex4Wl5zc^d<D-pK@2F`Q2uVo6D$w0>&WyF-}YT006
zfYr~Y+7=XPmR@*z&Hl6`D3$MYb*RP>u65O5e{O!JY|8!0T-08$=iR5@dPm<(whN_f
zm!u^yn)2EF=zN8kK?3!(WMm;4<mUN2EEb>^4sv=>qf~!W0b5~(h31aE72oUazU=nt
z8D%cEEjymtQ&;ugh2yi(niT)iKK6yY_!1gTP<2`6ut}+K0JGmh_F>CtGOYwyvM;2P
zJDPQkKkNLs@9DRX2h9!k+Mg#H?x`KxclG{}@ijNE+pu2wK$fwsp^#I1uT=~ENrk+v
z#B5XMZMO)-zAdEn_%|<vFE&S#VuvoL5i!+o8dx}f!Y`hhe<UbqJ1kSpP&@p<HG7J(
zxa-^t&IebPAjUJC8zO)qQEL;1AaMyVhbiWw<$&5J+5r9a0D`7wI@a?sC&aV<Aemy+
z*cG=uy%Uzxw{nZW;tK|`tGjl5a{RoBShv?YwotF+>h~Or><>>@-o+4&%f@+00a!sc
z_l0Iq!@}$=^ycPg1FyR;4=%OR4y!U3+jI9%O;)bj9?a_Ia?R-E$oQBqx?L>0-PR9Y
zbTO`&<-?=A8!+a_zbg@t5M>G__9dqf*o3sGt}2MhMt@-;T$g6Uf_v9?%RQeBV7MCn
zXJpQ{LqEP|D&$^U11+0_3vUW!yl=lwhnU=he<cXvV36wc+Oj-)CZ?qQ7bU54*(rvq
QC;$Ke07*qoM6N<$f(*KCmjD0&

literal 0
HcmV?d00001

diff --git a/static/images/read_all.png b/static/images/read_all.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d300bf4a21296866e300d0a9efd0dd097723512
GIT binary patch
literal 7241
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
A9smFU

literal 0
HcmV?d00001

diff --git a/static/images/room_book.png b/static/images/room_book.png
index 1293533dc7fdc77c0655455c6c2e184593334c9c..58b24616b1b3bfda4ac15852dd0b912c4cdd249d 100644
GIT binary patch
literal 692
zcmeAS@N?(olHy`uVBq!ia0vp^c_7Te1|*L~tNjL2jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qt-3{0M$E{-7;ac}QB<~?!{aC@lr&Xwu*4;hu?
z4D!tnWm33>?`uyzn_==QuzJ_R+Yhhr@&9y8%;LpKF+IuSJU}zS;7`0w>_lVPcIOD2
z-M`iDw(aTI@$1y_ukUJnx8Hp{|KYO71qRz|cgamXbnNTxpA**YyPC7(rAdy?n@Q`A
z_evd$UaI|1Wd6a4*MbfkU(d1FVm`M`?Y>~z;g7CQ3eUD3eylV{<4`AlBFZl2Mn>N4
zMXZsZzt8z2p%hzgzCHJ)tbgpc|97?Q{?B>ZZ(-tS5!fQ^ib`z#^MvK-we`<)<oi%1
zVCrsa7r!>K?Cf~-Ter%_W<lD2+bcE8cAoSsYcAyqFW!8n{Qds+{>P`6n%s-A@SD1b
zL%pj2o!Auq>{@0~pmCAbT!WC6Gv?ID#COSMzj<cwEq_zn+OqJw@5@R1$}(TxpB#PY
zk!5Xees{aGG=@uo4!Sw9t5mA;YR{aIZ}NiImv8^R$UWj@-<}I>4_yTPL{N#4Z>R2P
zsj-J1a*K|<_+-)P{|f0vMatXvw#IgerRd7@`3j)x02;7!=FJi*vyYO$_nV3JrA_(r
zt2XZC?|Z-J?fX=?*E+twJ^6^rqw8y?1~0`HA1m~~f80GoNBY_|P?GR;^>bP0l+XkK
D$3ZUm

literal 1131
zcmb7E`%hB`6h61*7S@NtmSW38*kGH0FnK6r!*VATS{p&I6H^AX+h9D#bE1TyT){CU
z=#cm-&zlNT&=dw@0R>CUHjoawF<=2E47E^dk+1?O&vpNS`{A4~-<L1vd^tayi^sx3
z8B{we05JGGZloFU|H_JD?vFW=0W%=qM1~#$#h`-@z~Ws#_Y+}Gtf5+vX76py?Vl7B
zKfJGy%(CuZwpq7Z`N-!~%NrLG*{Ywk#=Mdty|yf7`Ol-gKRRr;icSzast@+>0+s{G
zyrGxL3Owr$Kv$@yb;l79XP}huT62&>k9|37LIBoh=X-}6NT8ag(rY+O0PXSVwRNLt
z-q?0EtLjx_aG)+S`Jht`$4l_l#{#s&e!JB;W6)O4n-=xYvil!)Ass!nm*Xq8_I4)f
zJ8g>yCtUeUrRnMhyD=~@|Ma@dtKnOj2gpVG%y!P+?A<rXIDe>=$48*-%OwU0;?nEY
zfR*?ATR~p;H6JqY-<xuV#pM%E=-?{ND+JY8w43j1nu{#OO|wh45_h>eHs50G#0p_d
z8TyFk#xSj3?@fJbm23^LW(_!JGb_aZYy2q+SaSjU8G=1x3TSgKWmHW=++d<RFvTyY
zP`{TT!s2XXs8M&rw@X4cdI97z)vTaEV9P2vZL8ncP27ds3GsC(u$va<q|oBh=5w9;
zdSsr8pMKj|D`PjyQ=~zUqXOO!2RjZe+;pHtvPEBwj_tMtwz2@hW^)aW9V;7Mk-4r+
zLSjk6rc&aSrc`I>dljdptJp-!TW1(O+3oFu#qodi)iFOjr(-k%m5<39!GScpot+Vk
z{!V+an@`&_^8jh(P}5*KZFF@ZY+10GkHKPhRi{lV$eD9lIa_(hY<ED(5vey2cPg{2
zh8u=1T0l$`l*L5^(=<Pd0?Mg`J%$n_d4ssRsokX!y2wH>-wT`gz=5>C`hfLen&v1k
z2??Og@n5LJ(K5$AZ>*;0xq2tGk^?Ax!(`lRWYNFCPUOtQv?Wy4C8B%MN=CYy=b`L{
zPROKa>SyRgIt+qOR2A|eIfJ4(x3XXwAlkQ+gkh)*?ei2HFwi*i0>0A^&vHq)!UHm#
z@O2nJ_cxu;-8;WWgr|`_aa)Y0S)qAi!%5_bd+?Wq2+SH`xN%mA>(_NBZ|hzJbv|j{
zKXPiED;&7<dGu0L?Zm2DG&Fz4ZAl<ofXSZvnRGqXuSx=9eL~2nCD@FV{tWmP=@lV3
z%PM|j!9E|~aw>3zzIJ2?NeGEV@Z#i<FF@6&=DD+hJKB5G;NhJAX2+)Rq=bt=u{^<#
z0;THGI@14}1=bP2Cenc=W%E&Zr-^+D0T*AF#tqbqJFN(f{WR13J%E2WjH@^#F8CMD
CFVx=v

diff --git a/uni_modules/lu-data-select/components/lu-data-select/props.js b/uni_modules/lu-data-select/components/lu-data-select/props.js
index aa62b33..98021b5 100644
--- a/uni_modules/lu-data-select/components/lu-data-select/props.js
+++ b/uni_modules/lu-data-select/components/lu-data-select/props.js
@@ -28,11 +28,6 @@ export default {
 		type: String,
 		default: "请选择"
 	},
-	// 过滤输入框占位符；为空时沿用 placeholder
-	filterPlaceholder: {
-		type: String,
-		default: ""
-	},
 	// 是否可清空
 	clearable: {
 		type: Boolean,
@@ -103,4 +98,4 @@ export default {
 		type: Number,
 		default: 1
 	}
-}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md
new file mode 100644
index 0000000..1eee75e
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,173 @@
+## 2.2.42（2025-08-20）
+- 修复 datetime-picker 小程序样式警告
+## 2.2.41（2025-08-20）
+- 修复 uni-datetime-picker组件时间对比报错问题
+## 2.2.40（2025-04-14）
+- 修复 绑定字符串值的时，日历面板选中状态未重置到默认值的问题
+## 2.2.39（2025-04-14）
+- 修复 在 iOS 微信小程序上type='daterange'时，传入'YYYY-MM-DD'格式不生效的问题
+
+## 2.2.38（2024-10-15）
+- 修复 微信小程序中的getSystemInfo警告
+## 2.2.35（2024-09-21）
+- 修复 没有选中日期时点击确定直接报错的Bug [详情](https://ask.dcloud.net.cn/question/198168)
+## 2.2.34（2024-04-24）
+- 新增 日期点击事件，在点击日期时会触发该事件。
+## 2.2.33（2024-04-15）
+- 修复 抖音小程序事件传递失效bug
+## 2.2.32（2024-02-20）
+- 修复 日历的close事件触发异常的bug [详情](https://github.com/dcloudio/uni-ui/issues/844)
+## 2.2.31（2024-02-20）
+- 修复 h5平台 右边日历的月份默认+1的bug [详情](https://github.com/dcloudio/uni-ui/issues/841)
+## 2.2.30（2024-01-31）
+- 修复 隐藏“秒”时，在IOS15及以下版本时出现 结束时间在开始时间之前 的bug [详情](https://github.com/dcloudio/uni-ui/issues/788)
+## 2.2.29（2024-01-20）
+- 新增 show事件，弹窗弹出时触发该事件 [详情](https://github.com/dcloudio/uni-app/issues/4694)
+## 2.2.28（2024-01-18）
+- 去除 noChange事件，当进行日期范围选择时，若只选了一天，则开始结束日期都为同一天 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.27（2024-01-10）
+- 优化 增加noChange事件，当进行日期范围选择时，若有空值，则触发该事件 [详情](https://github.com/dcloudio/uni-ui/issues/815)
+## 2.2.26（2024-01-08）
+- 修复 字节小程序时间选择范围器失效问题 [详情](https://github.com/dcloudio/uni-ui/issues/834)
+## 2.2.25（2023-10-18）
+- 修复 PC端初次修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+## 2.2.24（2023-06-02）
+- 修复 部分情况修改时间，开始、结束时间显示异常的Bug [详情](https://ask.dcloud.net.cn/question/171146)
+- 优化 当前月可以选择上月、下月的日期的Bug
+## 2.2.23（2023-05-02）
+- 修复 部分情况修改时间，开始时间未更新的Bug [详情](https://github.com/dcloudio/uni-ui/issues/737)
+- 修复 部分平台及设备第一次点击无法显示弹框的Bug
+- 修复 ios 日期格式未补零显示及使用异常的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.22（2023-03-30）
+- 修复 日历 picker 修改年月后，自动选中当月1日的Bug [详情](https://ask.dcloud.net.cn/question/165937)
+- 修复 小程序端 低版本 ios NaN的Bug [详情](https://ask.dcloud.net.cn/question/162979)
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行的Bug
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 2.2.6（2022-06-30）
+- 优化 组件样式，调整了组件图标大小、高度、颜色等，与uni-ui风格保持一致
+## 2.2.5（2022-06-24）
+- 修复 日历顶部年月及底部确认未国际化的Bug
+## 2.2.4（2022-03-31）
+- 修复 Vue3 下动态赋值,单选类型未响应的Bug
+## 2.2.3（2022-03-28）
+- 修复 Vue3 下动态赋值未响应的Bug
+## 2.2.2（2021-12-10）
+- 修复 clear-icon 属性在小程序平台不生效的Bug
+## 2.2.1（2021-12-10）
+- 修复 日期范围选在小程序平台，必须多点击一次才能取消选中状态的Bug
+## 2.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源 [详情](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移 [https://uniapp.dcloud.io/component/uniui/uni-datetime-picker](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+## 2.1.5（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+## 2.1.4（2021-09-10）
+- 修复 hide-second 在移动端的Bug
+- 修复 单选赋默认值时，赋值日期未高亮的Bug
+- 修复 赋默认值时，移动端未正确显示时间的Bug
+## 2.1.3（2021-09-09）
+- 新增 hide-second 属性，支持只使用时分，隐藏秒
+## 2.1.2（2021-09-03）
+- 优化 取消选中时（范围选）直接开始下一次选择, 避免多点一次
+- 优化 移动端支持清除按钮，同时支持通过 ref 调用组件的 clear 方法
+- 优化 调整字号大小，美化日历界面
+- 修复 因国际化导致的 placeholder 失效的Bug
+## 2.1.1（2021-08-24）
+- 新增 支持国际化
+- 优化 范围选择器在 pc 端过宽的问题
+## 2.1.0（2021-08-09）
+- 新增 适配 vue3
+## 2.0.19（2021-08-09）
+- 新增 支持作为 uni-forms 子组件相关功能
+- 修复 在 uni-forms 中使用时，选择时间报 NAN 错误的Bug
+## 2.0.18（2021-08-05）
+- 修复 type 属性动态赋值无效的Bug
+- 修复 ‘确认’按钮被 tabbar 遮盖 bug
+- 修复 组件未赋值时范围选左、右日历相同的Bug
+## 2.0.17（2021-08-04）
+- 修复 范围选未正确显示当前值的Bug
+- 修复 h5 平台（移动端）报错 'cale' of undefined 的Bug
+## 2.0.16（2021-07-21）
+- 新增 return-type 属性支持返回 date 日期对象
+## 2.0.15（2021-07-14）
+- 修复 单选日期类型，初始赋值后不在当前日历的Bug
+- 新增 clearIcon 属性，显示框的清空按钮可配置显示隐藏（仅 pc 有效）
+- 优化 移动端移除显示框的清空按钮，无实际用途
+## 2.0.14（2021-07-14）
+- 修复 组件赋值为空，界面未更新的Bug
+- 修复 start 和 end 不能动态赋值的Bug
+- 修复 范围选类型，用户选择后再次选择右侧日历（结束日期）显示不正确的Bug
+## 2.0.13（2021-07-08）
+- 修复 范围选择不能动态赋值的Bug
+## 2.0.12（2021-07-08）
+- 修复 范围选择的初始时间在一个月内时，造成无法选择的bug
+## 2.0.11（2021-07-08）
+- 优化 弹出层在超出视窗边缘定位不准确的问题
+## 2.0.10（2021-07-08）
+- 修复 范围起始点样式的背景色与今日样式的字体前景色融合，导致日期字体看不清的Bug
+- 优化 弹出层在超出视窗边缘被遮盖的问题
+## 2.0.9（2021-07-07）
+- 新增 maskClick 事件
+- 修复 特殊情况日历 rpx 布局错误的Bug，rpx -> px
+- 修复 范围选择时清空返回值不合理的bug，['', ''] -> []
+## 2.0.8（2021-07-07）
+- 新增 日期时间显示框支持插槽
+## 2.0.7（2021-07-01）
+- 优化 添加 uni-icons 依赖
+## 2.0.6（2021-05-22）
+- 修复 图标在小程序上不显示的Bug
+- 优化 重命名引用组件，避免潜在组件命名冲突
+## 2.0.5（2021-05-20）
+- 优化 代码目录扁平化
+## 2.0.4（2021-05-12）
+- 新增 组件示例地址
+## 2.0.3（2021-05-10）
+- 修复 ios 下不识别 '-' 日期格式的Bug
+- 优化 pc 下弹出层添加边框和阴影
+## 2.0.2（2021-05-08）
+- 修复 在 admin 中获取弹出层定位错误的bug
+## 2.0.1（2021-05-08）
+- 修复 type 属性向下兼容，默认值从 date 变更为 datetime
+## 2.0.0（2021-04-30）
+- 支持日历形式的日期+时间的范围选择
+ > 注意：此版本不向后兼容，不再支持单独时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）
+## 1.0.6（2021-03-18）
+- 新增 hide-second 属性，时间支持仅选择时、分
+- 修复 选择跟显示的日期不一样的Bug
+- 修复 chang事件触发2次的Bug
+- 修复 分、秒 end 范围错误的Bug
+- 优化 更好的 nvue 适配
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
new file mode 100644
index 0000000..dba9887
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,177 @@
+<template>
+	<view class="uni-calendar-item__weeks-box" :class="{
+		'uni-calendar-item--disable':weeks.disable,
+		'uni-calendar-item--before-checked-x':weeks.beforeMultiple,
+		'uni-calendar-item--multiple': weeks.multiple,
+		'uni-calendar-item--after-checked-x':weeks.afterMultiple,
+		}" @click="choiceDate(weeks)" @mouseenter="handleMousemove(weeks)">
+		<view class="uni-calendar-item__weeks-box-item" :class="{
+				'uni-calendar-item--checked':calendar.fullDate === weeks.fullDate && (calendar.userChecked || !checkHover),
+				'uni-calendar-item--checked-range-text': checkHover,
+				'uni-calendar-item--before-checked':weeks.beforeMultiple,
+				'uni-calendar-item--multiple': weeks.multiple,
+				'uni-calendar-item--after-checked':weeks.afterMultiple,
+				'uni-calendar-item--disable':weeks.disable,
+				}">
+			<text v-if="selected && weeks.extraInfo" class="uni-calendar-item__weeks-box-circle"></text>
+			<text class="uni-calendar-item__weeks-box-text uni-calendar-item__weeks-box-text-disable uni-calendar-item--checked-text">{{weeks.date}}</text>
+		</view>
+		<view :class="{'uni-calendar-item--today': weeks.isToday}"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			weeks: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			calendar: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default: () => {
+					return []
+				}
+			},
+			checkHover: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			choiceDate(weeks) {
+				this.$emit('change', weeks)
+			},
+			handleMousemove(weeks) {
+				this.$emit('handleMouse', weeks)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" >
+	$uni-primary: #007aff !default;
+
+	.uni-calendar-item__weeks-box {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin: 1px 0;
+		position: relative;
+	}
+
+	.uni-calendar-item__weeks-box-text {
+		font-size: 14px;
+		// font-family: Lato-Bold, Lato;
+		font-weight: bold;
+		color: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.uni-calendar-item__weeks-box-item {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		width: 40px;
+		height: 40px;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-calendar-item__weeks-box-circle {
+		position: absolute;
+		top: 5px;
+		right: 5px;
+		width: 8px;
+		height: 8px;
+		border-radius: 8px;
+		background-color: #dd524d;
+
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--disable {
+		cursor: default;
+	}
+
+	.uni-calendar-item--disable .uni-calendar-item__weeks-box-text-disable {
+		color: #D1D1D1;
+	}
+
+	.uni-calendar-item--today {
+		position: absolute;
+		top: 10px;
+		right: 17%;
+		background-color: #dd524d;
+		width:6px;
+		height: 6px;
+		border-radius: 50%;
+	}
+
+	.uni-calendar-item--extra {
+		color: #dd524d;
+		opacity: 0.8;
+	}
+
+	.uni-calendar-item__weeks-box .uni-calendar-item--checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #fff;
+	}
+
+	.uni-calendar-item--checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--checked-range-text {
+		color: #333;
+	}
+
+	.uni-calendar-item--multiple {
+		background-color:  #F6F7FC;
+		// color: #fff;
+	}
+
+	.uni-calendar-item--multiple .uni-calendar-item--before-checked,
+	.uni-calendar-item--multiple .uni-calendar-item--after-checked {
+		background-color: $uni-primary;
+		border-radius: 50%;
+		box-sizing: border-box;
+		border: 3px solid #F6F7FC;
+	}
+
+	.uni-calendar-item--before-checked .uni-calendar-item--checked-text,
+	.uni-calendar-item--after-checked .uni-calendar-item--checked-text {
+		color: #fff;
+	}
+
+	.uni-calendar-item--before-checked-x {
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		box-sizing: border-box;
+		background-color: #F6F7FC;
+	}
+
+	.uni-calendar-item--after-checked-x {
+		border-top-right-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: #F6F7FC;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..0f9e121
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,947 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+
+		<view v-if="!insert && show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="maskClick"></view>
+
+		<view v-if="insert || show" class="uni-calendar__content"
+			:class="{'uni-calendar--fixed':!insert,'uni-calendar--ani-show':aniMaskShow, 'uni-calendar__content-mobile': aniMaskShow}">
+			<view class="uni-calendar__header" :class="{'uni-calendar__header-mobile' :!insert}">
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('pre')">
+					<view class="uni-calendar__header-btn uni-calendar--left"></view>
+				</view>
+
+				<picker mode="date" :value="date" fields="month" @change="bindDateChange">
+					<text
+						class="uni-calendar__header-text">{{ (nowDate.year||'') + yearText + ( nowDate.month||'') + monthText}}</text>
+				</picker>
+
+				<view class="uni-calendar__header-btn-box" @click.stop="changeMonth('next')">
+					<view class="uni-calendar__header-btn uni-calendar--right"></view>
+				</view>
+
+				<view v-if="!insert" class="dialog-close" @click="maskClick">
+					<view class="dialog-close-plus" data-id="close"></view>
+					<view class="dialog-close-plus dialog-close-rotate" data-id="close"></view>
+				</view>
+			</view>
+			<view class="uni-calendar__box">
+
+				<view v-if="showMonth" class="uni-calendar__box-bg">
+					<text class="uni-calendar__box-bg-text">{{nowDate.month}}</text>
+				</view>
+
+				<view class="uni-calendar__weeks" style="padding-bottom: 7px;">
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SUNText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{MONText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{TUEText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{WEDText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{THUText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{FRIText}}</text>
+					</view>
+					<view class="uni-calendar__weeks-day">
+						<text class="uni-calendar__weeks-day-text">{{SATText}}</text>
+					</view>
+				</view>
+
+				<view class="uni-calendar__weeks" v-for="(item,weekIndex) in weeks" :key="weekIndex">
+					<view class="uni-calendar__weeks-item" v-for="(weeks,weeksIndex) in item" :key="weeksIndex">
+						<calendar-item class="uni-calendar-item--hook" :weeks="weeks" :calendar="calendar" :selected="selected"
+							:checkHover="range" @change="choiceDate" @handleMouse="handleMouse">
+						</calendar-item>
+					</view>
+				</view>
+			</view>
+
+			<view v-if="!insert && !range && hasTime" class="uni-date-changed uni-calendar--fixed-top"
+				style="padding: 0 80px;">
+				<view class="uni-date-changed--time-date">{{tempSingleDate ? tempSingleDate : selectDateText}}</view>
+				<time-picker type="time" :start="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" class="uni-date-changed uni-calendar--fixed-top">
+				<view class="uni-date-changed--time-start">
+					<view class="uni-date-changed--time-date">{{tempRange.before ? tempRange.before : startDateText}}
+					</view>
+					<time-picker type="time" :start="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<view class="uni-date-changed--time-end">
+					<view class="uni-date-changed--time-date">{{tempRange.after ? tempRange.after : endDateText}}</view>
+					<time-picker type="time" :end="timepickerEndTime" v-model="timeRange.endTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.after" class="time-picker-style">
+					</time-picker>
+				</view>
+			</view>
+
+			<view v-if="!insert" class="uni-date-changed uni-date-btn--ok">
+				<view class="uni-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		Calendar,
+		getDate,
+		getTime
+	} from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(i18nMessages)
+
+	/**
+	 * Calendar 日历
+	 * @description 日历组件可以查看日期，选择任意范围内的日期，打点操作。常用场景如：酒店日期预订、火车机票选择购买日期、上下班打卡等
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=56
+	 * @property {String} date 自定义当前时间，默认为今天
+	 * @property {String} startDate 日期选择范围-开始日期
+	 * @property {String} endDate 日期选择范围-结束日期
+	 * @property {Boolean} range 范围选择
+	 * @property {Boolean} insert = [true|false] 插入模式,默认为false
+	 * 	@value true 弹窗模式
+	 * 	@value false 插入模式
+	 * @property {Boolean} clearDate = [true|false] 弹窗模式是否清空上次选择内容
+	 * @property {Array} selected 打点，期待格式[{date: '2019-06-27', info: '签到', data: { custom: '自定义信息', name: '自定义消息头',xxx:xxx... }}]
+	 * @property {Boolean} showMonth 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 日期改变，`insert :ture` 时生效
+	 * @event {Function} confirm 确认选择`insert :false` 时生效
+	 * @event {Function} monthSwitch 切换月份时触发
+	 * @example <uni-calendar :insert="true" :start-date="'2019-3-2'":end-date="'2019-5-20'"@change="change" />
+	 */
+	export default {
+		components: {
+			calendarItem,
+			timePicker
+		},
+
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			date: {
+				type: String,
+				default: ''
+			},
+			defTime: {
+				type: [String, Object],
+				default: ''
+			},
+			selectableTimes: {
+				type: [Object],
+				default () {
+					return {}
+				}
+			},
+			selected: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			startDate: {
+				type: String,
+				default: ''
+			},
+			endDate: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				type: Boolean,
+				default: false
+			},
+			insert: {
+				type: Boolean,
+				default: true
+			},
+			showMonth: {
+				type: Boolean,
+				default: true
+			},
+			clearDate: {
+				type: Boolean,
+				default: true
+			},
+			checkHover: {
+				type: Boolean,
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			pleStatus: {
+				type: Object,
+				default () {
+					return {
+						before: '',
+						after: '',
+						data: [],
+						fulldate: ''
+					}
+				}
+			},
+			defaultValue: {
+				type: [String, Object, Array],
+				default: ''
+			}
+		},
+		data() {
+			return {
+				show: false,
+				weeks: [],
+				calendar: {},
+				nowDate: {},
+				aniMaskShow: false,
+				firstEnter: true,
+				time: '',
+				timeRange: {
+					startTime: '',
+					endTime: ''
+				},
+				tempSingleDate: '',
+				tempRange: {
+					before: '',
+					after: ''
+				}
+			}
+		},
+		watch: {
+			date: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setStartDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					const {
+						before,
+						after,
+						fulldate,
+						which
+					} = newVal
+					this.tempRange.before = before
+					this.tempRange.after = after
+					setTimeout(() => {
+						if (fulldate) {
+							this.cale.setHoverMultiple(fulldate)
+							if (before && after) {
+								this.cale.lastHover = true
+								if (this.rangeWithinMonth(after, before)) return
+								this.setDate(before)
+							} else {
+								this.cale.setMultiple(fulldate)
+								this.setDate(this.nowDate.fullDate)
+								this.calendar.fullDate = ''
+								this.cale.lastHover = false
+							}
+						} else {
+							// 字节小程序 watch 早于 created
+							if (!this.cale) {
+								return
+							}
+
+							this.cale.setDefaultMultiple(before, after)
+							if (which === 'left' && before) {
+								this.setDate(before)
+								this.weeks = this.cale.weeks
+							} else if (after) {
+								this.setDate(after)
+								this.weeks = this.cale.weeks
+							}
+							this.cale.lastHover = true
+						}
+					}, 16)
+				}
+			}
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * for i18n
+			 */
+			selectDateText() {
+				return t("uni-datetime-picker.selectDate")
+			},
+			startDateText() {
+				return this.startPlaceholder || t("uni-datetime-picker.startDate")
+			},
+			endDateText() {
+				return this.endPlaceholder || t("uni-datetime-picker.endDate")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			yearText() {
+				return t("uni-datetime-picker.year")
+			},
+			monthText() {
+				return t("uni-datetime-picker.month")
+			},
+			MONText() {
+				return t("uni-calender.MON")
+			},
+			TUEText() {
+				return t("uni-calender.TUE")
+			},
+			WEDText() {
+				return t("uni-calender.WED")
+			},
+			THUText() {
+				return t("uni-calender.THU")
+			},
+			FRIText() {
+				return t("uni-calender.FRI")
+			},
+			SATText() {
+				return t("uni-calender.SAT")
+			},
+			SUNText() {
+				return t("uni-calender.SUN")
+			},
+			confirmText() {
+				return t("uni-calender.confirm")
+			},
+		},
+		created() {
+			// 获取日历方法实例
+			this.cale = new Calendar({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		methods: {
+			leaveCale() {
+				this.firstEnter = true
+			},
+			handleMouse(weeks) {
+				if (weeks.disable) return
+				if (this.cale.lastHover) return
+				let {
+					before,
+					after
+				} = this.cale.multipleStatus
+				if (!before) return
+				this.calendar = weeks
+				// 设置范围选
+				this.cale.setHoverMultiple(this.calendar.fullDate)
+				this.weeks = this.cale.weeks
+				// hover时，进入一个日历，更新另一个
+				if (this.firstEnter) {
+					this.$emit('firstEnterCale', this.cale.multipleStatus)
+					this.firstEnter = false
+				}
+			},
+			rangeWithinMonth(A, B) {
+				const [yearA, monthA] = A.split('-')
+				const [yearB, monthB] = B.split('-')
+				return yearA === yearB && monthA === monthB
+			},
+			// 蒙版点击事件
+			maskClick() {
+				this.close()
+				this.$emit('maskClose')
+			},
+
+			clearCalender() {
+				if (this.range) {
+					this.timeRange.startTime = ''
+					this.timeRange.endTime = ''
+					this.tempRange.before = ''
+					this.tempRange.after = ''
+					this.cale.multipleStatus.before = ''
+					this.cale.multipleStatus.after = ''
+					this.cale.multipleStatus.data = []
+					this.cale.lastHover = false
+				} else {
+					this.time = ''
+					this.tempSingleDate = ''
+				}
+				this.calendar.fullDate = ''
+				this.setDate(new Date())
+			},
+
+			bindDateChange(e) {
+				const value = e.detail.value + '-1'
+				this.setDate(value)
+			},
+			/**
+			 * 初始化日期显示
+			 * @param {Object} date
+			 */
+			init(date) {
+				// 字节小程序 watch 早于 created
+				if (!this.cale) {
+					return
+				}
+				this.cale.setDate(date || new Date())
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+				this.calendar = {
+					...this.nowDate
+				}
+				if (!date) {
+					// 优化date为空默认不选中今天
+					this.calendar.fullDate = ''
+					if (this.defaultValue && !this.range) {
+						// 暂时只支持移动端非范围选择
+						const defaultDate = new Date(this.defaultValue)
+						const fullDate = getDate(defaultDate)
+						const year = defaultDate.getFullYear()
+						const month = defaultDate.getMonth() + 1
+						const date = defaultDate.getDate()
+						const day = defaultDate.getDay()
+						this.calendar = {
+								fullDate,
+								year,
+								month,
+								date,
+								day
+							},
+							this.tempSingleDate = fullDate
+						this.time = getTime(defaultDate, this.hideSecond)
+					}
+				}
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			open() {
+				// 弹窗模式并且清理数据
+				if (this.clearDate && !this.insert) {
+					this.cale.cleanMultipleStatus()
+					this.init(this.date)
+				}
+				this.show = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.aniMaskShow = true
+					}, 50)
+				})
+			},
+			/**
+			 * 关闭日历弹窗
+			 */
+			close() {
+				this.aniMaskShow = false
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.show = false
+						this.$emit('close')
+					}, 300)
+				})
+			},
+			/**
+			 * 确认按钮
+			 */
+			confirm() {
+				this.setEmit('confirm')
+				this.close()
+			},
+			/**
+			 * 变化触发
+			 */
+			change(isSingleChange) {
+				if (!this.insert && !isSingleChange) return
+				this.setEmit('change')
+			},
+			/**
+			 * 选择月份触发
+			 */
+			monthSwitch() {
+				let {
+					year,
+					month
+				} = this.nowDate
+				this.$emit('monthSwitch', {
+					year,
+					month: Number(month)
+				})
+			},
+			/**
+			 * 派发事件
+			 * @param {Object} name
+			 */
+			setEmit(name) {
+				if (!this.range) {
+					if (!this.calendar.fullDate) {
+						this.calendar = this.cale.getInfo(new Date())
+						this.tempSingleDate = this.calendar.fullDate
+					}
+					if (this.hasTime && !this.time) {
+						this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				let {
+					year,
+					month,
+					date,
+					fullDate,
+					extraInfo
+				} = this.calendar
+				this.$emit(name, {
+					range: this.cale.multipleStatus,
+					year,
+					month,
+					date,
+					time: this.time,
+					timeRange: this.timeRange,
+					fulldate: fullDate,
+					extraInfo: extraInfo || {}
+				})
+			},
+			/**
+			 * 选择天触发
+			 * @param {Object} weeks
+			 */
+			choiceDate(weeks) {
+				if (weeks.disable) return
+				this.calendar = weeks
+				this.calendar.userChecked = true
+				// 设置多选
+				this.cale.setMultiple(this.calendar.fullDate, true)
+				this.weeks = this.cale.weeks
+				this.tempSingleDate = this.calendar.fullDate
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				this.change(true)
+			},
+			changeMonth(type) {
+				let newDate
+				if (type === 'pre') {
+					newDate = this.cale.getPreMonthObj(this.nowDate.fullDate).fullDate
+				} else if (type === 'next') {
+					newDate = this.cale.getNextMonthObj(this.nowDate.fullDate).fullDate
+				}
+
+				this.setDate(newDate)
+				this.monthSwitch()
+			},
+			/**
+			 * 设置日期
+			 * @param {Object} date
+			 */
+			setDate(date) {
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-calendar {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+	}
+
+	.uni-calendar__mask {
+		position: fixed;
+		bottom: 0;
+		top: 0;
+		left: 0;
+		right: 0;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-property: opacity;
+		transition-duration: 0.3s;
+		opacity: 0;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--mask-show {
+		opacity: 1
+	}
+
+	.uni-calendar--fixed {
+		position: fixed;
+		bottom: calc(var(--window-bottom));
+		left: 0;
+		right: 0;
+		transition-property: transform;
+		transition-duration: 0.3s;
+		transform: translateY(460px);
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+		/* #endif */
+	}
+
+	.uni-calendar--ani-show {
+		transform: translateY(0);
+	}
+
+	.uni-calendar__content {
+		background-color: #fff;
+	}
+
+	.uni-calendar__content-mobile {
+		border-top-left-radius: 10px;
+		border-top-right-radius: 10px;
+		box-shadow: 0px 0px 5px 3px rgba(0, 0, 0, 0.1);
+	}
+
+	.uni-calendar__header {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 50px;
+	}
+
+	.uni-calendar__header-mobile {
+		padding: 10px;
+		padding-bottom: 0;
+	}
+
+	.uni-calendar--fixed-top {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+		border-top-color: rgba(0, 0, 0, 0.4);
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--fixed-width {
+		width: 50px;
+	}
+
+	.uni-calendar__backtoday {
+		position: absolute;
+		right: 0;
+		top: 25rpx;
+		padding: 0 5px;
+		padding-left: 10px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
+		border-top-left-radius: 25px;
+		border-bottom-left-radius: 25px;
+		color: #fff;
+		background-color: #f1f1f1;
+	}
+
+	.uni-calendar__header-text {
+		text-align: center;
+		width: 100px;
+		font-size: 15px;
+		color: #666;
+	}
+
+	.uni-calendar__button-text {
+		text-align: center;
+		width: 100px;
+		font-size: 14px;
+		color: $uni-primary;
+		/* #ifndef APP-NVUE */
+		letter-spacing: 3px;
+		/* #endif */
+	}
+
+	.uni-calendar__header-btn-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		width: 50px;
+		height: 50px;
+	}
+
+	.uni-calendar__header-btn {
+		width: 9px;
+		height: 9px;
+		border-left-color: #808080;
+		border-left-style: solid;
+		border-left-width: 1px;
+		border-top-color: #555555;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-calendar--left {
+		transform: rotate(-45deg);
+	}
+
+	.uni-calendar--right {
+		transform: rotate(135deg);
+	}
+
+
+	.uni-calendar__weeks {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-calendar__weeks-item {
+		flex: 1;
+	}
+
+	.uni-calendar__weeks-day {
+		flex: 1;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		height: 40px;
+		border-bottom-color: #F5F5F5;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-calendar__weeks-day-text {
+		font-size: 12px;
+		color: #B2B2B2;
+	}
+
+	.uni-calendar__box {
+		position: relative;
+		// padding: 0 10px;
+		padding-bottom: 7px;
+	}
+
+	.uni-calendar__box-bg {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+	}
+
+	.uni-calendar__box-bg-text {
+		font-size: 200px;
+		font-weight: bold;
+		color: #999;
+		opacity: 0.1;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		line-height: 1;
+		/* #endif */
+	}
+
+	.uni-date-changed {
+		padding: 0 10px;
+		// line-height: 50px;
+		text-align: center;
+		color: #333;
+		border-top-color: #DCDCDC;
+		;
+		border-top-style: solid;
+		border-top-width: 1px;
+		flex: 1;
+	}
+
+	.uni-date-btn--ok {
+		padding: 20px 15px;
+	}
+
+	.uni-date-changed--time-start {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-end {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		align-items: center;
+	}
+
+	.uni-date-changed--time-date {
+		color: #999;
+		line-height: 50px;
+		/* #ifdef MP-TOUTIAO */
+		font-size: 16px;
+		/* #endif */
+		margin-right: 5px;
+		// opacity: 0.6;
+	}
+
+	.time-picker-style {
+		// width: 62px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		justify-content: center;
+		align-items: center
+	}
+
+	.mr-10 {
+		margin-right: 10px;
+	}
+
+	.dialog-close {
+		position: absolute;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		padding: 0 25px;
+		margin-top: 10px;
+	}
+
+	.dialog-close-plus {
+		width: 16px;
+		height: 2px;
+		background-color: #737987;
+		border-radius: 2px;
+		transform: rotate(45deg);
+	}
+
+	.dialog-close-rotate {
+		position: absolute;
+		transform: rotate(-45deg);
+	}
+
+	.uni-datetime-picker--btn {
+		border-radius: 100px;
+		height: 40px;
+		line-height: 40px;
+		background-color: $uni-primary;
+		color: #fff;
+		font-size: 16px;
+		letter-spacing: 2px;
+	}
+
+	/* #ifndef APP-NVUE */
+	.uni-datetime-picker--btn:active {
+		opacity: 0.7;
+	}
+
+	/* #endif */
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
new file mode 100644
index 0000000..024f22f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/en.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "select date",
+	"uni-datetime-picker.selectTime": "select time",
+	"uni-datetime-picker.selectDateTime": "select date and time",
+	"uni-datetime-picker.startDate": "start date",
+	"uni-datetime-picker.endDate": "end date",
+	"uni-datetime-picker.startTime": "start time",
+	"uni-datetime-picker.endTime": "end time",
+	"uni-datetime-picker.ok": "ok",
+	"uni-datetime-picker.clear": "clear",
+	"uni-datetime-picker.cancel": "cancel",
+	"uni-datetime-picker.year": "-",
+	"uni-datetime-picker.month": "",
+	"uni-calender.MON": "MON",
+	"uni-calender.TUE": "TUE",
+	"uni-calender.WED": "WED",
+	"uni-calender.THU": "THU",
+	"uni-calender.FRI": "FRI",
+	"uni-calender.SAT": "SAT",
+	"uni-calender.SUN": "SUN",
+	"uni-calender.confirm": "confirm"
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
new file mode 100644
index 0000000..d2df5e7
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hans.json
@@ -0,0 +1,22 @@
+{
+	"uni-datetime-picker.selectDate": "选择日期",
+	"uni-datetime-picker.selectTime": "选择时间",
+	"uni-datetime-picker.selectDateTime": "选择日期时间",
+	"uni-datetime-picker.startDate": "开始日期",
+	"uni-datetime-picker.endDate": "结束日期",
+	"uni-datetime-picker.startTime": "开始时间",
+	"uni-datetime-picker.endTime": "结束时间",
+	"uni-datetime-picker.ok": "确定",
+	"uni-datetime-picker.clear": "清除",
+	"uni-datetime-picker.cancel": "取消",
+	"uni-datetime-picker.year": "年",
+	"uni-datetime-picker.month": "月",
+	"uni-calender.SUN": "日",
+	"uni-calender.MON": "一",
+	"uni-calender.TUE": "二",
+	"uni-calender.WED": "三",
+	"uni-calender.THU": "四",
+	"uni-calender.FRI": "五",
+	"uni-calender.SAT": "六",
+	"uni-calender.confirm": "确认"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
new file mode 100644
index 0000000..d23fa3c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/i18n/zh-Hant.json
@@ -0,0 +1,22 @@
+{
+  "uni-datetime-picker.selectDate": "選擇日期",
+  "uni-datetime-picker.selectTime": "選擇時間",
+  "uni-datetime-picker.selectDateTime": "選擇日期時間",
+  "uni-datetime-picker.startDate": "開始日期",
+  "uni-datetime-picker.endDate": "結束日期",
+  "uni-datetime-picker.startTime": "開始时间",
+  "uni-datetime-picker.endTime": "結束时间",
+  "uni-datetime-picker.ok": "確定",
+  "uni-datetime-picker.clear": "清除",
+  "uni-datetime-picker.cancel": "取消",
+  "uni-datetime-picker.year": "年",
+  "uni-datetime-picker.month": "月",
+  "uni-calender.SUN": "日",
+  "uni-calender.MON": "一",
+  "uni-calender.TUE": "二",
+  "uni-calender.WED": "三",
+  "uni-calender.THU": "四",
+  "uni-calender.FRI": "五",
+  "uni-calender.SAT": "六",
+  "uni-calender.confirm": "確認"
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..1817692
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,940 @@
+<template>
+	<view class="uni-datetime-picker">
+		<view @click="initTimePicker">
+			<slot>
+				<view class="uni-datetime-picker-timebox-pointer"
+					:class="{'uni-datetime-picker-disabled': disabled, 'uni-datetime-picker-timebox': border}">
+					<text class="uni-datetime-picker-text">{{time}}</text>
+					<view v-if="!time" class="uni-datetime-picker-time">
+						<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+					</view>
+				</view>
+			</slot>
+		</view>
+		<view v-if="visible" id="mask" class="uni-datetime-picker-mask" @click="tiggerTimePicker"></view>
+		<view v-if="visible" class="uni-datetime-picker-popup" :class="[dateShow && timeShow ? '' : 'fix-nvue-height']"
+			:style="fixNvueBug">
+			<view class="uni-title">
+				<text class="uni-datetime-picker-text">{{selectTimeText}}</text>
+			</view>
+			<view v-if="dateShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :indicator-style="indicatorStyle" :value="ymd"
+					@change="bindDateChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in years" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in months" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in days" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign sign-left">-</text>
+				<text class="uni-datetime-picker-sign sign-right">-</text>
+			</view>
+			<view v-if="timeShow" class="uni-datetime-picker__container-box">
+				<picker-view class="uni-datetime-picker-view" :class="[hideSecond ? 'time-hide-second' : '']"
+					:indicator-style="indicatorStyle" :value="hms" @change="bindTimeChange">
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in hours" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="uni-datetime-picker-item" v-for="(item,index) in minutes" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+					<picker-view-column v-if="!hideSecond">
+						<view class="uni-datetime-picker-item" v-for="(item,index) in seconds" :key="index">
+							<text class="uni-datetime-picker-item">{{lessThanTen(item)}}</text>
+						</view>
+					</picker-view-column>
+				</picker-view>
+				<!-- 兼容 nvue 不支持伪类 -->
+				<text class="uni-datetime-picker-sign" :class="[hideSecond ? 'sign-center' : 'sign-left']">:</text>
+				<text v-if="!hideSecond" class="uni-datetime-picker-sign sign-right">:</text>
+			</view>
+			<view class="uni-datetime-picker-btn">
+				<view @click="clearTime">
+					<text class="uni-datetime-picker-btn-text">{{clearText}}</text>
+				</view>
+				<view class="uni-datetime-picker-btn-group">
+					<view class="uni-datetime-picker-cancel" @click="tiggerTimePicker">
+						<text class="uni-datetime-picker-btn-text">{{cancelText}}</text>
+					</view>
+					<view @click="setTime">
+						<text class="uni-datetime-picker-btn-text">{{okText}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {
+		t
+	} = initVueI18n(i18nMessages)
+	import {
+		fixIosDateFormat
+	} from './util'
+
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 可以同时选择日期和时间的选择器
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=xxx
+	 * @property {String} type = [datetime | date | time] 显示模式
+	 * @property {Boolean} multiple = [true|false] 是否多选
+	 * @property {String|Number} value 默认值
+	 * @property {String|Number} start 起始日期或时间
+	 * @property {String|Number} end 起始日期或时间
+	 * @property {String} return-type = [timestamp | string]
+	 * @event {Function} change  选中发生变化触发
+	 */
+
+	export default {
+		name: 'UniDatetimePicker',
+		data() {
+			return {
+				indicatorStyle: `height: 50px;`,
+				visible: false,
+				fixNvueBug: {},
+				dateShow: true,
+				timeShow: true,
+				title: '日期和时间',
+				// 输入框当前时间
+				time: '',
+				// 当前的年月日时分秒
+				year: 1920,
+				month: 0,
+				day: 0,
+				hour: 0,
+				minute: 0,
+				second: 0,
+				// 起始时间
+				startYear: 1920,
+				startMonth: 1,
+				startDay: 1,
+				startHour: 0,
+				startMinute: 0,
+				startSecond: 0,
+				// 结束时间
+				endYear: 2120,
+				endMonth: 12,
+				endDay: 31,
+				endHour: 23,
+				endMinute: 59,
+				endSecond: 59,
+			}
+		},
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			disabled: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		watch: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+					if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				handler(newVal) {
+					if (newVal) {
+						this.parseValue(fixIosDateFormat(newVal))
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			type: {
+				handler(newValue) {
+					if (newValue === 'date') {
+						this.dateShow = true
+						this.timeShow = false
+						this.title = '日期'
+					} else if (newValue === 'time') {
+						this.dateShow = false
+						this.timeShow = true
+						this.title = '时间'
+					} else {
+						this.dateShow = true
+						this.timeShow = true
+						this.title = '日期和时间'
+					}
+				},
+				immediate: true
+			},
+			start: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'start')
+				},
+				immediate: true
+			},
+			end: {
+				handler(newVal) {
+					this.parseDatetimeRange(fixIosDateFormat(newVal), 'end')
+				},
+				immediate: true
+			},
+
+			// 月、日、时、分、秒可选范围变化后，检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			months(newVal) {
+				this.checkValue('month', this.month, newVal)
+			},
+			days(newVal) {
+				this.checkValue('day', this.day, newVal)
+			},
+			hours(newVal) {
+				this.checkValue('hour', this.hour, newVal)
+			},
+			minutes(newVal) {
+				this.checkValue('minute', this.minute, newVal)
+			},
+			seconds(newVal) {
+				this.checkValue('second', this.second, newVal)
+			}
+		},
+		computed: {
+			// 当前年、月、日、时、分、秒选择范围
+			years() {
+				return this.getCurrentRange('year')
+			},
+
+			months() {
+				return this.getCurrentRange('month')
+			},
+
+			days() {
+				return this.getCurrentRange('day')
+			},
+
+			hours() {
+				return this.getCurrentRange('hour')
+			},
+
+			minutes() {
+				return this.getCurrentRange('minute')
+			},
+
+			seconds() {
+				return this.getCurrentRange('second')
+			},
+
+			// picker 当前值数组
+			ymd() {
+				return [this.year - this.minYear, this.month - this.minMonth, this.day - this.minDay]
+			},
+			hms() {
+				return [this.hour - this.minHour, this.minute - this.minMinute, this.second - this.minSecond]
+			},
+
+			// 当前 date 是 start
+			currentDateIsStart() {
+				return this.year === this.startYear && this.month === this.startMonth && this.day === this.startDay
+			},
+
+			// 当前 date 是 end
+			currentDateIsEnd() {
+				return this.year === this.endYear && this.month === this.endMonth && this.day === this.endDay
+			},
+
+			// 当前年、月、日、时、分、秒的最小值和最大值
+			minYear() {
+				return this.startYear
+			},
+			maxYear() {
+				return this.endYear
+			},
+			minMonth() {
+				if (this.year === this.startYear) {
+					return this.startMonth
+				} else {
+					return 1
+				}
+			},
+			maxMonth() {
+				if (this.year === this.endYear) {
+					return this.endMonth
+				} else {
+					return 12
+				}
+			},
+			minDay() {
+				if (this.year === this.startYear && this.month === this.startMonth) {
+					return this.startDay
+				} else {
+					return 1
+				}
+			},
+			maxDay() {
+				if (this.year === this.endYear && this.month === this.endMonth) {
+					return this.endDay
+				} else {
+					return this.daysInMonth(this.year, this.month)
+				}
+			},
+			minHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart) {
+						return this.startHour
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					return this.startHour
+				}
+			},
+			maxHour() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd) {
+						return this.endHour
+					} else {
+						return 23
+					}
+				}
+				if (this.type === 'time') {
+					return this.endHour
+				}
+			},
+			minMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour) {
+						return this.startMinute
+					} else {
+						return 0
+					}
+				}
+			},
+			maxMinute() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour) {
+						return this.endMinute
+					} else {
+						return 59
+					}
+				}
+			},
+			minSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsStart && this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.startHour && this.minute === this.startMinute) {
+						return this.startSecond
+					} else {
+						return 0
+					}
+				}
+			},
+			maxSecond() {
+				if (this.type === 'datetime') {
+					if (this.currentDateIsEnd && this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+				if (this.type === 'time') {
+					if (this.hour === this.endHour && this.minute === this.endMinute) {
+						return this.endSecond
+					} else {
+						return 59
+					}
+				}
+			},
+
+			/**
+			 * for i18n
+			 */
+			selectTimeText() {
+				return t("uni-datetime-picker.selectTime")
+			},
+			okText() {
+				return t("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return t("uni-datetime-picker.clear")
+			},
+			cancelText() {
+				return t("uni-datetime-picker.cancel")
+			}
+		},
+
+		mounted() {
+			// #ifdef APP-NVUE
+			const res = uni.getSystemInfoSync();
+			this.fixNvueBug = {
+				top: res.windowHeight / 2,
+				left: res.windowWidth / 2
+			}
+			// #endif
+		},
+
+		methods: {
+			/**
+			 * @param {Object} item
+			 * 小于 10 在前面加个 0
+			 */
+
+			lessThanTen(item) {
+				return item < 10 ? '0' + item : item
+			},
+
+			/**
+			 * 解析时分秒字符串，例如：00:00:00
+			 * @param {String} timeString
+			 */
+			parseTimeType(timeString) {
+				if (timeString) {
+					let timeArr = timeString.split(':')
+					this.hour = Number(timeArr[0])
+					this.minute = Number(timeArr[1])
+					this.second = Number(timeArr[2])
+				}
+			},
+
+			/**
+			 * 解析选择器初始值，类型可以是字符串、时间戳，例如：2000-10-02、'08:30:00'、 1610695109000
+			 * @param {String | Number} datetime
+			 */
+			initPickerValue(datetime) {
+				let defaultValue = null
+				if (datetime) {
+					defaultValue = this.compareValueWithStartAndEnd(datetime, this.start, this.end)
+				} else {
+					defaultValue = Date.now()
+					defaultValue = this.compareValueWithStartAndEnd(defaultValue, this.start, this.end)
+				}
+				this.parseValue(defaultValue)
+			},
+
+			/**
+			 * 初始值规则：
+			 * - 用户设置初始值 value
+			 * 	- 设置了起始时间 start、终止时间 end，并 start < value < end，初始值为 value， 否则初始值为 start
+			 * 	- 只设置了起始时间 start，并 start < value，初始值为 value，否则初始值为 start
+			 * 	- 只设置了终止时间 end，并 value < end，初始值为 value，否则初始值为 end
+			 * 	- 无起始终止时间，则初始值为 value
+			 * - 无初始值 value，则初始值为当前本地时间 Date.now()
+			 * @param {Object} value
+			 * @param {Object} dateBase
+			 */
+			compareValueWithStartAndEnd(value, start, end) {
+				let winner = null
+				value = this.superTimeStamp(value)
+				start = this.superTimeStamp(start)
+				end = this.superTimeStamp(end)
+
+				if (start && end) {
+					if (value < start) {
+						winner = new Date(start)
+					} else if (value > end) {
+						winner = new Date(end)
+					} else {
+						winner = new Date(value)
+					}
+				} else if (start && !end) {
+					winner = start <= value ? new Date(value) : new Date(start)
+				} else if (!start && end) {
+					winner = value <= end ? new Date(value) : new Date(end)
+				} else {
+					winner = new Date(value)
+				}
+
+				return winner
+			},
+
+			/**
+			 * 转换为可比较的时间戳，接受日期、时分秒、时间戳
+			 * @param {Object} value
+			 */
+			superTimeStamp(value) {
+				let dateBase = ''
+				if (this.type === 'time' && value && typeof value === 'string') {
+					const now = new Date()
+					const year = now.getFullYear()
+					const month = now.getMonth() + 1
+					const day = now.getDate()
+					dateBase = year + '/' + month + '/' + day + ' '
+				}
+				if (Number(value)) {
+					value = parseInt(value)
+					dateBase = 0
+				}
+				return this.createTimeStamp(dateBase + value)
+			},
+
+			/**
+			 * 解析默认值 value，字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseValue(value) {
+				if (!value) {
+					return
+				}
+				if (this.type === 'time' && typeof value === "string") {
+					this.parseTimeType(value)
+				} else {
+					let defaultDate = null
+					defaultDate = new Date(value)
+					if (this.type !== 'time') {
+						this.year = defaultDate.getFullYear()
+						this.month = defaultDate.getMonth() + 1
+						this.day = defaultDate.getDate()
+					}
+					if (this.type !== 'date') {
+						this.hour = defaultDate.getHours()
+						this.minute = defaultDate.getMinutes()
+						this.second = defaultDate.getSeconds()
+					}
+				}
+				if (this.hideSecond) {
+					this.second = 0
+				}
+			},
+
+			/**
+			 * 解析可选择时间范围 start、end，年月日字符串、时间戳
+			 * @param {Object} defaultTime
+			 */
+			parseDatetimeRange(point, pointType) {
+				// 时间为空，则重置为初始值
+				if (!point) {
+					if (pointType === 'start') {
+						this.startYear = 1920
+						this.startMonth = 1
+						this.startDay = 1
+						this.startHour = 0
+						this.startMinute = 0
+						this.startSecond = 0
+					}
+					if (pointType === 'end') {
+						this.endYear = 2120
+						this.endMonth = 12
+						this.endDay = 31
+						this.endHour = 23
+						this.endMinute = 59
+						this.endSecond = 59
+					}
+					return
+				}
+				if (this.type === 'time') {
+					const pointArr = point.split(':')
+					this[pointType + 'Hour'] = Number(pointArr[0])
+					this[pointType + 'Minute'] = Number(pointArr[1])
+					this[pointType + 'Second'] = Number(pointArr[2])
+				} else {
+					if (!point) {
+						pointType === 'start' ? this.startYear = this.year - 60 : this.endYear = this.year + 60
+						return
+					}
+					if (Number(point)) {
+						point = parseInt(point)
+					}
+					// datetime 的 end 没有时分秒, 则不限制
+					const hasTime = /[0-9]:[0-9]/
+					if (this.type === 'datetime' && pointType === 'end' && typeof point === 'string' && !hasTime.test(
+							point)) {
+						point = point + ' 23:59:59'
+					}
+					const pointDate = new Date(point)
+					this[pointType + 'Year'] = pointDate.getFullYear()
+					this[pointType + 'Month'] = pointDate.getMonth() + 1
+					this[pointType + 'Day'] = pointDate.getDate()
+					if (this.type === 'datetime') {
+						this[pointType + 'Hour'] = pointDate.getHours()
+						this[pointType + 'Minute'] = pointDate.getMinutes()
+						this[pointType + 'Second'] = pointDate.getSeconds()
+					}
+				}
+			},
+
+			// 获取 年、月、日、时、分、秒 当前可选范围
+			getCurrentRange(value) {
+				const range = []
+				for (let i = this['min' + this.capitalize(value)]; i <= this['max' + this.capitalize(value)]; i++) {
+					range.push(i)
+				}
+				return range
+			},
+
+			// 字符串首字母大写
+			capitalize(str) {
+				return str.charAt(0).toUpperCase() + str.slice(1)
+			},
+
+			// 检查当前值是否在范围内，不在则当前值重置为可选范围第一项
+			checkValue(name, value, values) {
+				if (values.indexOf(value) === -1) {
+					this[name] = values[0]
+				}
+			},
+
+			// 每个月的实际天数
+			daysInMonth(year, month) { // Use 1 for January, 2 for February, etc.
+				return new Date(year, month, 0).getDate();
+			},
+
+			/**
+			 * 生成时间戳
+			 * @param {Object} time
+			 */
+			createTimeStamp(time) {
+				if (!time) return
+				if (typeof time === "number") {
+					return time
+				} else {
+					time = time.replace(/-/g, '/')
+					if (this.type === 'date') {
+						time = time + ' ' + '00:00:00'
+					}
+					return Date.parse(time)
+				}
+			},
+
+			/**
+			 * 生成日期或时间的字符串
+			 */
+			createDomSting() {
+				const yymmdd = this.year +
+					'-' +
+					this.lessThanTen(this.month) +
+					'-' +
+					this.lessThanTen(this.day)
+
+				let hhmmss = this.lessThanTen(this.hour) +
+					':' +
+					this.lessThanTen(this.minute)
+
+				if (!this.hideSecond) {
+					hhmmss = hhmmss + ':' + this.lessThanTen(this.second)
+				}
+
+				if (this.type === 'date') {
+					return yymmdd
+				} else if (this.type === 'time') {
+					return hhmmss
+				} else {
+					return yymmdd + ' ' + hhmmss
+				}
+			},
+
+			/**
+			 * 初始化返回值，并抛出 change 事件
+			 */
+			initTime(emit = true) {
+				this.time = this.createDomSting()
+				if (!emit) return
+				if (this.returnType === 'timestamp' && this.type !== 'time') {
+					this.$emit('change', this.createTimeStamp(this.time))
+					this.$emit('input', this.createTimeStamp(this.time))
+					this.$emit('update:modelValue', this.createTimeStamp(this.time))
+				} else {
+					this.$emit('change', this.time)
+					this.$emit('input', this.time)
+					this.$emit('update:modelValue', this.time)
+				}
+			},
+
+			/**
+			 * 用户选择日期或时间更新 data
+			 * @param {Object} e
+			 */
+			bindDateChange(e) {
+				const val = e.detail.value
+				this.year = this.years[val[0]]
+				this.month = this.months[val[1]]
+				this.day = this.days[val[2]]
+			},
+			bindTimeChange(e) {
+				const val = e.detail.value
+				this.hour = this.hours[val[0]]
+				this.minute = this.minutes[val[1]]
+				this.second = this.seconds[val[2]]
+			},
+
+			/**
+			 * 初始化弹出层
+			 */
+			initTimePicker() {
+				if (this.disabled) return
+				const value = fixIosDateFormat(this.time)
+				this.initPickerValue(value)
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 触发或关闭弹框
+			 */
+			tiggerTimePicker(e) {
+				this.visible = !this.visible
+			},
+
+			/**
+			 * 用户点击“清空”按钮，清空当前值
+			 */
+			clearTime() {
+				this.time = ''
+				this.$emit('change', this.time)
+				this.$emit('input', this.time)
+				this.$emit('update:modelValue', this.time)
+				this.tiggerTimePicker()
+			},
+
+			/**
+			 * 用户点击“确定”按钮
+			 */
+			setTime() {
+				this.initTime()
+				this.tiggerTimePicker()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-datetime-picker {
+		/* #ifndef APP-NVUE */
+		/* width: 100%; */
+		/* #endif */
+	}
+
+	.uni-datetime-picker-view {
+		height: 130px;
+		width: 270px;
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-item {
+		height: 50px;
+		line-height: 50px;
+		text-align: center;
+		font-size: 14px;
+	}
+
+	.uni-datetime-picker-btn {
+		margin-top: 60px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		cursor: pointer;
+		/* #endif */
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.uni-datetime-picker-btn-text {
+		font-size: 14px;
+		color: $uni-primary;
+	}
+
+	.uni-datetime-picker-btn-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.uni-datetime-picker-cancel {
+		margin-right: 30px;
+	}
+
+	.uni-datetime-picker-mask {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0.4);
+		transition-duration: 0.3s;
+		z-index: 998;
+	}
+
+	.uni-datetime-picker-popup {
+		border-radius: 8px;
+		padding: 30px;
+		width: 270px;
+		/* #ifdef APP-NVUE */
+		height: 500px;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		width: 330px;
+		/* #endif */
+		background-color: #fff;
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+		transition-duration: 0.3s;
+		z-index: 999;
+	}
+
+	.fix-nvue-height {
+		/* #ifdef APP-NVUE */
+		height: 330px;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-time {
+		color: grey;
+	}
+
+	.uni-datetime-picker-column {
+		height: 50px;
+	}
+
+	.uni-datetime-picker-timebox {
+
+		border: 1px solid #E5E5E5;
+		border-radius: 5px;
+		padding: 7px 10px;
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-timebox-pointer {
+		/* #ifndef APP-NVUE */
+		cursor: pointer;
+		/* #endif */
+	}
+
+
+	.uni-datetime-picker-disabled {
+		opacity: 0.4;
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+
+	.uni-datetime-picker-text {
+		font-size: 14px;
+		line-height: 50px
+	}
+
+	.uni-datetime-picker-sign {
+		position: absolute;
+		top: 53px;
+		/* 减掉 10px 的元素高度，兼容nvue */
+		color: #999;
+		/* #ifdef APP-NVUE */
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.sign-left {
+		left: 86px;
+	}
+
+	.sign-right {
+		right: 86px;
+	}
+
+	.sign-center {
+		left: 135px;
+	}
+
+	.uni-datetime-picker__container-box {
+		position: relative;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40px;
+	}
+
+	.time-hide-second {
+		width: 180px;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
new file mode 100644
index 0000000..021300f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1068 @@
+<template>
+	<view class="uni-date">
+		<view class="uni-date-editor" @click="show">
+			<slot>
+				<view class="uni-date-editor--x"
+					:class="{'uni-date-editor--x__disabled': disabled,'uni-date-x--border': border}">
+					<view v-if="!isRange" class="uni-date-x uni-date-single">
+						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
+					</view>
+
+					<view v-else class="uni-date-x uni-date-range">
+						<uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input text-center">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+
+						<view class="range-separator">{{rangeSeparator}}</view>
+
+						<view class="uni-date__x-input text-center">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+					</view>
+
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="22"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="pickerVisible" class="uni-date-mask--pc" @click="close"></view>
+
+		<view v-if="!isPhone" v-show="pickerVisible" ref="datePicker" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input text-center" type="text" v-model="inputDate" :placeholder="selectDateText" />
+
+					<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
+						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
+							:disabled="!inputDate" />
+					</time-picker>
+				</view>
+
+				<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
+					:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange" :default-value="defaultValue"
+					style="padding: 0 8px;" />
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="confirm-text" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+				<view v-if="hasTime" class="popup-x-header uni-date-changed">
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startDate"
+							:placeholder="startDateText" />
+
+						<time-picker type="time" v-model="tempRange.startTime" :start="timepickerStartTime" :border="false"
+							:disabled="!tempRange.startDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.startTime"
+								:placeholder="startTimeText" :disabled="!tempRange.startDate" />
+						</time-picker>
+					</view>
+
+					<uni-icons type="arrowthinright" color="#999" style="line-height: 40px;"></uni-icons>
+
+					<view class="popup-x-header--datetime">
+						<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endDate"
+							:placeholder="endDateText" />
+
+						<time-picker type="time" v-model="tempRange.endTime" :end="timepickerEndTime" :border="false"
+							:disabled="!tempRange.endDate" :hideSecond="hideSecond">
+							<input class="uni-date__input uni-date-range__input" type="text" v-model="tempRange.endTime"
+								:placeholder="endTimeText" :disabled="!tempRange.endDate" />
+						</time-picker>
+					</view>
+				</view>
+
+				<view class="popup-x-body">
+					<Calendar ref="left" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus" @change="leftChange"
+						@firstEnterCale="updateRightCale" style="padding: 0 8px;"/>
+					<Calendar ref="right" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" @change="rightChange" :pleStatus="startMultipleStatus"
+						@firstEnterCale="updateLeftCale" style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text @click="clear">{{clearText}}</text>
+					<text class="confirm-text" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+
+		<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
+			:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
+			:startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder" :default-value="defaultValue"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" @change="calendarClick"/>
+	</view>
+</template>
+<script>
+	/**
+	 * DatetimePicker 时间选择器
+	 * @description 同时支持 PC 和移动端使用日历选择日期和日期范围
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=3962
+	 * @property {String} type 选择器类型
+	 * @property {String|Number|Array|Date} value 绑定值
+	 * @property {String} placeholder 单选择时的占位内容
+	 * @property {String} start 起始时间
+	 * @property {String} end 终止时间
+	 * @property {String} start-placeholder 范围选择时开始日期的占位内容
+	 * @property {String} end-placeholder 范围选择时结束日期的占位内容
+	 * @property {String} range-separator 选择范围时的分隔符
+	 * @property {Boolean} border = [true|false] 是否有边框
+	 * @property {Boolean} disabled = [true|false] 是否禁用
+	 * @property {Boolean} clearIcon = [true|false] 是否显示清除按钮（仅PC端适用）
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} maskClick 点击遮罩层触发的事件
+	 * @event {Function} show 打开弹出层
+	 * @event {Function} close 关闭弹出层
+	 * @event {Function} clear 清除上次选中的状态和值
+	 **/
+	import Calendar from './calendar.vue'
+	import TimePicker from './time-picker.vue'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	import {
+		getDateTime,
+		getDate,
+		getTime,
+		getDefaultSecond,
+		dateCompare,
+		checkDate,
+		fixIosDateFormat
+	} from './util'
+
+	export default {
+		name: 'UniDatetimePicker',
+
+		options: {
+			// #ifdef MP-TOUTIAO
+			virtualHost: false,
+			// #endif
+			// #ifndef MP-TOUTIAO
+			virtualHost: true
+			// #endif
+		},
+		components: {
+			Calendar,
+			TimePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				displayValue: '',
+				inputDate: '',
+				calendarDate: '',
+				pickerTime: '',
+				calendarRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				displayRangeValue: {
+					startDate: '',
+					endDate: '',
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				pickerVisible: false,
+				pickerPositionStyle: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+				i18nT: () => {}
+			}
+		},
+		props: {
+			type: {
+				type: String,
+				default: 'datetime'
+			},
+			value: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			modelValue: {
+				type: [String, Number, Array, Date],
+				default: ''
+			},
+			start: {
+				type: [Number, String],
+				default: ''
+			},
+			end: {
+				type: [Number, String],
+				default: ''
+			},
+			returnType: {
+				type: String,
+				default: 'string'
+			},
+			placeholder: {
+				type: String,
+				default: ''
+			},
+			startPlaceholder: {
+				type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			rangeSeparator: {
+				type: String,
+				default: '-'
+			},
+			border: {
+				type: [Boolean],
+				default: true
+			},
+			disabled: {
+				type: [Boolean],
+				default: false
+			},
+			clearIcon: {
+				type: [Boolean],
+				default: true
+			},
+			hideSecond: {
+				type: [Boolean],
+				default: false
+			},
+			defaultValue: {
+				type: [String, Object, Array],
+				default: ''
+			}
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal) {
+					this.hasTime = newVal.indexOf('time') !== -1
+					this.isRange = newVal.indexOf('range') !== -1
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.startDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.startTime = getTime(newVal)
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.endDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.endTime = getTime(newVal, this.hideSecond)
+					}
+				}
+			},
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.inputDate
+				return activeDate === this.calendarRange.startDate ? this.calendarRange.startTime : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.inputDate
+				return activeDate === this.calendarRange.endDate ? this.calendarRange.endTime : ''
+			},
+			mobileCalendarTime() {
+				const timeRange = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? timeRange : this.pickerTime
+			},
+			mobSelectableTime() {
+				return {
+					start: this.calendarRange.startTime,
+					end: this.calendarRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : this.selectDateTimeText)
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return this.i18nT("uni-datetime-picker.selectDate")
+			},
+			selectDateTimeText() {
+				return this.i18nT("uni-datetime-picker.selectDateTime")
+			},
+			selectTimeText() {
+				return this.i18nT("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || this.i18nT("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return this.i18nT("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || this.i18nT("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return this.i18nT("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return this.i18nT("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return this.i18nT("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this
+					.displayRangeValue.endDate))
+			}
+		},
+		created() {
+			this.initI18nT()
+			this.platform()
+		},
+		methods: {
+			initI18nT() {
+				const vueI18n = initVueI18n(i18nMessages)
+				this.i18nT = vueI18n.t
+			},
+			initPicker(newVal) {
+				if ((!newVal && !this.defaultValue) || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+
+				if (!Array.isArray(newVal) && !this.isRange) {
+					if (newVal) {
+						this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
+						if (this.hasTime) {
+							this.pickerTime = getTime(newVal, this.hideSecond)
+							this.displayValue = `${this.displayValue} ${this.pickerTime}`
+						}
+					} else if (this.defaultValue) {
+						this.inputDate = this.calendarDate = getDate(this.defaultValue)
+						if (this.hasTime) {
+							this.pickerTime = getTime(this.defaultValue, this.hideSecond)
+						}
+					}
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+					const beforeDate = getDate(before)
+					const beforeTime = getTime(before, this.hideSecond)
+
+					const afterDate = getDate(after)
+					const afterTime = getTime(after, this.hideSecond)
+					const startDate = beforeDate
+					const endDate = afterDate
+					this.displayRangeValue.startDate = this.tempRange.startDate = startDate
+					this.displayRangeValue.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.displayRangeValue.startDate = `${beforeDate} ${beforeTime}`
+						this.displayRangeValue.endDate = `${afterDate} ${afterTime}`
+						this.tempRange.startTime = beforeTime
+						this.tempRange.endTime = afterTime
+					}
+					const defaultRange = {
+						before: beforeDate,
+						after: afterDate
+					}
+					this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, defaultRange, {
+						which: 'right'
+					})
+					this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, defaultRange, {
+						which: 'left'
+					})
+				}
+			},
+			updateLeftCale(e) {
+				const left = this.$refs.left
+				// 设置范围选
+				left.cale.setHoverMultiple(e.after)
+				left.setDate(this.$refs.left.nowDate.fullDate)
+			},
+			updateRightCale(e) {
+				const right = this.$refs.right
+				// 设置范围选
+				right.cale.setHoverMultiple(e.after)
+				right.setDate(this.$refs.right.nowDate.fullDate)
+			},
+			platform() {
+				if (typeof navigator !== "undefined") {
+					this.isPhone = navigator.userAgent.toLowerCase().indexOf('mobile') !== -1
+					return
+				}
+				// #ifdef MP-WEIXIN
+				const {
+					windowWidth
+				} = uni.getWindowInfo()
+				// #endif
+				// #ifndef MP-WEIXIN
+				const {
+					windowWidth
+				} = uni.getSystemInfoSync()
+				// #endif
+				this.isPhone = windowWidth <= 500
+				this.windowWidth = windowWidth
+			},
+			show() {
+				this.$emit("show")
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					setTimeout(() => {
+						this.$refs.mobile.open()
+					}, 0);
+					return
+				}
+				this.pickerPositionStyle = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.pickerPositionStyle.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.pickerVisible = !this.pickerVisible
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.calendarRange
+						if (startDate && endDate) {
+							if (this.diffDate(startDate, endDate) < 30) {
+								this.$refs.right.changeMonth('pre')
+							}
+						} else {
+							// this.$refs.right.changeMonth('next')
+							if (this.isPhone) {
+								this.$refs.right.cale.lastHover = false;
+							}
+						}
+					}
+
+				}, 50)
+			},
+			close() {
+				setTimeout(() => {
+					this.pickerVisible = false
+					this.$emit('maskClick', this.value)
+					this.$refs.mobile && this.$refs.mobile.close()
+				}, 20)
+			},
+			setEmit(value) {
+				if (this.returnType === "timestamp" || this.returnType === "date") {
+					if (!Array.isArray(value)) {
+						if (!this.hasTime) {
+							value = value + ' ' + '00:00:00'
+						}
+						value = this.createTimestamp(value)
+						if (this.returnType === "date") {
+							value = new Date(value)
+						}
+					} else {
+						if (!this.hasTime) {
+							value[0] = value[0] + ' ' + '00:00:00'
+							value[1] = value[1] + ' ' + '00:00:00'
+						}
+						value[0] = this.createTimestamp(value[0])
+						value[1] = this.createTimestamp(value[1])
+						if (this.returnType === "date") {
+							value[0] = new Date(value[0])
+							value[1] = new Date(value[1])
+						}
+					}
+				}
+
+				this.$emit('update:modelValue', value)
+				this.$emit('input', value)
+				this.$emit('change', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.calendarDate = this.inputDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+			confirmSingleChange() {
+				if (!checkDate(this.inputDate)) {
+					const now = new Date()
+					this.calendarDate = this.inputDate = getDate(now)
+					this.pickerTime = getTime(now, this.hideSecond)
+				}
+
+				let startLaterInputDate = false
+				let startDate, startTime
+				if (this.start) {
+					let startString = this.start
+					if (typeof this.start === 'number') {
+						startString = getDateTime(this.start, this.hideSecond)
+					}
+					[startDate, startTime] = startString.split(' ')
+					if (this.start && !dateCompare(startDate, this.inputDate)) {
+						startLaterInputDate = true
+						this.inputDate = startDate
+					}
+				}
+
+				let endEarlierInputDate = false
+				let endDate, endTime
+				if (this.end) {
+					let endString = this.end
+					if (typeof this.end === 'number') {
+						endString = getDateTime(this.end, this.hideSecond)
+					}
+					[endDate, endTime] = endString.split(' ')
+					if (this.end && !dateCompare(this.inputDate, endDate)) {
+						endEarlierInputDate = true
+						this.inputDate = endDate
+					}
+				}
+				if (this.hasTime) {
+					if (startLaterInputDate) {
+						this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
+					}
+					if (endEarlierInputDate) {
+						this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.pickerTime) {
+						this.pickerTime = getTime(Date.now(), this.hideSecond)
+					}
+					this.displayValue = `${this.inputDate} ${this.pickerTime}`
+				} else {
+					this.displayValue = this.inputDate
+				}
+				this.setEmit(this.displayValue)
+				this.pickerVisible = false
+			},
+			leftChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.startMultipleStatus = Object.assign({}, this.startMultipleStatus, obj)
+				this.$emit('calendarClick', e)
+			},
+			rightChange(e) {
+				const {
+					before,
+					after
+				} = e.range
+				this.rangeChange(before, after)
+				const obj = {
+					before: e.range.before,
+					after: e.range.after,
+					data: e.range.data,
+					fulldate: e.fulldate
+				}
+				this.endMultipleStatus = Object.assign({}, this.endMultipleStatus, obj)
+				this.$emit('calendarClick', e)
+			},
+			mobileChange(e) {
+				if (this.isRange) {
+					const {
+						before,
+						after
+					} = e.range
+					if (!before) {
+						return;
+					}
+
+					this.handleStartAndEnd(before, after, true)
+					if (this.hasTime) {
+						const {
+							startTime,
+							endTime
+						} = e.timeRange
+						this.tempRange.startTime = startTime
+						this.tempRange.endTime = endTime
+					}
+					this.confirmRangeChange()
+				} else {
+					if (this.hasTime) {
+						this.displayValue = e.fulldate + ' ' + e.time
+					} else {
+						this.displayValue = e.fulldate
+					}
+					this.setEmit(this.displayValue)
+					this.calendarDate = this.displayValue;
+				}
+				this.$refs.mobile.close()
+			},
+			rangeChange(before, after) {
+				if (!(before && after)) return
+				this.handleStartAndEnd(before, after, true)
+				if (this.hasTime) return
+				this.confirmRangeChange()
+			},
+			confirmRangeChange() {
+				if (!this.tempRange.startDate || !this.tempRange.endDate) {
+					this.pickerVisible = false
+					return
+				}
+				if (!checkDate(this.tempRange.startDate)) {
+					this.tempRange.startDate = getDate(Date.now())
+				}
+				if (!checkDate(this.tempRange.endDate)) {
+					this.tempRange.endDate = getDate(Date.now())
+				}
+
+				let start, end
+
+				let startDateLaterRangeStartDate = false
+				let startDateLaterRangeEndDate = false
+				let startDate, startTime
+
+				let compareStartDateString = this.tempRange.startDate
+				let compareEndDateString = this.tempRange.endDate
+				if (this.hasTime) {
+					compareStartDateString = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					compareEndDateString = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+
+				if (this.start) {
+					let startString = this.start
+					if (typeof this.start === 'number') {
+						startString = getDateTime(this.start, this.hideSecond)
+					}
+					[startDate, startTime] = startString.split(' ')
+					if (this.start && !dateCompare(this.start, compareStartDateString)) {
+						startDateLaterRangeStartDate = true
+						this.tempRange.startDate = startDate
+					}
+					if (this.start && !dateCompare(this.start, compareEndDateString)) {
+						startDateLaterRangeEndDate = true
+						this.tempRange.endDate = startDate
+					}
+				}
+				let endDateEarlierRangeStartDate = false
+				let endDateEarlierRangeEndDate = false
+				let endDate, endTime
+				if (this.end) {
+					let endString = this.end
+					if (typeof this.end === 'number') {
+						endString = getDateTime(this.end, this.hideSecond)
+					}
+					[endDate, endTime] = endString.split(' ')
+
+					if (this.end && !dateCompare(compareStartDateString, this.end)) {
+						endDateEarlierRangeStartDate = true
+						this.tempRange.startDate = endDate
+					}
+					if (this.end && !dateCompare(compareEndDateString, this.end)) {
+						endDateEarlierRangeEndDate = true
+						this.tempRange.endDate = endDate
+					}
+				}
+				if (!this.hasTime) {
+					start = this.displayRangeValue.startDate = this.tempRange.startDate
+					end = this.displayRangeValue.endDate = this.tempRange.endDate
+				} else {
+					if (startDateLaterRangeStartDate) {
+						this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
+					} else if (endDateEarlierRangeStartDate) {
+						this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.tempRange.startTime) {
+						this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
+					}
+
+					if (startDateLaterRangeEndDate) {
+						this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
+					} else if (endDateEarlierRangeEndDate) {
+						this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
+					}
+					if (!this.tempRange.endTime) {
+						this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
+					}
+					start = this.displayRangeValue.startDate = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					end = this.displayRangeValue.endDate = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+				if (!dateCompare(start, end)) {
+					[start, end] = [end, start]
+				}
+				this.displayRangeValue.startDate = start
+				this.displayRangeValue.endDate = end
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.pickerVisible = false
+			},
+			handleStartAndEnd(before, after, temp = false) {
+				if (!before) return
+				if (!after) after = before;
+				const type = temp ? 'tempRange' : 'range'
+				const isStartEarlierEnd = dateCompare(before, after)
+				this[type].startDate = isStartEarlierEnd ? before : after
+				this[type].endDate = isStartEarlierEnd ? after : before
+			},
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				return startDate <= endDate
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			diffDate(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				const diff = (endDate - startDate) / (24 * 60 * 60 * 1000)
+				return Math.abs(diff)
+			},
+
+			clear(needEmit = true) {
+				if (!this.isRange) {
+					this.displayValue = ''
+					this.inputDate = ''
+					this.pickerTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.displayRangeValue.startDate = ''
+					this.displayRangeValue.endDate = ''
+					this.tempRange.startDate = ''
+					this.tempRange.startTime = ''
+					this.tempRange.endDate = ''
+					this.tempRange.endTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.left && this.$refs.left.clearCalender()
+						this.$refs.right && this.$refs.right.clearCalender()
+						this.$refs.right && this.$refs.right.changeMonth('next')
+					}
+					if (needEmit) {
+						this.$emit('change', [])
+						this.$emit('input', [])
+						this.$emit('update:modelValue', [])
+					}
+				}
+			},
+
+			calendarClick(e) {
+				this.$emit('calendarClick', e)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-date {
+		width: 100%;
+		flex: 1;
+	}
+
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+		flex: 1;
+
+		.icon-calendar {
+			padding-left: 3px;
+		}
+
+		.range-separator {
+			height: 35px;
+			/* #ifndef MP */
+			padding: 0 2px;
+			/* #endif */
+			line-height: 35px;
+		}
+	}
+
+	.uni-date-x--border {
+		box-sizing: border-box;
+		border-radius: 4px;
+		border: 1px solid #e5e5e5;
+	}
+
+	.uni-date-editor--x {
+		display: flex;
+		align-items: center;
+		position: relative;
+	}
+
+	.uni-date-editor--x .uni-date__icon-clear {
+		padding-right: 3px;
+		display: flex;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		width: auto;
+		height: 35px;
+		/* #ifndef MP */
+		padding-left: 5px;
+		/* #endif */
+		position: relative;
+		flex: 1;
+		line-height: 35px;
+		font-size: 14px;
+		overflow: hidden;
+	}
+
+	.text-center {
+		text-align: center;
+	}
+
+	.uni-date__input {
+		height: 40px;
+		width: 100%;
+		line-height: 40px;
+		font-size: 14px;
+	}
+
+	.uni-date-range__input {
+		text-align: center;
+		max-width: 142px;
+	}
+
+	.uni-date-picker__container {
+		position: relative;
+	}
+
+	.uni-date-mask--pc {
+		position: fixed;
+		bottom: 0px;
+		top: 0px;
+		left: 0px;
+		right: 0px;
+		background-color: rgba(0, 0, 0, 0);
+		transition-duration: 0.3s;
+		z-index: 996;
+	}
+
+	.uni-date-single--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-range--x {
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		z-index: 999;
+		border: 1px solid #EBEEF5;
+		box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+		border-radius: 4px;
+	}
+
+	.uni-date-editor--x__disabled {
+		opacity: 0.4;
+		cursor: default;
+	}
+
+	.uni-date-editor--logo {
+		width: 16px;
+		height: 16px;
+		vertical-align: middle;
+	}
+
+	/* 添加时间 */
+	.popup-x-header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+	}
+
+	.popup-x-header--datetime {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex: 1;
+	}
+
+	.popup-x-body {
+		display: flex;
+	}
+
+	.popup-x-footer {
+		padding: 0 15px;
+		border-top-color: #F1F1F1;
+		border-top-style: solid;
+		border-top-width: 1px;
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: $uni-primary;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm-text {
+		margin-left: 20px;
+		color: $uni-primary;
+	}
+
+	.uni-date-changed {
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		flex: 1;
+	}
+
+	.uni-date-changed--time-date {
+		color: #333;
+		opacity: 0.6;
+	}
+
+	.mr-50 {
+		margin-right: 50px;
+	}
+
+	/* picker 弹出层通用的指示小三角, todo：扩展至上下左右方向定位 */
+	.uni-popper__arrow,
+	.uni-popper__arrow::after {
+		position: absolute;
+		display: block;
+		width: 0;
+		height: 0;
+		border: 6px solid transparent;
+		border-top-width: 0;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		border-bottom-color: #fff;
+	}
+</style>
diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
new file mode 100644
index 0000000..00888d2
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,421 @@
+class Calendar {
+	constructor({
+		selected,
+		startDate,
+		endDate,
+		range,
+	} = {}) {
+		// 当前日期
+		this.date = this.getDateObj(new Date()) // 当前初入日期
+		// 打点信息
+		this.selected = selected || [];
+		// 起始时间
+		this.startDate = startDate
+		// 终止时间
+		this.endDate = endDate
+		// 是否范围选择
+		this.range = range
+		// 多选状态
+		this.cleanMultipleStatus()
+		// 每周日期
+		this.weeks = {}
+		this.lastHover = false
+	}
+	/**
+	 * 设置日期
+	 * @param {Object} date
+	 */
+	setDate(date) {
+		const selectDate = this.getDateObj(date)
+		this.getWeeks(selectDate.fullDate)
+	}
+
+	/**
+	 * 清理多选状态
+	 */
+	cleanMultipleStatus() {
+		this.multipleStatus = {
+			before: '',
+			after: '',
+			data: []
+		}
+	}
+
+	setStartDate(startDate) {
+		this.startDate = startDate
+	}
+
+	setEndDate(endDate) {
+		this.endDate = endDate
+	}
+
+	getPreMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth - 1)
+		const newMonth = date.getMonth()
+		if (oldMonth !== 0 && newMonth - oldMonth === 0) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+	getNextMonthObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		const oldMonth = date.getMonth()
+		date.setMonth(oldMonth + 1)
+		const newMonth = date.getMonth()
+		if (newMonth - oldMonth > 1) {
+			date.setMonth(newMonth - 1)
+		}
+		return this.getDateObj(date)
+	}
+
+	/**
+	 * 获取指定格式Date对象
+	 */
+	getDateObj(date) {
+		date = fixIosDateFormat(date)
+		date = new Date(date)
+
+		return {
+			fullDate: getDate(date),
+			year: date.getFullYear(),
+			month: addZero(date.getMonth() + 1),
+			date: addZero(date.getDate()),
+			day: date.getDay()
+		}
+	}
+
+	/**
+	 * 获取上一个月日期集合
+	 */
+	getPreMonthDays(amount, dateObj) {
+		const result = []
+		for (let i = amount - 1; i >= 0; i--) {
+			const month = dateObj.month - 1
+			result.push({
+				date: new Date(dateObj.year, month, -i).getDate(),
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取本月日期集合
+	 */
+	getCurrentMonthDays(amount, dateObj) {
+		const result = []
+		const fullDate = this.date.fullDate
+		for (let i = 1; i <= amount; i++) {
+			const currentDate = `${dateObj.year}-${dateObj.month}-${addZero(i)}`
+			const isToday = fullDate === currentDate
+			// 获取打点信息
+			const info = this.selected && this.selected.find((item) => {
+				if (this.dateEqual(currentDate, item.date)) {
+					return item
+				}
+			})
+
+			// 日期禁用
+			let disableBefore = true
+			let disableAfter = true
+			if (this.startDate) {
+				disableBefore = dateCompare(this.startDate, currentDate)
+			}
+
+			if (this.endDate) {
+				disableAfter = dateCompare(currentDate, this.endDate)
+			}
+
+			let multiples = this.multipleStatus.data
+			let multiplesStatus = -1
+			if (this.range && multiples) {
+				multiplesStatus = multiples.findIndex((item) => {
+					return this.dateEqual(item, currentDate)
+				})
+			}
+			const checked = multiplesStatus !== -1
+
+			result.push({
+				fullDate: currentDate,
+				year: dateObj.year,
+				date: i,
+				multiple: this.range ? checked : false,
+				beforeMultiple: this.isLogicBefore(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				afterMultiple: this.isLogicAfter(currentDate, this.multipleStatus.before, this.multipleStatus.after),
+				month: dateObj.month,
+				disable: (this.startDate && !dateCompare(this.startDate, currentDate)) || (this.endDate && !dateCompare(
+					currentDate, this.endDate)),
+				isToday,
+				userChecked: false,
+				extraInfo: info
+			})
+		}
+		return result
+	}
+	/**
+	 * 获取下一个月日期集合
+	 */
+	_getNextMonthDays(amount, dateObj) {
+		const result = []
+		const month = dateObj.month + 1
+		for (let i = 1; i <= amount; i++) {
+			result.push({
+				date: i,
+				month,
+				disable: true
+			})
+		}
+		return result
+	}
+
+	/**
+	 * 获取当前日期详情
+	 * @param {Object} date
+	 */
+	getInfo(date) {
+		if (!date) {
+			date = new Date()
+		}
+		const res = this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate)
+		return res ? res : this.getDateObj(date)
+	}
+
+	/**
+	 * 比较时间是否相等
+	 */
+	dateEqual(before, after) {
+		before = new Date(fixIosDateFormat(before))
+		after = new Date(fixIosDateFormat(after))
+		return before.valueOf() === after.valueOf()
+	}
+
+	/**
+	 *  比较真实起始日期
+	 */
+
+	isLogicBefore(currentDate, before, after) {
+		let logicBefore = before
+		if (before && after) {
+			logicBefore = dateCompare(before, after) ? before : after
+		}
+		return this.dateEqual(logicBefore, currentDate)
+	}
+
+	isLogicAfter(currentDate, before, after) {
+		let logicAfter = after
+		if (before && after) {
+			logicAfter = dateCompare(before, after) ? after : before
+		}
+		return this.dateEqual(logicAfter, currentDate)
+	}
+
+	/**
+	 * 获取日期范围内所有日期
+	 * @param {Object} begin
+	 * @param {Object} end
+	 */
+	geDateAll(begin, end) {
+		var arr = []
+		var ab = begin.split('-')
+		var ae = end.split('-')
+		var db = new Date()
+		db.setFullYear(ab[0], ab[1] - 1, ab[2])
+		var de = new Date()
+		de.setFullYear(ae[0], ae[1] - 1, ae[2])
+		var unixDb = db.getTime() - 24 * 60 * 60 * 1000
+		var unixDe = de.getTime() - 24 * 60 * 60 * 1000
+		for (var k = unixDb; k <= unixDe;) {
+			k = k + 24 * 60 * 60 * 1000
+			arr.push(this.getDateObj(new Date(parseInt(k))).fullDate)
+		}
+		return arr
+	}
+
+	/**
+	 *  获取多选状态
+	 */
+	setMultiple(fullDate) {
+		if (!this.range) return
+
+		let {
+			before,
+			after
+		} = this.multipleStatus
+		if (before && after) {
+			if (!this.lastHover) {
+				this.lastHover = true
+				return
+			}
+			this.multipleStatus.before = fullDate
+			this.multipleStatus.after = ''
+			this.multipleStatus.data = []
+			this.multipleStatus.fulldate = ''
+			this.lastHover = false
+		} else {
+			if (!before) {
+				this.multipleStatus.before = fullDate
+				this.multipleStatus.after = undefined;
+				this.lastHover = false
+			} else {
+				this.multipleStatus.after = fullDate
+				if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus
+						.after);
+				} else {
+					this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus
+						.before);
+				}
+				this.lastHover = true
+			}
+		}
+		this.getWeeks(fullDate)
+	}
+
+	/**
+	 *  鼠标 hover 更新多选状态
+	 */
+	setHoverMultiple(fullDate) {
+		//抖音小程序点击会触发hover事件，需要避免一下
+		// #ifndef MP-TOUTIAO
+		if (!this.range || this.lastHover) return
+		const {
+			before
+		} = this.multipleStatus
+
+		if (!before) {
+			this.multipleStatus.before = fullDate
+		} else {
+			this.multipleStatus.after = fullDate
+			if (dateCompare(this.multipleStatus.before, this.multipleStatus.after)) {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.before, this.multipleStatus.after);
+			} else {
+				this.multipleStatus.data = this.geDateAll(this.multipleStatus.after, this.multipleStatus.before);
+			}
+		}
+		this.getWeeks(fullDate)
+		// #endif
+
+	}
+
+	/**
+	 * 更新默认值多选状态
+	 */
+	setDefaultMultiple(before, after) {
+		this.multipleStatus.before = before
+		this.multipleStatus.after = after
+		if (before && after) {
+			if (dateCompare(before, after)) {
+				this.multipleStatus.data = this.geDateAll(before, after);
+				this.getWeeks(after)
+			} else {
+				this.multipleStatus.data = this.geDateAll(after, before);
+				this.getWeeks(before)
+			}
+		}
+	}
+
+	/**
+	 * 获取每周数据
+	 * @param {Object} dateData
+	 */
+	getWeeks(dateData) {
+		const {
+			year,
+			month,
+		} = this.getDateObj(dateData)
+
+		const preMonthDayAmount = new Date(year, month - 1, 1).getDay()
+		const preMonthDays = this.getPreMonthDays(preMonthDayAmount, this.getDateObj(dateData))
+
+		const currentMonthDayAmount = new Date(year, month, 0).getDate()
+		const currentMonthDays = this.getCurrentMonthDays(currentMonthDayAmount, this.getDateObj(dateData))
+
+		const nextMonthDayAmount = 42 - preMonthDayAmount - currentMonthDayAmount
+		const nextMonthDays = this._getNextMonthDays(nextMonthDayAmount, this.getDateObj(dateData))
+
+		const calendarDays = [...preMonthDays, ...currentMonthDays, ...nextMonthDays]
+
+		const weeks = new Array(6)
+		for (let i = 0; i < calendarDays.length; i++) {
+			const index = Math.floor(i / 7)
+			if (!weeks[index]) {
+				weeks[index] = new Array(7)
+			}
+			weeks[index][i % 7] = calendarDays[i]
+		}
+
+		this.calendar = calendarDays
+		this.weeks = weeks
+	}
+}
+
+function getDateTime(date, hideSecond) {
+	return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const year = date.getFullYear()
+	const month = date.getMonth() + 1
+	const day = date.getDate()
+	return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond) {
+	date = fixIosDateFormat(date)
+	date = new Date(date)
+	const hour = date.getHours()
+	const minute = date.getMinutes()
+	const second = date.getSeconds()
+	return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+	if (num < 10) {
+		num = `0${num}`
+	}
+	return num
+}
+
+function getDefaultSecond(hideSecond) {
+	return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+	startDate = new Date(fixIosDateFormat(typeof startDate === 'string' ? startDate.trim() : startDate))
+	endDate = new Date(fixIosDateFormat(typeof endDate === 'string' ? endDate.trim() : endDate))
+	return startDate <= endDate
+}
+
+function checkDate(date) {
+	const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+	return date.match(dateReg)
+}
+//ios低版本15及以下，无法匹配 没有 ’秒‘ 时的情况，所以需要在末尾 秒 加上 问号
+const dateTimeReg = /^\d{4}-(0?[1-9]|1[012])-(0?[1-9]|[12][0-9]|3[01])( [0-5]?[0-9]:[0-5]?[0-9](:[0-5]?[0-9])?)?$/;
+
+function fixIosDateFormat(value) {
+	if (typeof value === 'string' && dateTimeReg.test(value)) {
+		value = value.replace(/-/g, '/')
+	}
+	return value
+}
+
+export {
+	Calendar,
+	getDateTime,
+	getDate,
+	getTime,
+	addZero,
+	getDefaultSecond,
+	dateCompare,
+	checkDate,
+	fixIosDateFormat
+}
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..55b8155
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,107 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.42",
+  "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择",
+  "keywords": [
+    "uni-datetime-picker",
+    "uni-ui",
+    "uniui",
+    "日期时间选择器",
+    "日期时间"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "",
+    "uni-app": "^4.07",
+    "uni-app-x": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue",
+    "darkmode": "x",
+    "i18n": "x",
+    "widescreen": "x"
+  },
+  "uni_modules": {
+    "dependencies": [
+      "uni-scss",
+      "uni-icons"
+    ],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "x",
+        "aliyun": "x",
+        "alipay": "x"
+      },
+      "client": {
+        "uni-app": {
+          "vue": {
+            "vue2": "√",
+            "vue3": "√"
+          },
+          "web": {
+            "safari": "√",
+            "chrome": "√"
+          },
+          "app": {
+            "vue": "√",
+            "nvue": "√",
+            "android": "√",
+            "ios": "√",
+            "harmony": "√"
+          },
+          "mp": {
+            "weixin": "√",
+            "alipay": "√",
+            "toutiao": "√",
+            "baidu": "√",
+            "kuaishou": "-",
+            "jd": "-",
+            "harmony": "-",
+            "qq": "√",
+            "lark": "-"
+          },
+          "quickapp": {
+            "huawei": "√",
+            "union": "√"
+          }
+        },
+        "uni-app-x": {
+          "web": {
+            "safari": "-",
+            "chrome": "-"
+          },
+          "app": {
+            "android": "-",
+            "ios": "-",
+            "harmony": "-"
+          },
+          "mp": {
+            "weixin": "-"
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/readme.md b/uni_modules/uni-datetime-picker/readme.md
new file mode 100644
index 0000000..162fbef
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/readme.md
@@ -0,0 +1,21 @@
+
+
+> `重要通知：组件升级更新 2.0.0 后，支持日期+时间范围选择，组件 ui 将使用日历选择日期，ui 变化较大，同时支持 PC 和 移动端。此版本不向后兼容，不再支持单独的时间选择（type=time）及相关的 hide-second 属性（时间选可使用内置组件 picker）。若仍需使用旧版本，可在插件市场下载*非uni_modules版本*，旧版本将不再维护`
+
+## DatetimePicker 时间选择器
+
+> **组件名：uni-datetime-picker**
+> 代码块： `uDatetimePicker`
+
+
+该组件的优势是，支持**时间戳**输入和输出（起始时间、终止时间也支持时间戳），可**同时选择**日期和时间。
+
+若只是需要单独选择日期和时间，不需要时间戳输入和输出，可使用原生的 picker 组件。
+
+**_点击 picker 默认值规则：_**
+
+- 若设置初始值 value, 会显示在 picker 显示框中
+- 若无初始值 value，则初始值 value 为当前本地时间 Date.now()， 但不会显示在 picker 显示框中
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-datetime-picker)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uview-ui/components/u-tabs/u-tabs.vue b/uni_modules/uview-ui/components/u-tabs/u-tabs.vue
index d2b3b03..70467bc 100644
--- a/uni_modules/uview-ui/components/u-tabs/u-tabs.vue
+++ b/uni_modules/uview-ui/components/u-tabs/u-tabs.vue
@@ -42,7 +42,7 @@
 								:shape="item.badge && item.badge.shape || propsBadge.shape"
 								:numberType="item.badge && item.badge.numberType || propsBadge.numberType"
 								:inverted="item.badge && item.badge.inverted || propsBadge.inverted"
-								customStyle="margin-left: 4px;"
+								:customStyle="item.badge && item.badge.customStyle || 'margin-left: 4px;'"
 							></u-badge>
 						</view>
 						<!-- #ifdef APP-NVUE -->