From 16cac42403daf4dbce50a74a2d2c533130d5fde0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Sat, 11 May 2019 10:22:13 +0800
Subject: [PATCH 1/2] [release] 1.6.18

---
 package.json      | 2 +-
 packages/index.ts | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5b97a01ae..184e15154 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vant",
-  "version": "1.6.17",
+  "version": "1.6.18",
   "description": "Mobile UI Components built on Vue",
   "main": "lib/index.js",
   "module": "es/index.js",
diff --git a/packages/index.ts b/packages/index.ts
index 993f06f41..ca3e6aefd 100644
--- a/packages/index.ts
+++ b/packages/index.ts
@@ -80,7 +80,7 @@ declare global {
   }
 }
 
-const version = '1.6.17';
+const version = '1.6.18';
 const components = [
   Actionsheet,
   AddressEdit,

From 6a5efe130b25fbf1281654ece16157554c85a151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Sat, 11 May 2019 10:29:19 +0800
Subject: [PATCH 2/2] [changelog] 1.6.18

---
 docs/markdown/changelog.en-US.md | 13 +++++++++++++
 docs/markdown/changelog.zh-CN.md | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/docs/markdown/changelog.en-US.md b/docs/markdown/changelog.en-US.md
index 1edea365d..1472165f3 100644
--- a/docs/markdown/changelog.en-US.md
+++ b/docs/markdown/changelog.en-US.md
@@ -1,5 +1,18 @@
 ## Changelog
 
+## [v1.6.18](https://github.com/youzan/vant/tree/v1.6.18)
+`2019-05-10`
+
+**Bug Fixes**
+
+- remote some outdated css in AddressEdit
+- fix Radio click event not bubble
+- fix Checkbox click event not bubble
+- fix PullRefresh transform style [\#3258](https://github.com/youzan/vant/pull/3258)
+- fix Progress incorrect width when update pivoit-text
+- fix Swipe map cause warning when prevent touchmove event
+
+
 ## [1.6.17](https://github.com/youzan/vant/tree/v1.6.17)
 `2019-05-05`
 
diff --git a/docs/markdown/changelog.zh-CN.md b/docs/markdown/changelog.zh-CN.md
index ea93d0103..ec659fdb0 100644
--- a/docs/markdown/changelog.zh-CN.md
+++ b/docs/markdown/changelog.zh-CN.md
@@ -1,5 +1,18 @@
 ## 更新日志
 
+## [v1.6.18](https://github.com/youzan/vant/tree/v1.6.18)
+`2019-05-10`
+
+**Bug Fixes**
+
+- 移除 AddressEdit 中部分冗余样式
+- 修复 Radio 点击事件未冒泡的问题
+- 修复 Checkbox 点击事件未冒泡的问题
+- 修复 PullRefresh 静止情况下存在 transform 样式的问题 [\#3258](https://github.com/youzan/vant/pull/3258)
+- 修复 Progress 动态更新 pivoit-text 时宽度计算错误的问题
+- 修复 Swipe 在部分情况下提示 preventDefault 警告的问题
+
+
 ## [1.6.17](https://github.com/youzan/vant/tree/v1.6.17)
 `2019-05-05`