From 1c199ffe38ab1e07e92df130b73bcc8c3621744f Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 8 Dec 2023 14:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/timeAcupoint/timeAcupoint.vue | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pages/timeAcupoint/timeAcupoint.vue b/pages/timeAcupoint/timeAcupoint.vue
index fa89c7d..7b95f54 100644
--- a/pages/timeAcupoint/timeAcupoint.vue
+++ b/pages/timeAcupoint/timeAcupoint.vue
@@ -170,7 +170,8 @@
 					minute:0,
 					increments:0 // 分钟数距离整点的差额
 				},
-				 myInterval:null, // 定时器				
+				 myInterval:null, // 定时器
+				myDingshi: null,
 			}
 		},
 		onLoad() {			
@@ -185,7 +186,7 @@
 			this.pageTime.hour = 0
 			this.pageTime.minute = 0
 			this.pageTime.increments =  0
-			// clearInterval(this.myInterval)
+			clearInterval(this.myDingshi)
 			clearTimeout(this.myInterval);
 			console.log('隐藏页面',this.myInterval)
 		},
@@ -195,22 +196,31 @@
 			this.pageTime.hour = mydate.getHours()
 			this.pageTime.minute =  mydate.getMinutes()
 			console.log('全局hours', this.pageTime.hour,this.pageTime.minute)
-			this.pageTime.increments =  60 - this.pageTime.minute
+			this.pageTime.increments =  42 - this.pageTime.minute
 			console.log('距离整点', this.pageTime.increments, this.pageTime.increments * 60000, '毫秒后执行')			
 			if(this.pageTime.increments > 0){
 				
 				this.myInterval = setTimeout(() => {					
 					this.autoChange()
+					this.myDingshi = setInterval(() => {
+						console.log('进入轮询')
+						this.autoChange()
+					},10000)
 				}, this.pageTime.increments * 60000)
 			}else{
 				// 正好是0分
-				this.myInterval = setTimeout(() => {
+				// this.myInterval = setTimeout(() => {
+				// 	this.autoChange()
+				// }, 60 * 60000)
+				this.myDingshi = setInterval(() => {
+					console.log('直接进入轮询')
 					this.autoChange()
-				}, 60 * 60000)
+				},10000)
 			}
 		},
 		onHide() {
 			clearTimeout(this.myInterval);
+			clearInterval(this.myDingshi)
 			console.log('清除定时器',this.myInterval)
 			//this.myInterval = null