diff --git a/docs/demos/index.js b/docs/demos/index.js
index a3c210b92..8e85dba4b 100644
--- a/docs/demos/index.js
+++ b/docs/demos/index.js
@@ -26,6 +26,7 @@ export default {
'address-list': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/address-list'), 'address-list')), 'address-list')),
'area': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/area'), 'area')), 'area')),
'badge': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/badge'), 'badge')), 'badge')),
+ 'built-in-style': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/built-in-style'), 'built-in-style')), 'built-in-style')),
'button': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/button'), 'button')), 'button')),
'card': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/card'), 'card')), 'card')),
'cell-swipe': asyncWrapper(r => require.ensure([], () => r(componentWrapper(require('./views/cell-swipe'), 'cell-swipe')), 'cell-swipe')),
diff --git a/docs/demos/views/built-in-style.vue b/docs/demos/views/built-in-style.vue
new file mode 100644
index 000000000..1c1a6a670
--- /dev/null
+++ b/docs/demos/views/built-in-style.vue
@@ -0,0 +1,85 @@
+
+
+
+ {{ $t('text') }}
+
+
+
+
+
+
+
+
+
+
+ Fade
+
+
+
+ Slide Bottom
+
+
+
+
+
+
+
+
+
diff --git a/docs/demos/views/coupon.vue b/docs/demos/views/coupon.vue
index 05d94ce14..d88d3a3da 100644
--- a/docs/demos/views/coupon.vue
+++ b/docs/demos/views/coupon.vue
@@ -115,7 +115,7 @@ export default {
});
},
randomId(max = 999999) {
- return Math.floor(Math.random() * max) + 1
+ return Math.floor(Math.random() * max) + 1;
}
}
};
diff --git a/docs/markdown/en-US/built-in-style.md b/docs/markdown/en-US/built-in-style.md
new file mode 100644
index 000000000..b2192ac72
--- /dev/null
+++ b/docs/markdown/en-US/built-in-style.md
@@ -0,0 +1,48 @@
+## Built-in Style
+Vant contains some common styles that can be used directly by the className.
+
+### Text ellipsis
+When the text content length exceeds the maximum container width, the excess text is automatically omitted.
+
+```html
+
+ This is a paragraph of 250px width limit, the back will be omitted.
+
+```
+
+### Hairline
+Add 1px border under the Retina screen for the element, based on a pseudo element.
+
+```html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+### Animation
+
+```html
+
+
+ Fade
+
+
+
+
+ Fade
+
+```
\ No newline at end of file
diff --git a/docs/markdown/en-US/coupon.md b/docs/markdown/en-US/coupon.md
index 8c3f9a091..ae927e837 100644
--- a/docs/markdown/en-US/coupon.md
+++ b/docs/markdown/en-US/coupon.md
@@ -107,8 +107,8 @@ export default {
| discount | Discount | `Number` |
| denominations | Denominations | `Number` |
| origin_condition | Condition | `Number` |
-| start_at | Start time | `Number` |
-| end_at | End time | `Number` |
+| start_at | Start time (Timestmap, unit second) | `Number` |
+| end_at | End time (Timestmap, unit second) | `Number` |
| reason | Unavailable reason | `String` |
| value | Value | `Number` |
diff --git a/docs/markdown/index.js b/docs/markdown/index.js
index e5108c2a8..16830af2c 100644
--- a/docs/markdown/index.js
+++ b/docs/markdown/index.js
@@ -18,6 +18,7 @@ export default {
'zh-CN/address-list': wrapper(r => require.ensure([], () => r(require('./zh-CN/address-list.md')), 'zh-CN/address-list')),
'zh-CN/area': wrapper(r => require.ensure([], () => r(require('./zh-CN/area.md')), 'zh-CN/area')),
'zh-CN/badge': wrapper(r => require.ensure([], () => r(require('./zh-CN/badge.md')), 'zh-CN/badge')),
+ 'zh-CN/built-in-style': wrapper(r => require.ensure([], () => r(require('./zh-CN/built-in-style.md')), 'zh-CN/built-in-style')),
'zh-CN/button': wrapper(r => require.ensure([], () => r(require('./zh-CN/button.md')), 'zh-CN/button')),
'zh-CN/card': wrapper(r => require.ensure([], () => r(require('./zh-CN/card.md')), 'zh-CN/card')),
'zh-CN/cell-swipe': wrapper(r => require.ensure([], () => r(require('./zh-CN/cell-swipe.md')), 'zh-CN/cell-swipe')),
@@ -72,6 +73,7 @@ export default {
'en-US/address-list': wrapper(r => require.ensure([], () => r(require('./en-US/address-list.md')), 'en-US/address-list')),
'en-US/area': wrapper(r => require.ensure([], () => r(require('./en-US/area.md')), 'en-US/area')),
'en-US/badge': wrapper(r => require.ensure([], () => r(require('./en-US/badge.md')), 'en-US/badge')),
+ 'en-US/built-in-style': wrapper(r => require.ensure([], () => r(require('./en-US/built-in-style.md')), 'en-US/built-in-style')),
'en-US/button': wrapper(r => require.ensure([], () => r(require('./en-US/button.md')), 'en-US/button')),
'en-US/card': wrapper(r => require.ensure([], () => r(require('./en-US/card.md')), 'en-US/card')),
'en-US/cell-swipe': wrapper(r => require.ensure([], () => r(require('./en-US/cell-swipe.md')), 'en-US/cell-swipe')),
diff --git a/docs/markdown/zh-CN/built-in-style.md b/docs/markdown/zh-CN/built-in-style.md
new file mode 100644
index 000000000..c779ef945
--- /dev/null
+++ b/docs/markdown/zh-CN/built-in-style.md
@@ -0,0 +1,47 @@
+## 内置样式
+Vant 中默认包含了一些常用样式,可以直接通过 className 的方式使用。
+
+### 文字省略
+当文本内容长度超过容器最大宽度时,自动省略多余的文本。
+
+```html
+这是一段宽度限制 250px 的文字,后面的内容会省略
+```
+
+### 1px 边框
+为元素添加 Retina 屏幕下的 1px 边框(即 hairline),基于伪类 transform 实现。
+
+```html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+```
+
+### 动画
+可以通过 `transition` 组件使用内置的动画
+
+```html
+
+
+ Fade
+
+
+
+
+ Fade
+
+```
\ No newline at end of file
diff --git a/docs/markdown/zh-CN/coupon.md b/docs/markdown/zh-CN/coupon.md
index dac310fcc..55c089fa5 100644
--- a/docs/markdown/zh-CN/coupon.md
+++ b/docs/markdown/zh-CN/coupon.md
@@ -110,8 +110,7 @@ export default {
| discount | 折扣(0为满减券)88=>8.8折 | `Number` |
| denominations | 面值(0为折扣券)单位分 | `Number` |
| origin_condition | 满减条件(0为无门槛,满XX元可用)单位分 | `Number` |
-| start_at | 卡有效开始时间 | `Number` |
-| end_at | 卡失效日期 | `Number` |
+| start_at | 卡有效开始时间 (时间戳, 单位秒) | `Number` |
+| end_at | 卡失效日期 (时间戳, 单位秒) | `Number` |
| reason | 不可用原因 | `String` |
| value | 订单优惠金额,单位分 | `Number` |
-
diff --git a/docs/src/WapApp.vue b/docs/src/WapApp.vue
index a8ac5faa2..1155dadf2 100644
--- a/docs/src/WapApp.vue
+++ b/docs/src/WapApp.vue
@@ -6,7 +6,6 @@
class="van-doc-nav-bar"
:title="title"
left-arrow
- :left-text="$t('back')"
@click-left="onBack"
/>
@@ -14,13 +13,11 @@