diff --git a/docs/examples-docs/actionsheet.md b/docs/examples-docs/actionsheet.md index 1f9d28d42..d560ccf69 100644 --- a/docs/examples-docs/actionsheet.md +++ b/docs/examples-docs/actionsheet.md @@ -83,6 +83,7 @@ Vue.component(ActionSheet.name, ActionSheet); ```js import { ActionSheet } from 'vant'; +import 'vant/lib/vant-css/actionSheet.css'; export default { components: { diff --git a/docs/examples-docs/badge.md b/docs/examples-docs/badge.md index baadb3ed4..509532fa9 100644 --- a/docs/examples-docs/badge.md +++ b/docs/examples-docs/badge.md @@ -53,6 +53,7 @@ Vue.component(BadgeGroup.name, BadgeGroup); ```js import { Badge, BadgeGroup } from 'vant'; +import 'vant/lib/vant-css/badge.css'; export default { components: { diff --git a/docs/examples-docs/button.md b/docs/examples-docs/button.md index d0f921f7b..c1504e9bf 100644 --- a/docs/examples-docs/button.md +++ b/docs/examples-docs/button.md @@ -44,6 +44,7 @@ Vue.component(Button.name, Button); ```js import { Button } from 'vant'; +import 'vant/lib/vant-css/button.css'; export default { components: { @@ -170,7 +171,7 @@ export default { |-----------|-----------|-----------|-------------|-------------| | type | 按钮类型 | `string` | `default` | `primary`, `danger` | | size | 按钮尺寸 | `string` | `normal` | `large`, `small`, `mini` | -| tag | 按钮标签 | `string` | `button` | `a`, `span`, ... | +| tag | 按钮标签 | `string` | `button` | 任何有意义的`html`标签, 如`a`, `span`等 | | diabled | 按钮是否禁用 | `boolean` | `false` | | | block | 按钮是否显示为块级元素 | `boolean` | `false` | | | bottomAction | 按钮是否显示为底部行动按钮,一般显示在页面底部,有特殊样式 | `boolean` | `false` | | diff --git a/docs/examples-docs/card.md b/docs/examples-docs/card.md index 6bca59cd6..ac01a52ae 100644 --- a/docs/examples-docs/card.md +++ b/docs/examples-docs/card.md @@ -22,6 +22,7 @@ Vue.component(Card.name, Card); ```js import { Card } from 'vant'; +import 'vant/lib/vant-css/card.css'; export default { components: { diff --git a/docs/examples-docs/cell.md b/docs/examples-docs/cell.md index 7a6ba5642..90e090c03 100644 --- a/docs/examples-docs/cell.md +++ b/docs/examples-docs/cell.md @@ -20,9 +20,10 @@ export default { ```js import Vue from 'vue'; -import { Cell } from 'vant'; +import { Cell, CellGroup } from 'vant'; import 'vant/lib/vant-css/cell.css'; +Vue.component(CellGroup.name, CellGroup); Vue.component(Cell.name, Cell); ``` @@ -32,9 +33,11 @@ Vue.component(Cell.name, Cell); ```js import { Cell } from 'vant'; +import 'vant/lib/vant-css/cell.css'; export default { components: { + 'van-cell-group': CellGroup, 'van-cell': Cell } }; @@ -44,6 +47,8 @@ export default { #### 基础用法 +你可以将`van-cell-group`组件看成一个容器即可。 + :::demo 基础用法 ```html diff --git a/docs/examples-docs/checkbox.md b/docs/examples-docs/checkbox.md index 641378e75..1a0bdf894 100644 --- a/docs/examples-docs/checkbox.md +++ b/docs/examples-docs/checkbox.md @@ -60,6 +60,7 @@ Vue.component(CheckboxGroup.name, CheckboxGroup); ```js import { Checkbox, CheckboxGroup } from 'vant'; +import 'vant/lib/vant-css/checkbox.css'; export default { components: { diff --git a/docs/examples-docs/field.md b/docs/examples-docs/field.md index 5ea2fd29d..c2223ff99 100644 --- a/docs/examples-docs/field.md +++ b/docs/examples-docs/field.md @@ -44,6 +44,7 @@ Vue.component(Field.name, Field); ```js import { Field } from 'vant'; +import 'vant/lib/vant-css/field.css'; export default { components: { diff --git a/docs/examples-docs/icon.md b/docs/examples-docs/icon.md index d5d7b634c..1ae87da18 100644 --- a/docs/examples-docs/icon.md +++ b/docs/examples-docs/icon.md @@ -38,6 +38,7 @@ Vue.component(Icon.name, Icon); ```js import { Icon } from 'vant'; +import 'vant/lib/vant-css/icon.css'; export default { components: { diff --git a/docs/examples-docs/layout.md b/docs/examples-docs/layout.md index 049fd59ed..b8364ff62 100644 --- a/docs/examples-docs/layout.md +++ b/docs/examples-docs/layout.md @@ -56,6 +56,8 @@ Vue.component(Col.name, Col); ```js import { Row, Col } from 'vant'; +import 'vant/lib/vant-css/col.css'; +import 'vant/lib/vant-css/row.css'; export default { components: { @@ -106,7 +108,7 @@ Layout组件提供了`24列栅格`,通过在`van-col`上添加`span`属性设 :::demo 在列元素之间增加间距 ```html - +
span: 8
diff --git a/docs/examples-docs/loading.md b/docs/examples-docs/loading.md index 2348d991c..0f0461aa8 100644 --- a/docs/examples-docs/loading.md +++ b/docs/examples-docs/loading.md @@ -44,6 +44,7 @@ Vue.component(Loading.name, Loading); ```js import { Loading } from 'vant'; +import 'vant/lib/vant-css/loading.css'; export default { components: { diff --git a/docs/examples-docs/panel.md b/docs/examples-docs/panel.md index 6be2130e8..082b9fbfb 100644 --- a/docs/examples-docs/panel.md +++ b/docs/examples-docs/panel.md @@ -53,6 +53,7 @@ Vue.component(Panel.name, Panel); ```js import { Panel } from 'vant'; +import 'vant/lib/vant-css/panel.css'; export default { components: { diff --git a/docs/examples-docs/picker.md b/docs/examples-docs/picker.md index 636d833c0..4c8d30f5d 100644 --- a/docs/examples-docs/picker.md +++ b/docs/examples-docs/picker.md @@ -59,6 +59,7 @@ Vue.component(Picker.name, Picker); ```js import { Picker } from 'vant'; +import 'vant/lib/vant-css/picker.css'; export default { components: { diff --git a/docs/examples-docs/popup.md b/docs/examples-docs/popup.md index 79b45e690..171bcd4ee 100644 --- a/docs/examples-docs/popup.md +++ b/docs/examples-docs/popup.md @@ -102,6 +102,7 @@ Vue.component(Popup.name, Popup); ```js import { Popup } from 'vant'; +import 'vant/lib/vant-css/popup.css'; export default { components: { diff --git a/docs/examples-docs/progress.md b/docs/examples-docs/progress.md index 62547273d..084b6cd21 100644 --- a/docs/examples-docs/progress.md +++ b/docs/examples-docs/progress.md @@ -34,6 +34,7 @@ Vue.component(Progress.name, Progress); ```js import { Progress } from 'vant'; +import 'vant/lib/vant-css/progress.css'; export default { components: { diff --git a/docs/examples-docs/quantity.md b/docs/examples-docs/quantity.md index 7f43f239e..f1933d182 100644 --- a/docs/examples-docs/quantity.md +++ b/docs/examples-docs/quantity.md @@ -47,6 +47,7 @@ Vue.component(Quantity.name, Quantity); ```js import { Quantity } from 'vant'; +import 'vant/lib/vant-css/quantity.css'; export default { components: { diff --git a/docs/examples-docs/radio.md b/docs/examples-docs/radio.md index 8a3918c5f..277bb9e57 100644 --- a/docs/examples-docs/radio.md +++ b/docs/examples-docs/radio.md @@ -50,6 +50,7 @@ Vue.component(RadioGroup.name, RadioGroup); ```js import { Radio, RadioGroup } from 'vant'; +import 'vant/lib/vant-css/radio.css'; export default { components: { diff --git a/docs/examples-docs/search.md b/docs/examples-docs/search.md index bf03ec823..342e6c44a 100644 --- a/docs/examples-docs/search.md +++ b/docs/examples-docs/search.md @@ -38,6 +38,7 @@ Vue.component(Search.name, Search); ```js import { Search } from 'vant'; +import 'vant/lib/vant-css/search.css'; export default { components: { diff --git a/docs/examples-docs/steps.md b/docs/examples-docs/steps.md index 0fb25b828..eebe46708 100644 --- a/docs/examples-docs/steps.md +++ b/docs/examples-docs/steps.md @@ -53,6 +53,7 @@ Vue.component(Step.name, Step); ```js import { Steps, Step } from 'vant'; +import 'vant/lib/vant-css/steps.css'; export default { components: { @@ -97,7 +98,7 @@ export default { #### 只显示步骤条 -当你不设置`title`或`description`属性时,就会🈯️显示步骤条,而没有步骤的详细信息。 +当你不设置`title`或`description`属性时,就会只显示步骤条,而没有步骤的详细信息。 :::demo 只显示步骤条 ```html @@ -110,6 +111,22 @@ export default { ``` ::: +### 高级用法 + +可以使用具名`slot`增加自定义内容,其中包含`icon`和`message-extra`。 + +:::demo 高级用法 +```html + + +

流程

+ 买家下单 + 商家接单 + 买家提货 + 交易完成 +
+``` +::: ### Steps API diff --git a/docs/examples-docs/swipe.md b/docs/examples-docs/swipe.md index 3e5b13a33..3acc26c7a 100644 --- a/docs/examples-docs/swipe.md +++ b/docs/examples-docs/swipe.md @@ -60,6 +60,7 @@ Vue.component(SwipeItem.name, SwipeItem); ```js import { Swipe, SwipeItem } from 'vant'; +import 'vant/lib/vant-css/swipe.css'; export default { components: { diff --git a/docs/examples-docs/switch.md b/docs/examples-docs/switch.md index d23df7d6c..11a18a0aa 100644 --- a/docs/examples-docs/switch.md +++ b/docs/examples-docs/switch.md @@ -67,6 +67,7 @@ Vue.component(Switch.name, Switch); ```js import { Switch } from 'vant'; +import 'vant/lib/vant-css/switch.css'; export default { components: { diff --git a/docs/examples-docs/tab.md b/docs/examples-docs/tab.md index 3d4dc9030..c8ba3ba11 100644 --- a/docs/examples-docs/tab.md +++ b/docs/examples-docs/tab.md @@ -74,6 +74,7 @@ Vue.component(Tabs.name, Tabs); ```js import { Tab, Tabs } from 'vant'; +import 'vant/lib/vant-css/tab.css'; export default { components: { @@ -103,7 +104,7 @@ export default { #### active特定tab -可以在`van-tabs`上设置`active`为对应`tab`的索引(从0开始,即0代表第一个)即可激活对应`tab`。 +可以在`van-tabs`上设置`active`为对应`tab`的索引(从0开始,即0代表第一个)即可激活对应`tab`,默认为0。 :::demo 基础用法 ```html @@ -117,6 +118,20 @@ export default { ``` ::: +### 设置切换tab的动画时间 + +通过设置`duration`来指定时间,默认为0.3s,只接受`Number`类型参数。 + +:::demo 设置切换tab的动画时间 +```html + + 内容一 + 内容二 + 内容三 + +``` +::: + #### 禁用tab 在对应的`van-tab`上设置`disabled`属性即可,如果需要监听禁用事件,可以监听`disabled`事件。 @@ -124,7 +139,7 @@ export default { :::demo 禁用tab ```html - 内容一 + 内容一 内容二 内容三 内容四 @@ -235,6 +250,7 @@ export default { | classtype | 两种UI | `string` | `line` | `line`, `card` | | active | 默认激活的tab | `string`, `number` | `0` | | | navclass | tabs的内部nav上的自定义classname | `string` | | | +| duration | 切换tab的动画时间 | `number` | `0.3` | | | ### van-tab API diff --git a/docs/examples-docs/tag.md b/docs/examples-docs/tag.md index eb2f4b518..f6ca4d596 100644 --- a/docs/examples-docs/tag.md +++ b/docs/examples-docs/tag.md @@ -32,6 +32,7 @@ Vue.component(Tag.name, Tag); ```js import { Tag } from 'vant'; +import 'vant/lib/vant-css/tag.css'; export default { components: { @@ -44,18 +45,17 @@ export default { #### 基础用法 -`Tag`目前有三种类型,`danger`、`success`、`primary`,它们分别显示为红色,绿色和蓝色,你也可以加上自定义的类,为它们加上其他的颜色。 +`Tag`默认是灰色,另外还有有三种类型,`danger`、`success`、`primary`,它们分别显示为红色,绿色和蓝色,你也可以加上自定义的类,为它们加上其他的颜色。 :::demo 基础用法 ```html
返现 - 返现
返现 - 四字标签 - + 四字标签 +
``` ::: @@ -66,6 +66,10 @@ export default { :::demo 高级用法 ```html +
+ 返现 + 返现 +
返现 返现 @@ -78,9 +82,6 @@ export default { 返现 返现
-
- 返现 -
``` ::: diff --git a/docs/examples-docs/uploader.md b/docs/examples-docs/uploader.md index 3123e65c8..d3fe3bb71 100644 --- a/docs/examples-docs/uploader.md +++ b/docs/examples-docs/uploader.md @@ -37,6 +37,7 @@ Vue.component(Uploader.name, Uploader); ```js import { Uploader } from 'vant'; +import 'vant/lib/vant-css/uploader.css'; export default { components: { diff --git a/docs/src/nav.config.js b/docs/src/nav.config.js index a8ee5ae09..b64adcc35 100644 --- a/docs/src/nav.config.js +++ b/docs/src/nav.config.js @@ -21,6 +21,10 @@ module.exports = { { "groupName": "基础组件", "list": [ + { + "path": "/layout", + "title": "Layout 布局" + }, { "path": "/button", "title": "Button 按钮" @@ -37,21 +41,17 @@ module.exports = { "path": "/progress", "title": "Progress 进度条" }, - { - "path": "/panel", - "title": "Panel 面板" - }, { "path": "/card", "title": "Card 图文组件" }, { - "path": "/loading", - "title": "Loading 加载" + "path": "/panel", + "title": "Panel 面板" }, { - "path": "/layout", - "title": "Layout 布局" + "path": "/loading", + "title": "Loading 加载" }, { "path": "/steps", diff --git a/packages/steps/src/steps.vue b/packages/steps/src/steps.vue index ac5f790fa..2fd212148 100644 --- a/packages/steps/src/steps.vue +++ b/packages/steps/src/steps.vue @@ -1,7 +1,7 @@