diff --git a/build/webpack.dev.js b/build/webpack.dev.js
index 1686d3fba..e853a6434 100644
--- a/build/webpack.dev.js
+++ b/build/webpack.dev.js
@@ -25,7 +25,8 @@ module.exports = {
       logLevel: 'warn'
     },
     hotClient: {
-      logLevel: 'warn'
+      logLevel: 'warn',
+      allEntries: true
     }
   },
   resolve: {
diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md
index 651008fc2..b8f170fbb 100644
--- a/docs/markdown/changelog.en-US.md
+++ b/docs/markdown/changelog.en-US.md
@@ -1,12 +1,28 @@
 ## Changelog
 
+### [1.1.16](https://github.com/youzan/vant/tree/v1.1.16)
+`2018-08-10`
+
+**Improvements**
+
+- Actionsheet: add select event [\#1594](https://github.com/youzan/vant/pull/1594)
+- ImagePreview: suppot onClose callback [\#1589](https://github.com/youzan/vant/pull/1589)
+- List: add check method [\#1590](https://github.com/youzan/vant/pull/1590)
+- Search: update style [\#1603](https://github.com/youzan/vant/pull/1603)
+
+**Bug Fixes**
+
+- fix Actionsheet item unclickable when loading [\#1587](https://github.com/youzan/vant/pull/1587)
+- fix DatetimePicker value uncorrect when use formatter [\#1591](https://github.com/youzan/vant/pull/1591)
+
+
 ### [1.1.15](https://github.com/youzan/vant/tree/v1.1.15)
 `2018-08-03`
 
 **Improvements**
 
 - Button: add warning type [\#1558](https://github.com/youzan/vant/pull/1558)
-- CellSwipe: add open method [\#1546](https://github.com/youzan/vant/pull/1546)
+- SwipeCell: add open method [\#1546](https://github.com/youzan/vant/pull/1546)
 - DatetimePicker: support minute range [\#1583](https://github.com/youzan/vant/pull/1583)
 - Icon: add size prop [\#1555](https://github.com/youzan/vant/pull/1555)
 - Stepper: update disabled color [\#1560](https://github.com/youzan/vant/pull/1560)
@@ -377,7 +393,7 @@
 
 * fix NavBar title max width limitation [\#867](https://github.com/youzan/vant/pull/867)
 * fix Button vertical align incorrect when loading [\#858](https://github.com/youzan/vant/pull/858)
-* fix CellSwipe should only trigger swipe when drag horizontally [\#866](https://github.com/youzan/vant/pull/866)
+* fix SwipeCell should only trigger swipe when drag horizontally [\#866](https://github.com/youzan/vant/pull/866)
 * fix ImagePreview manually close not work [\#864](https://github.com/youzan/vant/pull/864)
 * fix SubmitBar inherit wrong font size [\#857](https://github.com/youzan/vant/pull/857)
 * fix SwitchCell text vertical align [\#852](https://github.com/youzan/vant/pull/852)
@@ -461,7 +477,7 @@
 **Improvements**
 
 * AddressEdit: add show-delete prop [\#716](https://github.com/youzan/vant/pull/716)
-* CellSwipe: optimzie animation fluency [\#685](https://github.com/youzan/vant/pull/685)
+* SwipeCell: optimzie animation fluency [\#685](https://github.com/youzan/vant/pull/685)
 * Field: support autosize maxHeight & minHeight [\#718](https://github.com/youzan/vant/pull/718)
 * Locale: optimize i18n config [\#701](https://github.com/youzan/vant/pull/701)
 * PullRefresh: support trigger loading animation [\#684](https://github.com/youzan/vant/pull/684)
@@ -879,7 +895,7 @@
 
 **Improvements**
 
-* CellSwipe: add onClose prop, support async controll [\#356](https://github.com/youzan/vant/pull/356)
+* SwipeCell: add onClose prop, support async controll [\#356](https://github.com/youzan/vant/pull/356)
 * Uploader: support inherit attrs [\#357](https://github.com/youzan/vant/pull/357)
 * optimize local compile speed [\#355](https://github.com/youzan/vant/pull/355)
 
diff --git a/docs/markdown/changelog.generated.md b/docs/markdown/changelog.generated.md
index 6520acc0b..3ad63008d 100644
--- a/docs/markdown/changelog.generated.md
+++ b/docs/markdown/changelog.generated.md
@@ -1,5 +1,53 @@
 ## 更新日志
 
+## [v1.1.16](https://github.com/youzan/vant/tree/v1.1.16) (2018-08-10)
+[Full Changelog](https://github.com/youzan/vant/compare/v1.1.15...v1.1.16)
+
+**Breaking changes**
+
+- SwipeCell 滑动单元格 可以实现点击一个按钮,多个cellswip向右滑动吗? [\#1538](https://github.com/youzan/vant/issues/1538)
+- 日期控件（datetimepicker）可以对时分设置范围 [\#1531](https://github.com/youzan/vant/issues/1531)
+- Tab 组件 sticky 增加一个 距离顶部的高度功能 [\#1504](https://github.com/youzan/vant/issues/1504)
+
+**Bug Fixes**
+
+- Tabbar 标签没有改变也会触发change事件 [\#1569](https://github.com/youzan/vant/issues/1569)
+- 微信上浏览文字垂直不局中 [\#1526](https://github.com/youzan/vant/issues/1526)
+- Stepper 的integer 参数 为true 不生效 [\#1525](https://github.com/youzan/vant/issues/1525)
+
+**Issue**
+
+- Tabs 标签页 的change 事件不会触发 [\#1613](https://github.com/youzan/vant/issues/1613)
+- list 监听滚动 [\#1611](https://github.com/youzan/vant/issues/1611)
+- DatetimePicker的formatter失效 [\#1610](https://github.com/youzan/vant/issues/1610)
+- 在iPhone 8 plus上， picker item过窄  [\#1606](https://github.com/youzan/vant/issues/1606)
+- 报错: Can't resolve 'postcss-loader'  [\#1605](https://github.com/youzan/vant/issues/1605)
+- ios8 微信6.5环境下Dialog兼容性问题 [\#1602](https://github.com/youzan/vant/issues/1602)
+- 日期组件只能选十年的范围，需要三十年的范围，例如贷款30年 [\#1601](https://github.com/youzan/vant/issues/1601)
+- 圆形进度条的slot功能能用吗  [\#1600](https://github.com/youzan/vant/issues/1600)
+- stepper  步进器 点击加号 减号也有点击反馈 [\#1599](https://github.com/youzan/vant/issues/1599)
+- upload到底怎么使用啊,怎么把得到的参数替换掉默认图片的路径呢? [\#1596](https://github.com/youzan/vant/issues/1596)
+- ImagePreview最新版本预览图片报错 [\#1595](https://github.com/youzan/vant/issues/1595)
+- SwipeCell 左滑，right 有 edit delete 两个按钮的时候，如何判断点击的是哪个呢？ [\#1593](https://github.com/youzan/vant/issues/1593)
+- 商品规格弹层控件中如果设置none\_sku: true,加入购物车时还提示“选择规格” [\#1588](https://github.com/youzan/vant/issues/1588)
+- Low android version compatibility issues [\#1585](https://github.com/youzan/vant/issues/1585)
+- vant  collapse使用报错 [\#1584](https://github.com/youzan/vant/issues/1584)
+- popup悬浮头部不生效 [\#1580](https://github.com/youzan/vant/issues/1580)
+- uploader 组件在部分安卓手机微信环境中点击不能触发上传图片功能 [\#1576](https://github.com/youzan/vant/issues/1576)
+- dialog销毁报错Error in nextTick: "TypeError: Cannot read property 'insert' of undefined" [\#1575](https://github.com/youzan/vant/issues/1575)
+- 文档有错 [\#1527](https://github.com/youzan/vant/issues/1527)
+
+**Improvements**
+
+- update dependencies [\#1614](https://github.com/youzan/vant/pull/1614) ([chenjiahan](https://github.com/chenjiahan))
+- \[Doc\] update vant-doc [\#1608](https://github.com/youzan/vant/pull/1608) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Search: update style [\#1603](https://github.com/youzan/vant/pull/1603) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Actionsheet: add select event [\#1594](https://github.com/youzan/vant/pull/1594) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] DatetimePicker: value uncorrect when use formatter [\#1591](https://github.com/youzan/vant/pull/1591) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] List: add check method [\#1590](https://github.com/youzan/vant/pull/1590) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] ImagePreview: suppot onClose callback [\#1589](https://github.com/youzan/vant/pull/1589) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] Actionsheet: item unclickable when loading [\#1587](https://github.com/youzan/vant/pull/1587) ([chenjiahan](https://github.com/chenjiahan))
+
 ## [v1.1.15](https://github.com/youzan/vant/tree/v1.1.15) (2018-08-03)
 [Full Changelog](https://github.com/youzan/vant/compare/v1.1.14...v1.1.15)
 
@@ -32,7 +80,7 @@
 - npm install 下来的css，里边有的icon font文件，是cdn引用的，而不是本地的。 [\#1552](https://github.com/youzan/vant/issues/1552)
 - DatetimePicker 中能否加上年月日上午/下午 [\#1551](https://github.com/youzan/vant/issues/1551)
 - 手机滚动不流畅啊？没有个scroll-content? [\#1549](https://github.com/youzan/vant/issues/1549)
-- CellSwipe 滑动单元格如何确定当前数据条目？ [\#1548](https://github.com/youzan/vant/issues/1548)
+- SwipeCell 滑动单元格如何确定当前数据条目？ [\#1548](https://github.com/youzan/vant/issues/1548)
 - 怎么修改弹出层样式 [\#1547](https://github.com/youzan/vant/issues/1547)
 - popup 组件中 lock-scroll 功能 在 ios 中失效 [\#1544](https://github.com/youzan/vant/issues/1544)
 - 以$toast、$dialog 形式调用 toast和dialog在prod环境莫名undefined  [\#1542](https://github.com/youzan/vant/issues/1542)
@@ -71,7 +119,7 @@
 - \[Improvement\] Button: add warning type [\#1558](https://github.com/youzan/vant/pull/1558) ([chenjiahan](https://github.com/chenjiahan))
 - \[Improvement\] Icon: add size prop [\#1555](https://github.com/youzan/vant/pull/1555) ([chenjiahan](https://github.com/chenjiahan))
 - \[Doc\] update detail [\#1554](https://github.com/youzan/vant/pull/1554) ([chenjiahan](https://github.com/chenjiahan))
-- \[Improvement\] CellSwipe: add open method [\#1546](https://github.com/youzan/vant/pull/1546) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] SwipeCell: add open method [\#1546](https://github.com/youzan/vant/pull/1546) ([chenjiahan](https://github.com/chenjiahan))
 - \[bugfix\] Button: text-size-adjust [\#1545](https://github.com/youzan/vant/pull/1545) ([chenjiahan](https://github.com/chenjiahan))
 - \[bugfix\] Stepper: optimize input strategy [\#1534](https://github.com/youzan/vant/pull/1534) ([chenjiahan](https://github.com/chenjiahan))
 - \[Doc\] Dialog: update usage [\#1520](https://github.com/youzan/vant/pull/1520) ([chenjiahan](https://github.com/chenjiahan))
@@ -125,12 +173,10 @@
 - Area组件默认第一个选中，再次选择也是第一个选中， [\#1421](https://github.com/youzan/vant/issues/1421)
 - van-swipe和van-swipe-item使用，页面内容比较多的情况，可以滚动，当触发了滚动事件的同时也触发左滑或者右滑事件 [\#1417](https://github.com/youzan/vant/issues/1417)
 - 定制主题的边框色，修改的应当是$border-color，而不是$gray-light [\#1401](https://github.com/youzan/vant/issues/1401)
-- 关于单、复选框组件API的小建议 [\#1373](https://github.com/youzan/vant/issues/1373)
 
 **Bug Fixes**
 
 - progress当pivot-text设置为空的时候，进度条长度有问题 [\#1407](https://github.com/youzan/vant/issues/1407)
-- 在 typescript 下使用遇到 vscode 提示类型不正确 [\#1397](https://github.com/youzan/vant/issues/1397)
 
 **Issue**
 
@@ -162,7 +208,6 @@
 - List组件 滑动顶部或底部 是否可以加上 bounce 回弹的效果？这样体验是否会更好？ [\#1432](https://github.com/youzan/vant/issues/1432)
 - DatetimePicker有坑 [\#1431](https://github.com/youzan/vant/issues/1431)
 - List列表，手动触发onload事件时，当首页数据高度低于屏幕高度时不能继续加载 [\#1423](https://github.com/youzan/vant/issues/1423)
-- 希望内置样式添加左右滑动 [\#1384](https://github.com/youzan/vant/issues/1384)
 
 **Improvements**
 
@@ -185,14 +230,6 @@
 ## [v1.1.12](https://github.com/youzan/vant/tree/v1.1.12) (2018-07-06)
 [Full Changelog](https://github.com/youzan/vant/compare/v1.1.11...v1.1.12)
 
-**Breaking changes**
-
-- 希望SwitchCell组件可以自定义size [\#1368](https://github.com/youzan/vant/issues/1368)
-
-**Bug Fixes**
-
-- change 获取 picker 时间值错误 [\#1366](https://github.com/youzan/vant/issues/1366)
-
 **Issue**
 
 - swiper纵向滚动不能使用 [\#1424](https://github.com/youzan/vant/issues/1424)
@@ -206,8 +243,6 @@
 - 请问DatetimePicker的类型为datetime的时候，如何设置默认时间？ [\#1403](https://github.com/youzan/vant/issues/1403)
 - Field标签输入框 全局注册后 在子组件里显示van-cell-group未注册 [\#1400](https://github.com/youzan/vant/issues/1400)
 - stepper blur触发失效 [\#1398](https://github.com/youzan/vant/issues/1398)
-- 图片上传 多选问题 [\#1396](https://github.com/youzan/vant/issues/1396)
-- 建议 Dialog 高级用法中增加 api 点击按钮不关闭弹窗 [\#1377](https://github.com/youzan/vant/issues/1377)
 
 **Improvements**
 
@@ -227,39 +262,10 @@
 ## [v1.1.11](https://github.com/youzan/vant/tree/v1.1.11) (2018-07-04)
 [Full Changelog](https://github.com/youzan/vant/compare/v1.1.10...v1.1.11)
 
-**Issue**
-
-- 上拉菜单无法显示 [\#1390](https://github.com/youzan/vant/issues/1390)
-- Field组件type设置为number，ios中文全键盘，联想的中文可以输入 [\#1389](https://github.com/youzan/vant/issues/1389)
-- CellSwipe 滑动单元格 on-close 函数如何传参 [\#1388](https://github.com/youzan/vant/issues/1388)
-- 关于 picker 选择器的建议 [\#1387](https://github.com/youzan/vant/issues/1387)
-- 更新版本1.1.10后lazyLoad报错 [\#1386](https://github.com/youzan/vant/issues/1386)
-- Picker配合Field使用弹出键盘 [\#1385](https://github.com/youzan/vant/issues/1385)
-- 使用Field组件报莫名其妙的错，无法处理，是与其他ui冲突了吗？ [\#1382](https://github.com/youzan/vant/issues/1382)
-- 如何将Uploader图片上传的返回值转成formdata格式？ [\#1380](https://github.com/youzan/vant/issues/1380)
-- 希望添加一个是否现在底部显示按钮的属性与bottom-action 属性区分开 [\#1379](https://github.com/youzan/vant/issues/1379)
-- area组件现在省市二级选择时，无法只选择省了，之前选择省份不选择市会返回省份 现在怎么就默认直接返回默认市了 [\#1378](https://github.com/youzan/vant/issues/1378)
-- 1.1.10版本Area组件遇到的问题 [\#1376](https://github.com/youzan/vant/issues/1376)
-- 命名规则一致性 [\#1375](https://github.com/youzan/vant/issues/1375)
-- 希望Field组件添加验证码图片 [\#1369](https://github.com/youzan/vant/issues/1369)
-- List组件 [\#1367](https://github.com/youzan/vant/issues/1367)
-
 **Improvements**
 
 - \[Improvement\] AddressEdit: event order [\#1402](https://github.com/youzan/vant/pull/1402) ([chenjiahan](https://github.com/chenjiahan))
 - \[bugfix\] Field: readonly in safari [\#1399](https://github.com/youzan/vant/pull/1399) ([chenjiahan](https://github.com/chenjiahan))
-- \[bugfix\] Field: hide clear icon when readonly [\#1395](https://github.com/youzan/vant/pull/1395) ([chenjiahan](https://github.com/chenjiahan))
-- \[Improvement\] Checkbox: add label-position prop [\#1394](https://github.com/youzan/vant/pull/1394) ([chenjiahan](https://github.com/chenjiahan))
-- \[bugfix\] AddressEdit: fix test cases [\#1393](https://github.com/youzan/vant/pull/1393) ([chenjiahan](https://github.com/chenjiahan))
-- \[bugfix\] Area: fix test cases [\#1392](https://github.com/youzan/vant/pull/1392) ([chenjiahan](https://github.com/chenjiahan))
-- \[Improvement\] Picker: optimize render performance [\#1391](https://github.com/youzan/vant/pull/1391) ([chenjiahan](https://github.com/chenjiahan))
-- \[Doc\] dialog before-close [\#1383](https://github.com/youzan/vant/pull/1383) ([chenjiahan](https://github.com/chenjiahan))
-- \[Improvement\] Area: watch area list [\#1381](https://github.com/youzan/vant/pull/1381) ([chenjiahan](https://github.com/chenjiahan))
-- \[bugfix\] Area: city list empty [\#1374](https://github.com/youzan/vant/pull/1374) ([chenjiahan](https://github.com/chenjiahan))
-- \[bugfix\] Tab: insert order [\#1372](https://github.com/youzan/vant/pull/1372) ([chenjiahan](https://github.com/chenjiahan))
-- \[Improvement\] SwitchCell: add size prop [\#1371](https://github.com/youzan/vant/pull/1371) ([chenjiahan](https://github.com/chenjiahan))
-- \[bugfix\] DatetimePicker: change event trigger timing [\#1370](https://github.com/youzan/vant/pull/1370) ([chenjiahan](https://github.com/chenjiahan))
-- \[Improvement\] Actionsheet: support lazy render [\#1365](https://github.com/youzan/vant/pull/1365) ([chenjiahan](https://github.com/chenjiahan))
 
 ## [v1.1.10](https://github.com/youzan/vant/tree/v1.1.10) (2018-06-28)
 [Full Changelog](https://github.com/youzan/vant/compare/v1.1.9...v1.1.10)
diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index a378cf4b4..a6d13c89e 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -1,12 +1,28 @@
 ## 更新日志
 
+### [1.1.16](https://github.com/youzan/vant/tree/v1.1.16)
+`2018-08-10`
+
+**Improvements**
+
+- Actionsheet: 新增 select 事件 [\#1594](https://github.com/youzan/vant/pull/1594)
+- ImagePreview: 支持传入 onClose 回调函数 [\#1589](https://github.com/youzan/vant/pull/1589)
+- List: 新增 check 方法 [\#1590](https://github.com/youzan/vant/pull/1590)
+- Search: 优化样式结构 [\#1603](https://github.com/youzan/vant/pull/1603)
+
+**Bug Fixes**
+
+- 修复 Actionsheet 选项加载中时仍然有点击态的问题 [\#1587](https://github.com/youzan/vant/pull/1587)
+- 修复 DatetimePicker 使用 formatter 时默认值错误的问题 [\#1591](https://github.com/youzan/vant/pull/1591)
+
+
 ### [1.1.15](https://github.com/youzan/vant/tree/v1.1.15)
 `2018-08-03`
 
 **Improvements**
 
 - Button: 新增 warning 类型 [\#1558](https://github.com/youzan/vant/pull/1558)
-- CellSwipe: 新增 open 方法 [\#1546](https://github.com/youzan/vant/pull/1546)
+- SwipeCell: 新增 open 方法 [\#1546](https://github.com/youzan/vant/pull/1546)
 - DatetimePicker: 支持限制分钟范围 [\#1583](https://github.com/youzan/vant/pull/1583)
 - Icon: 新增 size 属性 [\#1555](https://github.com/youzan/vant/pull/1555)
 - Stepper: 优化禁用态样式 [\#1560](https://github.com/youzan/vant/pull/1560)
@@ -371,7 +387,7 @@
 
 - 修复 NavBar 标题长度未限制的问题 [\#867](https://github.com/youzan/vant/pull/867)
 - 修复 Button loading 状态下无法水平对齐的问题 [\#858](https://github.com/youzan/vant/pull/858)
-- 修复 CellSwipe 在垂直滑动时也会触发 Swipe 的问题 [\#866](https://github.com/youzan/vant/pull/866)
+- 修复 SwipeCell 在垂直滑动时也会触发 Swipe 的问题 [\#866](https://github.com/youzan/vant/pull/866)
 - 修复 ImagePreview close 方法失效的问题 [\#864](https://github.com/youzan/vant/pull/864)
 - 修复 SubmitBar 字体大小继承错误的问题 [\#857](https://github.com/youzan/vant/pull/857)
 - 修复 SwitchCell 文字未垂直居中的问题 [\#852](https://github.com/youzan/vant/pull/852)
@@ -453,7 +469,7 @@
 **Improvements**
 
 * AddressEdit: 新增 show-delete 属性 [\#716](https://github.com/youzan/vant/pull/716)
-* CellSwipe: 优化 Swipe 动画流畅度 [\#685](https://github.com/youzan/vant/pull/685)
+* SwipeCell: 优化 Swipe 动画流畅度 [\#685](https://github.com/youzan/vant/pull/685)
 * Field: 支持配置 autosize 最大/最小高度 [\#718](https://github.com/youzan/vant/pull/718)
 * Locale: 精简 i18n 配置文档 [\#701](https://github.com/youzan/vant/pull/701)
 * PullRefresh: 支持手动触发 loading 动画 [\#684](https://github.com/youzan/vant/pull/684)
@@ -870,7 +886,7 @@
 
 **Improvements**
 
-* CellSwipe: 新增 onClose 属性，支持异步控制 [\#356](https://github.com/youzan/vant/pull/356)
+* SwipeCell: 新增 onClose 属性，支持异步控制 [\#356](https://github.com/youzan/vant/pull/356)
 * Uploader: 支持继承原生属性 [\#357](https://github.com/youzan/vant/pull/357)
 * 优化本地构建速度 [\#355](https://github.com/youzan/vant/pull/355)
 
@@ -1257,7 +1273,7 @@
 * 新增 CellSwitch 组件 [\#95](https://github.com/youzan/vant/pull/95)
 * Dialog: 支持通过组件的方式进行调用 [\#93](https://github.com/youzan/vant/pull/93)
 * Progress: 简化 DOM 结构 [\#90](https://github.com/youzan/vant/pull/90)
-* CellSwipe: 性能优化，补充单元测试 [\#91](https://github.com/youzan/vant/pull/91)
+* SwipeCell: 性能优化，补充单元测试 [\#91](https://github.com/youzan/vant/pull/91)
 
 ### [0.8.6](https://github.com/youzan/vant/tree/v0.8.6)
 
@@ -1361,7 +1377,7 @@
 
 * 支持 SSR [\#40](https://github.com/youzan/vant/pull/40)
 * 新增多个 Icon 类型 [\#40](https://github.com/youzan/vant/pull/40)
-* 新增 CellSwipe 组件 [\#39](https://github.com/youzan/vant/pull/39)
+* 新增 SwipeCell 组件 [\#39](https://github.com/youzan/vant/pull/39)
 * 新增 Search 组件微杂志样式 [\#38](https://github.com/youzan/vant/pull/38)
 
 ### [0.5.8](https://github.com/youzan/vant/tree/v0.5.8)
diff --git a/docs/src/DocsApp.vue b/docs/src/DocsApp.vue
index d9565960e..6a8059bae 100644
--- a/docs/src/DocsApp.vue
+++ b/docs/src/DocsApp.vue
@@ -1,6 +1,12 @@
 <template>
   <div class="app">
-    <van-doc :simulators="simulators" :current-simulator="currentSimulator" :config="config" :base="base">
+    <van-doc
+      :base="base"
+      :config="config"
+      active="Vue 组件"
+      :simulators="simulators"
+      :current-simulator="currentSimulator"
+    >
       <router-view @changeDemoURL="onChangeDemoURL" />
     </van-doc>
   </div>
diff --git a/docs/src/demo-entry.js b/docs/src/demo-entry.js
index 5c47b592e..3865fc0c4 100644
--- a/docs/src/demo-entry.js
+++ b/docs/src/demo-entry.js
@@ -10,7 +10,6 @@ export default {
   'button': () => wrapper(import('../../packages/button/demo'), 'button'),
   'card': () => wrapper(import('../../packages/card/demo'), 'card'),
   'cell': () => wrapper(import('../../packages/cell/demo'), 'cell'),
-  'cell-swipe': () => wrapper(import('../../packages/cell-swipe/demo'), 'cell-swipe'),
   'checkbox': () => wrapper(import('../../packages/checkbox/demo'), 'checkbox'),
   'circle': () => wrapper(import('../../packages/circle/demo'), 'circle'),
   'col': () => wrapper(import('../../packages/col/demo'), 'col'),
@@ -45,6 +44,7 @@ export default {
   'steps': () => wrapper(import('../../packages/steps/demo'), 'steps'),
   'submit-bar': () => wrapper(import('../../packages/submit-bar/demo'), 'submit-bar'),
   'swipe': () => wrapper(import('../../packages/swipe/demo'), 'swipe'),
+  'swipe-cell': () => wrapper(import('../../packages/swipe-cell/demo'), 'swipe-cell'),
   'switch': () => wrapper(import('../../packages/switch/demo'), 'switch'),
   'switch-cell': () => wrapper(import('../../packages/switch-cell/demo'), 'switch-cell'),
   'tab': () => wrapper(import('../../packages/tab/demo'), 'tab'),
diff --git a/docs/src/doc.config.js b/docs/src/doc.config.js
index e3f6bd6b3..a4d6bcca8 100644
--- a/docs/src/doc.config.js
+++ b/docs/src/doc.config.js
@@ -11,6 +11,8 @@ module.exports = {
         href: '#/'
       },
       nav: {
+        'Vue 组件': 'https://youzan.github.io/vant/',
+        '小程序组件': 'https://youzan.github.io/vant-weapp/',
         lang: {
           text: 'En',
           from: 'zh-CN',
@@ -243,14 +245,14 @@ module.exports = {
           {
             groupName: '高阶组件',
             list: [
-              {
-                path: '/cell-swipe',
-                title: 'CellSwipe 滑动单元格'
-              },
               {
                 path: '/image-preview',
                 title: 'ImagePreview 图片预览'
               },
+              {
+                path: '/swipe-cell',
+                title: 'SwipeCell 滑动单元格'
+              },
               {
                 path: '/switch-cell',
                 title: 'SwitchCell 开关单元格'
@@ -540,8 +542,8 @@ module.exports = {
             groupName: 'Advanced Components',
             list: [
               {
-                path: '/cell-swipe',
-                title: 'CellSwipe'
+                path: '/swipe-cell',
+                title: 'SwipeCell'
               },
               {
                 path: '/image-preview',
diff --git a/docs/src/docs-entry.js b/docs/src/docs-entry.js
index 840c5b983..d81934da9 100644
--- a/docs/src/docs-entry.js
+++ b/docs/src/docs-entry.js
@@ -27,8 +27,6 @@ export default {
   'card.zh-CN': () => import('../../packages/card/zh-CN.md'),
   'cell.en-US': () => import('../../packages/cell/en-US.md'),
   'cell.zh-CN': () => import('../../packages/cell/zh-CN.md'),
-  'cell-swipe.en-US': () => import('../../packages/cell-swipe/en-US.md'),
-  'cell-swipe.zh-CN': () => import('../../packages/cell-swipe/zh-CN.md'),
   'checkbox.en-US': () => import('../../packages/checkbox/en-US.md'),
   'checkbox.zh-CN': () => import('../../packages/checkbox/zh-CN.md'),
   'circle.en-US': () => import('../../packages/circle/en-US.md'),
@@ -99,6 +97,8 @@ export default {
   'submit-bar.zh-CN': () => import('../../packages/submit-bar/zh-CN.md'),
   'swipe.en-US': () => import('../../packages/swipe/en-US.md'),
   'swipe.zh-CN': () => import('../../packages/swipe/zh-CN.md'),
+  'swipe-cell.en-US': () => import('../../packages/swipe-cell/en-US.md'),
+  'swipe-cell.zh-CN': () => import('../../packages/swipe-cell/zh-CN.md'),
   'switch.en-US': () => import('../../packages/switch/en-US.md'),
   'switch.zh-CN': () => import('../../packages/switch/zh-CN.md'),
   'switch-cell.en-US': () => import('../../packages/switch-cell/en-US.md'),
diff --git a/package.json b/package.json
index 44b237a5a..f5154afb7 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   "devDependencies": {
     "@vue/server-test-utils": "^1.0.0-beta.24",
     "@vue/test-utils": "^1.0.0-beta.24",
-    "autoprefixer": "^9.1.0",
+    "autoprefixer": "^9.1.2",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",
     "babel-jest": "^23.4.2",
@@ -73,7 +73,7 @@
     "cross-env": "^5.2.0",
     "css-loader": "^1.0.0",
     "dependency-tree": "^6.1.1",
-    "eslint": "^5.3.0",
+    "eslint": "^5.4.0",
     "eslint-plugin-vue-libs": "^3.0.0",
     "fast-glob": "^2.2.2",
     "fast-vue-md-loader": "^1.0.3",
@@ -83,9 +83,9 @@
     "gulp-iconfont-css": "^2.3.0",
     "html-webpack-plugin": "3.2.0",
     "husky": "^0.14.3",
-    "jest": "^23.4.2",
+    "jest": "^23.5.0",
     "jest-serializer-vue": "^2.0.2",
-    "lint-staged": "^7.2.0",
+    "lint-staged": "^7.2.2",
     "md5-file": "^4.0.0",
     "postcss": "^7.0.2",
     "postcss-calc": "^6.0.0",
@@ -97,14 +97,14 @@
     "shelljs": "^0.8.1",
     "signale": "^1.2.1",
     "style-loader": "^0.22.1",
-    "stylelint": "^9.4.0",
+    "stylelint": "^9.5.0",
     "stylelint-config-standard": "^18.2.0",
     "uppercamelcase": "^3.0.0",
-    "url-loader": "^1.0.1",
-    "vant-doc": "1.0.13",
+    "url-loader": "^1.1.1",
+    "vant-doc": "1.0.14",
     "vue": "2.5.17",
     "vue-jest": "^2.6.0",
-    "vue-loader": "^15.3.0",
+    "vue-loader": "^15.4.0",
     "vue-router": "^3.0.1",
     "vue-server-renderer": "^2.5.17",
     "vue-sfc-compiler": "^0.0.8",
diff --git a/packages/address-edit/en-US.md b/packages/address-edit/en-US.md
index d79a78e1a..67965158a 100644
--- a/packages/address-edit/en-US.md
+++ b/packages/address-edit/en-US.md
@@ -103,10 +103,10 @@ export default {
 | province | Province | `String` |
 | city | City | `String` |
 | county | County | `String` |
-| address_detail | Detailed Address | `String` |
-| area_code | Area code | `String` |
-| postal_code | Postal code | `String` |
-| is_default | Is default address | `Boolean` |
+| addressDetail | Detailed Address | `String` |
+| areaCode | Area code | `String` |
+| postalCode | Postal code | `String` |
+| isDefault | Is default address | `Boolean` |
 
 #### searchResult Data Structure
 | key | Description | Type |
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index 35270eb45..0340b178e 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -26,11 +26,11 @@
       />
       <address-edit-detail
         :focused="detailFocused"
-        :value="data.address_detail"
-        :error="errorInfo.address_detail"
+        :value="data.addressDetail"
+        :error="errorInfo.addressDetail"
         :search-result="searchResult"
         :show-search-result="showSearchResult"
-        @focus="onFocus('address_detail')"
+        @focus="onFocus('addressDetail')"
         @blur="detailFocused = false"
         @input="onChangeDetail"
         @select-search="$emit('select-search', $event)"
@@ -38,20 +38,20 @@
       <field
         v-if="showPostal"
         v-show="!hideBottomFields"
-        v-model="data.postal_code"
+        v-model="data.postalCode"
         type="tel"
         maxlength="6"
         class="van-hairline--top"
         :label="$t('postal')"
         :placeholder="$t('postal')"
-        :error="errorInfo.postal_code"
-        @focus="onFocus('postal_code')"
+        :error="errorInfo.postalCode"
+        @focus="onFocus('postalCode')"
       />
       <slot />
       <switch-cell
         v-if="showSetDefault"
         v-show="!hideBottomFields"
-        v-model="data.is_default"
+        v-model="data.isDefault"
         :title="$t('defaultAddress')"
       />
     </cell-group>
@@ -60,7 +60,7 @@
       <van-button block :loading="isSaving" @click="onSave" type="primary">
         {{ saveButtonText || $t('save') }}
       </van-button>
-      <van-button block :loading="isDeleting" @click="onDelete" v-if="isEdit">
+      <van-button block :loading="isDeleting" @click="onDelete" v-if="showDelete">
         {{ deleteButtonText || $t('delete') }}
       </van-button>
     </div>
@@ -69,7 +69,7 @@
       <van-area
         ref="area"
         :loading="!areaListLoaded"
-        :value="data.area_code"
+        :value="data.areaCode"
         :area-list="areaList"
         @confirm="onAreaConfirm"
         @cancel="showArea = false"
@@ -98,10 +98,10 @@ const defaultData = {
   province: '',
   city: '',
   county: '',
-  area_code: '',
-  postal_code: '',
-  address_detail: '',
-  is_default: false
+  areaCode: '',
+  postalCode: '',
+  addressDetail: '',
+  isDefault: false
 };
 
 export default create({
@@ -148,8 +148,8 @@ export default create({
       errorInfo: {
         tel: false,
         name: false,
-        postal_code: false,
-        address_detail: false
+        postalCode: false,
+        addressDetail: false
       }
     };
   },
@@ -164,13 +164,9 @@ export default create({
       return isObj(this.areaList) && Object.keys(this.areaList).length;
     },
 
-    isEdit() {
-      return this.showDelete || !!this.data.id;
-    },
-
     areaText() {
-      const { province, city, county, area_code } = this.data;
-      return province && city && county && area_code
+      const { province, city, county, areaCode } = this.data;
+      return province && city && county && areaCode
         ? `${province} ${city} ${county}`
         : '';
     }
@@ -184,32 +180,32 @@ export default create({
           ...val
         };
 
-        this.setAreaCode(val.area_code);
+        this.setAreaCode(val.areaCode);
       },
       deep: true,
       immediate: true
     },
 
     areaList() {
-      this.setAreaCode(this.data.area_code);
+      this.setAreaCode(this.data.areaCode);
     }
   },
 
   methods: {
     onFocus(key) {
       this.errorInfo[key] = false;
-      this.detailFocused = key === 'address_detail';
+      this.detailFocused = key === 'addressDetail';
       this.$emit('focus', key);
     },
 
     onChangeDetail(val) {
-      this.data.address_detail = val;
+      this.data.addressDetail = val;
       this.$emit('change-detail', val);
     },
 
     onAreaConfirm(values) {
       this.showArea = false;
-      this.data.area_code = values[2].code;
+      this.data.areaCode = values[2].code;
       this.assignAreaValues(values);
       this.$emit('change-area', values);
     },
@@ -223,10 +219,10 @@ export default create({
     },
 
     onSave() {
-      const items = ['name', 'tel', 'area_code', 'address_detail'];
+      const items = ['name', 'tel', 'areaCode', 'addressDetail'];
 
       if (this.showPostal) {
-        items.push('postal_code');
+        items.push('postalCode');
       }
 
       const isValid = items.every(item => {
@@ -252,11 +248,11 @@ export default create({
           return value ? '' : $t('nameEmpty');
         case 'tel':
           return this.telValidator(value) ? '' : $t('telInvalid');
-        case 'area_code':
+        case 'areaCode':
           return value ? '' : $t('areaEmpty');
-        case 'address_detail':
+        case 'addressDetail':
           return value ? '' : $t('addressEmpty');
-        case 'postal_code':
+        case 'postalCode':
           return value && !/^\d{6}$/.test(value) ? $t('postalEmpty') : '';
       }
     },
@@ -280,7 +276,7 @@ export default create({
 
     // set area code to area component
     setAreaCode(code) {
-      this.data.area_code = code || '';
+      this.data.areaCode = code || '';
       this.$nextTick(() => {
         const { area } = this.$refs;
         if (area) {
diff --git a/packages/address-edit/test/index.spec.js b/packages/address-edit/test/index.spec.js
index 1d37fde40..0f5081cb1 100644
--- a/packages/address-edit/test/index.spec.js
+++ b/packages/address-edit/test/index.spec.js
@@ -12,10 +12,10 @@ const addressInfo = {
   province: '北京市',
   city: '北京市',
   county: '朝阳区',
-  address_detail: '详细地址',
-  area_code: '110101',
-  postal_code: '10000',
-  is_default: true
+  addressDetail: '详细地址',
+  areaCode: '110101',
+  postalCode: '10000',
+  isDefault: true
 };
 
 const createComponent = () => {
@@ -77,47 +77,47 @@ it('valid tel', () => {
   expect(errorInfo.tel).toBeFalsy();
 });
 
-it('valid area_code', () => {
+it('valid areaCode', () => {
   const { data, button, errorInfo } = createComponent();
-  // area_code empty
-  data.area_code = '';
+  // areaCode empty
+  data.areaCode = '';
   button.trigger('click');
-  expect(errorInfo.area_code).toBeTruthy();
+  expect(errorInfo.areaCode).toBeTruthy();
 
-  // area_code invalid
-  data.area_code = '-1';
+  // areaCode invalid
+  data.areaCode = '-1';
   button.trigger('click');
-  expect(errorInfo.area_code).toBeTruthy();
+  expect(errorInfo.areaCode).toBeTruthy();
 });
 
-it('valid address_detail', () => {
+it('valid addressDetail', () => {
   const { data, field, button, errorInfo } = createComponent();
-  data.address_detail = '';
+  data.addressDetail = '';
   button.trigger('click');
-  expect(errorInfo.address_detail).toBeTruthy();
+  expect(errorInfo.addressDetail).toBeTruthy();
   field.at(3).trigger('focus');
-  expect(errorInfo.address_detail).toBeFalsy();
+  expect(errorInfo.addressDetail).toBeFalsy();
 });
 
 test('valid postal code', () => {
   const { vm, data, field, button, errorInfo } = createComponent();
 
-  // postal_code invalid
-  data.postal_code = '123';
+  // postalCode invalid
+  data.postalCode = '123';
   button.trigger('click');
-  expect(errorInfo.postal_code).toBeTruthy();
+  expect(errorInfo.postalCode).toBeTruthy();
   field.at(4).trigger('focus');
-  expect(errorInfo.postal_code).toBeFalsy();
+  expect(errorInfo.postalCode).toBeFalsy();
 
   // valid result
-  data.postal_code = '123456';
+  data.postalCode = '123456';
   button.trigger('click');
 
-  // not show postal_code
-  data.postal_code = '156';
+  // not show postalCode
+  data.postalCode = '156';
   vm.showPostal = false;
   button.trigger('click');
-  expect(errorInfo.postal_code).toBeFalsy();
+  expect(errorInfo.postalCode).toBeFalsy();
 });
 
 test('select area', () => {
@@ -137,7 +137,7 @@ test('select area', () => {
   expect(data.province).toEqual('北京市');
   expect(data.city).toEqual('北京市');
   expect(data.county).toEqual('朝阳区');
-  expect(data.area_code).toEqual('123456');
+  expect(data.areaCode).toEqual('123456');
 });
 
 test('on change detail', () => {
@@ -169,7 +169,7 @@ test('set/get area code', async() => {
   wrapper.vm.setAreaCode('110102');
 
   await later(50);
-  expect(wrapper.vm.data.area_code).toEqual('110102');
+  expect(wrapper.vm.data.areaCode).toEqual('110102');
   expect(wrapper.vm.getArea()).toEqual([
     { code: '110000', name: '北京市' },
     { code: '110100', name: '北京市' },
@@ -186,7 +186,7 @@ test('watch area code', async() => {
     propsData: {
       areaList: {},
       addressInfo: {
-        area_code: '110101'
+        areaCode: '110101'
       }
     }
   });
@@ -231,9 +231,7 @@ test('delete address', async() => {
   const wrapper = mount(AddressEdit, {
     attachToDocument: true,
     propsData: {
-      addressInfo: {
-        id: '123'
-      }
+      showDelete: true
     }
   });
 
diff --git a/packages/address-edit/zh-CN.md b/packages/address-edit/zh-CN.md
index e4c91a6a7..b6a8f74c0 100644
--- a/packages/address-edit/zh-CN.md
+++ b/packages/address-edit/zh-CN.md
@@ -105,12 +105,13 @@ export default {
 | province | 省份 | `String` |
 | city | 城市 | `String` |
 | county | 区县 | `String` |
-| address_detail | 详细地址 | `String` |
-| area_code | 地区编码，通过省市区选择获取 | `String` |
-| postal_code | 邮政编码 | `String` |
-| is_default | 是否为默认地址 | `Boolean` |
+| addressDetail | 详细地址 | `String` |
+| areaCode | 地区编码，通过省市区选择获取 | `String` |
+| postalCode | 邮政编码 | `String` |
+| isDefault | 是否为默认地址 | `Boolean` |
 
 #### searchResult 数据格式
+
 | key | 说明 | 类型 |
 |-----------|-----------|-----------|
 | name | 地名 | `String` |
diff --git a/packages/address-list/demo/index.vue b/packages/address-list/demo/index.vue
index c8718526b..9ac4a419d 100644
--- a/packages/address-list/demo/index.vue
+++ b/packages/address-list/demo/index.vue
@@ -35,8 +35,8 @@ export default {
           address: '浙江省杭州市滨江区江南大道 15 号'
         }
       ],
-      add: '新增收货地址',
-      edit: '编辑收货地址'
+      add: '新增地址',
+      edit: '编辑地址'
     },
     'en-US': {
       list: [
diff --git a/packages/address-list/en-US.md b/packages/address-list/en-US.md
index 4846ae3d6..e400a7d83 100644
--- a/packages/address-list/en-US.md
+++ b/packages/address-list/en-US.md
@@ -77,3 +77,10 @@ export default {
 | name | Name | `String` |
 | tel | Phone | `String` |
 | address | Address | `String` |
+
+### Slot
+
+| 名称 | 说明 |
+|-----------|-----------|
+| - | Custom content after list |
+| top | Custom content before list |
diff --git a/packages/address-list/index.vue b/packages/address-list/index.vue
index 51d2ef23e..ec7f8d3fa 100644
--- a/packages/address-list/index.vue
+++ b/packages/address-list/index.vue
@@ -1,5 +1,6 @@
 <template>
   <div :class="b()">
+    <slot name="top" />
     <radio-group :value="value" :class="b('group')" @input="$emit('input', $event)">
       <cell-group>
         <cell v-for="(item, index) in list" :key="item.id" is-link>
@@ -16,12 +17,13 @@
         </cell>
       </cell-group>
     </radio-group>
-    <cell
-      icon="add"
-      is-link
+    <slot />
+    <van-button
+      square
+      size="large"
+      type="danger"
       :class="b('add')"
-      class="van-hairline--top"
-      :title="addButtonText || $t('add')"
+      :text="addButtonText || $t('add')"
       @click="$emit('add')"
     />
   </div>
@@ -31,13 +33,15 @@
 import create from '../utils/create';
 import Radio from '../radio';
 import RadioGroup from '../radio-group';
+import VanButton from '../button';
 
 export default create({
   name: 'address-list',
 
   components: {
     Radio,
-    RadioGroup
+    RadioGroup,
+    VanButton
   },
 
   props: {
diff --git a/packages/address-list/test/__snapshots__/demo.spec.js.snap b/packages/address-list/test/__snapshots__/demo.spec.js.snap
index 6a2f62655..3f69b88e0 100644
--- a/packages/address-list/test/__snapshots__/demo.spec.js.snap
+++ b/packages/address-list/test/__snapshots__/demo.spec.js.snap
@@ -10,9 +10,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
             <!---->
             <div class="van-cell__value van-cell__value--alone">
-              <div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">张三，13000000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div></span></div>
+              <div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">张三，13000000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div></span></div>
             </div>
-            <i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;size:undefined;">
+            <i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;font-size:undefined;">
               <!---->
             </i>
           </div>
@@ -20,9 +20,9 @@ exports[`renders demo correctly 1`] = `
             <!---->
             <!---->
             <div class="van-cell__value van-cell__value--alone">
-              <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">李四，1310000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市拱墅区莫干山路 50 号</div></span></div>
+              <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">李四，1310000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市拱墅区莫干山路 50 号</div></span></div>
             </div>
-            <i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;size:undefined;">
+            <i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;font-size:undefined;">
               <!---->
             </i>
           </div>
@@ -30,26 +30,16 @@ exports[`renders demo correctly 1`] = `
             <!---->
             <!---->
             <div class="van-cell__value van-cell__value--alone">
-              <div class="van-radio"><span class="van-radio__input"><input type="radio" value="3" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">王五，1320000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市滨江区江南大道 15 号</div></span></div>
+              <div class="van-radio"><span class="van-radio__input"><input type="radio" value="3" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><div class="van-address-list__name">王五，1320000000</div> <div class="van-address-list__address">收货地址：浙江省杭州市滨江区江南大道 15 号</div></span></div>
             </div>
-            <i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;size:undefined;">
+            <i class="van-icon van-icon-edit van-address-list__edit" style="color:undefined;font-size:undefined;">
               <!---->
             </i>
           </div>
         </div>
       </div>
-      <div class="van-hairline--top van-cell van-cell--clickable van-hairline van-address-list__add">
-        <i class="van-icon van-icon-add van-cell__left-icon" style="color:undefined;size:undefined;">
-          <!---->
-        </i>
-        <div class="van-cell__title"><span>新增收货地址</span>
-          <!---->
-        </div>
-        <!---->
-        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
-          <!---->
-        </i>
-      </div>
+      <button class="van-button van-button--danger van-button--large van-button--square van-address-list__add">
+        <!----><span class="van-button__text">新增地址</span></button>
     </div>
   </div>
 </div>
diff --git a/packages/address-list/zh-CN.md b/packages/address-list/zh-CN.md
index 219cb8046..0cc47f761 100644
--- a/packages/address-list/zh-CN.md
+++ b/packages/address-list/zh-CN.md
@@ -44,10 +44,10 @@ export default {
 
   methods: {
     onAdd() {
-      Toast('新增收货地址');
+      Toast('新增地址');
     },
     onEdit(item, index) {
-      Toast('编辑收货地址:' + index);
+      Toast('编辑地址:' + index);
     }
   }
 }
@@ -60,7 +60,7 @@ export default {
 |-----------|-----------|-----------|-------------|
 | v-model | 当前选中地址的 id | String | - |
 | list | 地址列表 | Array | `[]` |
-| add-button-text | 底部按钮文字 | String | `新增收货地址` |
+| add-button-text | 底部按钮文字 | String | `新增地址` |
 
 ### Event
 
@@ -71,6 +71,7 @@ export default {
 | select | 切换选中的地址时触发 | item: 当前地址对象，index: 索引 |
 
 ### 数据格式
+
 #### 地址列表字段说明
 | key | 说明 | 类型 |
 |-----------|-----------|-----------|
@@ -78,3 +79,10 @@ export default {
 | name | 收货人姓名 | `String` |
 | tel | 收货人手机号 | `String` |
 | address | 收货地址 | `String` |
+
+### Slot
+
+| 名称 | 说明 |
+|-----------|-----------|
+| - | 在列表下方插入内容 |
+| top | 在顶部插入内容 |
diff --git a/packages/area/demo/area.js b/packages/area/demo/area.js
index 775710198..59653753c 100644
--- a/packages/area/demo/area.js
+++ b/packages/area/demo/area.js
@@ -1,5 +1,5 @@
 export default {
-  'province_list': {
+  province_list: {
     '110000': '北京市',
     '120000': '天津市',
     '130000': '河北省',
@@ -35,11 +35,9 @@ export default {
     '810000': '香港特别行政区',
     '820000': '澳门特别行政区'
   },
-  'city_list': {
+  city_list: {
     '110100': '北京市',
-    '110200': '县',
     '120100': '天津市',
-    '120200': '县',
     '130100': '石家庄市',
     '130200': '唐山市',
     '130300': '秦皇岛市',
@@ -112,7 +110,6 @@ export default {
     '231200': '绥化市',
     '232700': '大兴安岭地区',
     '310100': '上海市',
-    '310200': '县',
     '320100': '南京市',
     '320200': '无锡市',
     '320300': '徐州市',
@@ -327,8 +324,8 @@ export default {
     '540200': '日喀则市',
     '540300': '昌都市',
     '540400': '林芝市',
-    '542200': '山南地区',
-    '542400': '那曲地区',
+    '540500': '山南市',
+    '540600': '那曲市',
     '542500': '阿里地区',
     '610100': '西安市',
     '610200': '铜川市',
@@ -370,7 +367,7 @@ export default {
     '650100': '乌鲁木齐市',
     '650200': '克拉玛依市',
     '650400': '吐鲁番市',
-    '652200': '哈密地区',
+    '650500': '哈密市',
     '652300': '昌吉回族自治州',
     '652700': '博尔塔拉蒙古自治州',
     '652800': '巴音郭楞蒙古自治州',
@@ -410,7 +407,7 @@ export default {
     '820100': '澳门半岛',
     '820200': '离岛'
   },
-  'county_list': {
+  county_list: {
     '110101': '东城区',
     '110102': '西城区',
     '110105': '朝阳区',
@@ -425,8 +422,8 @@ export default {
     '110115': '大兴区',
     '110116': '怀柔区',
     '110117': '平谷区',
-    '110228': '密云县',
-    '110229': '延庆县',
+    '110118': '密云区',
+    '110119': '延庆区',
     '120101': '和平区',
     '120102': '河东区',
     '120103': '河西区',
@@ -442,7 +439,7 @@ export default {
     '120116': '滨海新区',
     '120117': '宁河区',
     '120118': '静海区',
-    '120225': '蓟县',
+    '120119': '蓟州区',
     '130102': '长安区',
     '130104': '桥西区',
     '130105': '新华区',
@@ -462,6 +459,7 @@ export default {
     '130131': '平山县',
     '130132': '元氏县',
     '130133': '赵县',
+    '130181': '辛集市',
     '130183': '晋州市',
     '130184': '新乐市',
     '130202': '路南区',
@@ -490,14 +488,13 @@ export default {
     '130403': '丛台区',
     '130404': '复兴区',
     '130406': '峰峰矿区',
-    '130421': '邯郸县',
+    '130407': '肥乡区',
+    '130408': '永年区',
     '130423': '临漳县',
     '130424': '成安县',
     '130425': '大名县',
     '130426': '涉县',
     '130427': '磁县',
-    '130428': '肥乡县',
-    '130429': '永年县',
     '130430': '邱县',
     '130431': '鸡泽县',
     '130432': '广平县',
@@ -551,7 +548,8 @@ export default {
     '130703': '桥西区',
     '130705': '宣化区',
     '130706': '下花园区',
-    '130721': '宣化县',
+    '130708': '万全区',
+    '130709': '崇礼区',
     '130722': '张北县',
     '130723': '康保县',
     '130724': '沽源县',
@@ -559,22 +557,20 @@ export default {
     '130726': '蔚县',
     '130727': '阳原县',
     '130728': '怀安县',
-    '130729': '万全县',
     '130730': '怀来县',
     '130731': '涿鹿县',
     '130732': '赤城县',
-    '130733': '崇礼县',
     '130802': '双桥区',
     '130803': '双滦区',
     '130804': '鹰手营子矿区',
     '130821': '承德县',
     '130822': '兴隆县',
-    '130823': '平泉县',
     '130824': '滦平县',
     '130825': '隆化县',
     '130826': '丰宁满族自治县',
     '130827': '宽城满族自治县',
     '130828': '围场满族蒙古族自治县',
+    '130881': '平泉市',
     '130902': '新华区',
     '130903': '运河区',
     '130921': '沧县',
@@ -602,8 +598,8 @@ export default {
     '131081': '霸州市',
     '131082': '三河市',
     '131090': '开发区',
-    '131091': '燕郊经济技术开发区',
     '131102': '桃城区',
+    '131103': '冀州区',
     '131121': '枣强县',
     '131122': '武邑县',
     '131123': '武强县',
@@ -612,10 +608,7 @@ export default {
     '131126': '故城县',
     '131127': '景县',
     '131128': '阜城县',
-    '131181': '冀州市',
     '131182': '深州市',
-    '139001': '定州市',
-    '139002': '辛集市',
     '140105': '小店区',
     '140106': '迎泽区',
     '140107': '杏花岭区',
@@ -777,6 +770,7 @@ export default {
     '150526': '扎鲁特旗',
     '150581': '霍林郭勒市',
     '150602': '东胜区',
+    '150603': '康巴什区',
     '150621': '达拉特旗',
     '150622': '准格尔旗',
     '150623': '鄂托克前旗',
@@ -846,7 +840,7 @@ export default {
     '210112': '浑南区',
     '210113': '沈北新区',
     '210114': '于洪区',
-    '210122': '辽中县',
+    '210115': '辽中区',
     '210123': '康平县',
     '210124': '法库县',
     '210181': '新民市',
@@ -857,12 +851,10 @@ export default {
     '210211': '甘井子区',
     '210212': '旅顺口区',
     '210213': '金州区',
+    '210214': '普兰店区',
     '210224': '长海县',
     '210281': '瓦房店市',
-    '210282': '普兰店市',
     '210283': '庄河市',
-    '210291': '大连经济技术开发区',
-    '210292': '大连高新区',
     '210302': '铁东区',
     '210303': '铁西区',
     '210304': '立山区',
@@ -920,7 +912,7 @@ export default {
     '211081': '灯塔市',
     '211102': '双台子区',
     '211103': '兴隆台区',
-    '211121': '大洼县',
+    '211104': '大洼区',
     '211122': '盘山县',
     '211202': '银州区',
     '211204': '清河区',
@@ -942,6 +934,7 @@ export default {
     '211421': '绥中县',
     '211422': '建昌县',
     '211481': '兴城市',
+    '215090': '工业园区',
     '220102': '南关区',
     '220103': '宽城区',
     '220104': '朝阳区',
@@ -952,8 +945,6 @@ export default {
     '220122': '农安县',
     '220182': '榆树市',
     '220183': '德惠市',
-    '220190': '高新技术产业开发区',
-    '220191': '汽车产业开发区',
     '220192': '经济技术开发区',
     '220202': '昌邑区',
     '220203': '龙潭区',
@@ -1098,9 +1089,9 @@ export default {
     '230822': '桦南县',
     '230826': '桦川县',
     '230828': '汤原县',
-    '230833': '抚远县',
     '230881': '同江市',
     '230882': '富锦市',
+    '230883': '抚远市',
     '230902': '新兴区',
     '230903': '桃山区',
     '230904': '茄子河区',
@@ -1109,12 +1100,12 @@ export default {
     '231003': '阳明区',
     '231004': '爱民区',
     '231005': '西安区',
-    '231024': '东宁县',
     '231025': '林口县',
     '231081': '绥芬河市',
     '231083': '海林市',
     '231084': '宁安市',
     '231085': '穆棱市',
+    '231086': '东宁市',
     '231102': '爱辉区',
     '231121': '嫩江县',
     '231123': '逊克县',
@@ -1138,13 +1129,11 @@ export default {
     '232791': '呼中区',
     '232792': '加格达奇区',
     '232793': '新林区',
-    '264290': '威海临港经济技术开发区',
     '310101': '黄浦区',
     '310104': '徐汇区',
     '310105': '长宁区',
     '310106': '静安区',
     '310107': '普陀区',
-    '310108': '闸北区',
     '310109': '虹口区',
     '310110': '杨浦区',
     '310112': '闵行区',
@@ -1155,7 +1144,7 @@ export default {
     '310117': '松江区',
     '310118': '青浦区',
     '310120': '奉贤区',
-    '310230': '崇明县',
+    '310151': '崇明区',
     '320102': '玄武区',
     '320104': '秦淮区',
     '320105': '建邺区',
@@ -1167,15 +1156,13 @@ export default {
     '320116': '六合区',
     '320117': '溧水区',
     '320118': '高淳区',
-    '320202': '崇安区',
-    '320203': '南长区',
-    '320204': '北塘区',
     '320205': '锡山区',
     '320206': '惠山区',
     '320211': '滨湖区',
+    '320213': '梁溪区',
+    '320214': '新吴区',
     '320281': '江阴市',
     '320282': '宜兴市',
-    '320290': '新区',
     '320302': '鼓楼区',
     '320303': '云龙区',
     '320305': '贾汪区',
@@ -1186,7 +1173,6 @@ export default {
     '320324': '睢宁县',
     '320381': '新沂市',
     '320382': '邳州市',
-    '320390': '金山桥开发区',
     '320391': '工业园区',
     '320402': '天宁区',
     '320404': '钟楼区',
@@ -1213,7 +1199,6 @@ export default {
     '320681': '启东市',
     '320682': '如皋市',
     '320684': '海门市',
-    '320690': '南通经济技术开发区',
     '320691': '高新区',
     '320703': '连云区',
     '320706': '海州区',
@@ -1221,12 +1206,11 @@ export default {
     '320722': '东海县',
     '320723': '灌云县',
     '320724': '灌南县',
-    '320802': '清河区',
     '320803': '淮安区',
     '320804': '淮阴区',
-    '320811': '清浦区',
+    '320812': '清江浦区',
+    '320813': '洪泽区',
     '320826': '涟水县',
-    '320829': '洪泽县',
     '320830': '盱眙县',
     '320831': '金湖县',
     '320890': '经济开发区',
@@ -1263,7 +1247,6 @@ export default {
     '321322': '沭阳县',
     '321323': '泗阳县',
     '321324': '泗洪县',
-    '321390': '宿迁经济开发区',
     '330102': '上城区',
     '330103': '下城区',
     '330104': '江干区',
@@ -1273,22 +1256,20 @@ export default {
     '330109': '萧山区',
     '330110': '余杭区',
     '330111': '富阳区',
+    '330112': '临安区',
     '330122': '桐庐县',
     '330127': '淳安县',
     '330182': '建德市',
-    '330185': '临安市',
     '330203': '海曙区',
-    '330204': '江东区',
     '330205': '江北区',
     '330206': '北仑区',
     '330211': '镇海区',
     '330212': '鄞州区',
+    '330213': '奉化区',
     '330225': '象山县',
     '330226': '宁海县',
     '330281': '余姚市',
     '330282': '慈溪市',
-    '330283': '奉化市',
-    '330290': '高新科技开发区',
     '330302': '鹿城区',
     '330303': '龙湾区',
     '330304': '瓯海区',
@@ -1340,12 +1321,12 @@ export default {
     '331002': '椒江区',
     '331003': '黄岩区',
     '331004': '路桥区',
-    '331021': '玉环县',
     '331022': '三门县',
     '331023': '天台县',
     '331024': '仙居县',
     '331081': '温岭市',
     '331082': '临海市',
+    '331083': '玉环市',
     '331102': '莲都区',
     '331121': '青田县',
     '331122': '缙云县',
@@ -1366,10 +1347,6 @@ export default {
     '340181': '巢湖市',
     '340190': '高新技术开发区',
     '340191': '经济技术开发区',
-    '340192': '北城新区',
-    '340193': '政务文化新区',
-    '340194': '滨湖新区',
-    '340195': '新站高新区',
     '340202': '镜湖区',
     '340203': '弋江区',
     '340207': '鸠江区',
@@ -1391,7 +1368,7 @@ export default {
     '340405': '八公山区',
     '340406': '潘集区',
     '340421': '凤台县',
-    '340490': '淮南高新技术产业开发区',
+    '340422': '寿县',
     '340503': '花山区',
     '340504': '雨山区',
     '340506': '博望区',
@@ -1402,22 +1379,20 @@ export default {
     '340603': '相山区',
     '340604': '烈山区',
     '340621': '濉溪县',
-    '340702': '铜官山区',
-    '340703': '狮子山区',
+    '340705': '铜官区',
+    '340706': '义安区',
     '340711': '郊区',
-    '340721': '铜陵县',
+    '340722': '枞阳县',
     '340802': '迎江区',
     '340803': '大观区',
     '340811': '宜秀区',
     '340822': '怀宁县',
-    '340823': '枞阳县',
     '340824': '潜山县',
     '340825': '太湖县',
     '340826': '宿松县',
     '340827': '望江县',
     '340828': '岳西县',
     '340881': '桐城市',
-    '340890': '安庆经济技术开发区',
     '341002': '屯溪区',
     '341003': '黄山区',
     '341004': '徽州区',
@@ -1441,7 +1416,6 @@ export default {
     '341225': '阜南县',
     '341226': '颍上县',
     '341282': '界首市',
-    '341290': '阜阳经济技术开发区',
     '341302': '埇桥区',
     '341321': '砀山县',
     '341322': '萧县',
@@ -1450,7 +1424,7 @@ export default {
     '341390': '经济开发区',
     '341502': '金安区',
     '341503': '裕安区',
-    '341521': '寿县',
+    '341504': '叶集区',
     '341522': '霍邱县',
     '341523': '舒城县',
     '341524': '金寨县',
@@ -1475,6 +1449,7 @@ export default {
     '350104': '仓山区',
     '350105': '马尾区',
     '350111': '晋安区',
+    '350112': '长乐区',
     '350121': '闽侯县',
     '350122': '连江县',
     '350123': '罗源县',
@@ -1482,7 +1457,6 @@ export default {
     '350125': '永泰县',
     '350128': '平潭县',
     '350181': '福清市',
-    '350182': '长乐市',
     '350203': '思明区',
     '350205': '海沧区',
     '350206': '湖里区',
@@ -1555,7 +1529,6 @@ export default {
     '350926': '柘荣县',
     '350981': '福安市',
     '350982': '福鼎市',
-    '350990': '东侨开发区',
     '360102': '东湖区',
     '360103': '西湖区',
     '360104': '青云谱区',
@@ -1566,7 +1539,6 @@ export default {
     '360123': '安义县',
     '360124': '进贤县',
     '360190': '经济技术开发区',
-    '360191': '红谷滩新区',
     '360192': '高新区',
     '360202': '昌江区',
     '360203': '珠山区',
@@ -1577,21 +1549,20 @@ export default {
     '360321': '莲花县',
     '360322': '上栗县',
     '360323': '芦溪县',
-    '360402': '庐山区',
+    '360402': '濂溪区',
     '360403': '浔阳区',
-    '360421': '九江县',
+    '360404': '柴桑区',
     '360423': '武宁县',
     '360424': '修水县',
     '360425': '永修县',
     '360426': '德安县',
-    '360427': '星子县',
     '360428': '都昌县',
     '360429': '湖口县',
     '360430': '彭泽县',
     '360481': '瑞昌市',
     '360482': '共青城市',
+    '360483': '庐山市',
     '360490': '经济技术开发区',
-    '360491': '八里湖新区',
     '360502': '渝水区',
     '360521': '分宜县',
     '360602': '月湖区',
@@ -1599,7 +1570,7 @@ export default {
     '360681': '贵溪市',
     '360702': '章贡区',
     '360703': '南康区',
-    '360721': '赣县',
+    '360704': '赣县区',
     '360722': '信丰县',
     '360723': '大余县',
     '360724': '上犹县',
@@ -1639,6 +1610,7 @@ export default {
     '360982': '樟树市',
     '360983': '高安市',
     '361002': '临川区',
+    '361003': '东乡区',
     '361021': '南城县',
     '361022': '黎川县',
     '361023': '南丰县',
@@ -1647,7 +1619,6 @@ export default {
     '361026': '宜黄县',
     '361027': '金溪县',
     '361028': '资溪县',
-    '361029': '东乡县',
     '361030': '广昌县',
     '361102': '信州区',
     '361103': '广丰区',
@@ -1667,10 +1638,10 @@ export default {
     '370105': '天桥区',
     '370112': '历城区',
     '370113': '长清区',
+    '370114': '章丘区',
     '370124': '平阴县',
     '370125': '济阳县',
     '370126': '商河县',
-    '370181': '章丘市',
     '370190': '高新区',
     '370202': '市南区',
     '370203': '市北区',
@@ -1678,8 +1649,8 @@ export default {
     '370212': '崂山区',
     '370213': '李沧区',
     '370214': '城阳区',
+    '370215': '即墨区',
     '370281': '胶州市',
-    '370282': '即墨市',
     '370283': '平度市',
     '370285': '莱西市',
     '370290': '开发区',
@@ -1699,7 +1670,7 @@ export default {
     '370481': '滕州市',
     '370502': '东营区',
     '370503': '河口区',
-    '370521': '垦利县',
+    '370505': '垦利区',
     '370522': '利津县',
     '370523': '广饶县',
     '370602': '芝罘区',
@@ -1751,7 +1722,6 @@ export default {
     '371003': '文登区',
     '371082': '荣成市',
     '371083': '乳山市',
-    '371090': '工业新区',
     '371091': '经济技术开发区',
     '371102': '东港区',
     '371103': '岚山区',
@@ -1782,7 +1752,6 @@ export default {
     '371428': '武城县',
     '371481': '乐陵市',
     '371482': '禹城市',
-    '371490': '德州经济技术开发区',
     '371502': '东昌府区',
     '371521': '阳谷县',
     '371522': '莘县',
@@ -1798,15 +1767,14 @@ export default {
     '371623': '无棣县',
     '371625': '博兴县',
     '371626': '邹平县',
-    '371690': '北海新区',
     '371702': '牡丹区',
+    '371703': '定陶区',
     '371721': '曹县',
     '371722': '单县',
     '371723': '成武县',
     '371724': '巨野县',
     '371725': '郓城县',
     '371726': '鄄城县',
-    '371727': '定陶县',
     '371728': '东明县',
     '410102': '中原区',
     '410103': '二七区',
@@ -1822,12 +1790,10 @@ export default {
     '410185': '登封市',
     '410190': '高新技术开发区',
     '410191': '经济技术开发区',
-    '410192': '郑东新区',
     '410202': '龙亭区',
     '410203': '顺河回族区',
     '410204': '鼓楼区',
     '410205': '禹王台区',
-    '410211': '金明区',
     '410212': '祥符区',
     '410221': '杞县',
     '410222': '通许县',
@@ -1848,7 +1814,6 @@ export default {
     '410328': '洛宁县',
     '410329': '伊川县',
     '410381': '偃师市',
-    '410390': '伊滨区',
     '410402': '新华区',
     '410403': '卫东区',
     '410404': '石龙区',
@@ -1903,7 +1868,7 @@ export default {
     '410927': '台前县',
     '410928': '濮阳县',
     '411002': '魏都区',
-    '411023': '许昌县',
+    '411003': '建安区',
     '411024': '鄢陵县',
     '411025': '襄城县',
     '411081': '禹州市',
@@ -1914,8 +1879,8 @@ export default {
     '411121': '舞阳县',
     '411122': '临颍县',
     '411202': '湖滨区',
+    '411203': '陕州区',
     '411221': '渑池县',
-    '411222': '陕县',
     '411224': '卢氏县',
     '411281': '义马市',
     '411282': '灵宝市',
@@ -1962,7 +1927,6 @@ export default {
     '411628': '鹿邑县',
     '411681': '项城市',
     '411690': '经济开发区',
-    '411691': '东新区',
     '411702': '驿城区',
     '411721': '西平县',
     '411722': '上蔡县',
@@ -1987,14 +1951,12 @@ export default {
     '420115': '江夏区',
     '420116': '黄陂区',
     '420117': '新洲区',
-    '420190': '武汉经济技术开发区',
     '420202': '黄石港区',
     '420203': '西塞山区',
     '420204': '下陆区',
     '420205': '铁山区',
     '420222': '阳新县',
     '420281': '大冶市',
-    '420290': '黄石经济技术开发区',
     '420302': '茅箭区',
     '420303': '张湾区',
     '420304': '郧阳区',
@@ -2087,8 +2049,8 @@ export default {
     '430111': '雨花区',
     '430112': '望城区',
     '430121': '长沙县',
-    '430124': '宁乡县',
     '430181': '浏阳市',
+    '430182': '宁乡市',
     '430202': '荷塘区',
     '430203': '芦淞区',
     '430204': '石峰区',
@@ -2229,10 +2191,7 @@ export default {
     '440306': '宝安区',
     '440307': '龙岗区',
     '440308': '盐田区',
-    '440390': '坪山新区',
-    '440391': '光明新区',
-    '440392': '大鹏新区',
-    '440393': '龙华新区',
+    '440310': '坪山区',
     '440402': '香洲区',
     '440403': '斗门区',
     '440404': '金湾区',
@@ -2374,7 +2333,6 @@ export default {
     '445102': '湘桥区',
     '445103': '潮安区',
     '445122': '饶平县',
-    '445190': '枫溪区',
     '445202': '榕城区',
     '445203': '揭东区',
     '445222': '揭西县',
@@ -2401,7 +2359,7 @@ export default {
     '450203': '鱼峰区',
     '450204': '柳南区',
     '450205': '柳北区',
-    '450221': '柳江县',
+    '450206': '柳江区',
     '450222': '柳城县',
     '450223': '鹿寨县',
     '450224': '融安县',
@@ -2468,10 +2426,12 @@ export default {
     '451031': '隆林各族自治县',
     '451081': '靖西市',
     '451102': '八步区',
+    '451103': '平桂区',
     '451121': '昭平县',
     '451122': '钟山县',
     '451123': '富川瑶族自治县',
     '451202': '金城江区',
+    '451203': '宜州区',
     '451221': '南丹县',
     '451222': '天峨县',
     '451223': '凤山县',
@@ -2481,7 +2441,6 @@ export default {
     '451227': '巴马瑶族自治县',
     '451228': '都安瑶族自治县',
     '451229': '大化瑶族自治县',
-    '451281': '宜州市',
     '451302': '兴宾区',
     '451321': '忻城县',
     '451322': '象州县',
@@ -2508,7 +2467,6 @@ export default {
     '460323': '中沙群岛的岛礁及其海域',
     '469001': '五指山市',
     '469002': '琼海市',
-    '469003': '儋州市',
     '469005': '文昌市',
     '469006': '万宁市',
     '469007': '东方市',
@@ -2545,13 +2503,13 @@ export default {
     '500151': '铜梁区',
     '500152': '潼南区',
     '500153': '荣昌区',
-    '500228': '梁平县',
+    '500154': '开州区',
+    '500155': '梁平区',
+    '500156': '武隆区',
     '500229': '城口县',
     '500230': '丰都县',
     '500231': '垫江县',
-    '500232': '武隆县',
     '500233': '忠县',
-    '500234': '开县',
     '500235': '云阳县',
     '500236': '奉节县',
     '500237': '巫山县',
@@ -2569,9 +2527,9 @@ export default {
     '510113': '青白江区',
     '510114': '新都区',
     '510115': '温江区',
+    '510116': '双流区',
+    '510117': '郫都区',
     '510121': '金堂县',
-    '510122': '双流县',
-    '510124': '郫县',
     '510129': '大邑县',
     '510131': '蒲江县',
     '510132': '新津县',
@@ -2579,7 +2537,7 @@ export default {
     '510182': '彭州市',
     '510183': '邛崃市',
     '510184': '崇州市',
-    '510190': '高新西区',
+    '510185': '简阳市',
     '510191': '高新区',
     '510302': '自流井区',
     '510303': '贡井区',
@@ -2600,21 +2558,20 @@ export default {
     '510524': '叙永县',
     '510525': '古蔺县',
     '510603': '旌阳区',
+    '510604': '罗江区',
     '510623': '中江县',
-    '510626': '罗江县',
     '510681': '广汉市',
     '510682': '什邡市',
     '510683': '绵竹市',
     '510703': '涪城区',
     '510704': '游仙区',
+    '510705': '安州区',
     '510722': '三台县',
     '510723': '盐亭县',
-    '510724': '安县',
     '510725': '梓潼县',
     '510726': '北川羌族自治县',
     '510727': '平武县',
     '510781': '江油市',
-    '510790': '经开区',
     '510791': '高新区',
     '510802': '利州区',
     '510811': '昭化区',
@@ -2632,7 +2589,7 @@ export default {
     '511011': '东兴区',
     '511024': '威远县',
     '511025': '资中县',
-    '511028': '隆昌县',
+    '511083': '隆昌市',
     '511102': '市中区',
     '511111': '沙湾区',
     '511112': '五通桥区',
@@ -2698,7 +2655,7 @@ export default {
     '512002': '雁江区',
     '512021': '安岳县',
     '512022': '乐至县',
-    '512081': '简阳市',
+    '513201': '马尔康市',
     '513221': '汶川县',
     '513222': '理县',
     '513223': '茂县',
@@ -2707,7 +2664,6 @@ export default {
     '513226': '金川县',
     '513227': '小金县',
     '513228': '黑水县',
-    '513229': '马尔康县',
     '513230': '壤塘县',
     '513231': '阿坝县',
     '513232': '若尔盖县',
@@ -2760,10 +2716,10 @@ export default {
     '520201': '钟山区',
     '520203': '六枝特区',
     '520221': '水城县',
-    '520222': '盘县',
+    '520281': '盘州市',
     '520302': '红花岗区',
     '520303': '汇川区',
-    '520321': '遵义县',
+    '520304': '播州区',
     '520322': '桐梓县',
     '520323': '绥阳县',
     '520324': '正安县',
@@ -2841,7 +2797,7 @@ export default {
     '530112': '西山区',
     '530113': '东川区',
     '530114': '呈贡区',
-    '530122': '晋宁县',
+    '530115': '晋宁区',
     '530124': '富民县',
     '530125': '宜良县',
     '530126': '石林彝族自治县',
@@ -2850,16 +2806,16 @@ export default {
     '530129': '寻甸回族彝族自治县',
     '530181': '安宁市',
     '530302': '麒麟区',
+    '530303': '沾益区',
     '530321': '马龙县',
     '530322': '陆良县',
     '530323': '师宗县',
     '530324': '罗平县',
     '530325': '富源县',
     '530326': '会泽县',
-    '530328': '沾益县',
     '530381': '宣威市',
     '530402': '红塔区',
-    '530421': '江川县',
+    '530403': '江川区',
     '530422': '澄江县',
     '530423': '通海县',
     '530424': '华宁县',
@@ -2957,7 +2913,7 @@ export default {
     '533122': '梁河县',
     '533123': '盈江县',
     '533124': '陇川县',
-    '533321': '泸水县',
+    '533301': '泸水市',
     '533323': '福贡县',
     '533324': '贡山独龙族怒族自治县',
     '533325': '兰坪白族普米族自治县',
@@ -2965,12 +2921,12 @@ export default {
     '533422': '德钦县',
     '533423': '维西傈僳族自治县',
     '540102': '城关区',
+    '540103': '堆龙德庆区',
+    '540104': '达孜区',
     '540121': '林周县',
     '540122': '当雄县',
     '540123': '尼木县',
     '540124': '曲水县',
-    '540125': '堆龙德庆县',
-    '540126': '达孜县',
     '540127': '墨竹工卡县',
     '540202': '桑珠孜区',
     '540221': '南木林县',
@@ -3008,18 +2964,19 @@ export default {
     '540424': '波密县',
     '540425': '察隅县',
     '540426': '朗县',
-    '542221': '乃东县',
-    '542222': '扎囊县',
-    '542223': '贡嘎县',
-    '542224': '桑日县',
-    '542225': '琼结县',
-    '542226': '曲松县',
-    '542227': '措美县',
-    '542228': '洛扎县',
-    '542229': '加查县',
-    '542231': '隆子县',
-    '542232': '错那县',
-    '542233': '浪卡子县',
+    '540502': '乃东区',
+    '540521': '扎囊县',
+    '540522': '贡嘎县',
+    '540523': '桑日县',
+    '540524': '琼结县',
+    '540525': '曲松县',
+    '540526': '措美县',
+    '540527': '洛扎县',
+    '540528': '加查县',
+    '540529': '隆子县',
+    '540530': '错那县',
+    '540531': '浪卡子县',
+    '540602': '色尼区',
     '542421': '那曲县',
     '542422': '嘉黎县',
     '542423': '比如县',
@@ -3048,9 +3005,9 @@ export default {
     '610115': '临潼区',
     '610116': '长安区',
     '610117': '高陵区',
+    '610118': '鄠邑区',
     '610122': '蓝田县',
     '610124': '周至县',
-    '610125': '户县',
     '610202': '王益区',
     '610203': '印台区',
     '610204': '耀州区',
@@ -3082,7 +3039,7 @@ export default {
     '610431': '武功县',
     '610481': '兴平市',
     '610502': '临渭区',
-    '610521': '华县',
+    '610503': '华州区',
     '610522': '潼关县',
     '610523': '大荔县',
     '610524': '合阳县',
@@ -3093,10 +3050,10 @@ export default {
     '610581': '韩城市',
     '610582': '华阴市',
     '610602': '宝塔区',
+    '610603': '安塞区',
     '610621': '延长县',
     '610622': '延川县',
     '610623': '子长县',
-    '610624': '安塞县',
     '610625': '志丹县',
     '610626': '吴起县',
     '610627': '甘泉县',
@@ -3106,7 +3063,7 @@ export default {
     '610631': '黄龙县',
     '610632': '黄陵县',
     '610702': '汉台区',
-    '610721': '南郑县',
+    '610703': '南郑区',
     '610722': '城固县',
     '610723': '洋县',
     '610724': '西乡县',
@@ -3117,9 +3074,8 @@ export default {
     '610729': '留坝县',
     '610730': '佛坪县',
     '610802': '榆阳区',
-    '610821': '神木县',
+    '610803': '横山区',
     '610822': '府谷县',
-    '610823': '横山县',
     '610824': '靖边县',
     '610825': '定边县',
     '610826': '绥德县',
@@ -3128,6 +3084,7 @@ export default {
     '610829': '吴堡县',
     '610830': '清涧县',
     '610831': '子洲县',
+    '610881': '神木市',
     '610902': '汉滨区',
     '610921': '汉阴县',
     '610922': '石泉县',
@@ -3318,9 +3275,9 @@ export default {
     '650402': '高昌区',
     '650421': '鄯善县',
     '650422': '托克逊县',
-    '652201': '哈密市',
-    '652222': '巴里坤哈萨克自治县',
-    '652223': '伊吾县',
+    '650502': '伊州区',
+    '650521': '巴里坤哈萨克自治县',
+    '650522': '伊吾县',
     '652301': '昌吉市',
     '652302': '阜康市',
     '652323': '呼图壁县',
@@ -3399,11 +3356,14 @@ export default {
     '654324': '哈巴河县',
     '654325': '青河县',
     '654326': '吉木乃县',
-    '654390': '北屯市',
     '659001': '石河子市',
     '659002': '阿拉尔市',
     '659003': '图木舒克市',
     '659004': '五家渠市',
+    '659006': '铁门关市',
+    '659007': '双河市',
+    '659008': '可克达拉市',
+    '659009': '昆玉市',
     '710101': '中正区',
     '710102': '大同区',
     '710103': '中山区',
@@ -3582,6 +3542,200 @@ export default {
     '711155': '八里区',
     '711156': '淡水区',
     '711157': '三芝区',
+    '711287': '宜兰市',
+    '711288': '头城镇',
+    '711289': '礁溪乡',
+    '711290': '壮围乡',
+    '711291': '员山乡',
+    '711292': '罗东镇',
+    '711293': '三星乡',
+    '711294': '大同乡',
+    '711295': '五结乡',
+    '711296': '冬山乡',
+    '711297': '苏澳镇',
+    '711298': '南澳乡',
+    '711299': '钓鱼台',
+    '711387': '竹北市',
+    '711388': '湖口乡',
+    '711389': '新丰乡',
+    '711390': '新埔镇',
+    '711391': '关西镇',
+    '711392': '芎林乡',
+    '711393': '宝山乡',
+    '711394': '竹东镇',
+    '711395': '五峰乡',
+    '711396': '横山乡',
+    '711397': '尖石乡',
+    '711398': '北埔乡',
+    '711399': '峨眉乡',
+    '711487': '中坜市',
+    '711488': '平镇市',
+    '711489': '龙潭乡',
+    '711490': '杨梅市',
+    '711491': '新屋乡',
+    '711492': '观音乡',
+    '711493': '桃园市',
+    '711494': '龟山乡',
+    '711495': '八德市',
+    '711496': '大溪镇',
+    '711497': '复兴乡',
+    '711498': '大园乡',
+    '711499': '芦竹乡',
+    '711582': '竹南镇',
+    '711583': '头份镇',
+    '711584': '三湾乡',
+    '711585': '南庄乡',
+    '711586': '狮潭乡',
+    '711587': '后龙镇',
+    '711588': '通霄镇',
+    '711589': '苑里镇',
+    '711590': '苗栗市',
+    '711591': '造桥乡',
+    '711592': '头屋乡',
+    '711593': '公馆乡',
+    '711594': '大湖乡',
+    '711595': '泰安乡',
+    '711596': '铜锣乡',
+    '711597': '三义乡',
+    '711598': '西湖乡',
+    '711599': '卓兰镇',
+    '711774': '彰化市',
+    '711775': '芬园乡',
+    '711776': '花坛乡',
+    '711777': '秀水乡',
+    '711778': '鹿港镇',
+    '711779': '福兴乡',
+    '711780': '线西乡',
+    '711781': '和美镇',
+    '711782': '伸港乡',
+    '711783': '员林镇',
+    '711784': '社头乡',
+    '711785': '永靖乡',
+    '711786': '埔心乡',
+    '711787': '溪湖镇',
+    '711788': '大村乡',
+    '711789': '埔盐乡',
+    '711790': '田中镇',
+    '711791': '北斗镇',
+    '711792': '田尾乡',
+    '711793': '埤头乡',
+    '711794': '溪州乡',
+    '711795': '竹塘乡',
+    '711796': '二林镇',
+    '711797': '大城乡',
+    '711798': '芳苑乡',
+    '711799': '二水乡',
+    '711982': '番路乡',
+    '711983': '梅山乡',
+    '711984': '竹崎乡',
+    '711985': '阿里山乡',
+    '711986': '中埔乡',
+    '711987': '大埔乡',
+    '711988': '水上乡',
+    '711989': '鹿草乡',
+    '711990': '太保市',
+    '711991': '朴子市',
+    '711992': '东石乡',
+    '711993': '六脚乡',
+    '711994': '新港乡',
+    '711995': '民雄乡',
+    '711996': '大林镇',
+    '711997': '溪口乡',
+    '711998': '义竹乡',
+    '711999': '布袋镇',
+    '712180': '斗南镇',
+    '712181': '大埤乡',
+    '712182': '虎尾镇',
+    '712183': '土库镇',
+    '712184': '褒忠乡',
+    '712185': '东势乡',
+    '712186': '台西乡',
+    '712187': '仑背乡',
+    '712188': '麦寮乡',
+    '712189': '斗六市',
+    '712190': '林内乡',
+    '712191': '古坑乡',
+    '712192': '莿桐乡',
+    '712193': '西螺镇',
+    '712194': '二仑乡',
+    '712195': '北港镇',
+    '712196': '水林乡',
+    '712197': '口湖乡',
+    '712198': '四湖乡',
+    '712199': '元长乡',
+    '712467': '屏东市',
+    '712468': '三地门乡',
+    '712469': '雾台乡',
+    '712470': '玛家乡',
+    '712471': '九如乡',
+    '712472': '里港乡',
+    '712473': '高树乡',
+    '712474': '盐埔乡',
+    '712475': '长治乡',
+    '712476': '麟洛乡',
+    '712477': '竹田乡',
+    '712478': '内埔乡',
+    '712479': '万丹乡',
+    '712480': '潮州镇',
+    '712481': '泰武乡',
+    '712482': '来义乡',
+    '712483': '万峦乡',
+    '712484': '莰顶乡',
+    '712485': '新埤乡',
+    '712486': '南州乡',
+    '712487': '林边乡',
+    '712488': '东港镇',
+    '712489': '琉球乡',
+    '712490': '佳冬乡',
+    '712491': '新园乡',
+    '712492': '枋寮乡',
+    '712493': '枋山乡',
+    '712494': '春日乡',
+    '712495': '狮子乡',
+    '712496': '车城乡',
+    '712497': '牡丹乡',
+    '712498': '恒春镇',
+    '712499': '满州乡',
+    '712584': '台东市',
+    '712585': '绿岛乡',
+    '712586': '兰屿乡',
+    '712587': '延平乡',
+    '712588': '卑南乡',
+    '712589': '鹿野乡',
+    '712590': '关山镇',
+    '712591': '海端乡',
+    '712592': '池上乡',
+    '712593': '东河乡',
+    '712594': '成功镇',
+    '712595': '长滨乡',
+    '712596': '金峰乡',
+    '712597': '大武乡',
+    '712598': '达仁乡',
+    '712599': '太麻里乡',
+    '712686': '花莲市',
+    '712687': '新城乡',
+    '712688': '太鲁阁',
+    '712689': '秀林乡',
+    '712690': '吉安乡',
+    '712691': '寿丰乡',
+    '712692': '凤林镇',
+    '712693': '光复乡',
+    '712694': '丰滨乡',
+    '712695': '瑞穗乡',
+    '712696': '万荣乡',
+    '712697': '玉里镇',
+    '712698': '卓溪乡',
+    '712699': '富里乡',
+    '712794': '马公市',
+    '712795': '西屿乡',
+    '712796': '望安乡',
+    '712797': '七美乡',
+    '712798': '白沙乡',
+    '712799': '湖西乡',
+    '712896': '南竿乡',
+    '712897': '北竿乡',
+    '712898': '东引乡',
+    '712899': '莒光乡',
     '810101': '中西区',
     '810102': '湾仔',
     '810103': '东区',
diff --git a/packages/area/demo/index.vue b/packages/area/demo/index.vue
index 9b8384518..2786a7a8f 100644
--- a/packages/area/demo/index.vue
+++ b/packages/area/demo/index.vue
@@ -33,9 +33,6 @@ export default {
   },
 
   data() {
-    setTimeout(() => {
-      this.$refs.area.reset();
-    }, 3000);
     return {
       value: '330302'
     };
diff --git a/packages/button/en-US.md b/packages/button/en-US.md
index 85ff41a57..03a0edaad 100644
--- a/packages/button/en-US.md
+++ b/packages/button/en-US.md
@@ -71,6 +71,7 @@ Use `tag` prop to custom button tag
 | disabled | Whether to disable button | `Boolean` | `false` |
 | loading | Whether show loading status | `Boolean` | `false` |
 | block | Whether to set display block | `Boolean` | `false` |
+| square | Whether to be square button | `Boolean` | `false` |
 
 ### Event
 
diff --git a/packages/button/index.vue b/packages/button/index.vue
index d787a912d..6fe9f6841 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -9,6 +9,7 @@
       {
         block,
         plain,
+        square,
         loading,
         disabled,
         unclickable: disabled || loading,
@@ -34,6 +35,7 @@ export default create({
     text: String,
     block: Boolean,
     plain: Boolean,
+    square: Boolean,
     loading: Boolean,
     disabled: Boolean,
     nativeType: String,
diff --git a/packages/button/zh-CN.md b/packages/button/zh-CN.md
index 9b45b7baf..ffa1b5bdf 100644
--- a/packages/button/zh-CN.md
+++ b/packages/button/zh-CN.md
@@ -76,6 +76,7 @@ Vue.use(Button);
 | disabled | 是否禁用 | `Boolean` | `false` |
 | loading | 是否显示为加载状态 | `Boolean` | `false` |
 | block | 是否为块级元素 | `Boolean` | `false` |
+| square | 是否为方形按钮 | `Boolean` | `false` |
 
 ### Event
 
diff --git a/packages/cell-swipe/test/__snapshots__/index.spec.js.snap b/packages/cell-swipe/test/__snapshots__/index.spec.js.snap
deleted file mode 100644
index c4a218f73..000000000
--- a/packages/cell-swipe/test/__snapshots__/index.spec.js.snap
+++ /dev/null
@@ -1,46 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`drag and show left part 1`] = `
-<div class="van-cell-swipe">
-  <div class="van-cell-swipe__wrapper">
-    <div class="van-cell-swipe__left"></div>
-    <div class="van-cell-swipe__right"></div>
-  </div>
-</div>
-`;
-
-exports[`drag and show left part 2`] = `
-<div class="van-cell-swipe">
-  <div class="van-cell-swipe__wrapper">
-    <div class="van-cell-swipe__left"></div>
-    <div class="van-cell-swipe__right"></div>
-  </div>
-</div>
-`;
-
-exports[`drag and show left part 3`] = `
-<div class="van-cell-swipe">
-  <div class="van-cell-swipe__wrapper">
-    <div class="van-cell-swipe__left"></div>
-    <div class="van-cell-swipe__right"></div>
-  </div>
-</div>
-`;
-
-exports[`drag and show left part 4`] = `
-<div class="van-cell-swipe">
-  <div class="van-cell-swipe__wrapper">
-    <div class="van-cell-swipe__left"></div>
-    <div class="van-cell-swipe__right"></div>
-  </div>
-</div>
-`;
-
-exports[`drag and show left part 5`] = `
-<div class="van-cell-swipe">
-  <div class="van-cell-swipe__wrapper">
-    <div class="van-cell-swipe__left"></div>
-    <div class="van-cell-swipe__right"></div>
-  </div>
-</div>
-`;
diff --git a/packages/cell/test/__snapshots__/demo.spec.js.snap b/packages/cell/test/__snapshots__/demo.spec.js.snap
index 092ee702f..4c1e442eb 100644
--- a/packages/cell/test/__snapshots__/demo.spec.js.snap
+++ b/packages/cell/test/__snapshots__/demo.spec.js.snap
@@ -35,7 +35,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-cell-group van-hairline--top-bottom">
       <div class="van-cell van-hairline">
-        <i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <div class="van-cell__title"><span>单元格</span>
@@ -54,7 +54,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <!---->
-        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
@@ -64,7 +64,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div class="van-cell__value"><span>内容</span></div>
-        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
@@ -74,7 +74,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div class="van-cell__value"><span>内容</span></div>
-        <i class="van-icon van-icon-arrow van-cell__right-icon van-cell__right-icon--down" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-cell__right-icon van-cell__right-icon--down" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
@@ -83,24 +83,24 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-cell-group van-hairline--top-bottom">
       <div class="van-cell van-cell--clickable van-hairline">
-        <i class="van-icon van-icon-shop van-cell__left-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-shop van-cell__left-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <div class="van-cell__title"><span class="van-cell-text">单元格</span> <span class="van-hairline--surround van-tag van-tag--danger">标签</span></div>
         <div class="van-cell__value"><span>内容</span></div>
-        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
       <div class="van-cell van-cell--clickable van-hairline">
-        <i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-location van-cell__left-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <div class="van-cell__title"><span>单元格</span>
           <!---->
         </div>
         <!---->
-        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
@@ -110,7 +110,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <!---->
-        <i class="van-cell__right-icon van-icon van-icon-search" style="color:undefined;size:undefined;">
+        <i class="van-cell__right-icon van-icon van-icon-search" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
diff --git a/packages/checkbox/test/__snapshots__/demo.spec.js.snap b/packages/checkbox/test/__snapshots__/demo.spec.js.snap
index a2044e508..50dd9812f 100644
--- a/packages/checkbox/test/__snapshots__/demo.spec.js.snap
+++ b/packages/checkbox/test/__snapshots__/demo.spec.js.snap
@@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-checkbox">
       <div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
-        <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div> <span class="van-checkbox__label">复选框</span></div>
@@ -13,13 +13,13 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-checkbox">
       <div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--disabled">
-        <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div> <span class="van-checkbox__label">复选框</span></div>
     <div class="van-checkbox">
       <div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--disabled van-checkbox__icon--checked">
-        <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div> <span class="van-checkbox__label">复选框</span></div>
@@ -36,7 +36,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-checkbox-group">
       <div class="van-checkbox">
         <div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
-          <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div> <span class="van-checkbox__label">
@@ -44,7 +44,7 @@ exports[`renders demo correctly 1`] = `
       </span></div>
       <div class="van-checkbox">
         <div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
-          <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div> <span class="van-checkbox__label">
@@ -52,7 +52,7 @@ exports[`renders demo correctly 1`] = `
       </span></div>
       <div class="van-checkbox">
         <div class="van-checkbox__icon van-checkbox__icon--round">
-          <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div> <span class="van-checkbox__label">
@@ -64,7 +64,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-checkbox-group">
       <div class="van-checkbox">
         <div class="van-checkbox__icon van-checkbox__icon--round">
-          <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div> <span class="van-checkbox__label">
@@ -72,7 +72,7 @@ exports[`renders demo correctly 1`] = `
       </span></div>
       <div class="van-checkbox">
         <div class="van-checkbox__icon van-checkbox__icon--round">
-          <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div> <span class="van-checkbox__label">
@@ -80,7 +80,7 @@ exports[`renders demo correctly 1`] = `
       </span></div>
       <div class="van-checkbox">
         <div class="van-checkbox__icon van-checkbox__icon--round">
-          <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div> <span class="van-checkbox__label">
@@ -99,7 +99,7 @@ exports[`renders demo correctly 1`] = `
           <div class="van-cell__value">
             <div class="van-checkbox">
               <div class="van-checkbox__icon van-checkbox__icon--round">
-                <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+                <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
                   <!---->
                 </i>
               </div>
@@ -116,7 +116,7 @@ exports[`renders demo correctly 1`] = `
           <div class="van-cell__value">
             <div class="van-checkbox">
               <div class="van-checkbox__icon van-checkbox__icon--round">
-                <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+                <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
                   <!---->
                 </i>
               </div>
@@ -133,7 +133,7 @@ exports[`renders demo correctly 1`] = `
           <div class="van-cell__value">
             <div class="van-checkbox">
               <div class="van-checkbox__icon van-checkbox__icon--round">
-                <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+                <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
                   <!---->
                 </i>
               </div>
diff --git a/packages/collapse/test/__snapshots__/demo.spec.js.snap b/packages/collapse/test/__snapshots__/demo.spec.js.snap
index 41a703c76..0c7771295 100644
--- a/packages/collapse/test/__snapshots__/demo.spec.js.snap
+++ b/packages/collapse/test/__snapshots__/demo.spec.js.snap
@@ -9,7 +9,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞微商城</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -22,7 +22,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞零售</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -33,7 +33,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞美业</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -48,7 +48,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞微商城</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -61,7 +61,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞零售</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -72,7 +72,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞美业</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -88,12 +88,12 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <div class="van-cell__value van-cell__value--alone">
             <div>有赞微商城
-              <i class="van-icon van-icon-question" style="color:undefined;size:undefined;">
+              <i class="van-icon van-icon-question" style="color:undefined;font-size:undefined;">
                 <!---->
               </i>
             </div>
           </div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -104,7 +104,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <!---->
           <div class="van-cell__value van-cell__value--alone">有赞零售</div>
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
diff --git a/packages/contact-card/test/__snapshots__/demo.spec.js.snap b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
index 323f9b84d..57a28b69f 100644
--- a/packages/contact-card/test/__snapshots__/demo.spec.js.snap
+++ b/packages/contact-card/test/__snapshots__/demo.spec.js.snap
@@ -5,12 +5,12 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-contact-card van-contact-card--add">
       <div class="van-contact-card__content">
-        <i class="van-icon van-icon-add2 van-contact-card__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-add2 van-contact-card__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <div class="van-contact-card__text">添加订单联系人信息</div>
       </div>
-      <i class="van-icon van-icon-arrow van-contact-card__arrow" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-arrow van-contact-card__arrow" style="color:undefined;font-size:undefined;">
         <!---->
       </i>
     </div>
@@ -22,23 +22,23 @@ exports[`renders demo correctly 1`] = `
               <!---->
               <!---->
               <div class="van-cell__value van-cell__value--alone">
-                <div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label"><p class="van-contact-list__text">联系人：张三</p> <p class="van-contact-list__text">联系电话：13000000000</p></span></div>
+                <div class="van-radio"><span class="van-radio__input"><input type="radio" value="0" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label"><p class="van-contact-list__text">联系人：张三</p> <p class="van-contact-list__text">联系电话：13000000000</p></span></div>
               </div>
-              <i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;size:undefined;">
+              <i class="van-icon van-icon-edit van-contact-list__edit" style="color:undefined;font-size:undefined;">
                 <!---->
               </i>
             </div>
           </div>
         </div>
         <div class="van-hairline--top van-cell van-cell--clickable van-hairline van-contact-list__add">
-          <i class="van-icon van-icon-add van-cell__left-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-add van-cell__left-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
           <div class="van-cell__title"><span>新建联系人</span>
             <!---->
           </div>
           <!---->
-          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -91,7 +91,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-contact-card van-contact-card--edit van-contact-card--uneditable">
       <div class="van-contact-card__content">
-        <i class="van-icon van-icon-contact van-contact-card__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-contact van-contact-card__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <div class="van-contact-card__text">
diff --git a/packages/coupon-cell/index.vue b/packages/coupon-cell/index.vue
index 58088f50e..96d875357 100644
--- a/packages/coupon-cell/index.vue
+++ b/packages/coupon-cell/index.vue
@@ -1,6 +1,11 @@
 <template>
   <cell-group :class="b()">
-    <cell :title="title || $t('title')" :value="value" :is-link="editable" @click="$emit('click')" />
+    <cell
+      :title="title || $t('title')"
+      :value="value"
+      :is-link="editable"
+      @click="$emit('click')"
+    />
   </cell-group>
 </template>
 
diff --git a/packages/coupon-list/Item.vue b/packages/coupon-list/Item.vue
index b00c4429c..0145a8484 100644
--- a/packages/coupon-list/Item.vue
+++ b/packages/coupon-list/Item.vue
@@ -1,25 +1,23 @@
 <template>
   <div :class="b({ disabled })">
-    <div :class="b('head')">
-      <div :class="b('lines')" />
-      <div :class="b('gradient')">
+    <div :class="b('content')">
+      <div :class="b('head')">
         <h2 v-html="faceAmount" />
         <p>{{ conditionMessage }}</p>
       </div>
-    </div>
-    <div :class="b('body')">
-      <h2>{{ data.name }}</h2>
-      <span>{{ validPeriod }}</span>
-      <p v-if="disabled && data.reason">{{ data.reason }}</p>
-      <div v-if="chosen" :class="b('corner')" >
-        <icon name="success" />
+      <div :class="b('body')">
+        <h2>{{ data.name }}</h2>
+        <p>{{ validPeriod }}</p>
+        <checkbox v-if="chosen" :class="b('corner')" :value="true" />
       </div>
     </div>
+    <p v-if="disabled && data.reason" :class="b('reason')">{{ data.reason }}</p>
   </div>
 </template>
 
 <script>
 import create from '../utils/create';
+import Checkbox from '../checkbox';
 
 export default create({
   name: 'coupon-item',
@@ -30,9 +28,13 @@ export default create({
     disabled: Boolean
   },
 
+  components: {
+    Checkbox
+  },
+
   computed: {
     validPeriod() {
-      return `${this.getDate(this.data.start_at)}-${this.getDate(this.data.end_at)}`;
+      return `${this.$t('valid')}：${this.getDate(this.data.startAt)} - ${this.getDate(this.data.endAt)}`;
     },
 
     faceAmount() {
@@ -44,9 +46,9 @@ export default create({
     },
 
     conditionMessage() {
-      let condition = this.data.origin_condition;
+      let condition = this.data.originCondition;
       condition = condition % 100 === 0 ? Math.round(condition / 100) : (condition / 100).toFixed(2);
-      return this.data.origin_condition === 0 ? this.$t('unlimited') : this.$t('condition', condition);
+      return this.data.originCondition === 0 ? this.$t('unlimited') : this.$t('condition', condition);
     }
   },
 
diff --git a/packages/coupon-list/demo/index.vue b/packages/coupon-list/demo/index.vue
index a8c974dd1..6420de3e5 100644
--- a/packages/coupon-list/demo/index.vue
+++ b/packages/coupon-list/demo/index.vue
@@ -7,7 +7,7 @@
         @click="showList = true"
       />
 
-      <van-popup v-model="showList" position="bottom" :lazy-render="false">
+      <van-popup v-model="showList" position="bottom">
         <van-coupon-list
           :coupons="coupons"
           :chosen-coupon="chosenCoupon"
@@ -63,12 +63,12 @@ export default {
         available: 1,
         discount: 0,
         denominations: 150,
-        origin_condition: 0,
+        originCondition: 0,
         reason: '',
         value: 150,
         name: this.$t('coupon.name'),
-        start_at: 1489104000,
-        end_at: 1514592000
+        startAt: 1489104000,
+        endAt: 1514592000
       };
     },
 
@@ -78,7 +78,7 @@ export default {
         id: 2,
         discount: 88,
         denominations: 0,
-        origin_condition: 50,
+        originCondition: 50,
         value: 12
       };
     },
diff --git a/packages/coupon-list/en-US.md b/packages/coupon-list/en-US.md
index 479de4261..3494f9b2b 100644
--- a/packages/coupon-list/en-US.md
+++ b/packages/coupon-list/en-US.md
@@ -36,12 +36,12 @@ const coupon = {
   available: 1,
   discount: 0,
   denominations: 150,
-  origin_condition: 0,
+  originCondition: 0,
   reason: '',
   value: 150,
   name: 'Coupon name',
-  start_at: 1489104000,
-  end_at: 1514592000
+  startAt: 1489104000,
+  endAt: 1514592000
 };
 
 export default {
@@ -106,9 +106,8 @@ export default {
 | name | Name | `String` |
 | discount | Discount | `Number` |
 | denominations | Denominations | `Number` |
-| origin_condition | Condition | `Number` |
-| start_at | Start time (Timestmap, unit second) | `Number` |
-| end_at | End time (Timestmap, unit second) | `Number` |
+| originCondition | Condition | `Number` |
+| startAt | Start time (Timestmap, unit second) | `Number` |
+| endAt | End time (Timestmap, unit second) | `Number` |
 | reason | Unavailable reason | `String` |
 | value | Value | `Number` |
-
diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue
index 9947df8a6..c69b22dd3 100644
--- a/packages/coupon-list/index.vue
+++ b/packages/coupon-list/index.vue
@@ -1,15 +1,16 @@
 <template>
   <div :class="b()">
-    <cell-group v-if="showExchangeBar" :class="b('top')">
-      <field
-        v-model="currentCode"
-        clearable
-        :class="b('field')"
-        class="van-hairline--surround"
-        :placeholder="inputPlaceholder || $t('placeholder')"
-        :maxlength="20"
-      />
+    <field
+      v-if="showExchangeBar"
+      v-model="currentCode"
+      clearable
+      :border="false"
+      :class="b('field')"
+      :placeholder="inputPlaceholder || $t('placeholder')"
+      :maxlength="20"
+    >
       <van-button
+        slot="button"
         size="small"
         type="danger"
         :class="b('exchange')"
@@ -18,33 +19,44 @@
         :disabled="buttonDisabled"
         @click="onClickExchangeButton"
       />
-    </cell-group>
-    <div :class="b('list', { 'with-exchange': showExchangeBar })" ref="list">
-      <coupon-item
-        ref="card"
-        v-for="(item, index) in coupons"
-        :key="item.id || item.name"
-        :data="item"
-        :chosen="index === chosenCoupon"
-        @click.native="$emit('change', index)"
-      />
-      <h3 v-if="disabledCoupons.length">{{ disabledListTitle || $t('disabled') }}</h3>
-      <coupon-item
-        disabled
-        v-for="item in disabledCoupons"
-        :key="item.id || item.name"
-        :data="item"
-      />
-      <div v-if="!coupons.length && !disabledCoupons.length" :class="b('empty')">
-        <img src="https://img.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png" >
-        <p>{{ $t('empty') }}</p>
-      </div>
-    </div>
-    <div
+    </field>
+    <tabs v-model="tab" :class="b('tab')" :line-width="120">
+      <tab :title="title">
+        <div :class="b('list')" :style="listStyle">
+          <coupon-item
+            ref="card"
+            v-for="(item, index) in coupons"
+            :key="item.id || item.name"
+            :data="item"
+            :chosen="index === chosenCoupon"
+            @click.native="$emit('change', index)"
+          />
+          <div v-if="!coupons.length" :class="b('empty')">
+            <img src="https://img.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png" >
+            <p>{{ $t('empty') }}</p>
+          </div>
+        </div>
+      </tab>
+      <tab :title="disabledTitle">
+        <div :class="b('list')" :style="listStyle">
+          <coupon-item
+            disabled
+            v-for="item in disabledCoupons"
+            :key="item.id || item.name"
+            :data="item"
+          />
+          <div v-if="!disabledCoupons.length" :class="b('empty')">
+            <img src="https://img.yzcdn.cn/v2/image/wap/trade/new_order/empty@2x.png" >
+            <p>{{ $t('empty') }}</p>
+          </div>
+        </div>
+      </tab>
+    </tabs>
+    <van-button
       v-show="showCloseButton"
-      v-text="closeButtonText || $t('close')"
+      size="large"
       :class="b('close')"
-      class="van-hairline--top"
+      :text="closeButtonText || $t('close')"
       @click="$emit('change', -1)"
     />
   </div>
@@ -55,13 +67,17 @@ import create from '../utils/create';
 import CouponItem from './Item';
 import Field from '../field';
 import VanButton from '../button';
+import Tab from '../tab';
+import Tabs from '../tabs';
 
 export default create({
   name: 'coupon-list',
 
   components: {
-    VanButton,
+    Tab,
+    Tabs,
     Field,
+    VanButton,
     CouponItem
   },
 
@@ -109,6 +125,8 @@ export default create({
 
   data() {
     return {
+      tab: 0,
+      winHeight: window.innerHeight,
       currentCode: this.code || ''
     };
   },
@@ -120,6 +138,20 @@ export default create({
         (this.exchangeButtonDisabled ||
           this.currentCode.length < this.exchangeMinLength)
       );
+    },
+
+    title() {
+      return `${this.$t('enable')} (${this.coupons.length})`;
+    },
+
+    disabledTitle() {
+      return `${this.$t('disabled')} (${this.disabledCoupons.length})`;
+    },
+
+    listStyle() {
+      return {
+        height: this.winHeight - (this.showExchangeBar ? 140 : 94) + 'px'
+      };
     }
   },
 
diff --git a/packages/coupon-list/test/__snapshots__/demo.spec.js.snap b/packages/coupon-list/test/__snapshots__/demo.spec.js.snap
index 8d565c79e..016900be8 100644
--- a/packages/coupon-list/test/__snapshots__/demo.spec.js.snap
+++ b/packages/coupon-list/test/__snapshots__/demo.spec.js.snap
@@ -10,94 +10,12 @@ exports[`renders demo correctly 1`] = `
           <!---->
         </div>
         <div class="van-cell__value"><span>您有 2 个可用优惠</span></div>
-        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-cell__right-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
     </div>
-    <div name="popup-slide-bottom" class="van-popup van-popup--bottom" style="display:none;">
-      <div class="van-coupon-list">
-        <div class="van-cell-group van-hairline--top-bottom van-coupon-list__top">
-          <div placeholder="请输入优惠码" maxlength="20" class="van-hairline--surround van-cell van-hairline van-field van-coupon-list__field">
-            <!---->
-            <!---->
-            <div class="van-cell__value van-cell__value--alone">
-              <div class="van-field__body">
-                <input type="text" placeholder="请输入优惠码" maxlength="20" value="" class="van-field__control">
-                <!---->
-                <!---->
-                <!---->
-              </div>
-              <!---->
-            </div>
-            <!---->
-          </div>
-          <button disabled="disabled" class="van-button van-button--danger van-button--small van-button--disabled van-button--unclickable van-coupon-list__exchange">
-            <!----><span class="van-button__text">兑换</span></button>
-        </div>
-        <div class="van-coupon-list__list van-coupon-list__list--with-exchange">
-          <div class="van-coupon-item">
-            <div class="van-coupon-item__head">
-              <div class="van-coupon-item__lines"></div>
-              <div class="van-coupon-item__gradient">
-                <h2><span>¥</span> 1.5</h2>
-                <p>无使用门槛</p>
-              </div>
-            </div>
-            <div class="van-coupon-item__body">
-              <h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
-              <!---->
-              <!---->
-            </div>
-          </div>
-          <div class="van-coupon-item">
-            <div class="van-coupon-item__head">
-              <div class="van-coupon-item__lines"></div>
-              <div class="van-coupon-item__gradient">
-                <h2>8.8折</h2>
-                <p>满0.50元可用</p>
-              </div>
-            </div>
-            <div class="van-coupon-item__body">
-              <h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
-              <!---->
-              <!---->
-            </div>
-          </div>
-          <h3>不可用优惠</h3>
-          <div class="van-coupon-item van-coupon-item--disabled">
-            <div class="van-coupon-item__head">
-              <div class="van-coupon-item__lines"></div>
-              <div class="van-coupon-item__gradient">
-                <h2><span>¥</span> 1.5</h2>
-                <p>无使用门槛</p>
-              </div>
-            </div>
-            <div class="van-coupon-item__body">
-              <h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
-              <p>优惠券不可用原因</p>
-              <!---->
-            </div>
-          </div>
-          <div class="van-coupon-item van-coupon-item--disabled">
-            <div class="van-coupon-item__head">
-              <div class="van-coupon-item__lines"></div>
-              <div class="van-coupon-item__gradient">
-                <h2>1折</h2>
-                <p>满0.50元可用</p>
-              </div>
-            </div>
-            <div class="van-coupon-item__body">
-              <h2>优惠券名称</h2> <span>2017.03.10-2017.12.30</span>
-              <p>优惠券不可用原因</p>
-              <!---->
-            </div>
-          </div>
-          <!---->
-        </div>
-        <div class="van-hairline--top van-coupon-list__close">不使用优惠</div>
-      </div>
-    </div>
+    <!---->
   </div>
 </div>
 `;
diff --git a/packages/coupon-list/zh-CN.md b/packages/coupon-list/zh-CN.md
index af6f5f615..8dbf72c19 100644
--- a/packages/coupon-list/zh-CN.md
+++ b/packages/coupon-list/zh-CN.md
@@ -36,12 +36,12 @@ const coupon = {
   available: 1,
   discount: 0,
   denominations: 150,
-  origin_condition: 0,
+  originCondition: 0,
   reason: '',
   value: 150,
   name: '优惠券名称',
-  start_at: 1489104000,
-  end_at: 1514592000
+  startAt: 1489104000,
+  endAt: 1514592000
 };
 
 export default {
@@ -109,8 +109,8 @@ export default {
 | name | 优惠券名称 | `String` |
 | discount | 折扣（0为满减券）88=>8.8折 | `Number` |
 | denominations | 面值（0为折扣券）单位分 | `Number` |
-| origin_condition | 满减条件（0为无门槛，满XX元可用）单位分 | `Number` |
-| start_at | 卡有效开始时间 (时间戳, 单位秒) | `Number` |
-| end_at | 卡失效日期 (时间戳, 单位秒) | `Number` |
+| originCondition | 满减条件（0为无门槛，满XX元可用）单位分 | `Number` |
+| startAt | 卡有效开始时间 (时间戳, 单位秒) | `Number` |
+| endAt | 卡失效日期 (时间戳, 单位秒) | `Number` |
 | reason | 不可用原因 | `String` |
 | value | 订单优惠金额，单位分 | `Number` |
diff --git a/packages/field/test/__snapshots__/demo.spec.js.snap b/packages/field/test/__snapshots__/demo.spec.js.snap
index 590dc7860..e0348a7df 100644
--- a/packages/field/test/__snapshots__/demo.spec.js.snap
+++ b/packages/field/test/__snapshots__/demo.spec.js.snap
@@ -32,7 +32,7 @@ exports[`renders demo correctly 1`] = `
             <input type="text" placeholder="请输入用户名" value="" class="van-field__control">
             <!---->
             <div class="van-field__icon">
-              <i class="van-icon van-icon-question" style="color:undefined;size:undefined;">
+              <i class="van-icon van-icon-question" style="color:undefined;font-size:undefined;">
                 <!---->
               </i>
             </div>
@@ -63,7 +63,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-cell-group van-hairline--top-bottom">
       <div disabled="disabled" class="van-cell van-hairline van-field">
-        <i class="van-icon van-icon-contact van-cell__left-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-contact van-cell__left-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <div class="van-cell__title"><span>用户名</span>
diff --git a/packages/goods-action/test/__snapshots__/demo.spec.js.snap b/packages/goods-action/test/__snapshots__/demo.spec.js.snap
index 5ca022a47..d62f2138f 100644
--- a/packages/goods-action/test/__snapshots__/demo.spec.js.snap
+++ b/packages/goods-action/test/__snapshots__/demo.spec.js.snap
@@ -5,11 +5,11 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-goods-action">
       <a class="van-hairline van-goods-action-mini-btn">
-        <i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i> 客服</a>
       <a class="van-hairline van-goods-action-mini-btn">
-        <i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i> 购物车</a>
       <a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn">
@@ -21,15 +21,15 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-goods-action">
       <a class="van-hairline van-goods-action-mini-btn">
-        <i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-chat van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i> 客服</a>
       <a class="van-hairline van-goods-action-mini-btn">
-        <i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-cart van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <div class="van-icon__info">5</div>
         </i> 购物车</a>
       <a class="van-hairline van-goods-action-mini-btn">
-        <i class="van-icon van-icon-shop van-goods-action-mini-btn__icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-shop van-goods-action-mini-btn__icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i> 店铺</a>
       <a class="van-button van-button--default van-button--normal van-button--bottom-action van-goods-action-big-btn">
diff --git a/packages/icon/assets/icons.sketch b/packages/icon/assets/icons.sketch
index 52be1fd62..86e1a55f5 100644
Binary files a/packages/icon/assets/icons.sketch and b/packages/icon/assets/icons.sketch differ
diff --git a/packages/icon/config/index.js b/packages/icon/config/index.js
index e8e5d2b31..45b551765 100644
--- a/packages/icon/config/index.js
+++ b/packages/icon/config/index.js
@@ -57,6 +57,10 @@ module.exports = {
       src: 'share.svg',
       css: 'share'
     },
+    {
+      src: 'aim.svg',
+      css: 'aim'
+    },
     {
       src: '喜欢.svg',
       css: 'like-o'
@@ -66,7 +70,7 @@ module.exports = {
       css: 'logistics'
     },
     {
-      src: '编辑地址.svg',
+      src: 'edit.svg',
       css: 'edit'
     },
     {
diff --git a/packages/icon/index.vue b/packages/icon/index.vue
index 7522ccc46..77aaea759 100644
--- a/packages/icon/index.vue
+++ b/packages/icon/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <i :class="[b(), `van-icon-${name}`]" :style="{ color, size }" v-on="$listeners">
+  <i :class="[b(), `van-icon-${name}`]" :style="style" v-on="$listeners">
     <slot />
     <div v-if="isDef(info)" :class="b('info')">{{ info }}</div>
   </i>
@@ -16,6 +16,15 @@ export default create({
     info: [String, Number],
     color: String,
     size: String
+  },
+
+  computed: {
+    style() {
+      return {
+        color: this.color,
+        fontSize: this.size
+      };
+    }
   }
 });
 </script>
diff --git a/packages/icon/test/__snapshots__/demo.spec.js.snap b/packages/icon/test/__snapshots__/demo.spec.js.snap
index d007dc762..cff4aeb6f 100644
--- a/packages/icon/test/__snapshots__/demo.spec.js.snap
+++ b/packages/icon/test/__snapshots__/demo.spec.js.snap
@@ -4,375 +4,379 @@ exports[`renders demo correctly 1`] = `
 <div>
   <div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-close" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-close" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>close</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-upgrade" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-upgrade" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>upgrade</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-add-o" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-add-o" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>add-o</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-passed" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-passed" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>passed</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-chat" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>chat</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-question" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-question" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>question</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-clock" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-clock" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>clock</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-gold-coin" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-gold-coin" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>gold-coin</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-play" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-play" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>play</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-pause" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-pause" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>pause</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-stop" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-stop" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>stop</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-more-o" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>more-o</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-info-o" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-info-o" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>info-o</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-share" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-share" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>share</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-like-o" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-aim" style="color:undefined;font-size:undefined;">
+        <!---->
+      </i> <span>aim</span></div>
+    <div class="van-col van-col--8">
+      <i class="van-icon van-icon-like-o" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>like-o</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-logistics" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-logistics" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>logistics</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-edit" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-edit" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>edit</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-exchange" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-exchange" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>exchange</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-location" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-location" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>location</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-cart" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-cart" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>cart</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-shop" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-shop" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>shop</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-gift" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-gift" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>gift</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-contact" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-contact" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>contact</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-wap-home" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-wap-home" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>wap-home</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-points" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-points" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>points</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-discount" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-discount" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>discount</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-point-gift" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-point-gift" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>point-gift</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-after-sale" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-after-sale" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>after-sale</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-edit-data" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-edit-data" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>edit-data</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-delete" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-delete" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>delete</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-records" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>records</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-completed" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-completed" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>completed</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-certificate" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-certificate" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>certificate</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-tosend" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-tosend" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>tosend</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-sign" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-sign" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>sign</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-photo" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-photo" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>photo</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-idcard" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-idcard" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>idcard</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-home" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-home" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>home</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-free-postage" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-free-postage" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>free-postage</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-cash-back-record" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-cash-back-record" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>cash-back-record</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-points-mall" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-points-mall" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>points-mall</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-exchange-record" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-exchange-record" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>exchange-record</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-pending-payment" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-pending-payment" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>pending-payment</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-pending-orders" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-pending-orders" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>pending-orders</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-pending-deliver" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-pending-deliver" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>pending-deliver</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-pending-evaluate" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-pending-evaluate" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>pending-evaluate</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-password-view" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-password-view" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>password-view</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-password-not-view" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-password-not-view" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>password-not-view</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-check" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>check</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-arrow" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-arrow" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>arrow</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-arrow-left" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-arrow-left" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>arrow-left</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-search" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-search" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>search</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>success</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-fail" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-fail" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>fail</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-add" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-add" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>add</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>checked</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-warn" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-warn" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>warn</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-clear" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-clear" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>clear</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-underway" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-underway" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>underway</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-more" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-more" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>more</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-like" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-like" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>like</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-photograph" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-photograph" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>photograph</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-qr-invalid" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-qr-invalid" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>qr-invalid</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-qr" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-qr" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>qr</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-add2" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-add2" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>add2</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-wechat" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-wechat" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>wechat</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-alipay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-alipay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>alipay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-wap-nav" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-wap-nav" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>wap-nav</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-ecard-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-ecard-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>ecard-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-balance-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-balance-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>balance-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-peer-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-peer-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>peer-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-credit-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-credit-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>credit-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-debit-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-debit-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>debit-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-other-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-other-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>other-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-shopping-cart" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-shopping-cart" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>shopping-cart</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-browsing-history" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-browsing-history" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>browsing-history</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-goods-collect" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-goods-collect" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>goods-collect</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-shop-collect" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-shop-collect" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>shop-collect</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-receive-gift" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-receive-gift" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>receive-gift</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-send-gift" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-send-gift" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>send-gift</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-setting" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-setting" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>setting</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-coupon" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-coupon" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>coupon</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-gift-card-pay" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-gift-card-pay" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>gift-card-pay</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-cash-on-deliver" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-cash-on-deliver" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>cash-on-deliver</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-phone" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-phone" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>phone</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-description" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-description" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>description</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-card" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-card" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>card</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-value-card" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-value-card" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>value-card</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-gift-card" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-gift-card" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>gift-card</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-hot" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-hot" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>hot</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-new" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-new" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>new</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-new-arrival" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-new-arrival" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>new-arrival</span></div>
     <div class="van-col van-col--8">
-      <i class="van-icon van-icon-hot-sale" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-hot-sale" style="color:undefined;font-size:undefined;">
         <!---->
       </i> <span>hot-sale</span></div>
   </div>
diff --git a/packages/icon/vant-icon-eb8c95.ttf b/packages/icon/vant-icon-1907f5.ttf
similarity index 88%
rename from packages/icon/vant-icon-eb8c95.ttf
rename to packages/icon/vant-icon-1907f5.ttf
index 7b8fc2c71..b7fc073f9 100644
Binary files a/packages/icon/vant-icon-eb8c95.ttf and b/packages/icon/vant-icon-1907f5.ttf differ
diff --git a/packages/icon/zh-CN.md b/packages/icon/zh-CN.md
index 451a1ba68..83232311f 100644
--- a/packages/icon/zh-CN.md
+++ b/packages/icon/zh-CN.md
@@ -55,7 +55,7 @@ import 'vant/lib/vant-css/icon-local.css';
 | name | 图标名称 | `String` | - |
 | info | 图标右上角文字提示 | `String | Number` | - |
 | color | 图标颜色 | `String` | `inherit` |
-| size | 图标大小 | `String` | `inherit` |
+| size | 图标大小，如 `20px`，`2em` | `String` | `inherit` |
 
 ### Event
 
diff --git a/packages/index.js b/packages/index.js
index 27cb645ee..7a62fac8b 100644
--- a/packages/index.js
+++ b/packages/index.js
@@ -9,7 +9,6 @@ import Button from './button';
 import Card from './card';
 import Cell from './cell';
 import CellGroup from './cell-group';
-import CellSwipe from './cell-swipe';
 import Checkbox from './checkbox';
 import CheckboxGroup from './checkbox-group';
 import Circle from './circle';
@@ -55,6 +54,7 @@ import Stepper from './stepper';
 import Steps from './steps';
 import SubmitBar from './submit-bar';
 import Swipe from './swipe';
+import SwipeCell from './swipe-cell';
 import SwipeItem from './swipe-item';
 import Switch from './switch';
 import SwitchCell from './switch-cell';
@@ -68,7 +68,7 @@ import TreeSelect from './tree-select';
 import Uploader from './uploader';
 import Waterfall from './waterfall';
 
-const version = '1.1.15';
+const version = '1.1.16';
 const components = [
   Actionsheet,
   AddressEdit,
@@ -80,7 +80,6 @@ const components = [
   Card,
   Cell,
   CellGroup,
-  CellSwipe,
   Checkbox,
   CheckboxGroup,
   Circle,
@@ -125,6 +124,7 @@ const components = [
   Steps,
   SubmitBar,
   Swipe,
+  SwipeCell,
   SwipeItem,
   Switch,
   SwitchCell,
@@ -162,7 +162,6 @@ export {
   Card,
   Cell,
   CellGroup,
-  CellSwipe,
   Checkbox,
   CheckboxGroup,
   Circle,
@@ -208,6 +207,7 @@ export {
   Steps,
   SubmitBar,
   Swipe,
+  SwipeCell,
   SwipeItem,
   Switch,
   SwitchCell,
diff --git a/packages/locale/lang/en-US.js b/packages/locale/lang/en-US.js
index f123be9d3..41d264797 100644
--- a/packages/locale/lang/en-US.js
+++ b/packages/locale/lang/en-US.js
@@ -40,10 +40,12 @@ export default {
     empty: 'No coupons',
     exchange: 'Exchange',
     close: 'Close',
+    enable: 'Available',
     disabled: 'Unavailable',
     placeholder: 'Coupon code'
   },
   vanCouponItem: {
+    valid: 'Valid',
     unlimited: 'Unlimited',
     discount: discount => `${discount * 10}% off`,
     condition: condition => `At least ${condition}`
diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js
index 5d3262e3e..e9326332b 100644
--- a/packages/locale/lang/zh-CN.js
+++ b/packages/locale/lang/zh-CN.js
@@ -38,10 +38,12 @@ export default {
     empty: '暂无优惠券',
     exchange: '兑换',
     close: '不使用优惠',
-    disabled: '不可用优惠',
+    enable: '可使用优惠券',
+    disabled: '不可使用优惠券',
     placeholder: '请输入优惠码'
   },
   vanCouponItem: {
+    valid: '有效期',
     unlimited: '无使用门槛',
     discount: discount => `${discount}折`,
     condition: (condition) => `满${condition}元可用`
@@ -61,7 +63,7 @@ export default {
   },
   vanAddressList: {
     address: '收货地址',
-    add: '新增收货地址'
+    add: '新增地址'
   },
   vanSku: {
     unavailable: '商品已经无法购买啦',
diff --git a/packages/locale/lang/zh-HK.js b/packages/locale/lang/zh-HK.js
index feca06c86..a7f60b2ae 100644
--- a/packages/locale/lang/zh-HK.js
+++ b/packages/locale/lang/zh-HK.js
@@ -39,11 +39,12 @@ export default {
   vanCouponList: {
     empty: '暫無優惠券',
     exchange: '兌換',
-    close: '不使用優惠',
-    disabled: '不可用優惠',
+    enable: '可使用優惠券',
+    disabled: '不可使用優惠券',
     placeholder: '請輸入優惠碼'
   },
   vanCouponItem: {
+    valid: '有效期',
     unlimited: '無使用門檻',
     discount: discount => `${discount}折`,
     condition: (condition) => `滿${condition}元可用`
diff --git a/packages/nav-bar/test/__snapshots__/demo.spec.js.snap b/packages/nav-bar/test/__snapshots__/demo.spec.js.snap
index f4247c1cd..ef421bdce 100644
--- a/packages/nav-bar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/nav-bar/test/__snapshots__/demo.spec.js.snap
@@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-hairline--bottom van-nav-bar" style="z-index:1;">
       <div class="van-nav-bar__left">
-        <i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;font-size:undefined;">
           <!---->
         </i> <span class="van-nav-bar__text">返回</span></div>
       <div class="van-ellipsis van-nav-bar__title">标题</div>
@@ -15,12 +15,12 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-hairline--bottom van-nav-bar" style="z-index:1;">
       <div class="van-nav-bar__left">
-        <i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-arrow van-nav-bar__arrow" style="color:undefined;font-size:undefined;">
           <!---->
         </i> <span class="van-nav-bar__text">返回</span></div>
       <div class="van-ellipsis van-nav-bar__title">标题</div>
       <div class="van-nav-bar__right">
-        <i class="van-icon van-icon-search" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-search" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
       </div>
diff --git a/packages/notice-bar/test/__snapshots__/demo.spec.js.snap b/packages/notice-bar/test/__snapshots__/demo.spec.js.snap
index 359ae80d4..87685fbf8 100644
--- a/packages/notice-bar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/notice-bar/test/__snapshots__/demo.spec.js.snap
@@ -28,7 +28,7 @@ exports[`renders demo correctly 1`] = `
       <div class="van-notice-bar__wrap">
         <div class="van-notice-bar__content" style="padding-left:0;animation-delay:1s;animation-duration:0s;">足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。</div>
       </div>
-      <i class="van-icon van-icon-close van-notice-bar__right-icon" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-close van-notice-bar__right-icon" style="color:undefined;font-size:undefined;">
         <!---->
       </i>
     </div>
@@ -37,7 +37,7 @@ exports[`renders demo correctly 1`] = `
       <div class="van-notice-bar__wrap">
         <div class="van-notice-bar__content" style="padding-left:0;animation-delay:1s;animation-duration:0s;">足协杯战线连续第2年上演广州德比战，上赛季半决赛上恒大以两回合5-3的总比分淘汰富力。</div>
       </div>
-      <i class="van-icon van-icon-arrow van-notice-bar__right-icon" style="color:undefined;size:undefined;">
+      <i class="van-icon van-icon-arrow van-notice-bar__right-icon" style="color:undefined;font-size:undefined;">
         <!---->
       </i>
     </div>
diff --git a/packages/radio/test/__snapshots__/demo.spec.js.snap b/packages/radio/test/__snapshots__/demo.spec.js.snap
index aafb9c52b..2aaf12d87 100644
--- a/packages/radio/test/__snapshots__/demo.spec.js.snap
+++ b/packages/radio/test/__snapshots__/demo.spec.js.snap
@@ -4,14 +4,14 @@ exports[`renders demo correctly 1`] = `
 <div>
   <div>
     <div class="demo-radio-group van-radio-group">
-      <div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
-      <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
+      <div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
+      <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
     </div>
   </div>
   <div>
     <div class="demo-radio-group van-radio-group">
-      <div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="1" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
-      <div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="2" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
+      <div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="1" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 1</span></div>
+      <div class="van-radio van-radio--disabled"><span class="van-radio__input"><input type="radio" disabled="disabled" value="2" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span> <span class="van-radio__label">单选框 2</span></div>
     </div>
   </div>
   <div>
@@ -23,7 +23,7 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </div>
           <div class="van-cell__value">
-            <div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;size:undefined;"> <!----></i></span>
+            <div class="van-radio"><span class="van-radio__input"><input type="radio" value="1" checked="checked" class="van-radio__control"> <i class="van-icon van-icon-checked" style="color:undefined;font-size:undefined;"> <!----></i></span>
               <!---->
             </div>
           </div>
@@ -35,7 +35,7 @@ exports[`renders demo correctly 1`] = `
             <!---->
           </div>
           <div class="van-cell__value">
-            <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;size:undefined;"> <!----></i></span>
+            <div class="van-radio"><span class="van-radio__input"><input type="radio" value="2" class="van-radio__control"> <i class="van-icon van-icon-check" style="color:undefined;font-size:undefined;"> <!----></i></span>
               <!---->
             </div>
           </div>
diff --git a/packages/search/test/__snapshots__/demo.spec.js.snap b/packages/search/test/__snapshots__/demo.spec.js.snap
index 4f0a7c164..479ade09d 100644
--- a/packages/search/test/__snapshots__/demo.spec.js.snap
+++ b/packages/search/test/__snapshots__/demo.spec.js.snap
@@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-search" style="background:#f2f2f2;">
       <div placeholder="请输入搜索关键词" class="van-cell van-field">
-        <i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <!---->
@@ -27,7 +27,7 @@ exports[`renders demo correctly 1`] = `
     <form action="/">
       <div class="van-search van-search--show-action" style="background:#f2f2f2;">
         <div placeholder="请输入搜索关键词" class="van-cell van-field">
-          <i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
           <!---->
@@ -51,7 +51,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-search van-search--show-action" style="background:#f2f2f2;">
       <div placeholder="请输入搜索关键词" class="van-cell van-field">
-        <i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-search van-cell__left-icon" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <!---->
diff --git a/packages/steps/test/__snapshots__/demo.spec.js.snap b/packages/steps/test/__snapshots__/demo.spec.js.snap
index 06268dfd9..ce66c4623 100644
--- a/packages/steps/test/__snapshots__/demo.spec.js.snap
+++ b/packages/steps/test/__snapshots__/demo.spec.js.snap
@@ -16,7 +16,7 @@ exports[`renders demo correctly 1`] = `
         <div class="van-hairline van-step van-step--horizontal van-step--process">
           <div class="van-step__title" style="color:#06bf04;">商家接单</div>
           <div class="van-step__circle-container">
-            <i class="van-icon van-icon-checked" style="color:#06bf04;size:undefined;">
+            <i class="van-icon van-icon-checked" style="color:#06bf04;font-size:undefined;">
               <!---->
             </i>
           </div>
@@ -45,7 +45,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-steps van-steps--horizontal">
       <div class="van-steps__status">
         <div class="van-steps__icon">
-          <i class="van-icon van-icon-logistics steps-success" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-logistics steps-success" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
@@ -65,7 +65,7 @@ exports[`renders demo correctly 1`] = `
         <div class="van-hairline van-step van-step--horizontal van-step--process">
           <div class="van-step__title" style="color:#06bf04;">商家接单</div>
           <div class="van-step__circle-container">
-            <i class="van-icon van-icon-checked" style="color:#06bf04;size:undefined;">
+            <i class="van-icon van-icon-checked" style="color:#06bf04;font-size:undefined;">
               <!---->
             </i>
           </div>
@@ -98,7 +98,7 @@ exports[`renders demo correctly 1`] = `
             <p>2016-07-12 12:40</p>
           </div>
           <div class="van-step__circle-container">
-            <i class="van-icon van-icon-checked" style="color:#f60;size:undefined;">
+            <i class="van-icon van-icon-checked" style="color:#f60;font-size:undefined;">
               <!---->
             </i>
           </div>
diff --git a/packages/submit-bar/en-US.md b/packages/submit-bar/en-US.md
index 3e3b5054d..fa4820586 100644
--- a/packages/submit-bar/en-US.md
+++ b/packages/submit-bar/en-US.md
@@ -84,4 +84,5 @@ Use slot to add custom contents.
 | Name | Description |
 |-----------|-----------|
 | default | Custom left content |
+| top | Custom top content |
 | tip | Custom tips |
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index b8cf75af4..ed8ad5ffc 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -1,15 +1,15 @@
 <template>
   <div :class="b()">
+    <slot name="top" />
     <div :class="b('tip')" v-if="tip || $slots.tip">
       {{ tip }}<slot name="tip" />
     </div>
     <div :class="b('bar')">
       <slot />
-      <div :class="b('price')">
+      <div :class="b('text')">
         <template v-if="hasPrice">
           <span>{{ label || $t('label') }}</span>
-          <span :class="b('price-integer')">{{ currency }}{{ priceInterger }}.</span>
-          <span :class="b('price-decimal')">{{ priceDecimal }}</span>
+          <span :class="b('price')">{{ currency }} {{ price | format }}</span>
         </template>
       </div>
       <van-button :type="buttonType" :disabled="disabled" :loading="loading" @click="$emit('submit')">
@@ -51,13 +51,12 @@ export default create({
   computed: {
     hasPrice() {
       return typeof this.price === 'number';
-    },
-    priceInterger() {
-      return Math.floor(this.price / 100);
-    },
-    priceDecimal() {
-      const decimal = Math.floor(this.price % 100);
-      return (decimal < 10 ? '0' : '') + decimal;
+    }
+  },
+
+  filters: {
+    format(price) {
+      return (price / 100).toFixed(2);
     }
   }
 });
diff --git a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
index 41778c866..1f20f4a91 100644
--- a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
@@ -6,7 +6,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-submit-bar">
       <!---->
       <div class="van-submit-bar__bar">
-        <div class="van-submit-bar__price"><span>合计：</span> <span class="van-submit-bar__price-integer">¥30.</span> <span class="van-submit-bar__price-decimal">50</span></div>
+        <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
         <button class="van-button van-button--danger van-button--normal">
           <!----><span class="van-button__text">
       提交订单
@@ -19,7 +19,7 @@ exports[`renders demo correctly 1`] = `
       <div class="van-submit-bar__tip">
         您的收货地址不支持同城送, 我们已为您推荐快递</div>
       <div class="van-submit-bar__bar">
-        <div class="van-submit-bar__price"><span>合计：</span> <span class="van-submit-bar__price-integer">¥30.</span> <span class="van-submit-bar__price-decimal">50</span></div>
+        <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
         <button disabled="disabled" class="van-button van-button--danger van-button--normal van-button--disabled van-button--unclickable">
           <!----><span class="van-button__text">
       提交订单
@@ -31,7 +31,7 @@ exports[`renders demo correctly 1`] = `
     <div class="van-submit-bar">
       <!---->
       <div class="van-submit-bar__bar">
-        <div class="van-submit-bar__price"><span>合计：</span> <span class="van-submit-bar__price-integer">¥30.</span> <span class="van-submit-bar__price-decimal">50</span></div>
+        <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
         <button class="van-button van-button--danger van-button--normal van-button--loading van-button--unclickable">
           <div class="van-loading van-loading--circular van-loading--white" style="width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div> <span class="van-button__text">
       
@@ -48,11 +48,11 @@ exports[`renders demo correctly 1`] = `
       <div class="van-submit-bar__bar">
         <div class="van-checkbox">
           <div class="van-checkbox__icon van-checkbox__icon--round van-checkbox__icon--checked">
-            <i class="van-icon van-icon-success" style="color:undefined;size:undefined;">
+            <i class="van-icon van-icon-success" style="color:undefined;font-size:undefined;">
               <!---->
             </i>
           </div> <span class="van-checkbox__label">全选</span></div>
-        <div class="van-submit-bar__price"><span>合计：</span> <span class="van-submit-bar__price-integer">¥30.</span> <span class="van-submit-bar__price-decimal">50</span></div>
+        <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
         <button class="van-button van-button--danger van-button--normal">
           <!----><span class="van-button__text">
       提交订单
diff --git a/packages/submit-bar/test/__snapshots__/index.spec.js.snap b/packages/submit-bar/test/__snapshots__/index.spec.js.snap
index 5e6222a1c..d894deb26 100644
--- a/packages/submit-bar/test/__snapshots__/index.spec.js.snap
+++ b/packages/submit-bar/test/__snapshots__/index.spec.js.snap
@@ -4,7 +4,7 @@ exports[`submit 1`] = `
 <div class="van-submit-bar">
   <!---->
   <div class="van-submit-bar__bar">
-    <div class="van-submit-bar__price"><span>合计：</span> <span class="van-submit-bar__price-integer">¥0.</span> <span class="van-submit-bar__price-decimal">00</span></div>
+    <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 0.00</span></div>
     <button disabled="disabled" class="van-button van-button--danger van-button--normal van-button--disabled van-button--unclickable">
       <!----><span class="van-button__text">
       
diff --git a/packages/submit-bar/zh-CN.md b/packages/submit-bar/zh-CN.md
index 01ac1952c..db73c2d35 100644
--- a/packages/submit-bar/zh-CN.md
+++ b/packages/submit-bar/zh-CN.md
@@ -84,4 +84,5 @@ Vue.use(SubmitBar);
 | 名称 | 说明 |
 |-----------|-----------|
 | default | 自定义订单栏左侧内容 |
+| top | 自定义订单栏上方内容 |
 | tip | 提示文案中的额外操作和说明 |
diff --git a/packages/cell-swipe/demo/index.vue b/packages/swipe-cell/demo/index.vue
similarity index 89%
rename from packages/cell-swipe/demo/index.vue
rename to packages/swipe-cell/demo/index.vue
index 385641b6a..e9c4d9bd4 100644
--- a/packages/cell-swipe/demo/index.vue
+++ b/packages/swipe-cell/demo/index.vue
@@ -3,23 +3,23 @@
     <demo-section>
       <van-notice-bar>{{ $t('tips') }}</van-notice-bar>
       <demo-block :title="$t('basicUsage')">
-        <van-cell-swipe :right-width="65" :left-width="65">
+        <van-swipe-cell :right-width="65" :left-width="65">
           <span slot="left">{{ $t('button1') }}</span>
           <van-cell-group>
             <van-cell :title="$t('title')" :value="$t('content')" />
           </van-cell-group>
           <span slot="right">{{ $t('button2') }}</span>
-        </van-cell-swipe>
+        </van-swipe-cell>
       </demo-block>
 
       <demo-block :title="$t('title2')">
-        <van-cell-swipe :right-width="65" :left-width="65" :on-close="onClose">
+        <van-swipe-cell :right-width="65" :left-width="65" :on-close="onClose">
           <span slot="left">{{ $t('button1') }}</span>
           <van-cell-group>
             <van-cell :title="$t('title')" :value="$t('content')" />
           </van-cell-group>
           <span slot="right">{{ $t('button2') }}</span>
-        </van-cell-swipe>
+        </van-swipe-cell>
       </demo-block>
     </demo-section>
   </div>
@@ -68,10 +68,10 @@ export default {
 </script>
 
 <style lang="postcss">
-.demo-cell-swipe {
+.demo-swipe-cell {
   user-select: none;
 
-  .van-cell-swipe {
+  .van-swipe-cell {
     &__left,
     &__right {
       color: #FFFFFF;
diff --git a/packages/cell-swipe/en-US.md b/packages/swipe-cell/en-US.md
similarity index 79%
rename from packages/cell-swipe/en-US.md
rename to packages/swipe-cell/en-US.md
index f0543c316..1f1a2f80e 100644
--- a/packages/cell-swipe/en-US.md
+++ b/packages/swipe-cell/en-US.md
@@ -1,10 +1,10 @@
-## CellSwipe
+## SwipeCell
 
 ### Install
 ``` javascript
-import { CellSwipe } from 'vant';
+import { SwipeCell } from 'vant';
 
-Vue.use(CellSwipe);
+Vue.use(SwipeCell);
 ```
 
 ### Usage
@@ -12,25 +12,25 @@ Vue.use(CellSwipe);
 #### Basic Usage
 
 ```html
-<van-cell-swipe :right-width="65" :left-width="65">
+<van-swipe-cell :right-width="65" :left-width="65">
   <span slot="left">Select</span>
   <van-cell-group>
     <van-cell title="Cell" value="Cell Content" />
   </van-cell-group>
   <span slot="right">Delete</span>
-</van-cell-swipe>
+</van-swipe-cell>
 ```
 
 #### Async close
 
 ```html
-<van-cell-swipe :right-width="65" :left-width="65" :on-close="onClose">
+<van-swipe-cell :right-width="65" :left-width="65" :on-close="onClose">
   <span slot="left">Select</span>
   <van-cell-group>
     <van-cell title="Cell" value="Cell Content" />
   </van-cell-group>
   <span slot="right">Delete</span>
-</van-cell-swipe>
+</van-swipe-cell>
 ```
 
 ```js
@@ -77,13 +77,13 @@ export default {
 | Argument | Type | Description |
 |-----------|-----------|-----------|
 | clickPosition | `String` | Click positon (`left` `right` `cell` `outside`) |
-| instance | `Object` | CellSwipe instance |
+| instance | `Object` | SwipeCell instance |
 
 ### Methods
 
-Use ref to get CellSwipe instance and call instance methods
+Use ref to get SwipeCell instance and call instance methods
 
 | Name | Attribute | Return value | Description |
 |-----------|-----------|-----------|-------------|
-| open | position: 'left' \| 'right' | - | open CellSwipe |
-| close | - | - | close CellSwipe |
+| open | position: 'left' \| 'right' | - | open SwipeCell |
+| close | - | - | close SwipeCell |
diff --git a/packages/cell-swipe/index.vue b/packages/swipe-cell/index.vue
similarity index 99%
rename from packages/cell-swipe/index.vue
rename to packages/swipe-cell/index.vue
index 8b451a002..394532a6c 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/swipe-cell/index.vue
@@ -32,7 +32,7 @@ import Touch from '../mixins/touch';
 const THRESHOLD = 0.15;
 
 export default create({
-  name: 'cell-swipe',
+  name: 'swipe-cell',
 
   mixins: [Touch],
 
diff --git a/packages/cell-swipe/test/__snapshots__/demo.spec.js.snap b/packages/swipe-cell/test/__snapshots__/demo.spec.js.snap
similarity index 76%
rename from packages/cell-swipe/test/__snapshots__/demo.spec.js.snap
rename to packages/swipe-cell/test/__snapshots__/demo.spec.js.snap
index b39ccdea6..7e5ec8fe9 100644
--- a/packages/cell-swipe/test/__snapshots__/demo.spec.js.snap
+++ b/packages/swipe-cell/test/__snapshots__/demo.spec.js.snap
@@ -11,9 +11,9 @@ exports[`renders demo correctly 1`] = `
       <!---->
     </div>
     <div>
-      <div class="van-cell-swipe">
-        <div class="van-cell-swipe__wrapper" style="transform:translate3d(0px, 0, 0);transition:.6s cubic-bezier(0.18, 0.89, 0.32, 1);">
-          <div class="van-cell-swipe__left"><span>选择</span></div>
+      <div class="van-swipe-cell">
+        <div class="van-swipe-cell__wrapper" style="transform:translate3d(0px, 0, 0);transition:.6s cubic-bezier(0.18, 0.89, 0.32, 1);">
+          <div class="van-swipe-cell__left"><span>选择</span></div>
           <div class="van-cell-group van-hairline--top-bottom">
             <div class="van-cell van-hairline">
               <!---->
@@ -24,14 +24,14 @@ exports[`renders demo correctly 1`] = `
               <!---->
             </div>
           </div>
-          <div class="van-cell-swipe__right"><span>删除</span></div>
+          <div class="van-swipe-cell__right"><span>删除</span></div>
         </div>
       </div>
     </div>
     <div>
-      <div class="van-cell-swipe">
-        <div class="van-cell-swipe__wrapper" style="transform:translate3d(0px, 0, 0);transition:.6s cubic-bezier(0.18, 0.89, 0.32, 1);">
-          <div class="van-cell-swipe__left"><span>选择</span></div>
+      <div class="van-swipe-cell">
+        <div class="van-swipe-cell__wrapper" style="transform:translate3d(0px, 0, 0);transition:.6s cubic-bezier(0.18, 0.89, 0.32, 1);">
+          <div class="van-swipe-cell__left"><span>选择</span></div>
           <div class="van-cell-group van-hairline--top-bottom">
             <div class="van-cell van-hairline">
               <!---->
@@ -42,7 +42,7 @@ exports[`renders demo correctly 1`] = `
               <!---->
             </div>
           </div>
-          <div class="van-cell-swipe__right"><span>删除</span></div>
+          <div class="van-swipe-cell__right"><span>删除</span></div>
         </div>
       </div>
     </div>
diff --git a/packages/swipe-cell/test/__snapshots__/index.spec.js.snap b/packages/swipe-cell/test/__snapshots__/index.spec.js.snap
new file mode 100644
index 000000000..857aafed0
--- /dev/null
+++ b/packages/swipe-cell/test/__snapshots__/index.spec.js.snap
@@ -0,0 +1,46 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`drag and show left part 1`] = `
+<div class="van-swipe-cell">
+  <div class="van-swipe-cell__wrapper">
+    <div class="van-swipe-cell__left"></div>
+    <div class="van-swipe-cell__right"></div>
+  </div>
+</div>
+`;
+
+exports[`drag and show left part 2`] = `
+<div class="van-swipe-cell">
+  <div class="van-swipe-cell__wrapper">
+    <div class="van-swipe-cell__left"></div>
+    <div class="van-swipe-cell__right"></div>
+  </div>
+</div>
+`;
+
+exports[`drag and show left part 3`] = `
+<div class="van-swipe-cell">
+  <div class="van-swipe-cell__wrapper">
+    <div class="van-swipe-cell__left"></div>
+    <div class="van-swipe-cell__right"></div>
+  </div>
+</div>
+`;
+
+exports[`drag and show left part 4`] = `
+<div class="van-swipe-cell">
+  <div class="van-swipe-cell__wrapper">
+    <div class="van-swipe-cell__left"></div>
+    <div class="van-swipe-cell__right"></div>
+  </div>
+</div>
+`;
+
+exports[`drag and show left part 5`] = `
+<div class="van-swipe-cell">
+  <div class="van-swipe-cell__wrapper">
+    <div class="van-swipe-cell__left"></div>
+    <div class="van-swipe-cell__right"></div>
+  </div>
+</div>
+`;
diff --git a/packages/cell-swipe/test/demo.spec.js b/packages/swipe-cell/test/demo.spec.js
similarity index 100%
rename from packages/cell-swipe/test/demo.spec.js
rename to packages/swipe-cell/test/demo.spec.js
diff --git a/packages/cell-swipe/test/index.spec.js b/packages/swipe-cell/test/index.spec.js
similarity index 81%
rename from packages/cell-swipe/test/index.spec.js
rename to packages/swipe-cell/test/index.spec.js
index a58787832..348a6f4c7 100644
--- a/packages/cell-swipe/test/index.spec.js
+++ b/packages/swipe-cell/test/index.spec.js
@@ -1,4 +1,4 @@
-import CellSwipe from '..';
+import SwipeCell from '..';
 import { mount, triggerDrag } from '../../../test/utils';
 
 const defaultProps = {
@@ -9,7 +9,7 @@ const defaultProps = {
 };
 
 it('drag and show left part', () => {
-  const wrapper = mount(CellSwipe, defaultProps);
+  const wrapper = mount(SwipeCell, defaultProps);
 
   triggerDrag(wrapper, 10, 0);
   expect(wrapper).toMatchSnapshot();
@@ -25,7 +25,7 @@ it('drag and show left part', () => {
 });
 
 it('drag and show left part', () => {
-  const wrapper = mount(CellSwipe, defaultProps);
+  const wrapper = mount(SwipeCell, defaultProps);
 
   triggerDrag(wrapper, -50, 0);
   expect(wrapper).toMatchSnapshot();
@@ -35,7 +35,7 @@ test('on close prop', () => {
   let position;
   let instance;
 
-  const wrapper = mount(CellSwipe, {
+  const wrapper = mount(SwipeCell, {
     propsData: {
       ...defaultProps.propsData,
       onClose(pos, ins) {
@@ -51,10 +51,10 @@ test('on close prop', () => {
   wrapper.trigger('click');
   expect(position).toEqual('cell');
 
-  wrapper.find('.van-cell-swipe__left').trigger('click');
+  wrapper.find('.van-swipe-cell__left').trigger('click');
   expect(position).toEqual('left');
 
-  wrapper.find('.van-cell-swipe__right').trigger('click');
+  wrapper.find('.van-swipe-cell__right').trigger('click');
   expect(position).toEqual('right');
 
   instance.close();
diff --git a/packages/cell-swipe/zh-CN.md b/packages/swipe-cell/zh-CN.md
similarity index 83%
rename from packages/cell-swipe/zh-CN.md
rename to packages/swipe-cell/zh-CN.md
index 16a069a9a..30caf8d44 100644
--- a/packages/cell-swipe/zh-CN.md
+++ b/packages/swipe-cell/zh-CN.md
@@ -1,10 +1,10 @@
-## CellSwipe 滑动单元格
+## SwipeCell 滑动单元格
 
 ### 使用指南
 ``` javascript
-import { CellSwipe } from 'vant';
+import { SwipeCell } from 'vant';
 
-Vue.use(CellSwipe);
+Vue.use(SwipeCell);
 ```
 
 ### 代码演示
@@ -12,25 +12,25 @@ Vue.use(CellSwipe);
 #### 基础用法
 
 ```html
-<van-cell-swipe :right-width="65" :left-width="65">
+<van-swipe-cell :right-width="65" :left-width="65">
   <span slot="left">选择</span>
   <van-cell-group>
     <van-cell title="单元格" value="内容" />
   </van-cell-group>
   <span slot="right">删除</span>
-</van-cell-swipe>
+</van-swipe-cell>
 ```
 
 #### 异步关闭
 
 ```html
-<van-cell-swipe :right-width="65" :left-width="65" :on-close="onClose">
+<van-swipe-cell :right-width="65" :left-width="65" :on-close="onClose">
   <span slot="left">选择</span>
   <van-cell-group>
     <van-cell title="单元格" value="内容" />
   </van-cell-group>
   <span slot="right">删除</span>
-</van-cell-swipe>
+</van-swipe-cell>
 ```
 
 ```js
@@ -77,11 +77,11 @@ export default {
 | 参数 | 类型 | 说明 |
 |-----------|-----------|-----------|
 | clickPosition | `String` | 关闭时的点击位置 (`left` `right` `cell` `outside`) |
-| instance | `Object` | CellSwipe 实例 |
+| instance | `Object` | SwipeCell 实例 |
 
 ### 方法
 
-通过 ref 可以获取到 CellSwipe 实例并调用实例方法
+通过 ref 可以获取到 SwipeCell 实例并调用实例方法
 
 | 方法名 | 参数 | 返回值 | 介绍 |
 |-----------|-----------|-----------|-------------|
diff --git a/packages/tab/test/__snapshots__/demo.spec.js.snap b/packages/tab/test/__snapshots__/demo.spec.js.snap
index 9f146f521..16abe55ea 100644
--- a/packages/tab/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tab/test/__snapshots__/demo.spec.js.snap
@@ -192,7 +192,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <div>
             <div>
-              <i class="van-icon van-icon-more-o" style="color:undefined;size:undefined;">
+              <i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
                 <!---->
               </i>选项
             </div>
@@ -202,7 +202,7 @@ exports[`renders demo correctly 1`] = `
           <!---->
           <div>
             <div>
-              <i class="van-icon van-icon-more-o" style="color:undefined;size:undefined;">
+              <i class="van-icon van-icon-more-o" style="color:undefined;font-size:undefined;">
                 <!---->
               </i>选项
             </div>
diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index e6bfcbc47..a1bac34ab 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -2,9 +2,8 @@
   <div :class="b({ active })" @click="onClick">
     <div :class="b('icon', { dot })">
       <slot name="icon" :active="active">
-        <icon v-if="icon" :name="icon" />
+        <icon v-if="icon" :name="icon" :info="info" />
       </slot>
-      <div v-if="isDef(info)" class="van-icon__info">{{ info }}</div>
     </div>
     <div :class="b('text')">
       <slot :active="active"/>
diff --git a/packages/tabbar/test/__snapshots__/demo.spec.js.snap b/packages/tabbar/test/__snapshots__/demo.spec.js.snap
index b5c6d9360..2dfef8d4a 100644
--- a/packages/tabbar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tabbar/test/__snapshots__/demo.spec.js.snap
@@ -6,37 +6,33 @@ exports[`renders demo correctly 1`] = `
     <div class="van-hairline--top-bottom van-tabbar van-tabbar--fixed" style="z-index:1;">
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
-          <i class="van-icon van-icon-shop" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-shop" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
-          <!---->
         </div>
         <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon van-tabbar-item__icon--dot">
-          <i class="van-icon van-icon-chat" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
-          <!---->
         </div>
         <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
-          <i class="van-icon van-icon-records" style="color:undefined;size:undefined;">
-            <!---->
+          <i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
+            <div class="van-icon__info">5</div>
           </i>
-          <div class="van-icon__info">5</div>
         </div>
         <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
-          <i class="van-icon van-icon-gold-coin" style="color:undefined;size:undefined;">
-            <!---->
+          <i class="van-icon van-icon-gold-coin" style="color:undefined;font-size:undefined;">
+            <div class="van-icon__info">20</div>
           </i>
-          <div class="van-icon__info">20</div>
         </div>
         <div class="van-tabbar-item__text">标签</div>
       </div>
@@ -47,25 +43,22 @@ exports[`renders demo correctly 1`] = `
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
           <img src="https://img.yzcdn.cn/public_files/2017/10/13/c547715be149dd3faa817e4a948b40c4.png">
-          <!---->
         </div>
         <div class="van-tabbar-item__text"><span>自定义</span></div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
-          <i class="van-icon van-icon-chat" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-chat" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
-          <!---->
         </div>
         <div class="van-tabbar-item__text">标签</div>
       </div>
       <div class="van-tabbar-item">
         <div class="van-tabbar-item__icon">
-          <i class="van-icon van-icon-records" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-records" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
-          <!---->
         </div>
         <div class="van-tabbar-item__text">标签</div>
       </div>
diff --git a/packages/tree-select/test/__snapshots__/demo.spec.js.snap b/packages/tree-select/test/__snapshots__/demo.spec.js.snap
index fe94d8315..9c3eb9322 100644
--- a/packages/tree-select/test/__snapshots__/demo.spec.js.snap
+++ b/packages/tree-select/test/__snapshots__/demo.spec.js.snap
@@ -18,7 +18,7 @@ exports[`renders demo correctly 1`] = `
       <div class="van-tree-select__content" style="height:300px;">
         <div class="van-ellipsis van-tree-select__item van-tree-select__item--active">
           杭州
-          <i class="van-icon van-icon-success van-tree-select__selected" style="color:undefined;size:undefined;">
+          <i class="van-icon van-icon-success van-tree-select__selected" style="color:undefined;font-size:undefined;">
             <!---->
           </i>
         </div>
diff --git a/packages/uploader/test/__snapshots__/demo.spec.js.snap b/packages/uploader/test/__snapshots__/demo.spec.js.snap
index 0f30c4ae6..f82f47d7b 100644
--- a/packages/uploader/test/__snapshots__/demo.spec.js.snap
+++ b/packages/uploader/test/__snapshots__/demo.spec.js.snap
@@ -5,7 +5,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="demo-uploader-container">
       <div class="van-uploader">
-        <i class="van-icon van-icon-photograph" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-photograph" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <input type="file" accept="image/*" class="van-uploader__input">
@@ -15,7 +15,7 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="demo-uploader-container">
       <div class="van-uploader">
-        <i class="van-icon van-icon-photograph" style="color:undefined;size:undefined;">
+        <i class="van-icon van-icon-photograph" style="color:undefined;font-size:undefined;">
           <!---->
         </i>
         <input type="file" accept="image/gif, image/jpeg" multiple="multiple" class="van-uploader__input">
diff --git a/packages/vant-css/src/address-list.css b/packages/vant-css/src/address-list.css
index 2a1dba330..c0286339f 100644
--- a/packages/vant-css/src/address-list.css
+++ b/packages/vant-css/src/address-list.css
@@ -3,6 +3,10 @@
 .van-address-list {
   height: 100%;
 
+  .van-cell {
+    padding: 15px;
+  }
+
   .van-cell__value {
     color: $text-color;
     padding-right: 34px;
@@ -10,37 +14,39 @@
   }
 
   .van-radio__label {
-    margin-left: 32px;
+    margin-left: 27px;
   }
 
   .van-radio__input {
     top: 50%;
     left: 0;
+    font-size: 16px;
     position: absolute;
     transform: translate(0, -50%);
   }
 
   .van-icon-checked {
-    color: $blue;
+    color: $red;
   }
 
   &__group {
     height: 100%;
     overflow-y: scroll;
-    padding-bottom: 40px;
+    padding-bottom: 100px;
     box-sizing: border-box;
     -webkit-overflow-scrolling: touch;
-    background-color: $background-color;
   }
 
   &__name {
     font-size: 14px;
-    line-height: 1.5;
+    font-weight: 500;
+    line-height: 20px;
+    margin-bottom: 5px;
   }
 
   &__address {
     font-size: 12px;
-    line-height: 1.5;
+    line-height: 16px;
     color: $gray-darker;
   }
 
@@ -48,8 +54,7 @@
     position: absolute;
     top: 50%;
     right: 15px;
-    font-size: 20px;
-    color: $gray-dark;
+    font-size: 16px;
     transform: translate(0, -50%);
   }
 
@@ -58,13 +63,5 @@
     left: 0;
     bottom: 0;
     z-index: 9999;
-    padding-left: 15px;
-    font-size: 16px;
-
-    .van-icon-add {
-      color: $blue;
-      font-size: 20px;
-      line-height: 1.2;
-    }
   }
 }
diff --git a/packages/vant-css/src/badge.css b/packages/vant-css/src/badge.css
index a1126537e..f92067abc 100644
--- a/packages/vant-css/src/badge.css
+++ b/packages/vant-css/src/badge.css
@@ -26,7 +26,7 @@
   }
 
   &--select {
-    font-weight: bold;
+    font-weight: 500;
     color: $text-color;
     border-color: $red;
 
diff --git a/packages/vant-css/src/button.css b/packages/vant-css/src/button.css
index 4a843ccec..d69ecc21a 100644
--- a/packages/vant-css/src/button.css
+++ b/packages/vant-css/src/button.css
@@ -143,4 +143,8 @@
     background-color: $button-disabled-background-color;
     border: 1px solid $button-disabled-border-color;
   }
+
+  &--square {
+    border-radius: 0;
+  }
 }
diff --git a/packages/vant-css/src/coupon-list.css b/packages/vant-css/src/coupon-list.css
index 3759265c4..f862fb85b 100644
--- a/packages/vant-css/src/coupon-list.css
+++ b/packages/vant-css/src/coupon-list.css
@@ -1,5 +1,5 @@
 @import './common/var.css';
-@import "./mixins/ellipsis.css";
+@import './mixins/ellipsis.css';
 
 .van-coupon {
   &-list {
@@ -7,93 +7,27 @@
     position: relative;
     background-color: $background-color;
 
-    &__top {
-      position: absolute;
-      top: 0;
-      left: 0;
-      width: 100%;
-      z-index: 1;
-      padding-right: 85px;
-      box-sizing: border-box;
-    }
-
     &__field {
-      margin: 10px 0;
-      padding: 4px 10px 4px 25px;
-
-      &::after {
-        border-radius: 6px;
-        border-color: #cacaca;
-      }
+      padding: 7px 15px;
     }
 
     &__exchange {
-      top: 10px;
-      right: 15px;
       height: 32px;
       line-height: 30px;
-      position: absolute;
-      border-radius: 2px;
     }
 
     &__list {
-      max-height: 100%;
       overflow-y: auto;
-      padding: 15px 0 60px;
+      padding: 15px 0;
       box-sizing: border-box;
       -webkit-overflow-scrolling: touch;
-
-      h3 {
-        color: $gray-dark;
-        margin: 15px 0;
-        font-size: 14px;
-        font-weight: normal;
-        position: relative;
-        text-align: center;
-
-        &::before,
-        &::after {
-          content: ' ';
-          width: 45px;
-          height: 1px;
-          top: 50%;
-          position: absolute;
-          background-color: $border-color;
-        }
-
-        &::before {
-          left: 50%;
-          margin-left: -95px;
-        }
-
-        &::after {
-          right: 50%;
-          margin-right: -95px;
-        }
-      }
-
-      .van-coupon-item + h3 {
-        margin-top: 30px;
-      }
-    }
-
-    &__list--with-exchange {
-      padding-top: 60px;
     }
 
     &__close {
       left: 0;
       bottom: 0;
-      width: 100%;
-      font-size: 15px;
-      line-height: 45px;
-      text-align: center;
       position: absolute;
-      background-color: $white;
-
-      &:active {
-        background-color: $active-color;
-      }
+      font-weight: 500;
     }
 
     &__empty {
@@ -115,131 +49,95 @@
   }
 
   &-item {
-    display: flex;
-    height: 100px;
-    margin: 0 15px 10px;
+    overflow: hidden;
+    border-radius: 4px;
+    margin: 0 15px 15px;
+    background-color: $white;
+    box-shadow: 0 0 4px rgba(0, 0, 0, 0.1);
+
+    &:active {
+      background-color: $active-color;
+    }
+
+    &__content {
+      display: flex;
+      height: 100px;
+      padding: 24px 0 0 15px;
+      box-sizing: border-box;
+    }
+
+    p,
+    h2 {
+      margin: 0;
+
+      @mixin ellipsis;
+    }
+
+    h2 {
+      height: 34px;
+      font-weight: 500;
+      line-height: 34px;
+    }
+
+    p {
+      font-size: 12px;
+      line-height: 16px;
+      color: $gray-dark;
+    }
 
     &__head {
-      display: flex;
-      height: 100%;
-      line-height: 1;
-      min-width: 126px;
-    }
-
-    &__lines {
-      height: 100%;
-      min-width: 18px;
-      background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAADICAMAAAC3WLNTAAAAclBMVEUAAAD/cHD/gID/amr/a2v/cXH/amr/dHT/cHD/cnL/bW3/aGj/dXX/gID/Z2f/Z2f/bW3/dXX/Zmb/dnb/Z2f/d3f/a2v/dnb/c3P/dXX/dHT/eHj/dHT/amr/cXH/bm7/aGj/bW3/cHD/bGz/dnb/Z2fPFIA9AAAAHHRSTlMANwyaQpoMQkLm5uaaBvPVvZSUj48rK/Pz1dVCCskVeAAABKBJREFUWMOFmdd2GzEMRKH03ntW0a5l//8vBh0hB2JgcZ/umRkC4JNJ6uvnn983rvvtnos/UzHy9uP9poj/7qGY+aCIcULxB6CPiYQjKn1VrzVIn7eqCDVT9AtlNlD6sWFBpg7RAxBiI/To9GYi8ILE9fwlaI0YSf1ugG2G6E17w22ETg0DSo/6UBtAHbKBHXJbHxwvmdBzBJzCZiLiII4FpzgNGKNbpj9/tj8LTA8hgdkZYq01Jkr/1yJmVpxn4vrPBQXSVEuQAMFyO/ssoAi1ghRZp5cBPzVkQdmqeLAFxFQSPUdaT+2GwfTQKXrQY/6kjIH8AGHr0Q4wDF5MQtgCL0FKDJtZEGrpWKoEQY4KGDiAgNpQ6Q6E/oDSHUrNIDEDXAEFYXJQurvrHEdIkYljYsBIAFRCO5FatosE0QPpUUkh7GoNeLogrg1xvXhpGHZrWDrL1QvV+jICk/ZPPYQbXTC1eFIayjlcVIcMAcqYtOOy7ChWwZWCS252lHnBhFMolM0MpAd9LBf+48Iput2FASH4mBIKMcSVQq1hKF1MKYgJKyV1teqUyi8viVBhl6IQilwru+RSigsgp1ALleyU1B1ApZUAQi7Tx5cB/yOkFLx8W5XABqHQyqVToORyH4zz9S0hpmAf/CEMfrUQhsWTSmQOxhRATkRLBUG7SpYYBM/xFJPQi1FHuCG+Mq8SCKwY1rKxHEcB0AqxOxZIJCNG9A+5ooiFWikLZuMhRfggWOEFUgSJuqRChWEsg67GtMn9Ry5zE/u/nWPEbvwLuT6/QFModGToGkouhSvBA358RK5yLEaVuJ68cs9b4W3pHOk6Lx/Sesw3vEQwlPKHEFJ9LH9SdUOkEjrqhs4gdOJuFQepPLgP5+KnU3rCkazzfSprphP9RthYrlKHnl6LrlaBtBSdz9ezMemJkBLnUEpqgrgESQyWXpXCT4jMlVqViT9KFlhY2VWsrAm6Zi6/YPZLQIMSCQ4ab3b2SerfYRvkgEPmNWgdDhlZrVC5Syk94wEHUZOuCx65Kh6sMg1dzaUbu8VEVb47Far52BTj5cdDqCtCt5jzJzXd8NATz9qhZwqE35TrUnaBlVJ5evBizoOUOVoLlHG1EktHb2YxpVWLKmMJwDHnjtp52kekYgnnajQh1dRKL9A+C4VU7hdNjCHDnlqmHXMJWE2F4IDp7fa9cxxykSL8wfs5J8FFaO/tMjpDZohYgSQyejDUeVCqUL2nDni/wYSjrsprj7XfkMqlY+xmdF/fCgb5EzppsxDxWP6kNBTGutrHIVFyBJc57fYcD3IVPLrQZbcW7FH9alkzQ6iftY7FVXKKaPcP4VdELXrYAUNoYILYV0qVbKEUlwS7B/4DysVKCQwtFmTCKxpT0ANKwe0emlT2WWeqFUwlhkRu0S0ZMCPLfvqqNEr1NGLp+lgpF+srwVqsoFPY4RULeiZ3vHnD3SEGeqnBjhn5tY6uxK0SrB1QtkAIw1qpaGYJ4axtLMbYBRFjyIjg+lgBlVpT9G6ghEGO3g9M3yv6MhB+ZqVvKIR29CmBm6D8uxCRiSOmJq0dM0l9+/L+3crwL+JFMIL5LZlUAAAAAElFTkSuQmCC') no-repeat;
-      background-size: 18px 100px;
-    }
-
-    &__gradient {
-      flex: 1;
-      color: $white;
-      display: flex;
-      text-align: center;
-      margin-left: -16px;
-      flex-direction: column;
-      justify-content: center;
-      background-image: linear-gradient(45deg, #ff6868, #ff8c8c);
+      min-width: 90px;
 
       h2 {
-        font-size: 22px;
-        font-weight: normal;
-        margin: 0 0 10px;
+        color: $red;
+        font-size: 24px;
 
         span {
-          font-size: 16px;
+          font-size: 50%;
         }
       }
-
-      p {
-        margin: 0;
-        font-size: 14px;
-        font-weight: 300;
-
-        @mixin ellipsis;
-      }
     }
 
     &__body {
       flex: 1;
-      height: 100%;
-      display: flex;
-      padding: 0 15px;
-      overflow: hidden;
       position: relative;
-      background-color: $white;
-      flex-direction: column;
-      justify-content: center;
       border-radius: 0 4px 4px 0;
 
       h2 {
-        margin: 0;
-        opacity: .8;
         font-size: 16px;
-        font-weight: normal;
+      }
+    }
+
+    &__corner {
+      top: 16px;
+      right: 15px;
+      position: absolute;
+
+      .van-icon {
+        border-color: $red;
+        background-color: $red;
+      }
+    }
+
+    &__reason {
+      padding: 7px 15px;
+      background-color: #fbfbfb;
+      border-top: 1px dashed $border-color;
+    }
+
+    &--disabled {
+      &:active {
+        background-color: $white;
       }
 
-      p,
-      span {
-        color: $gray-dark;
-        font-size: 12px;
-        margin: 5px 0 0;
+      .van-coupon-item__content {
+        height: 90px;
       }
 
       p,
       h2,
       span {
-        line-height: 1.4;
-
-        @mixin ellipsis;
-      }
-    }
-
-    &__corner {
-      position: absolute;
-      top: 0;
-      right: 0;
-      width: 0;
-      height: 0;
-      border-style: solid;
-      border-width: 18px 19px;
-      border-radius: 0 4px 0 0;
-      border-color: $red $red transparent transparent;
-
-      .van-icon {
-        position: absolute;
-        top: -13px;
-        right: -13px;
-        color: $white;
-        font-size: 12px;
-
-        &::before {
-          font-weight: bold;
-        }
-      }
-    }
-
-    &:active {
-      .van-coupon-item__body {
-        background-color: $active-color;
-      }
-    }
-
-    &--disabled {
-      .van-coupon-item__lines {
-        background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAADICAMAAAC3WLNTAAAAWlBMVEUAAACqrremq7Oqv7+mq7Wqqr+rsLeprreqsrmqrralq7SkqbKrsbikqLGqwNWqrrmrr7mkqbGrsbijqLGnq7SssrimrLKlqrOnrLWprraqr7ekqbKrsLijqLGfTYl9AAAAF3RSTlMAN5oMQgya5kJC5uaSkgZC8/PV1b0rK6hQU+kAAASjSURBVFjDfZlJduMwDESZntJDeh5sUdb9r9kuA+AXA0iIIi/8X6FYALNJU/19+fWj3/pNT1V35NvLratgMvTtjxH+1NBLt7rLHbb7OwhVrSUhKQhz7z1Dv6xZoLWnH70vg5ESINDedkg5BrR0yrGs9Pbpw21SqxNvH593YsN+30OibhwvaQXUPgghVH1m6EkAXK30VllB+UeCMG7OmCPtlk5exN6TcWsRv0UE/aG0GIKxMsycfB9j6QgZwn7FgO/AYhSFq+7Q4hBgyMT9kJKkkhJiriTEuoKACereTw+Y98LTsDVvKdenDWAW6gh1lNwTGHvjEGGhRre+U3J0iKGGknl7zeCJjoBCDPQBBxXhY94WwlYFuXLQTfW979LKYKzvECKH3aLGRSCFnnPwK7UPi8VZ7IRAGH+9X9w7iv0a3GvjZG+F8Y8LRRS0fMQ0hUn0o2ws1wEB7tJqV4iEDKVlgZo5bDWYPQWiVzNmNCX2CMo9XSutziEFoTRjRNqkAwBBqBGBvSpMpEVwrXLgr9Gidi511FaQSZVASO2VkJqxRQPefw3GbX2syqdnqdEy2bd7F77qWRvU3ggp09LDvUMmu/crJVN+wlRA9CrG4+0eadmTteLeScW0/De3+zSEljIpD3Mx53WoGssbfQfgrwm6Un5EgAJCL0MAQ2r4AkoYzoBgBnbuiREilSGLw/YLpUuSChBjKAGltIBSzxDKUOpVQYbEx27ABTYiEOurUjvSi6V7V0ihxb3LqbNfXARqRvdXqmb8fgyI8eSNqNst834l41mNe1f1G38EHzE9w8ycZW5juVzEwCHl7S5CqJJrd0Sci9VUM8CcJ843qwnBVFUGCamJBU+OGVsEKsiYE18egQllJSLA1ZF3Nx6uyoYonRwRJbBM+oANtY6pbFU+iwBMp/R7x/dZa6yvGELVZ4aeRliEn6C3QlDzvgnyIvS6HYWpZJxQzRQUEYC5fTDCpFjleLf3jGWvhTG2oKKoBHEA2tZK1gxPpdC8XzXELosBOsIeYDsEEMpKOXugGjG1MyUW9VgJBqWC88cGfJKCgazKETiW7jhOFeubigvNRTjbGIPeFwRJAB1T3LvTwviJFhGshxRhnjl/jGVd0Sk9rUKoGroj4s7EtE/x9aqnhqQRptYzTysqJ578dQIZ475OIvATnhlfcVVjzZFwFXCthNipUo0xYHpVjK3KFxcTk8FYujuB0Hq0vkgJ0WeGnggrjYcrRRCRfwENBk+53SbEQUxl43ZAY48jwDvhz2GqAMuxbPcfPbF/Q4gBb5teoQMFtN0rkE3AiAqw6euBccRaaRMK5kccSsIQYmeMNUiAYU5iC08BGAGAkCBvuEZa+Wq0Gclh6SWl4X1Ogt1pmwMg2/6MYvCkj30/5mgDXi1PDrmNQxpoqxJCSCE3lk4KKdRLjDvWdwPAfQQ6LgJHnPK0CPxK2fnQA1MBCaDZ/oS0A4v9oty4MajNgVoEG7UOMaIgTJy7LZzHWGBWA+FswBTctMsZYr+AfpbAHFb7XQiZScy3rxliFfzd/h06wlY7kJp86d+FGTEhlO4UWgU6Bvzv6++fmWGE/wHKk5MgoCYAjwAAAABJRU5ErkJggg==');
-      }
-
-      .van-coupon-item__gradient {
-        background-image: linear-gradient(45deg, #a4a9b2, #b7bcc3);
-      }
-
-      &:active {
-        .van-coupon-item__body {
-          background: $white;
-        }
+        color: $gray-dark;
       }
     }
   }
diff --git a/packages/vant-css/src/icon-local.css b/packages/vant-css/src/icon-local.css
index bcb0ce131..42102afd0 100644
--- a/packages/vant-css/src/icon-local.css
+++ b/packages/vant-css/src/icon-local.css
@@ -2,5 +2,5 @@
   font-style: normal;
   font-weight: normal;
   font-family: 'vant-icon';
-  src: url('../icon/vant-icon-eb8c95.ttf') format('truetype');
+  src: url('../icon/vant-icon-1907f5.ttf') format('truetype');
 }
diff --git a/packages/vant-css/src/icon.css b/packages/vant-css/src/icon.css
index fcb78b146..9bbae980d 100644
--- a/packages/vant-css/src/icon.css
+++ b/packages/vant-css/src/icon.css
@@ -4,7 +4,7 @@
   font-style: normal;
   font-weight: normal;
   font-family: 'vant-icon';
-  src: url('https://img.yzcdn.cn/vant/vant-icon-eb8c95.ttf') format('truetype');
+  src: url('https://img.yzcdn.cn/vant/vant-icon-1907f5.ttf') format('truetype');
 }
 
 .van-icon {
@@ -52,359 +52,363 @@
   content: "\F003";
 }
 
-.van-icon-alipay::before {
+.van-icon-aim::before {
   content: "\F004";
 }
 
-.van-icon-arrow-left::before {
+.van-icon-alipay::before {
   content: "\F005";
 }
 
-.van-icon-arrow::before {
+.van-icon-arrow-left::before {
   content: "\F006";
 }
 
-.van-icon-balance-pay::before {
+.van-icon-arrow::before {
   content: "\F007";
 }
 
-.van-icon-browsing-history::before {
+.van-icon-balance-pay::before {
   content: "\F008";
 }
 
-.van-icon-card::before {
+.van-icon-browsing-history::before {
   content: "\F009";
 }
 
-.van-icon-cart::before {
+.van-icon-card::before {
   content: "\F00A";
 }
 
-.van-icon-cash-back-record::before {
+.van-icon-cart::before {
   content: "\F00B";
 }
 
-.van-icon-cash-on-deliver::before {
+.van-icon-cash-back-record::before {
   content: "\F00C";
 }
 
-.van-icon-certificate::before {
+.van-icon-cash-on-deliver::before {
   content: "\F00D";
 }
 
-.van-icon-chat::before {
+.van-icon-certificate::before {
   content: "\F00E";
 }
 
-.van-icon-check::before {
+.van-icon-chat::before {
   content: "\F00F";
 }
 
-.van-icon-checked::before {
+.van-icon-check::before {
   content: "\F010";
 }
 
-.van-icon-clear::before {
+.van-icon-checked::before {
   content: "\F011";
 }
 
-.van-icon-clock::before {
+.van-icon-clear::before {
   content: "\F012";
 }
 
-.van-icon-close::before {
+.van-icon-clock::before {
   content: "\F013";
 }
 
-.van-icon-completed::before {
+.van-icon-close::before {
   content: "\F014";
 }
 
-.van-icon-contact::before {
+.van-icon-completed::before {
   content: "\F015";
 }
 
-.van-icon-coupon::before {
+.van-icon-contact::before {
   content: "\F016";
 }
 
-.van-icon-credit-pay::before {
+.van-icon-coupon::before {
   content: "\F017";
 }
 
-.van-icon-debit-pay::before {
+.van-icon-credit-pay::before {
   content: "\F018";
 }
 
-.van-icon-delete::before {
+.van-icon-debit-pay::before {
   content: "\F019";
 }
 
-.van-icon-description::before {
+.van-icon-delete::before {
   content: "\F01A";
 }
 
-.van-icon-discount::before {
+.van-icon-description::before {
   content: "\F01B";
 }
 
-.van-icon-ecard-pay::before {
+.van-icon-discount::before {
   content: "\F01C";
 }
 
-.van-icon-edit-data::before {
+.van-icon-ecard-pay::before {
   content: "\F01D";
 }
 
-.van-icon-edit::before {
+.van-icon-edit-data::before {
   content: "\F01E";
 }
 
-.van-icon-exchange-record::before {
+.van-icon-edit::before {
   content: "\F01F";
 }
 
-.van-icon-exchange::before {
+.van-icon-exchange-record::before {
   content: "\F020";
 }
 
-.van-icon-fail::before {
+.van-icon-exchange::before {
   content: "\F021";
 }
 
-.van-icon-free-postage::before {
+.van-icon-fail::before {
   content: "\F022";
 }
 
-.van-icon-gift-card-pay::before {
+.van-icon-free-postage::before {
   content: "\F023";
 }
 
-.van-icon-gift-card::before {
+.van-icon-gift-card-pay::before {
   content: "\F024";
 }
 
-.van-icon-gift::before {
+.van-icon-gift-card::before {
   content: "\F025";
 }
 
-.van-icon-gold-coin::before {
+.van-icon-gift::before {
   content: "\F026";
 }
 
-.van-icon-goods-collect::before {
+.van-icon-gold-coin::before {
   content: "\F027";
 }
 
-.van-icon-home::before {
+.van-icon-goods-collect::before {
   content: "\F028";
 }
 
-.van-icon-hot-sale::before {
+.van-icon-home::before {
   content: "\F029";
 }
 
-.van-icon-hot::before {
+.van-icon-hot-sale::before {
   content: "\F02A";
 }
 
-.van-icon-idcard::before {
+.van-icon-hot::before {
   content: "\F02B";
 }
 
-.van-icon-info-o::before {
+.van-icon-idcard::before {
   content: "\F02C";
 }
 
-.van-icon-like-o::before {
+.van-icon-info-o::before {
   content: "\F02D";
 }
 
-.van-icon-like::before {
+.van-icon-like-o::before {
   content: "\F02E";
 }
 
-.van-icon-location::before {
+.van-icon-like::before {
   content: "\F02F";
 }
 
-.van-icon-logistics::before {
+.van-icon-location::before {
   content: "\F030";
 }
 
-.van-icon-more-o::before {
+.van-icon-logistics::before {
   content: "\F031";
 }
 
-.van-icon-more::before {
+.van-icon-more-o::before {
   content: "\F032";
 }
 
-.van-icon-new-arrival::before {
+.van-icon-more::before {
   content: "\F033";
 }
 
-.van-icon-new::before {
+.van-icon-new-arrival::before {
   content: "\F034";
 }
 
-.van-icon-other-pay::before {
+.van-icon-new::before {
   content: "\F035";
 }
 
-.van-icon-passed::before {
+.van-icon-other-pay::before {
   content: "\F036";
 }
 
-.van-icon-password-not-view::before {
+.van-icon-passed::before {
   content: "\F037";
 }
 
-.van-icon-password-view::before {
+.van-icon-password-not-view::before {
   content: "\F038";
 }
 
-.van-icon-pause::before {
+.van-icon-password-view::before {
   content: "\F039";
 }
 
-.van-icon-peer-pay::before {
+.van-icon-pause::before {
   content: "\F03A";
 }
 
-.van-icon-pending-deliver::before {
+.van-icon-peer-pay::before {
   content: "\F03B";
 }
 
-.van-icon-pending-evaluate::before {
+.van-icon-pending-deliver::before {
   content: "\F03C";
 }
 
-.van-icon-pending-orders::before {
+.van-icon-pending-evaluate::before {
   content: "\F03D";
 }
 
-.van-icon-pending-payment::before {
+.van-icon-pending-orders::before {
   content: "\F03E";
 }
 
-.van-icon-phone::before {
+.van-icon-pending-payment::before {
   content: "\F03F";
 }
 
-.van-icon-photo::before {
+.van-icon-phone::before {
   content: "\F040";
 }
 
-.van-icon-photograph::before {
+.van-icon-photo::before {
   content: "\F041";
 }
 
-.van-icon-play::before {
+.van-icon-photograph::before {
   content: "\F042";
 }
 
-.van-icon-point-gift::before {
+.van-icon-play::before {
   content: "\F043";
 }
 
-.van-icon-points-mall::before {
+.van-icon-point-gift::before {
   content: "\F044";
 }
 
-.van-icon-points::before {
+.van-icon-points-mall::before {
   content: "\F045";
 }
 
-.van-icon-qr-invalid::before {
+.van-icon-points::before {
   content: "\F046";
 }
 
-.van-icon-qr::before {
+.van-icon-qr-invalid::before {
   content: "\F047";
 }
 
-.van-icon-question::before {
+.van-icon-qr::before {
   content: "\F048";
 }
 
-.van-icon-receive-gift::before {
+.van-icon-question::before {
   content: "\F049";
 }
 
-.van-icon-records::before {
+.van-icon-receive-gift::before {
   content: "\F04A";
 }
 
-.van-icon-search::before {
+.van-icon-records::before {
   content: "\F04B";
 }
 
-.van-icon-send-gift::before {
+.van-icon-search::before {
   content: "\F04C";
 }
 
-.van-icon-setting::before {
+.van-icon-send-gift::before {
   content: "\F04D";
 }
 
-.van-icon-share::before {
+.van-icon-setting::before {
   content: "\F04E";
 }
 
-.van-icon-shop-collect::before {
+.van-icon-share::before {
   content: "\F04F";
 }
 
-.van-icon-shop::before {
+.van-icon-shop-collect::before {
   content: "\F050";
 }
 
-.van-icon-shopping-cart::before {
+.van-icon-shop::before {
   content: "\F051";
 }
 
-.van-icon-sign::before {
+.van-icon-shopping-cart::before {
   content: "\F052";
 }
 
-.van-icon-stop::before {
+.van-icon-sign::before {
   content: "\F053";
 }
 
-.van-icon-success::before {
+.van-icon-stop::before {
   content: "\F054";
 }
 
-.van-icon-tosend::before {
+.van-icon-success::before {
   content: "\F055";
 }
 
-.van-icon-underway::before {
+.van-icon-tosend::before {
   content: "\F056";
 }
 
-.van-icon-upgrade::before {
+.van-icon-underway::before {
   content: "\F057";
 }
 
-.van-icon-value-card::before {
+.van-icon-upgrade::before {
   content: "\F058";
 }
 
-.van-icon-wap-home::before {
+.van-icon-value-card::before {
   content: "\F059";
 }
 
-.van-icon-wap-nav::before {
+.van-icon-wap-home::before {
   content: "\F05A";
 }
 
-.van-icon-warn::before {
+.van-icon-wap-nav::before {
   content: "\F05B";
 }
 
-.van-icon-wechat::before {
+.van-icon-warn::before {
   content: "\F05C";
 }
 
+.van-icon-wechat::before {
+  content: "\F05D";
+}
+
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 0b099ae11..d671a0362 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -46,7 +46,7 @@
 @import './toast.css';
 
 /* high order components */
-@import './cell-swipe.css';
+@import './swipe-cell.css';
 @import './switch-cell.css';
 @import './tree-select.css';
 
diff --git a/packages/vant-css/src/radio.css b/packages/vant-css/src/radio.css
index 8905b1b9c..743075f93 100644
--- a/packages/vant-css/src/radio.css
+++ b/packages/vant-css/src/radio.css
@@ -13,8 +13,9 @@ $van-radio-size: 20px;
   }
 
   &__input {
+    height: 1em;
     position: relative;
-    height: $van-radio-size;
+    font-size: $van-radio-size;
   }
 
   &__control {
@@ -40,7 +41,6 @@ $van-radio-size: 20px;
   .van-icon {
     width: 1em;
     pointer-events: none;
-    font-size: $van-radio-size;
   }
 
   .van-icon-checked {
diff --git a/packages/vant-css/src/submit-bar.css b/packages/vant-css/src/submit-bar.css
index 62238fa60..1ef33ce3d 100644
--- a/packages/vant-css/src/submit-bar.css
+++ b/packages/vant-css/src/submit-bar.css
@@ -19,15 +19,16 @@
   &__bar {
     height: 50px;
     display: flex;
-    font-size: 16px;
+    font-size: 14px;
     align-items: center;
     background-color: $white;
   }
 
-  &__price {
+  &__text {
     flex: 1;
+    font-weight: 500;
     text-align: right;
-    color: $gray-darker;
+    color: $text-color;
     padding-right: 12px;
 
     span {
@@ -35,15 +36,10 @@
     }
   }
 
-  &__price-integer {
+  &__price {
     color: $red;
   }
 
-  &__price-decimal {
-    color: $red;
-    font-size: 12px;
-  }
-
   .van-button {
     width: 110px;
     height: 100%;
diff --git a/packages/vant-css/src/cell-swipe.css b/packages/vant-css/src/swipe-cell.css
similarity index 94%
rename from packages/vant-css/src/cell-swipe.css
rename to packages/vant-css/src/swipe-cell.css
index 50b250db3..27fb673b3 100644
--- a/packages/vant-css/src/cell-swipe.css
+++ b/packages/vant-css/src/swipe-cell.css
@@ -1,6 +1,6 @@
 @import './common/var.css';
 
-.van-cell-swipe {
+.van-swipe-cell {
   overflow: hidden;
   position: relative;
 
diff --git a/types/index.d.ts b/types/index.d.ts
index 16a3757ad..18cb1eac3 100644
--- a/types/index.d.ts
+++ b/types/index.d.ts
@@ -19,7 +19,7 @@ export class Button extends VanComponent {}
 export class Card extends VanComponent {}
 export class Cell extends VanComponent {}
 export class CellGroup extends VanComponent {}
-export class CellSwipe extends VanComponent {}
+export class SwipeCell extends VanComponent {}
 export class Checkbox extends VanComponent {}
 export class CheckboxGroup extends VanComponent {}
 export class Circle extends VanComponent {}
diff --git a/yarn.lock b/yarn.lock
index 8ae35187a..a6188ed3d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8,6 +8,31 @@
   dependencies:
     "@babel/highlight" "7.0.0-beta.44"
 
+"@babel/code-frame@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-rc.1.tgz#5c2154415d6c09959a71845ef519d11157e95d10"
+  dependencies:
+    "@babel/highlight" "7.0.0-rc.1"
+
+"@babel/core@^7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.0.0-rc.1.tgz#53c84fd562e13325f123d5951184eec97b958204"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/generator" "7.0.0-rc.1"
+    "@babel/helpers" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    convert-source-map "^1.1.0"
+    debug "^3.1.0"
+    json5 "^0.5.0"
+    lodash "^4.17.10"
+    resolve "^1.3.2"
+    semver "^5.4.1"
+    source-map "^0.5.0"
+
 "@babel/generator@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
@@ -18,6 +43,16 @@
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
+"@babel/generator@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-rc.1.tgz#739c87d70b31aeed802bd6bc9fd51480065c45e8"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+    jsesc "^2.5.1"
+    lodash "^4.17.10"
+    source-map "^0.5.0"
+    trim-right "^1.0.1"
+
 "@babel/helper-function-name@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
@@ -26,18 +61,46 @@
     "@babel/template" "7.0.0-beta.44"
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-function-name@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-rc.1.tgz#20b2cc836a53c669f297c8d309fc553385c5cdde"
+  dependencies:
+    "@babel/helper-get-function-arity" "7.0.0-rc.1"
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-get-function-arity@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-get-function-arity@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-rc.1.tgz#60185957f72ed73766ce74c836ac574921743c46"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/helper-split-export-declaration@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
   dependencies:
     "@babel/types" "7.0.0-beta.44"
 
+"@babel/helper-split-export-declaration@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-rc.1.tgz#b00323834343fd0210f1f46c7a53521ad53efa5e"
+  dependencies:
+    "@babel/types" "7.0.0-rc.1"
+
+"@babel/helpers@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.0.0-rc.1.tgz#e59092cdf4b28026b3fc9d272e27e0ef152b4bee"
+  dependencies:
+    "@babel/template" "7.0.0-rc.1"
+    "@babel/traverse" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+
 "@babel/highlight@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
@@ -46,6 +109,18 @@
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
+"@babel/highlight@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-rc.1.tgz#e0ca4731fa4786f7b9500421d6ff5e5a7753e81e"
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^3.0.0"
+
+"@babel/parser@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.0.0-rc.1.tgz#d009a9bba8175d7b971e30cd03535b278c44082d"
+
 "@babel/template@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
@@ -55,6 +130,15 @@
     babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
+"@babel/template@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-rc.1.tgz#5f9c0a481c9f22ecdb84697b3c3a34eadeeca23c"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    lodash "^4.17.10"
+
 "@babel/traverse@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
@@ -70,6 +154,20 @@
     invariant "^2.2.0"
     lodash "^4.2.0"
 
+"@babel/traverse@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-rc.1.tgz#867b4b45ada2d51ae2d0076f1c1d5880f8557158"
+  dependencies:
+    "@babel/code-frame" "7.0.0-rc.1"
+    "@babel/generator" "7.0.0-rc.1"
+    "@babel/helper-function-name" "7.0.0-rc.1"
+    "@babel/helper-split-export-declaration" "7.0.0-rc.1"
+    "@babel/parser" "7.0.0-rc.1"
+    "@babel/types" "7.0.0-rc.1"
+    debug "^3.1.0"
+    globals "^11.1.0"
+    lodash "^4.17.10"
+
 "@babel/types@7.0.0-beta.44":
   version "7.0.0-beta.44"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
@@ -78,6 +176,14 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@babel/types@7.0.0-rc.1":
+  version "7.0.0-rc.1"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-rc.1.tgz#6abf6d14ddd9fc022617e5b62e6b32f4fa6526ad"
+  dependencies:
+    esutils "^2.0.2"
+    lodash "^4.17.10"
+    to-fast-properties "^2.0.0"
+
 "@mrmlnc/readdir-enhanced@^2.2.1":
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
@@ -697,12 +803,12 @@ autoprefixer@^9.0.0:
     postcss "^7.0.2"
     postcss-value-parser "^3.2.3"
 
-autoprefixer@^9.1.0:
-  version "9.1.0"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.0.tgz#566a70d1148046b96b31efa08090f1999ffb6d8c"
+autoprefixer@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.1.2.tgz#73672614e3ee43a433b84c1c2a4b1ca392d2f6a1"
   dependencies:
-    browserslist "^4.0.1"
-    caniuse-lite "^1.0.30000872"
+    browserslist "^4.0.2"
+    caniuse-lite "^1.0.30000877"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
     postcss "^7.0.2"
@@ -1684,6 +1790,14 @@ browserslist@^4.0.1:
     electron-to-chromium "^1.3.52"
     node-releases "^1.0.0-alpha.10"
 
+browserslist@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.0.2.tgz#294388f5844bb3ab15ef7394ca17f49bf7a4e6f1"
+  dependencies:
+    caniuse-lite "^1.0.30000876"
+    electron-to-chromium "^1.3.57"
+    node-releases "^1.0.0-alpha.11"
+
 bser@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719"
@@ -1820,9 +1934,9 @@ caniuse-lite@^1.0.30000865:
   version "1.0.30000865"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000865.tgz#70026616e8afe6e1442f8bb4e1092987d81a2f25"
 
-caniuse-lite@^1.0.30000872:
-  version "1.0.30000874"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000874.tgz#a641b1f1c420d58d9b132920ef6ba87bbdcd2223"
+caniuse-lite@^1.0.30000876, caniuse-lite@^1.0.30000877:
+  version "1.0.30000877"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000877.tgz#f189673b86ecc06436520e3e391de6a13ca923b4"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -2268,7 +2382,7 @@ content-type@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
 
-convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
+convert-source-map@^1.1.0, convert-source-map@^1.4.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
 
@@ -2914,6 +3028,10 @@ electron-to-chromium@^1.3.52:
   version "1.3.55"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.55.tgz#f150e10b20b77d9d41afcca312efe0c3b1a7fdce"
 
+electron-to-chromium@^1.3.57:
+  version "1.3.58"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.58.tgz#8267a4000014e93986d9d18c65a8b4022ca75188"
+
 elegant-spinner@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e"
@@ -2982,16 +3100,6 @@ error-inject@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/error-inject/-/error-inject-1.0.0.tgz#e2b3d91b54aed672f309d950d154850fa11d4f37"
 
-es-abstract@^1.10.0:
-  version "1.12.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
-  dependencies:
-    es-to-primitive "^1.1.1"
-    function-bind "^1.1.1"
-    has "^1.0.1"
-    is-callable "^1.1.3"
-    is-regex "^1.0.4"
-
 es-abstract@^1.5.1:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
@@ -3087,9 +3195,9 @@ eslint-visitor-keys@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#3f3180fb2e291017716acb4c9d6d5b5c34a6a81d"
 
-eslint@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.3.0.tgz#53695aca5213968aacdf970ccb231e42a2b285f8"
+eslint@^5.4.0:
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-5.4.0.tgz#d068ec03006bb9e06b429dc85f7e46c1b69fac62"
   dependencies:
     ajv "^6.5.0"
     babel-code-frame "^6.26.0"
@@ -3125,7 +3233,6 @@ eslint@^5.3.0:
     regexpp "^2.0.0"
     require-uncached "^1.0.3"
     semver "^5.5.0"
-    string.prototype.matchall "^2.0.0"
     strip-ansi "^4.0.0"
     strip-json-comments "^2.0.1"
     table "^4.0.3"
@@ -3270,14 +3377,14 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-expect@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/expect/-/expect-23.4.0.tgz#6da4ecc99c1471253e7288338983ad1ebadb60c3"
+expect@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/expect/-/expect-23.5.0.tgz#18999a0eef8f8acf99023fde766d9c323c2562ed"
   dependencies:
     ansi-styles "^3.2.0"
-    jest-diff "^23.2.0"
+    jest-diff "^23.5.0"
     jest-get-type "^22.1.0"
-    jest-matcher-utils "^23.2.0"
+    jest-matcher-utils "^23.5.0"
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
 
@@ -4535,7 +4642,7 @@ interpret@^1.0.0, interpret@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
-invariant@^2.2.0, invariant@^2.2.2:
+invariant@^2.2.0, invariant@^2.2.2, invariant@^2.2.4:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
   dependencies:
@@ -4982,9 +5089,9 @@ jest-changed-files@^23.4.2:
   dependencies:
     throat "^4.0.0"
 
-jest-cli@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.4.2.tgz#49d56bcfe6cf01871bfcc4a0494e08edaf2b61d0"
+jest-cli@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.5.0.tgz#d316b8e34a38a610a1efc4f0403d8ef8a55e4492"
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.1"
@@ -4998,18 +5105,18 @@ jest-cli@^23.4.2:
     istanbul-lib-instrument "^1.10.1"
     istanbul-lib-source-maps "^1.2.4"
     jest-changed-files "^23.4.2"
-    jest-config "^23.4.2"
+    jest-config "^23.5.0"
     jest-environment-jsdom "^23.4.0"
     jest-get-type "^22.1.0"
-    jest-haste-map "^23.4.1"
+    jest-haste-map "^23.5.0"
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
-    jest-resolve-dependencies "^23.4.2"
-    jest-runner "^23.4.2"
-    jest-runtime "^23.4.2"
-    jest-snapshot "^23.4.2"
+    jest-resolve-dependencies "^23.5.0"
+    jest-runner "^23.5.0"
+    jest-runtime "^23.5.0"
+    jest-snapshot "^23.5.0"
     jest-util "^23.4.0"
-    jest-validate "^23.4.0"
+    jest-validate "^23.5.0"
     jest-watcher "^23.4.0"
     jest-worker "^23.2.0"
     micromatch "^2.3.11"
@@ -5023,9 +5130,9 @@ jest-cli@^23.4.2:
     which "^1.2.12"
     yargs "^11.0.0"
 
-jest-config@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.4.2.tgz#62a105e14b8266458f2bf4d32403b2c44418fa77"
+jest-config@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.5.0.tgz#3770fba03f7507ee15f3b8867c742e48f31a9773"
   dependencies:
     babel-core "^6.0.0"
     babel-jest "^23.4.2"
@@ -5034,21 +5141,22 @@ jest-config@^23.4.2:
     jest-environment-jsdom "^23.4.0"
     jest-environment-node "^23.4.0"
     jest-get-type "^22.1.0"
-    jest-jasmine2 "^23.4.2"
+    jest-jasmine2 "^23.5.0"
     jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
+    jest-resolve "^23.5.0"
     jest-util "^23.4.0"
-    jest-validate "^23.4.0"
-    pretty-format "^23.2.0"
+    jest-validate "^23.5.0"
+    micromatch "^2.3.11"
+    pretty-format "^23.5.0"
 
-jest-diff@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.2.0.tgz#9f2cf4b51e12c791550200abc16b47130af1062a"
+jest-diff@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.5.0.tgz#250651a433dd0050290a07642946cc9baaf06fba"
   dependencies:
     chalk "^2.0.1"
     diff "^3.2.0"
     jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-docblock@^23.2.0:
   version "23.2.0"
@@ -5056,12 +5164,12 @@ jest-docblock@^23.2.0:
   dependencies:
     detect-newline "^2.1.0"
 
-jest-each@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.4.0.tgz#2fa9edd89daa1a4edc9ff9bf6062a36b71345143"
+jest-each@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.5.0.tgz#77f7e2afe6132a80954b920006e78239862b10ba"
   dependencies:
     chalk "^2.0.1"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-environment-jsdom@^23.4.0:
   version "23.4.0"
@@ -5082,48 +5190,49 @@ jest-get-type@^22.1.0:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4"
 
-jest-haste-map@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.4.1.tgz#43a174ba7ac079ae1dd74eaf5a5fe78989474dd2"
+jest-haste-map@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.5.0.tgz#d4ca618188bd38caa6cb20349ce6610e194a8065"
   dependencies:
     fb-watchman "^2.0.0"
     graceful-fs "^4.1.11"
+    invariant "^2.2.4"
     jest-docblock "^23.2.0"
     jest-serializer "^23.0.1"
     jest-worker "^23.2.0"
     micromatch "^2.3.11"
     sane "^2.0.0"
 
-jest-jasmine2@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.4.2.tgz#2fbf52f93e43ed4c5e7326a90bb1d785be4321ac"
+jest-jasmine2@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.5.0.tgz#05fe7f1788e650eeb5a03929e6461ea2e9f3db53"
   dependencies:
     babel-traverse "^6.0.0"
     chalk "^2.0.1"
     co "^4.6.0"
-    expect "^23.4.0"
+    expect "^23.5.0"
     is-generator-fn "^1.0.0"
-    jest-diff "^23.2.0"
-    jest-each "^23.4.0"
-    jest-matcher-utils "^23.2.0"
+    jest-diff "^23.5.0"
+    jest-each "^23.5.0"
+    jest-matcher-utils "^23.5.0"
     jest-message-util "^23.4.0"
-    jest-snapshot "^23.4.2"
+    jest-snapshot "^23.5.0"
     jest-util "^23.4.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
-jest-leak-detector@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.2.0.tgz#c289d961dc638f14357d4ef96e0431ecc1aa377d"
+jest-leak-detector@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.5.0.tgz#14ac2a785bd625160a2ea968fd5d98b7dcea3e64"
   dependencies:
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
-jest-matcher-utils@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.2.0.tgz#4d4981f23213e939e3cedf23dc34c747b5ae1913"
+jest-matcher-utils@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.5.0.tgz#0e2ea67744cab78c9ab15011c4d888bdd3e49e2a"
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-message-util@^23.4.0:
   version "23.4.0"
@@ -5143,42 +5252,42 @@ jest-regex-util@^23.3.0:
   version "23.3.0"
   resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.3.0.tgz#5f86729547c2785c4002ceaa8f849fe8ca471bc5"
 
-jest-resolve-dependencies@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.4.2.tgz#0675ba876a5b819deffc449ad72e9985c2592048"
+jest-resolve-dependencies@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.5.0.tgz#10c4d135beb9d2256de1fedc7094916c3ad74af7"
   dependencies:
     jest-regex-util "^23.3.0"
-    jest-snapshot "^23.4.2"
+    jest-snapshot "^23.5.0"
 
-jest-resolve@^23.4.1:
-  version "23.4.1"
-  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.4.1.tgz#7f3c17104732a2c0c940a01256025ed745814982"
+jest-resolve@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.5.0.tgz#3b8e7f67e84598f0caf63d1530bd8534a189d0e6"
   dependencies:
     browser-resolve "^1.11.3"
     chalk "^2.0.1"
     realpath-native "^1.0.0"
 
-jest-runner@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.4.2.tgz#579a88524ac52c846075b0129a21c7b483e75a7e"
+jest-runner@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.5.0.tgz#570f7a044da91648b5bb9b6baacdd511076c71d7"
   dependencies:
     exit "^0.1.2"
     graceful-fs "^4.1.11"
-    jest-config "^23.4.2"
+    jest-config "^23.5.0"
     jest-docblock "^23.2.0"
-    jest-haste-map "^23.4.1"
-    jest-jasmine2 "^23.4.2"
-    jest-leak-detector "^23.2.0"
+    jest-haste-map "^23.5.0"
+    jest-jasmine2 "^23.5.0"
+    jest-leak-detector "^23.5.0"
     jest-message-util "^23.4.0"
-    jest-runtime "^23.4.2"
+    jest-runtime "^23.5.0"
     jest-util "^23.4.0"
     jest-worker "^23.2.0"
     source-map-support "^0.5.6"
     throat "^4.0.0"
 
-jest-runtime@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.4.2.tgz#00c3bb8385253d401a394a27d1112d3615e5a65c"
+jest-runtime@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.5.0.tgz#eb503525a196dc32f2f9974e3482d26bdf7b63ce"
   dependencies:
     babel-core "^6.0.0"
     babel-plugin-istanbul "^4.1.6"
@@ -5187,14 +5296,14 @@ jest-runtime@^23.4.2:
     exit "^0.1.2"
     fast-json-stable-stringify "^2.0.0"
     graceful-fs "^4.1.11"
-    jest-config "^23.4.2"
-    jest-haste-map "^23.4.1"
+    jest-config "^23.5.0"
+    jest-haste-map "^23.5.0"
     jest-message-util "^23.4.0"
     jest-regex-util "^23.3.0"
-    jest-resolve "^23.4.1"
-    jest-snapshot "^23.4.2"
+    jest-resolve "^23.5.0"
+    jest-snapshot "^23.5.0"
     jest-util "^23.4.0"
-    jest-validate "^23.4.0"
+    jest-validate "^23.5.0"
     micromatch "^2.3.11"
     realpath-native "^1.0.0"
     slash "^1.0.0"
@@ -5212,19 +5321,19 @@ jest-serializer@^23.0.1:
   version "23.0.1"
   resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165"
 
-jest-snapshot@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.4.2.tgz#8fa6130feb5a527dac73e5fa80d86f29f7c42ab6"
+jest-snapshot@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.5.0.tgz#cc368ebd8513e1175e2a7277f37a801b7358ae79"
   dependencies:
     babel-types "^6.0.0"
     chalk "^2.0.1"
-    jest-diff "^23.2.0"
-    jest-matcher-utils "^23.2.0"
+    jest-diff "^23.5.0"
+    jest-matcher-utils "^23.5.0"
     jest-message-util "^23.4.0"
-    jest-resolve "^23.4.1"
+    jest-resolve "^23.5.0"
     mkdirp "^0.5.1"
     natural-compare "^1.4.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
     semver "^5.5.0"
 
 jest-util@^23.4.0:
@@ -5240,23 +5349,14 @@ jest-util@^23.4.0:
     slash "^1.0.0"
     source-map "^0.6.0"
 
-jest-validate@^23.0.0:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f"
+jest-validate@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.5.0.tgz#f5df8f761cf43155e1b2e21d6e9de8a2852d0231"
   dependencies:
     chalk "^2.0.1"
     jest-get-type "^22.1.0"
     leven "^2.1.0"
-    pretty-format "^23.0.1"
-
-jest-validate@^23.4.0:
-  version "23.4.0"
-  resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.4.0.tgz#d96eede01ef03ac909c009e9c8e455197d48c201"
-  dependencies:
-    chalk "^2.0.1"
-    jest-get-type "^22.1.0"
-    leven "^2.1.0"
-    pretty-format "^23.2.0"
+    pretty-format "^23.5.0"
 
 jest-watcher@^23.4.0:
   version "23.4.0"
@@ -5272,12 +5372,12 @@ jest-worker@^23.2.0:
   dependencies:
     merge-stream "^1.0.1"
 
-jest@^23.4.2:
-  version "23.4.2"
-  resolved "https://registry.yarnpkg.com/jest/-/jest-23.4.2.tgz#1fae3ed832192143070ae85156b25cea891a1260"
+jest@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/jest/-/jest-23.5.0.tgz#80de353d156ea5ea4a7332f7962ac79135fbc62e"
   dependencies:
     import-local "^1.0.0"
-    jest-cli "^23.4.2"
+    jest-cli "^23.5.0"
 
 js-base64@^2.1.9:
   version "2.4.3"
@@ -5544,11 +5644,10 @@ linkify-it@^2.0.0:
   dependencies:
     uc.micro "^1.0.1"
 
-lint-staged@^7.2.0:
-  version "7.2.0"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.2.0.tgz#bdf4bb7f2f37fe689acfaec9999db288a5b26888"
+lint-staged@^7.2.2:
+  version "7.2.2"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.2.2.tgz#0983d55d497f19f36d11ff2c8242b2f56cc2dd05"
   dependencies:
-    app-root-path "^2.0.1"
     chalk "^2.3.1"
     commander "^2.14.1"
     cosmiconfig "^5.0.2"
@@ -5558,7 +5657,7 @@ lint-staged@^7.2.0:
     find-parent-dir "^0.3.0"
     is-glob "^4.0.0"
     is-windows "^1.0.2"
-    jest-validate "^23.0.0"
+    jest-validate "^23.5.0"
     listr "^0.14.1"
     lodash "^4.17.5"
     log-symbols "^2.2.0"
@@ -6583,6 +6682,12 @@ node-releases@^1.0.0-alpha.10:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.0.0-alpha.11:
+  version "1.0.0-alpha.11"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.0.0-alpha.11.tgz#73c810acc2e5b741a17ddfbb39dfca9ab9359d8a"
+  dependencies:
+    semver "^5.3.0"
+
 node-source-walk@3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/node-source-walk/-/node-source-walk-3.2.0.tgz#3c605cc53abdee4b45ab65e947dfb1db7c90f0e3"
@@ -7136,6 +7241,10 @@ pify@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
 
+pify@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.0.tgz#db04c982b632fd0df9090d14aaf1c8413cadb695"
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -7259,9 +7368,9 @@ postcss-extend@^1.0.5:
   dependencies:
     postcss "^5.0.4"
 
-postcss-html@^0.31.0:
-  version "0.31.0"
-  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.31.0.tgz#ea6ae2e95df60a03032e9ab5aba72143d8ca0325"
+postcss-html@^0.33.0:
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/postcss-html/-/postcss-html-0.33.0.tgz#8ab6067d7a8a234e1937920b38760e3be1dca070"
   dependencies:
     htmlparser2 "^3.9.2"
 
@@ -7282,6 +7391,14 @@ postcss-js@^1.0.1:
     camelcase-css "^1.0.1"
     postcss "^6.0.11"
 
+postcss-jsx@^0.33.0:
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/postcss-jsx/-/postcss-jsx-0.33.0.tgz#433f8aadd6f3b0ee403a62b441bca8db9c87471c"
+  dependencies:
+    "@babel/core" "^7.0.0-rc.1"
+  optionalDependencies:
+    postcss-styled ">=0.33.0"
+
 postcss-less@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-less/-/postcss-less-2.0.0.tgz#5d190b8e057ca446d60fe2e2587ad791c9029fb8"
@@ -7304,9 +7421,9 @@ postcss-loader@^3.0.0:
     postcss-load-config "^2.0.0"
     schema-utils "^1.0.0"
 
-postcss-markdown@^0.31.0:
-  version "0.31.0"
-  resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.31.0.tgz#e4c699ad34b14a29ad5d47132bb1b3100b60ef75"
+postcss-markdown@^0.33.0:
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/postcss-markdown/-/postcss-markdown-0.33.0.tgz#2d0462742ee108c9d6020780184b499630b8b33a"
   dependencies:
     remark "^9.0.0"
     unist-util-find-all-after "^1.0.2"
@@ -7458,13 +7575,13 @@ postcss-simple-vars@^4.1.0:
   dependencies:
     postcss "^6.0.9"
 
-postcss-styled@^0.31.0:
-  version "0.31.0"
-  resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.31.0.tgz#ab532a2b3c469dfcca306a7623c4d4a98bb077d5"
+postcss-styled@>=0.33.0, postcss-styled@^0.33.0:
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/postcss-styled/-/postcss-styled-0.33.0.tgz#69be377584105a582fda7e4f76888e5b97eed737"
 
-postcss-syntax@^0.31.0:
-  version "0.31.0"
-  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.31.0.tgz#13d955c705d339595d10a19efa4a1bee82dfb78f"
+postcss-syntax@^0.33.0:
+  version "0.33.0"
+  resolved "https://registry.yarnpkg.com/postcss-syntax/-/postcss-syntax-0.33.0.tgz#59c0c678d2f9ecefa84c6ce9ef46fc805c54ab3a"
 
 postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
   version "3.3.0"
@@ -7581,16 +7698,9 @@ pretty-error@^2.0.2:
     renderkid "^2.0.1"
     utila "~0.4"
 
-pretty-format@^23.0.1:
-  version "23.0.1"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4"
-  dependencies:
-    ansi-regex "^3.0.0"
-    ansi-styles "^3.2.0"
-
-pretty-format@^23.2.0:
-  version "23.2.0"
-  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.2.0.tgz#3b0aaa63c018a53583373c1cb3a5d96cc5e83017"
+pretty-format@^23.5.0:
+  version "23.5.0"
+  resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.5.0.tgz#0f9601ad9da70fe690a269cd3efca732c210687c"
   dependencies:
     ansi-regex "^3.0.0"
     ansi-styles "^3.2.0"
@@ -7901,12 +8011,6 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regexp.prototype.flags@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz#6b30724e306a27833eeb171b66ac8890ba37e41c"
-  dependencies:
-    define-properties "^1.1.2"
-
 regexpp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.0.tgz#b2a7534a85ca1b033bcf5ce9ff8e56d4e0755365"
@@ -8188,6 +8292,12 @@ resolve@^1.1.6, resolve@^1.1.7, resolve@^1.2.0, resolve@^1.5.0, resolve@^1.6.0:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.3.2:
+  version "1.8.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.8.1.tgz#82f1ec19a423ac1fbd080b0bab06ba36e84a7a26"
+  dependencies:
+    path-parse "^1.0.5"
+
 restore-cursor@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541"
@@ -8291,7 +8401,7 @@ sax@^1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
 
-schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5:
+schema-utils@^0.4.4, schema-utils@^0.4.5:
   version "0.4.5"
   resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
   dependencies:
@@ -8711,16 +8821,6 @@ string.prototype.codepointat@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz#004ad44c8afc727527b108cd462b4d971cd469bc"
 
-string.prototype.matchall@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-2.0.0.tgz#2af8fe3d2d6dc53ca2a59bd376b089c3c152b3c8"
-  dependencies:
-    define-properties "^1.1.2"
-    es-abstract "^1.10.0"
-    function-bind "^1.1.1"
-    has-symbols "^1.0.0"
-    regexp.prototype.flags "^1.2.0"
-
 string_decoder@^1.0.0, string_decoder@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
@@ -8836,9 +8936,9 @@ stylelint-config-standard@^18.2.0:
   dependencies:
     stylelint-config-recommended "^2.1.0"
 
-stylelint@^9.4.0:
-  version "9.4.0"
-  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.4.0.tgz#2f2b82ae9db53a06735ae0724f41b134fdb84a10"
+stylelint@^9.5.0:
+  version "9.5.0"
+  resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-9.5.0.tgz#f7afb45342abc4acf28a8da8a48373e9f79c1fb4"
   dependencies:
     autoprefixer "^9.0.0"
     balanced-match "^1.0.0"
@@ -8861,11 +8961,12 @@ stylelint@^9.4.0:
     meow "^5.0.0"
     micromatch "^2.3.11"
     normalize-selector "^0.2.0"
-    pify "^3.0.0"
+    pify "^4.0.0"
     postcss "^7.0.0"
-    postcss-html "^0.31.0"
+    postcss-html "^0.33.0"
+    postcss-jsx "^0.33.0"
     postcss-less "^2.0.0"
-    postcss-markdown "^0.31.0"
+    postcss-markdown "^0.33.0"
     postcss-media-query-parser "^0.2.3"
     postcss-reporter "^5.0.0"
     postcss-resolve-nested-selector "^0.1.1"
@@ -8873,15 +8974,15 @@ stylelint@^9.4.0:
     postcss-sass "^0.3.0"
     postcss-scss "^2.0.0"
     postcss-selector-parser "^3.1.0"
-    postcss-styled "^0.31.0"
-    postcss-syntax "^0.31.0"
+    postcss-styled "^0.33.0"
+    postcss-syntax "^0.33.0"
     postcss-value-parser "^3.3.0"
     resolve-from "^4.0.0"
     signal-exit "^3.0.2"
     specificity "^0.4.0"
     string-width "^2.1.0"
     style-search "^0.1.0"
-    sugarss "^1.0.0"
+    sugarss "^2.0.0"
     svg-tags "^1.0.0"
     table "^4.0.1"
 
@@ -8898,6 +8999,12 @@ sugarss@^1.0.0:
   dependencies:
     postcss "^6.0.14"
 
+sugarss@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-2.0.0.tgz#ddd76e0124b297d40bf3cca31c8b22ecb43bc61d"
+  dependencies:
+    postcss "^7.0.2"
+
 supports-color@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a"
@@ -9466,13 +9573,13 @@ url-join@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-4.0.0.tgz#4d3340e807d3773bda9991f8305acdcc2a665d2a"
 
-url-loader@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.0.1.tgz#61bc53f1f184d7343da2728a1289ef8722ea45ee"
+url-loader@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-1.1.1.tgz#4d1f3b4f90dde89f02c008e662d604d7511167c1"
   dependencies:
     loader-utils "^1.1.0"
     mime "^2.0.3"
-    schema-utils "^0.4.3"
+    schema-utils "^1.0.0"
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
@@ -9547,9 +9654,9 @@ validate-npm-package-license@^3.0.1:
     spdx-correct "^3.0.0"
     spdx-expression-parse "^3.0.0"
 
-vant-doc@1.0.13:
-  version "1.0.13"
-  resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-1.0.13.tgz#d5a6b35fb85e65e0846097f5a90007efa3d485a1"
+vant-doc@1.0.14:
+  version "1.0.14"
+  resolved "https://registry.yarnpkg.com/vant-doc/-/vant-doc-1.0.14.tgz#c7f259e5b535b140a7025c6b5397611430551199"
   dependencies:
     cheerio "0.22.0"
     commander "^2.17.1"
@@ -9679,9 +9786,9 @@ vue-lazyload@1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/vue-lazyload/-/vue-lazyload-1.2.3.tgz#901f9ec15c7e6ca78781a2bae4a343686bdedb2c"
 
-vue-loader@^15.3.0:
-  version "15.3.0"
-  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.3.0.tgz#b474d10a4e93d934a78c147fc3e314b370e9fc54"
+vue-loader@^15.4.0:
+  version "15.4.0"
+  resolved "https://registry.yarnpkg.com/vue-loader/-/vue-loader-15.4.0.tgz#8c90f94ece61c6b4707e87b4a58617f97faa125b"
   dependencies:
     "@vue/component-compiler-utils" "^2.0.0"
     hash-sum "^1.0.2"