diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md
index ecf3fc0d2..751fc836a 100644
--- a/docs/markdown/changelog.en-US.md
+++ b/docs/markdown/changelog.en-US.md
@@ -55,7 +55,7 @@
- Cell: add less vars [\#3122](https://github.com/youzan/vant/pull/3122)
- Rate: add less vars [\#3135](https://github.com/youzan/vant/pull/3135)
- Panel: add less vars [\#3136](https://github.com/youzan/vant/pull/3136)
-- Badge: add less vars [\#3131](https://github.com/youzan/vant/pull/3131)
+- Sidebar: add less vars [\#3131](https://github.com/youzan/vant/pull/3131)
- Dialog: add less vars [\#3123](https://github.com/youzan/vant/pull/3123)
- Slider: add less vars [\#3125](https://github.com/youzan/vant/pull/3125)
- Tabbar: add less vars [\#3124](https://github.com/youzan/vant/pull/3124)
@@ -554,7 +554,7 @@ Also we have optimized the UI of the following components::
- Tab: add animated props [\#2126](https://github.com/youzan/vant/pull/2126)
- Tab: update title style [\#2120](https://github.com/youzan/vant/pull/2120)
-- Badge: update info style [\#2122](https://github.com/youzan/vant/pull/2122)
+- Sidebar: update info style [\#2122](https://github.com/youzan/vant/pull/2122)
- Radio: add checked-color prop [\#2129](https://github.com/youzan/vant/pull/2129)
- Swipe: add indicator-color prop [\#2110](https://github.com/youzan/vant/pull/2110)
- TreeSelect: support disable option [\#2107](https://github.com/youzan/vant/pull/2107)
@@ -612,7 +612,7 @@ Also we have optimized the UI of the following components::
**Improvements**
-- Badge: add change event [\#2017](https://github.com/youzan/vant/pull/2017)
+- Sidebar: add change event [\#2017](https://github.com/youzan/vant/pull/2017)
- Radio: update color [\#2018](https://github.com/youzan/vant/pull/2018)
- Checkbox: update color [\#2018](https://github.com/youzan/vant/pull/2018)
- Sku: support image preview [\#2019](https://github.com/youzan/vant/pull/2019)
@@ -710,7 +710,7 @@ Also we have optimized the UI of the following components::
**Improvements**
- Tab: upgrade style [\#1908](https://github.com/youzan/vant/pull/1908)
-- Badge: upgrade style [\#1907](https://github.com/youzan/vant/pull/1907)
+- Sidebar: upgrade style [\#1907](https://github.com/youzan/vant/pull/1907)
- Dialog: upgrade style [\#1906](https://github.com/youzan/vant/pull/1906)
- NoticeBar: upgrade style [\#1893](https://github.com/youzan/vant/pull/1893)
- Collapse: add disabled prop [\#1892](https://github.com/youzan/vant/pull/1892)
@@ -1362,7 +1362,7 @@ Also we have optimized the UI of the following components::
* fix ActionSheet bottom border missing [\#686](https://github.com/youzan/vant/pull/686)
* fix AddressEdit area not selected when area_code changed [\#680](https://github.com/youzan/vant/pull/680)
* fix Stepper value overlimit [\#691](https://github.com/youzan/vant/issues/691)
-* fix Badge info font weight when selected [\#687](https://github.com/youzan/vant/pull/687)
+* fix Sidebar info font weight when selected [\#687](https://github.com/youzan/vant/pull/687)
## [v0.12.14](https://github.com/youzan/vant/tree/v0.12.14)
@@ -1652,7 +1652,7 @@ Also we have optimized the UI of the following components::
* Search: support native input attrs [\#418](https://github.com/youzan/vant/pull/418)
* CellGroup: add 'border' prop [\#420](https://github.com/youzan/vant/pull/420)
* AddressEdit: add focus、change-area、select-search events [\#426](https://github.com/youzan/vant/pull/426)
-* Badge、CouponList、ContactCard: add active color [\#419](https://github.com/youzan/vant/pull/419)
+* Sidebar、CouponList、ContactCard: add active color [\#419](https://github.com/youzan/vant/pull/419)
**Bug Fixes**
diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index 674be9ea2..b3ae6640a 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -55,7 +55,7 @@
- Cell: 新增多个 Less 变量 [\#3122](https://github.com/youzan/vant/pull/3122)
- Rate: 新增多个 Less 变量 [\#3135](https://github.com/youzan/vant/pull/3135)
- Panel: 新增多个 Less 变量 [\#3136](https://github.com/youzan/vant/pull/3136)
-- Badge: 新增多个 Less 变量 [\#3131](https://github.com/youzan/vant/pull/3131)
+- Sidebar: 新增多个 Less 变量 [\#3131](https://github.com/youzan/vant/pull/3131)
- Dialog: 新增多个 Less 变量 [\#3123](https://github.com/youzan/vant/pull/3123)
- Slider: 新增多个 Less 变量 [\#3125](https://github.com/youzan/vant/pull/3125)
- Tabbar: 新增多个 Less 变量 [\#3124](https://github.com/youzan/vant/pull/3124)
@@ -555,7 +555,7 @@ PS: 不小心跳过了 1.4.6 版本 ^_^
- Tab: 新增 animated 属性 [\#2126](https://github.com/youzan/vant/pull/2126)
- Tab: 更新标题栏样式 [\#2120](https://github.com/youzan/vant/pull/2120)
-- Badge: 更新提示样式 [\#2122](https://github.com/youzan/vant/pull/2122)
+- Sidebar: 更新提示样式 [\#2122](https://github.com/youzan/vant/pull/2122)
- Radio: 新增 checked-color 属性 [\#2129](https://github.com/youzan/vant/pull/2129)
- Swipe: 新增 indica为r-color 属性 [\#2110](https://github.com/youzan/vant/pull/2110)
- TreeSelect: 支持禁用选项 [\#2107](https://github.com/youzan/vant/pull/2107)
@@ -616,7 +616,7 @@ PS: 不小心跳过了 1.4.6 版本 ^_^
- i18n: 支持土耳其语 [\#1998](https://github.com/youzan/vant/pull/1998)
- i18n: 支持繁体中文(台) [\#1999](https://github.com/youzan/vant/pull/1999)
- Icon: 新增 question2 图标 [\#2005](https://github.com/youzan/vant/pull/2005)
-- Badge: 新增 change 事件 [\#2017](https://github.com/youzan/vant/pull/2017)
+- Sidebar: 新增 change 事件 [\#2017](https://github.com/youzan/vant/pull/2017)
- Switch: 新增 active-color 属性 [\#2013](https://github.com/youzan/vant/pull/2013)
- Switch: 新增 inactive-color 属性 [\#2013](https://github.com/youzan/vant/pull/2013)
- Radio: 选中态颜色调整为蓝色 [\#2018](https://github.com/youzan/vant/pull/2018)
@@ -710,7 +710,7 @@ PS: 不小心跳过了 1.4.6 版本 ^_^
**Improvements**
- Tab: 样式升级 [\#1908](https://github.com/youzan/vant/pull/1908)
-- Badge: 样式升级 [\#1907](https://github.com/youzan/vant/pull/1907)
+- Sidebar: 样式升级 [\#1907](https://github.com/youzan/vant/pull/1907)
- Dialog: 样式升级 [\#1906](https://github.com/youzan/vant/pull/1906)
- NoticeBar: 样式升级 [\#1893](https://github.com/youzan/vant/pull/1893)
- Collapse: 新增 disabled 属性 [\#1892](https://github.com/youzan/vant/pull/1892)
@@ -1356,7 +1356,7 @@ PS: 不小心跳过了 1.4.6 版本 ^_^
* 修复 ActionSheet 下边框未展示的问题 [\#686](https://github.com/youzan/vant/pull/686)
* 修复 AddressEdit 在数据变更时未正确选中省市区的问题 [\#680](https://github.com/youzan/vant/pull/680)
* 修复 Stepper value 溢出的问题 [\#691](https://github.com/youzan/vant/issues/691)
-* 修复 Badge 选中时字体粗细 [\#687](https://github.com/youzan/vant/pull/687)
+* 修复 Sidebar 选中时字体粗细 [\#687](https://github.com/youzan/vant/pull/687)
## [v0.12.14](https://github.com/youzan/vant/tree/v0.12.14)
`2018-03-09`
@@ -1644,7 +1644,7 @@ PS: 不小心跳过了 1.4.6 版本 ^_^
* Search: 支持 input 标签原生属性 [\#418](https://github.com/youzan/vant/pull/418)
* CellGroup: 新增 'border' 属性 [\#420](https://github.com/youzan/vant/pull/420)
* AddressEdit: 新增 focus、change-area、select-search 事件 [\#426](https://github.com/youzan/vant/pull/426)
-* Badge、CouponList、ContactCard: 增加点击反馈 [\#419](https://github.com/youzan/vant/pull/419)
+* Sidebar、CouponList、ContactCard: 增加点击反馈 [\#419](https://github.com/youzan/vant/pull/419)
**Bug Fixes**
@@ -2126,7 +2126,7 @@ PS: 不小心跳过了 1.4.6 版本 ^_^
* 新增 GoodsAction 组件 [\#102](https://github.com/youzan/vant/pull/102)
* 新增 OrderGoods 组件 [\#99](https://github.com/youzan/vant/pull/99)
* 新增 PayOrder 组件 [\#98](https://github.com/youzan/vant/pull/98)
-* 优化 Step、Loading、Tag、Badge 文档 [\#101](https://github.com/youzan/vant/pull/101)
+* 优化 Step、Loading、Tag、Sidebar 文档 [\#101](https://github.com/youzan/vant/pull/101)
* Checkbox: 支持 change 事件 [\#104](https://github.com/youzan/vant/pull/104)
**Bug Fixes**
diff --git a/docs/markdown/v2-progress-tracking.md b/docs/markdown/v2-progress-tracking.md
index ab05d4df0..41cfd6364 100644
--- a/docs/markdown/v2-progress-tracking.md
+++ b/docs/markdown/v2-progress-tracking.md
@@ -35,7 +35,8 @@
### Badge
-- [ ] 重命名为`SideNav`
+- [x] `BadgeGroup`重命名为`Sidebar`
+- [x] `Badge`重命名为`SlideBarItem`
### Loading
diff --git a/docs/src/demo-entry.js b/docs/src/demo-entry.js
index d8ba6c5ab..6f0a73fc6 100644
--- a/docs/src/demo-entry.js
+++ b/docs/src/demo-entry.js
@@ -7,7 +7,6 @@ export default {
'address-edit': () => wrapper(import('../../packages/address-edit/demo'), 'address-edit'),
'address-list': () => wrapper(import('../../packages/address-list/demo'), 'address-list'),
'area': () => wrapper(import('../../packages/area/demo'), 'area'),
- 'badge': () => wrapper(import('../../packages/badge/demo'), 'badge'),
'button': () => wrapper(import('../../packages/button/demo'), 'button'),
'card': () => wrapper(import('../../packages/card/demo'), 'card'),
'cell': () => wrapper(import('../../packages/cell/demo'), 'cell'),
@@ -40,6 +39,7 @@ export default {
'radio': () => wrapper(import('../../packages/radio/demo'), 'radio'),
'rate': () => wrapper(import('../../packages/rate/demo'), 'rate'),
'search': () => wrapper(import('../../packages/search/demo'), 'search'),
+ 'sidebar': () => wrapper(import('../../packages/sidebar/demo'), 'sidebar'),
'sku': () => wrapper(import('../../packages/sku/demo'), 'sku'),
'slider': () => wrapper(import('../../packages/slider/demo'), 'slider'),
'stepper': () => wrapper(import('../../packages/stepper/demo'), 'stepper'),
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index 37ca5347b..6a009488e 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -251,10 +251,6 @@ module.exports = {
groupName: '导航组件',
icon: 'https://img.yzcdn.cn/vant/nav-0401.svg',
list: [
- {
- path: '/badge',
- title: 'Badge 徽章'
- },
{
path: '/nav-bar',
title: 'NavBar 导航栏'
@@ -263,6 +259,10 @@ module.exports = {
path: '/pagination',
title: 'Pagination 分页'
},
+ {
+ path: '/sidebar',
+ title: 'Sidebar 侧边导航'
+ },
{
path: '/tab',
title: 'Tab 标签页'
@@ -558,10 +558,6 @@ module.exports = {
groupName: 'Navigation Components',
icon: 'https://img.yzcdn.cn/vant/nav-0401.svg',
list: [
- {
- path: '/badge',
- title: 'Badge'
- },
{
path: '/nav-bar',
title: 'NavBar'
@@ -570,6 +566,10 @@ module.exports = {
path: '/pagination',
title: 'Pagination'
},
+ {
+ path: '/sidebar',
+ title: 'Sidebar'
+ },
{
path: '/tab',
title: 'Tab'
diff --git a/docs/src/docs-entry.js b/docs/src/docs-entry.js
index da7cb205a..5e9291552 100644
--- a/docs/src/docs-entry.js
+++ b/docs/src/docs-entry.js
@@ -21,8 +21,6 @@ export default {
'address-list.zh-CN': () => import('../../packages/address-list/zh-CN.md'),
'area.en-US': () => import('../../packages/area/en-US.md'),
'area.zh-CN': () => import('../../packages/area/zh-CN.md'),
- 'badge.en-US': () => import('../../packages/badge/en-US.md'),
- 'badge.zh-CN': () => import('../../packages/badge/zh-CN.md'),
'button.en-US': () => import('../../packages/button/en-US.md'),
'button.zh-CN': () => import('../../packages/button/zh-CN.md'),
'card.en-US': () => import('../../packages/card/en-US.md'),
@@ -89,6 +87,8 @@ export default {
'rate.zh-CN': () => import('../../packages/rate/zh-CN.md'),
'search.en-US': () => import('../../packages/search/en-US.md'),
'search.zh-CN': () => import('../../packages/search/zh-CN.md'),
+ 'sidebar.en-US': () => import('../../packages/sidebar/en-US.md'),
+ 'sidebar.zh-CN': () => import('../../packages/sidebar/zh-CN.md'),
'sku.en-US': () => import('../../packages/sku/en-US.md'),
'sku.zh-CN': () => import('../../packages/sku/zh-CN.md'),
'slider.en-US': () => import('../../packages/slider/en-US.md'),
diff --git a/packages/badge-group/index.less b/packages/badge-group/index.less
deleted file mode 100644
index 545f9304b..000000000
--- a/packages/badge-group/index.less
+++ /dev/null
@@ -1,5 +0,0 @@
-@import '../style/var';
-
-.badge-group {
- width: @badge-group-width;
-}
diff --git a/packages/badge/en-US.md b/packages/badge/en-US.md
deleted file mode 100644
index d4f9ea2a6..000000000
--- a/packages/badge/en-US.md
+++ /dev/null
@@ -1,65 +0,0 @@
-## Badge
-
-### Install
-``` javascript
-import { Badge, BadgeGroup } from 'vant';
-
-Vue.use(Badge);
-Vue.use(BadgeGroup);
-```
-
-### Usage
-
-#### Basic Usage
-Use `active-key` prop to set index of chosen 'badge'
-
-```html
-