From 2db9b12816f3b8619ca0ad4834ceaf3573ef761d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Fri, 15 Dec 2017 14:27:59 +0800
Subject: [PATCH] [changelog] 0.11.12

---
 docs/markdown/en-US/changelog.md           | 14 ++++++++++++++
 docs/markdown/zh-CN/changelog-generated.md | 21 +++++++++++++++++++++
 docs/markdown/zh-CN/changelog.md           | 14 ++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/docs/markdown/en-US/changelog.md b/docs/markdown/en-US/changelog.md
index 80694327a..4527403c7 100644
--- a/docs/markdown/en-US/changelog.md
+++ b/docs/markdown/en-US/changelog.md
@@ -1,5 +1,19 @@
 ## Changelog
 
+### [0.11.12](https://github.com/youzan/vant/tree/v0.11.12)
+`2017-12-15`
+
+**Improvements**
+- ContactCard: add 'editable' prop [\#435](https://github.com/youzan/vant/pull/435) [@chenjiahan](https://github.com/chenjiahan)
+- Coupon: support i18n [\#431](https://github.com/youzan/vant/pull/431) [@chenjiahan](https://github.com/chenjiahan)
+
+**Bug Fixes**
+- fix Popup preventScroll not work in some cases [\#429](https://github.com/youzan/vant/pull/429) [@Tinysymphony](https://github.com/Tinysymphony)
+- fix Picker should prevent default touchmove [\#432](https://github.com/youzan/vant/pull/432) [@chenjiahan](https://github.com/chenjiahan)
+- fix Picker bottom area not dragable [\#433](https://github.com/youzan/vant/pull/433) [@chenjiahan](https://github.com/chenjiahan)
+- fix PullRefresh head display error [\#436](https://github.com/youzan/vant/pull/436) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [0.11.11](https://github.com/youzan/vant/tree/v0.11.11)
 `2017-12-13`
 
diff --git a/docs/markdown/zh-CN/changelog-generated.md b/docs/markdown/zh-CN/changelog-generated.md
index d81ec89e5..e2f8221de 100644
--- a/docs/markdown/zh-CN/changelog-generated.md
+++ b/docs/markdown/zh-CN/changelog-generated.md
@@ -1,5 +1,26 @@
 ## 更新日志
 
+## [v0.11.12](https://github.com/youzan/vant/tree/v0.11.12) (2017-12-15)
+[Full Changelog](https://github.com/youzan/vant/compare/v0.11.11...v0.11.12)
+
+**Issue**
+
+- 引入图片懒加载组件时报错 [\#438](https://github.com/youzan/vant/issues/438)
+- 自定义tabbar选中颜色 [\#428](https://github.com/youzan/vant/issues/428)
+- 请教一下，如何使van-field得到焦点 [\#427](https://github.com/youzan/vant/issues/427)
+- iOS（任何版本）下Popup的preventScroll属性会禁止掉弹层内部的内容滚动 [\#423](https://github.com/youzan/vant/issues/423)
+- Search 组件的 focusStatus 是否可以增加到API选项, 进页面自动聚焦 [\#416](https://github.com/youzan/vant/issues/416)
+
+**Improvements**
+
+- \[Doc\] translate AddressList & Contact [\#437](https://github.com/youzan/vant/pull/437) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] PullRefresh head overflow [\#436](https://github.com/youzan/vant/pull/436) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] ContactCard add 'editable' prop [\#435](https://github.com/youzan/vant/pull/435) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] Picker bottom area not dragable [\#433](https://github.com/youzan/vant/pull/433) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] Picker should prevent default touchmove [\#432](https://github.com/youzan/vant/pull/432) ([chenjiahan](https://github.com/chenjiahan))
+- \[Improvement\] Coupon i18n [\#431](https://github.com/youzan/vant/pull/431) ([chenjiahan](https://github.com/chenjiahan))
+- \[bugfix\] popup scrollable element [\#429](https://github.com/youzan/vant/pull/429) ([Tinysymphony](https://github.com/Tinysymphony))
+
 ## [v0.11.11](https://github.com/youzan/vant/tree/v0.11.11) (2017-12-13)
 [Full Changelog](https://github.com/youzan/vant/compare/v0.11.10...v0.11.11)
 
diff --git a/docs/markdown/zh-CN/changelog.md b/docs/markdown/zh-CN/changelog.md
index f4e6a2345..ef301df94 100644
--- a/docs/markdown/zh-CN/changelog.md
+++ b/docs/markdown/zh-CN/changelog.md
@@ -1,5 +1,19 @@
 ## 更新日志
 
+### [0.11.12](https://github.com/youzan/vant/tree/v0.11.12)
+`2017-12-15`
+
+**Improvements**
+- ContactCard: 新增 'editable' 属性 [\#435](https://github.com/youzan/vant/pull/435) [@chenjiahan](https://github.com/chenjiahan)
+- Coupon: 支持英文语言 [\#431](https://github.com/youzan/vant/pull/431) [@chenjiahan](https://github.com/chenjiahan)
+
+**Bug Fixes**
+- 修复 Popup preventScroll 属性失效的问题 [\#429](https://github.com/youzan/vant/pull/429) [@Tinysymphony](https://github.com/Tinysymphony)
+- 修复 Picker 滑动时未禁止页面滚动的问题 [\#432](https://github.com/youzan/vant/pull/432) [@chenjiahan](https://github.com/chenjiahan)
+- 修复 Picker 底部区域无法滑动的问题 [\#433](https://github.com/youzan/vant/pull/433) [@chenjiahan](https://github.com/chenjiahan)
+- 修复 PullRefresh 顶部内容遮挡的问题 [\#436](https://github.com/youzan/vant/pull/436) [@chenjiahan](https://github.com/chenjiahan)
+
+
 ### [0.11.11](https://github.com/youzan/vant/tree/v0.11.11)
 `2017-12-13`