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

examples/hello-uniapp/README.md

 # hello-uniapp
 
 ## 注意事项
-* 运行本示例需要HBuilderX 0.1.49版本（或以上版本）
-* [uni-app 尺寸单位更改及历史版本兼容说明](http://ask.dcloud.net.cn/article/35014)
\ No newline at end of file
+* 运行本示例需要HBuilderX 1.1.0.20181030版本（或以上版本）
+* [uni-app 尺寸单位更改及历史版本兼容说明](http://ask.dcloud.net.cn/article/35014)

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);