From 320a7a6983607b48a81516b669887a2fdeea5b94 Mon Sep 17 00:00:00 2001
From: hulinneil <1289739946@qq.com>
Date: Thu, 15 Nov 2018 10:56:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=80=92=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=8F=8A=E7=A4=BA=E4=BE=8B=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E9=87=8D=E7=BD=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hello-uniapp/components/graceCountd.vue   |  10 +-
 .../pages/template/countdown/countdown.vue    | 103 +++++++++++-------
 2 files changed, 72 insertions(+), 41 deletions(-)

diff --git a/examples/hello-uniapp/components/graceCountd.vue b/examples/hello-uniapp/components/graceCountd.vue
index 767dd23c3..26e1224aa 100755
--- a/examples/hello-uniapp/components/graceCountd.vue
+++ b/examples/hello-uniapp/components/graceCountd.vue
@@ -7,7 +7,7 @@
 		<view class="grace-countdown-numbers" :style="{borderColor:borderColor, color:fontColor, background:bgrColor}">{{s}}</view>
 	</view>
 </template>
-<script>
+<script>
 export default {
 	name: "graceCountd",
 	props: {
@@ -33,7 +33,8 @@ export default {
 		}
 	},
 	data() {
-		return {
+		return {
+            setTime:null,
 			h: '00',
 			i: '00',
 			s: '00',
@@ -62,9 +63,12 @@ export default {
 			this.setInterValFunc(this);
 		}
 	},
+    beforeDestroy(){
+        clearInterval(this.setTime)
+    },
 	methods: {
 		setInterValFunc:function(obj){
-			setInterval(function(){ obj.countDown(obj);}, 1000);
+			this.setTime = setInterval(function(){ obj.countDown(obj);}, 1000);
 		},
 		countDown: function (self){
 			var leftTime = self.leftTime - new Date();
diff --git a/examples/hello-uniapp/pages/template/countdown/countdown.vue b/examples/hello-uniapp/pages/template/countdown/countdown.vue
index 14eafea70..3eab06426 100755
--- a/examples/hello-uniapp/pages/template/countdown/countdown.vue
+++ b/examples/hello-uniapp/pages/template/countdown/countdown.vue
@@ -17,46 +17,73 @@
 </template>
 <script>
 	import graceCountd from "../../../components/graceCountd.vue";
-	//模拟3个时间
-	var dateObj = new Date();
-	var currentTime = dateObj.getTime();
-	var timer1 = formatDateTime((currentTime + 1000 * 2000));
-	var timer2 = formatDateTime((currentTime + 1000 * 3000));
-	var timer3 = formatDateTime((currentTime + 1000 * 5000));
-	//时间戳 转 YY-mm-dd HH:ii:ss 
-	function formatDateTime(inputTime){
-		  var date = new Date(inputTime);
-		  var y = date.getFullYear();
-		  var m = date.getMonth() + 1;
-		  m = m < 10 ? ('0' + m) : m;
-		  var d = date.getDate();
-		  d = d < 10 ? ('0' + d) : d;
-		  var h = date.getHours();
-		  h = h < 10 ? ('0' + h) : h;
-		  var minute = date.getMinutes();
-		  var second = date.getSeconds();
-		  minute = minute < 10 ? ('0' + minute) : minute;
-		  second = second < 10 ? ('0' + second) : second;
-		  return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
-	};
 	export default {
-	data(){
-		return {
-			title : '倒计时',
-			timer1 : timer1, 
-			timer2 : timer2, 
-			timer3 : timer3
-		}
-	},
-	components:{
-		graceCountd
+		data() {
+			var dateObj = new Date();
+			var currentTime = dateObj.getTime();
+			var timer1 = this.formatDateTime((currentTime + 1000 * 2000));
+			var timer2 = this.formatDateTime((currentTime + 1000 * 3000));
+			var timer3 = this.formatDateTime((currentTime + 1000 * 5000));
+			return {
+				title: '倒计时',
+				timer1: timer1,
+				timer2: timer2,
+				timer3: timer3
+			}
+		},
+		components: {
+			graceCountd
+		},
+		methods: {
+			formatDateTime(inputTime) { //时间戳 转 YY-mm-dd HH:ii:ss 
+				var date = new Date(inputTime);
+				var y = date.getFullYear();
+				var m = date.getMonth() + 1;
+				m = m < 10 ? ('0' + m) : m;
+				var d = date.getDate();
+				d = d < 10 ? ('0' + d) : d;
+				var h = date.getHours();
+				h = h < 10 ? ('0' + h) : h;
+				var minute = date.getMinutes();
+				var second = date.getSeconds();
+				minute = minute < 10 ? ('0' + minute) : minute;
+				second = second < 10 ? ('0' + second) : second;
+				return y + '-' + m + '-' + d + ' ' + h + ':' + minute + ':' + second;
+			}
+		},
 	}
-}
 </script>
 
 <style>
-view{display:flex; width:100%; flex-wrap:wrap; justify-content:center;}
-.uni-countdown{padding:2rpx 0; flex-wrap:nowrap; justify-content:center;}
-.uni-countdown-splitor{width:auto !important; justify-content:center; line-height:44upx; padding:0 5upx;}
-.uni-countdown-numbers{line-height:44upx; width:auto !important; padding:0 10upx; justify-content:center; height:44upx; border-radius:8upx; margin:0 5upx; border:1px solid #000000; font-size:22upx;}
-</style>
\ No newline at end of file
+	view {
+		display: flex;
+		width: 100%;
+		flex-wrap: wrap;
+		justify-content: center;
+	}
+
+	.uni-countdown {
+		padding: 2rpx 0;
+		flex-wrap: nowrap;
+		justify-content: center;
+	}
+
+	.uni-countdown-splitor {
+		width: auto !important;
+		justify-content: center;
+		line-height: 44upx;
+		padding: 0 5upx;
+	}
+
+	.uni-countdown-numbers {
+		line-height: 44upx;
+		width: auto !important;
+		padding: 0 10upx;
+		justify-content: center;
+		height: 44upx;
+		border-radius: 8upx;
+		margin: 0 5upx;
+		border: 1px solid #000000;
+		font-size: 22upx;
+	}
+</style>
-- 
GitLab