Merge branch 'master' of github.com:dcloudio/uni-app

fang-kang · Nov 11, 2018 · 777b912 · 777b912
2 parents 05c852d + 6a820f0
commit 777b912
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/examples/hello-uniapp/README.md b/examples/hello-uniapp/README.md
@@ -1,5 +1,5 @@
 # hello-uniapp
 
 ## 注意事项
-* 运行本示例需要HBuilderX 0.1.49版本（或以上版本）
-* [uni-app 尺寸单位更改及历史版本兼容说明](http://ask.dcloud.net.cn/article/35014)
+* 运行本示例需要HBuilderX 1.1.0.20181030版本（或以上版本）
+* [uni-app 尺寸单位更改及历史版本兼容说明](http://ask.dcloud.net.cn/article/35014)
diff --git a/examples/hello-uniapp/pages/template/countdown/countdown.vue b/examples/hello-uniapp/pages/template/countdown/countdown.vue
@@ -20,9 +20,9 @@
 	//模拟3个时间
 	var dateObj = new Date();
 	var currentTime = dateObj.getTime();
-	var timer1 = formatDateTime((currentTime + 1000 * 200));
-	var timer2 = formatDateTime((currentTime + 1000 * 300));
-	var timer3 = formatDateTime((currentTime + 1000 * 500));
+	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);