From 0c083b784f395eaf807afc364dd910c51fb41c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Mon, 23 Sep 2024 17:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E7=AA=97=E5=AE=9A=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js | 45 +++++++--------------------------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/main.js b/main.js
index c10f992..71c03b7 100644
--- a/main.js
+++ b/main.js
@@ -25,47 +25,14 @@ Vue.directive('enterNumber', {
     }
 });
 
-// 全局计时
-// Vue.prototype.$globalData = {
-//   timer: null,
-//   timerDuration: 20, // 假设是60秒
-//   startTimer: function() {
-//     const self = this;
-//     self.timer = setInterval(function() {
-//       self.timerDuration--;
-//       console.log('剩余时间：' + self.timerDuration + '秒');
-//       if (self.timerDuration <= 0) {
-//         clearInterval(self.timer);
-// 		self.timerDuration = 20;
-//         console.log('计时器结束1');
-// 		uni.showModal({
-// 			title: '提示',
-// 			showCancel: false,
-// 			content: '路线锁定未释放，请操作完成再退出！',
-// 			success: (res) => {
-// 				if (res.confirm) {
-// 					Vue.prototype.$globalData.startTimer()
-// 				}
-// 			}
-// 		})
-//       }
-//     }, 1000);
-//   },
-//   stopTimer: function() {
-//     if (this.timer) {
-//       clearInterval(this.timer);
-// 	  console.log('计时器结束2');
-//       this.timer = null;
-// 	  this.timerDuration = 20;
-//     }
-//   }
-// };
 Vue.prototype.$globalData = {
   timer: null,
+  timerDuration: 900000,
   startTimer: function() {
     const self = this;
     self.timer = setTimeout(function() {
       clearTimeout(self.timer);
+	  self.timer = null;
       // console.log('延时器结束1');
       uni.showModal({
       	title: '提示',
@@ -73,17 +40,19 @@ Vue.prototype.$globalData = {
       	content: '路线锁定未释放，请操作完成再退出！',
       	success: (res) => {
       		if (res.confirm) {
-      			Vue.prototype.$globalData.startTimer()
+				self.timerDuration = 30000;
+      			Vue.prototype.$globalData.startTimer();
       		}
       	}
       })
-    }, 900000);
+    }, self.timerDuration);
   },
   stopTimer: function() {
     if (this.timer) {
       clearTimeout(this.timer);
+	  this.timer = null;
 	  // console.log('延时器结束2');
-      this.timer = null;
+	  this.timerDuration = 900000;
     }
   }
 };