From 2ca4445107856a1bafa4f5d8d863272815b3f135 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Fri, 8 Dec 2023 16:28:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BD=AE=E8=AF=A2=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pages/timeAcupoint/timeAcupoint.vue b/pages/timeAcupoint/timeAcupoint.vue
index 7b95f54..080c972 100644
--- a/pages/timeAcupoint/timeAcupoint.vue
+++ b/pages/timeAcupoint/timeAcupoint.vue
@@ -188,7 +188,7 @@
 			this.pageTime.increments =  0
 			clearInterval(this.myDingshi)
 			clearTimeout(this.myInterval);
-			console.log('隐藏页面',this.myInterval)
+			console.log('隐藏页面', this.myInterval, this.myDingshi)
 		},
 		onShow() {
 			// console.log('全局hours',this.$getHours.hourNumber,this.$getHours.minuteNumber)
@@ -196,39 +196,28 @@
 			this.pageTime.hour = mydate.getHours()
 			this.pageTime.minute =  mydate.getMinutes()
 			console.log('全局hours', this.pageTime.hour,this.pageTime.minute)
-			this.pageTime.increments =  42 - this.pageTime.minute
+			this.pageTime.increments =  60 - 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)
+					},60 * 60000)
 				}, this.pageTime.increments * 60000)
-			}else{
-				// 正好是0分
-				// this.myInterval = setTimeout(() => {
-				// 	this.autoChange()
-				// }, 60 * 60000)
-				this.myDingshi = setInterval(() => {
-					console.log('直接进入轮询')
-					this.autoChange()
-				},10000)
 			}
 		},
 		onHide() {
 			clearTimeout(this.myInterval);
 			clearInterval(this.myDingshi)
-			console.log('清除定时器',this.myInterval)
+			console.log('清除定时器',this.myInterval, this.myDingshi)
 			//this.myInterval = null
-		
 		},
 		methods: {
 			scroll: function(e) {},
 			autoChange(){
-				console.log()
+				// console.log()
 				let da = new Date().toISOString().slice(0, 10)
 				this.timestamp = new Date(da).getTime()
 				this.dateToString = formatDateTime(new Date()), // 字符串格式的日期