Merge branch 'v2' of https://github.com/jdf2e/nutui into v2

package.json

@@ -14,7 +14,7 @@
   "scripts": {
     "dev:demo": "cross-env NODE_ENV=development webpack-dev-server -d --open --progress --config build/webpack.demo.dev.conf.js",
     "build:demo": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.demo.build.conf.js",
-    "dev:doc": "cross-env NODE_ENV=development webpack-dev-server -d --open --progress --config build/webpack.doc.dev.conf.js",
+    "dev:doc": "cross-env NODE_ENV=development webpack-dev-server -d --open -w --progress --config build/webpack.doc.dev.conf.js",
     "dev": "npm run dev:demo",
     "dev:carefree": "cross-env NODE_ENV=carefree carefree_env=dev webpack -w --colors --progress --config build/webpack.demo.dev.conf.js",
     "build:doc": "cross-env NODE_ENV=production webpack --hide-modules --progress --config build/webpack.doc.build.conf.js",

src/packages/countdown/countdown.vue

@@ -57,7 +57,7 @@ function restTime(t) {
 };
 
 const countdownTimer = {
-  name: 'CountDown',
+  name: 'nut-countdown',
   data() {
     return {
       restTime: 0,

src/packages/countdown/demo.vue

@@ -3,31 +3,31 @@
       <h4>基本用法</h4>
       <div>
         <nut-cell>
-          <count-down slot="title" :endTime="end" />
+          <nut-countdown slot="title" :endTime="end" />
         </nut-cell>
       </div>
       <h4>显示天</h4>
       <div>
         <nut-cell>
-          <count-down slot="title" :endTime="end" showDays/>
+          <nut-countdown slot="title" :endTime="end" showDays/>
         </nut-cell>
       </div>
       <h4>以服务端的时间为准</h4>
       <div>
         <nut-cell>
-          <count-down slot="title" :startTime="serverTime" :endTime="end" />
+          <nut-countdown slot="title" :startTime="serverTime" :endTime="end" />
         </nut-cell>
       </div>
       <h4>显示为 天时分秒</h4>
       <div>
         <nut-cell>
-          <count-down slot="title" showDays showPlainText :endTime="end" />
+          <nut-countdown slot="title" showDays showPlainText :endTime="end" />
         </nut-cell>
       </div>
       <h4>控制开始和暂停的倒计时</h4>
       <div>
         <nut-cell>
-          <count-down slot="title" :endTime="end" :paused="paused" />
+          <nut-countdown slot="title" :endTime="end" :paused="paused" />
           <div slot="desc">
             <nut-button type="default" small shape="circle" @click="toggle">
               <b style="font-size: 14px;">{{paused ? 'start': 'stop'}}</b>

src/packages/countdown/doc.md

@@ -0,0 +1,63 @@
+# CountDown 倒计时
+
+## 基础用法
+
+```html
+<nut-countdown 
+    :endTime="end"  
+>
+</nut-countdown>
+```
+
+显示天
+
+```html
+<nut-countdown 
+    :endTime="end" 
+    showDays 
+>
+</nut-countdown>
+```
+
+以服务端的时间为准
+
+```html
+<nut-countdown 
+    :startTime="serverTime"
+    :endTime="end" 
+    showDays 
+>
+</nut-countdown>
+```
+
+显示为 天时分秒
+
+```html
+<nut-countdown 
+    showDays 
+    showPlainText 
+    :endTime="end" 
+>
+</nut-countdown>
+```
+
+控制开始和暂停的倒计时
+
+```html
+<nut-countdown 
+    :endTime="end" 
+    :paused="paused" 
+>
+</nut-countdown>
+```
+
+## Prop
+
+| 字段 | 说明 | 类型 | 默认值
+| ----- | ----- | ----- | -----
+| startTime | 开始时间 | String, Number | Date.now()
+| endTime | 结束时间 | String, Number | Date.now()
+| showDays | 是否显示天 | Boolean | false
+| showPlainText | 显示为纯文本 | Boolean | false
+| paused | 是否暂停 | Boolean | false
+| interval | 间隔时间 | Number | 1000