merge limo to daylight

2026-09-22 16:37:00 +08:00
parent 0c92868836
commit a7359d443b
73 changed files with 11614 additions and 1040 deletions
@@ -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; /* 深灰提升阅读舒适度 */