From 6c3a421bce3cdcd5705cd694938642885db605e4 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Thu, 12 Feb 2026 09:37:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 uniapps/work-app/src/App.vue |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/uniapps/work-app/src/App.vue b/uniapps/work-app/src/App.vue
index cfaebb6..deec9d2 100644
--- a/uniapps/work-app/src/App.vue
+++ b/uniapps/work-app/src/App.vue
@@ -4,7 +4,7 @@
 import { useGlobalWS } from '@/hooks/useGlobalWS.js'
 // #ifdef APP-PLUS
 import { keepAliveStart, requestIgnoreBatteryOptimization } from '@/uni_modules/keep-app'
-import { openDialog, allowFloat,getBatteryCapacity } from '@/uni_modules/lgh-dialog'
+import { openDialog, allowFloat, getBatteryCapacity } from '@/uni_modules/lgh-dialog'
 // #endif
 
 const appStore = useAppStore()
@@ -24,11 +24,8 @@
 // testKeep()
 
 // 开启悬浮窗
-allowFloat()
+// allowFloat()
 // 假设五秒后来电
-setTimeout(() => {
-	openDialog()
-}, 5000)
 // #endif
 
 useGlobalWS()
@@ -57,9 +54,9 @@
 	// 初始化系统信息
 	appStore.initSystemInfo()
 	// #ifdef APP-PLUS
-	keepAliveStart()
+	// keepAliveStart()
 	// 请求用户允许忽略电池优化(重要:用于保活)
-	setTimeout(requestIgnoreBatteryOptimization, 2000)
+	// setTimeout(requestIgnoreBatteryOptimization, 2000)
 	// #endif
 	if (!userStore.userInfo) {
 		//不存在则跳转至登录页
@@ -106,4 +103,3 @@
 	background: transparent !important;
 }
 </style>
-

--
Gitblit v1.9.3