From 52e01c6a955e391fa1ff5557364d637b5946ddcc 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, 7 Dec 2018 16:23:11 +0800
Subject: [PATCH 01/31] [changelog] 0.4.9

---
 docs/markdown/changelog.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/docs/markdown/changelog.md b/docs/markdown/changelog.md
index 6698073e..ca27fb42 100644
--- a/docs/markdown/changelog.md
+++ b/docs/markdown/changelog.md
@@ -1,5 +1,31 @@
 ## 更新日志
 
+## [v0.4.9](https://github.com/youzan/vant-weapp/tree/v0.4.9)
+`2018-12-07`
+
+**Improvements**
+
+- Tab: 新增 sticky 属性 [\#1019](https://github.com/youzan/vant-weapp/pull/1019)
+- Tab: 新增 swipeable 属性 [\#1019](https://github.com/youzan/vant-weapp/pull/1019)
+- Rate: 新增 icon-class 外部样式类 [\#1026](https://github.com/youzan/vant-weapp/pull/1026)
+- Icon: 优化内部 setData 次数 [\#1009](https://github.com/youzan/vant-weapp/pull/1009)
+- Popup: 适配 iPhoneX [\#989](https://github.com/youzan/vant-weapp/pull/989)
+- Tabbar: 适配 iPhoneX [\#989](https://github.com/youzan/vant-weapp/pull/989)
+- SubmitBar: 适配 iPhoneX [\#989](https://github.com/youzan/vant-weapp/pull/989)
+- ActionSheet: 适配 iPhoneX [\#989](https://github.com/youzan/vant-weapp/pull/989)
+- GoodsAction: 适配 iPhoneX [\#989](https://github.com/youzan/vant-weapp/pull/989)
+
+**Bug Fixes**
+
+- 修复 Collapse 箭头方向错误 [\#1014](https://github.com/youzan/vant-weapp/pull/1014)
+- 修复 Steps 在开发者工具体验评分中提示选择器错误的问题 [\#1015](https://github.com/youzan/vant-weapp/pull/1015)
+- 修复 Stepper 动态设置 value 时禁用状态未更新的问题 [\#1022](https://github.com/youzan/vant-weapp/pull/1022)
+- 修复 Popup 在 iOS 8 下动画错误的问题 [\#1008](https://github.com/youzan/vant-weapp/pull/1008) [\#1029](https://github.com/youzan/vant-weapp/pull/1029)
+- 修复 Transition 在 iOS 8 下动画错误的问题 [\#1008](https://github.com/youzan/vant-weapp/pull/1008) [\#1029](https://github.com/youzan/vant-weapp/pull/1029)
+- 修复 DatetimePicker 动态设置 type 后报错的问题 [\#1004](https://github.com/youzan/vant-weapp/pull/1004)
+- 修复劫持 setData 方法导致无法适配支付宝小程序的问题 [\#1023](https://github.com/youzan/vant-weapp/pull/1023)
+
+
 ## [v0.4.8](https://github.com/youzan/vant-weapp/tree/v0.4.8)
 `2018-12-03`
 

From 562ffde2f1432740413a9f8db1d2236606d01d60 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Sat, 8 Dec 2018 20:26:18 +0800
Subject: [PATCH 02/31] =?UTF-8?q?docs(DatetimePicker):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0value=E7=B1=BB=E5=9E=8B=E8=AF=B4=E6=98=8E=E4=B8=8E?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BB=BA=E8=AE=AE=20@rex-zsd=20(#1034)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/datetime-picker/README.md | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/datetime-picker/README.md b/packages/datetime-picker/README.md
index 2bd6a466..b604be70 100644
--- a/packages/datetime-picker/README.md
+++ b/packages/datetime-picker/README.md
@@ -13,6 +13,8 @@
 
 #### 选择完整时间
 
+`value` 为时间戳
+
 ```html
 <van-datetime-picker
   type="datetime"
@@ -43,6 +45,8 @@ Page({
 
 #### 选择日期（年月日）
 
+`value` 为时间戳
+
 ```html
 <van-datetime-picker
   type="date"
@@ -69,6 +73,8 @@ Page({
 
 #### 选择日期（年月）
 
+`value` 为时间戳
+
 ```html
 <van-datetime-picker
   type="year-month"
@@ -95,6 +101,8 @@ Page({
 
 #### 选择时间
 
+`value` 为字符串
+
 ```html
 <van-datetime-picker
   type="time"
@@ -125,7 +133,8 @@ Page({
 
 | 参数 | 说明 | 类型 | 默认值 |
 |------|------|------|------|------|
-| type | 类型，可选值为 `date` <br> `time` `year-month` | `String` | `datetime` |
+| value | 当前选中值 | `String | Number` | - |
+| type | 类型，可选值为 `date` `time` `year-month` <br> <strong>不建议动态修改</strong> | `String` | `datetime` |
 | min-date | 可选的最小时间，精确到分钟 | `Number` | 十年前 |
 | max-date | 可选的最大时间，精确到分钟 | `Number` | 十年后 |
 | min-hour | 可选的最小小时，针对 time 类型 | `Number` | `0` |

From 163d0da83667d1282c64a80c84d4f86bf6971221 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Mon, 10 Dec 2018 16:12:31 +0800
Subject: [PATCH 03/31] [improvement] Card: change default thumb-mode to
 aspectFit (#1039)

---
 packages/card/README.md | 5 +++--
 packages/card/index.ts  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/card/README.md b/packages/card/README.md
index 375ad714..d07f6013 100644
--- a/packages/card/README.md
+++ b/packages/card/README.md
@@ -24,7 +24,8 @@
 ```
 
 #### 高级用法
-可以通过具名`slot`添加定制内容
+
+可以通过插槽添加定制内容
 
 ```html
 <van-card
@@ -47,7 +48,7 @@
 | 参数 | 说明 | 类型 | 默认值 |
 |-----------|-----------|-----------|-------------|
 | thumb | 左侧图片 | `String` | - |
-| thumb-mode | 左侧图片裁剪、缩放的模式，可选值参考小程序 image 组件 mode 属性值 | `String` | `scaleToFill` |
+| thumb-mode | 左侧图片裁剪、缩放的模式，可选值参考小程序 image 组件 mode 属性值 | `String` | `aspectFit` |
 | title | 标题 | `String` | - |
 | desc | 描述 | `String` | - |
 | tag | 标签 | `String` | - |
diff --git a/packages/card/index.ts b/packages/card/index.ts
index 97f96767..1c155ea9 100644
--- a/packages/card/index.ts
+++ b/packages/card/index.ts
@@ -26,7 +26,7 @@ VantComponent({
     originPrice: String,
     thumbMode: {
       type: String,
-      value: 'scaleToFill'
+      value: 'aspectFit'
     },
     currency: {
       type: String,

From cd0544e68d89c5eeffcf9e3be0b97250dfdd5628 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 11 Dec 2018 14:55:34 +0800
Subject: [PATCH 04/31] =?UTF-8?q?perf:=20iPhoneX=E9=80=82=E9=85=8D?=
 =?UTF-8?q?=E6=8F=90=E5=8F=96=E5=88=B0=E7=8B=AC=E7=AB=8Bbehaviors=20@rex-z?=
 =?UTF-8?q?sd=20(#1048)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/goods-action/index.ts |  3 +++
 packages/mixins/basic.ts       | 15 ---------------
 packages/mixins/iphonex.ts     | 27 +++++++++++++++++++++++++++
 packages/popup/index.ts        |  3 ++-
 packages/submit-bar/index.ts   |  3 +++
 packages/tabbar/index.ts       |  3 +++
 6 files changed, 38 insertions(+), 16 deletions(-)
 create mode 100644 packages/mixins/iphonex.ts

diff --git a/packages/goods-action/index.ts b/packages/goods-action/index.ts
index 4a9bf784..4dac3734 100644
--- a/packages/goods-action/index.ts
+++ b/packages/goods-action/index.ts
@@ -1,6 +1,9 @@
 import { VantComponent } from '../common/component';
+import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
+  mixins: [iphonex],
+
   props: {
     safeAreaInsetBottom: {
       type: Boolean,
diff --git a/packages/mixins/basic.ts b/packages/mixins/basic.ts
index 9d6f5b21..50ede2fc 100644
--- a/packages/mixins/basic.ts
+++ b/packages/mixins/basic.ts
@@ -1,21 +1,6 @@
 import { classNames } from '../common/class-names';
 
 export const basic = Behavior({
-  created() {
-    wx.getSystemInfo({
-      success: ({ model, screenHeight }) => {
-        const isIphoneX = /iphone x/i.test(model);
-        const isIphoneNew = /iPhone11/i.test(model) && screenHeight === 812;
-
-        if (isIphoneX || isIphoneNew) {
-          this.set({
-            isIPhoneX: true
-          });
-        }
-      }
-    });
-  },
-
   methods: {
     classNames,
 
diff --git a/packages/mixins/iphonex.ts b/packages/mixins/iphonex.ts
new file mode 100644
index 00000000..c8d9d0ef
--- /dev/null
+++ b/packages/mixins/iphonex.ts
@@ -0,0 +1,27 @@
+let isIPhoneX = null;
+
+function getIsIPhoneX() {
+  return new Promise((resolve, reject) => {
+    if (isIPhoneX !== null) {
+      resolve(isIPhoneX);
+    } else {
+      wx.getSystemInfo({
+        success: ({ model, screenHeight }) => {
+          const iphoneX = /iphone x/i.test(model);
+          const iphoneNew = /iPhone11/i.test(model) && screenHeight === 812;
+          isIPhoneX = iphoneX || iphoneNew;
+          resolve(isIPhoneX);
+        },
+        fail: reject
+      });
+    }
+  });
+}
+
+export const iphonex = Behavior({
+  created() {
+    getIsIPhoneX().then(isIPhoneX => {
+      this.set({ isIPhoneX });
+    });
+  }
+});
diff --git a/packages/popup/index.ts b/packages/popup/index.ts
index d100fe0b..0db4abb8 100644
--- a/packages/popup/index.ts
+++ b/packages/popup/index.ts
@@ -1,8 +1,9 @@
 import { VantComponent } from '../common/component';
 import { transition } from '../mixins/transition';
+import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
-  mixins: [transition(false)],
+  mixins: [transition(false), iphonex],
 
   props: {
     transition: String,
diff --git a/packages/submit-bar/index.ts b/packages/submit-bar/index.ts
index 8cf54459..4a363b93 100644
--- a/packages/submit-bar/index.ts
+++ b/packages/submit-bar/index.ts
@@ -1,4 +1,5 @@
 import { VantComponent } from '../common/component';
+import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
   classes: [
@@ -7,6 +8,8 @@ VantComponent({
     'button-class'
   ],
 
+  mixins: [iphonex],
+
   props: {
     tip: null,
     type: Number,
diff --git a/packages/tabbar/index.ts b/packages/tabbar/index.ts
index ecb766fe..fa628965 100644
--- a/packages/tabbar/index.ts
+++ b/packages/tabbar/index.ts
@@ -1,4 +1,5 @@
 import { VantComponent } from '../common/component';
+import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
   relation: {
@@ -18,6 +19,8 @@ VantComponent({
     }
   },
 
+  mixins: [iphonex],
+
   props: {
     active: Number,
     fixed: {

From 66e845bf12dd670d568023a12a237a459b3ed9de Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 11 Dec 2018 14:56:04 +0800
Subject: [PATCH 05/31] feat(Field): add new prop showConfirmBar @rex-zsd
 (#1040)

---
 packages/field/README.md  | 1 +
 packages/field/index.ts   | 4 ++++
 packages/field/index.wxml | 1 +
 3 files changed, 6 insertions(+)

diff --git a/packages/field/README.md b/packages/field/README.md
index 3d88f08e..12d88dba 100644
--- a/packages/field/README.md
+++ b/packages/field/README.md
@@ -164,6 +164,7 @@ Page({
 | adjust-position | 键盘弹起时，是否自动上推页面 | `Boolean` | `true` |
 | use-icon-slot | 是否使用 icon slot  | `Boolean` | `false` |
 | use-button-slot | 是否使用 button slot  | `Boolean` | `false` |
+| show-confirm-bar | 是否显示键盘上方带有”完成“按钮那一栏，只对 textarea 有效 | `Boolean` | `true` |
 
 ### Event
 
diff --git a/packages/field/index.ts b/packages/field/index.ts
index 1e3c2291..8837d5f1 100644
--- a/packages/field/index.ts
+++ b/packages/field/index.ts
@@ -29,6 +29,10 @@ VantComponent({
     customStyle: String,
     useIconSlot: Boolean,
     useButtonSlot: Boolean,
+    showConfirmBar: {
+      type: Boolean,
+      value: true
+    },
     placeholderStyle: String,
     adjustPosition: {
       type: Boolean,
diff --git a/packages/field/index.wxml b/packages/field/index.wxml
index 61cd6985..ba369a1b 100644
--- a/packages/field/index.wxml
+++ b/packages/field/index.wxml
@@ -26,6 +26,7 @@
       placeholder-class="{{ error ? 'van-field--error' : '' }}"
       cursor-spacing="{{ cursorSpacing }}"
       adjust-position="{{ adjustPosition }}"
+      show-confirm-bar="{{ showConfirmBar }}"
       bindinput="onInput"
       bind:blur="onBlur"
       bind:focus="onFocus"

From 4912029e2b4fb78b2d5f6c3cc9866188d12db3af Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 11 Dec 2018 14:56:26 +0800
Subject: [PATCH 06/31] docs(Tab): improve docs for sticky @rex-zsd (#1042)

---
 packages/tab/README.md | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/packages/tab/README.md b/packages/tab/README.md
index d38caeb2..546b3294 100644
--- a/packages/tab/README.md
+++ b/packages/tab/README.md
@@ -116,7 +116,7 @@ Page({
 通过`sticky`属性可以开启粘性布局，粘性布局下，当 Tab 滚动到顶部时会自动吸顶
 
 ```html
-<van-tabs sticky>
+<van-tabs sticky scroll-top="{{ scrollTop }}">
   <van-tab title="标签 1">内容 1</van-tab>
   <van-tab title="标签 2">内容 2</van-tab>
   <van-tab title="标签 3">内容 3</van-tab>
@@ -124,6 +124,19 @@ Page({
 </van-tabs>
 ```
 
+```javascript
+Page({
+  data: {
+    scrollTop: 0
+  },
+  onPageScroll(event) {
+    this.setData({
+      scrollTop: event.scrollTop
+    });
+  }
+});
+```
+
 #### 切换动画
 
 可以通过`animated`来设置是否启用切换tab时的动画。

From aebcb213a9033d555bc524d7c7d31582dadec807 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 11 Dec 2018 14:56:41 +0800
Subject: [PATCH 07/31] docs(Collapse): improve docs for onChange @rex-zsd
 (#1044)

---
 packages/collapse/README.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/packages/collapse/README.md b/packages/collapse/README.md
index f7235c11..a5b0a179 100644
--- a/packages/collapse/README.md
+++ b/packages/collapse/README.md
@@ -32,6 +32,11 @@
 Page({
   data: {
     activeNames: ['1']
+  },
+  onChange(event) {
+    this.setData({
+      activeNames: event.detail
+    });
   }
 });
 ```
@@ -57,6 +62,11 @@ Page({
 Page({
   data: {
     activeName: '1'
+  },
+  onChange(event) {
+    this.setData({
+      activeNames: event.detail
+    });
   }
 });
 ```
@@ -75,6 +85,19 @@ Page({
 </van-collapse>
 ```
 
+``` javascript
+Page({
+  data: {
+    activeName: ['1']
+  },
+  onChange(event) {
+    this.setData({
+      activeNames: event.detail
+    });
+  }
+});
+```
+
 
 
 ### Collapse API

From 20928347e749eceec95156f5fe9fa64a32d48c2f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 14:57:29 +0800
Subject: [PATCH 08/31] [improvement] Button: use wxs to optimize performance
 (#1049)

---
 example/pages/button/index.wxml    |  1 -
 packages/button/index.ts           | 15 -------------
 packages/button/index.wxml         |  4 +++-
 packages/icon/index.wxml           |  4 ++--
 packages/wxs/array.wxs             |  5 +++++
 packages/wxs/bem.wxs               | 34 ++++++++++++++++++++++++++++++
 packages/wxs/object.wxs            | 13 ++++++++++++
 packages/{common => wxs}/utils.wxs |  3 +++
 8 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 packages/wxs/array.wxs
 create mode 100644 packages/wxs/bem.wxs
 create mode 100644 packages/wxs/object.wxs
 rename packages/{common => wxs}/utils.wxs (66%)

diff --git a/example/pages/button/index.wxml b/example/pages/button/index.wxml
index 495cf2e7..c91445c1 100644
--- a/example/pages/button/index.wxml
+++ b/example/pages/button/index.wxml
@@ -34,5 +34,4 @@
     <van-button size="small" class="demo-margin-right">小型按钮</van-button>
     <van-button size="mini">迷你按钮</van-button>
   </demo-block>
-
 </demo-section>
diff --git a/packages/button/index.ts b/packages/button/index.ts
index ccc246e9..94b03143 100644
--- a/packages/button/index.ts
+++ b/packages/button/index.ts
@@ -24,21 +24,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    classes(): string {
-      const { type, size, block, plain, round, square, loading, disabled } = this.data;
-      return this.classNames('van-button', `van-button--${type}`, `van-button--${size}`, {
-        'van-button--block': block,
-        'van-button--round': round,
-        'van-button--plain': plain,
-        'van-button--square': square,
-        'van-button--loading': loading,
-        'van-button--disabled': disabled,
-        'van-button--unclickable': disabled || loading
-      });
-    }
-  },
-
   methods: {
     onClick() {
       if (!this.data.disabled && !this.data.loading) {
diff --git a/packages/button/index.wxml b/packages/button/index.wxml
index 3480f938..63817067 100644
--- a/packages/button/index.wxml
+++ b/packages/button/index.wxml
@@ -1,7 +1,9 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <button
   id="{{ id }}"
   lang="{{ lang }}"
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('button', [type, size, { block, round, plain, square, loading, disabled, unclickable: disabled || loading }]) }}"
   open-type="{{ openType }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"
diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml
index aefcdebf..156ab17f 100644
--- a/packages/icon/index.wxml
+++ b/packages/icon/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
   class="custom-class {{ classPrefix }} {{ utils.isSrc(name) ? 'van-icon--image' : classPrefix + '-' + name }}"
   style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + size + ';' : '' }}{{ customStyle }}"
@@ -14,5 +16,3 @@
     src="{{ name }}"
   />
 </view>
-
-<wxs src="../common/utils.wxs" module="utils" />
diff --git a/packages/wxs/array.wxs b/packages/wxs/array.wxs
new file mode 100644
index 00000000..28753fa5
--- /dev/null
+++ b/packages/wxs/array.wxs
@@ -0,0 +1,5 @@
+function isArray(obj) {
+  return obj && obj.constructor === 'Array';
+}
+
+module.exports.isArray = isArray;
diff --git a/packages/wxs/bem.wxs b/packages/wxs/bem.wxs
new file mode 100644
index 00000000..d030ee59
--- /dev/null
+++ b/packages/wxs/bem.wxs
@@ -0,0 +1,34 @@
+var array = require('./array.wxs');
+var object = require('./object.wxs');
+var PREFIX = 'van-';
+
+function join(name, mods) {
+  name = PREFIX + name;
+  mods = mods.map(function(mod) {
+    return name + '--' + mod;
+  });
+  mods.unshift(name);
+  return mods.join(' ');
+}
+
+function traversing(mods, conf) {
+  if (typeof conf === 'string') {
+    mods.push(conf);
+  } else if (array.isArray(conf)) {
+    conf.forEach(function(item) {
+      traversing(mods, item);
+    });
+  } else if (typeof conf === 'object') {
+    object.keys(conf).forEach(function(key) {
+      conf[key] && mods.push(key);
+    });
+  }
+}
+
+function bem(name, conf) {
+  var mods = [];
+  traversing(mods, conf);
+  return join(name, mods);
+}
+
+module.exports.bem = bem;
diff --git a/packages/wxs/object.wxs b/packages/wxs/object.wxs
new file mode 100644
index 00000000..e0771077
--- /dev/null
+++ b/packages/wxs/object.wxs
@@ -0,0 +1,13 @@
+/* eslint-disable */
+var REGEXP = getRegExp('{|}|"', 'g');
+
+function keys(obj) {
+  return JSON.stringify(obj)
+    .replace(REGEXP, '')
+    .split(',')
+    .map(function(item) {
+      return item.split(':')[0];
+    });
+}
+
+module.exports.keys = keys;
diff --git a/packages/common/utils.wxs b/packages/wxs/utils.wxs
similarity index 66%
rename from packages/common/utils.wxs
rename to packages/wxs/utils.wxs
index 6435ac9e..a1ac7674 100644
--- a/packages/common/utils.wxs
+++ b/packages/wxs/utils.wxs
@@ -1,5 +1,8 @@
+var bem = require('./bem.wxs').bem;
+
 function isSrc(url) {
   return url.indexOf('http') === 0 || url.indexOf('data:image') === 0;
 }
 
+module.exports.bem = bem;
 module.exports.isSrc = isSrc;

From 8fc9ce3b9cf1d4a8b98ddd7b43718918287ab327 Mon Sep 17 00:00:00 2001
From: fangxu864 <864109504@qq.com>
Date: Tue, 11 Dec 2018 14:58:51 +0800
Subject: [PATCH 09/31] =?UTF-8?q?[improvement]=20dialog=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=EF=BC=9A=E5=8F=AF=E4=BB=A5=E4=BD=BF=E7=94=A8?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=87=BA=E7=9A=84dialog=E5=AE=9E=E4=BE=8B?=
 =?UTF-8?q?=E7=9A=84stopLoading()=E6=89=8B=E5=8A=A8=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=9A=84loading=E7=8A=B6=E6=80=81=20(#1047)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/dialog/index.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
index 948097fa..fec7b977 100644
--- a/packages/dialog/index.ts
+++ b/packages/dialog/index.ts
@@ -95,7 +95,9 @@ VantComponent({
         this.close();
       }
       this.$emit('close', action);
-      this.$emit(action);
+      
+      //把 dialog 实例传递出去，可以通过 stopLoading() 在外部关闭按钮的 loading
+      this.$emit(action, { dialog: this });
 
       const callback = this.data[action === 'confirm' ? 'onConfirm' : 'onCancel'];
       if (callback) {

From 15576ab95a8d17639eb5fe754358a4dff0ba909e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 15:11:28 +0800
Subject: [PATCH 10/31] [improvement] Cell: optimize performance (#1050)

---
 packages/cell/index.ts   | 18 ------------------
 packages/cell/index.wxml |  6 ++++--
 packages/wxs/bem.wxs     |  4 ++++
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/packages/cell/index.ts b/packages/cell/index.ts
index 5487f9f2..70b717bf 100644
--- a/packages/cell/index.ts
+++ b/packages/cell/index.ts
@@ -30,24 +30,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    cellClass(): string {
-      const { data } = this;
-      return this.classNames('van-cell', {
-        'van-cell--center': data.center,
-        'van-cell--required': data.required,
-        'van-cell--borderless': !data.border,
-        'van-cell--clickable': data.isLink || data.clickable,
-        [`van-cell--${data.size}`]: data.size
-      });
-    },
-
-    titleStyle(): string {
-      const { titleWidth } = this.data;
-      return titleWidth ? `max-width: ${titleWidth};min-width: ${titleWidth}` : '';
-    }
-  },
-
   methods: {
     onClick(event: Weapp.Event) {
       this.$emit('click', event.detail);
diff --git a/packages/cell/index.wxml b/packages/cell/index.wxml
index bdea77b0..caee22b6 100644
--- a/packages/cell/index.wxml
+++ b/packages/cell/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="custom-class {{ cellClass }}"
+  class="custom-class {{ utils.bem('cell', [size, { center, required, borderless: !border, clickable: isLink || clickable }]) }}"
   style="{{ customStyle }}"
   bind:tap="onClick"
 >
@@ -12,7 +14,7 @@
   <slot wx:else name="icon" />
 
   <view
-    style="{{ titleStyle }}"
+    style="{{ titleWidth ? 'max-width:' + titleWidth + ';min-width:' + titleWidth : '' }}"
     class="van-cell__title title-class"
   >
     <block wx:if="{{ title }}">
diff --git a/packages/wxs/bem.wxs b/packages/wxs/bem.wxs
index d030ee59..e6b00faa 100644
--- a/packages/wxs/bem.wxs
+++ b/packages/wxs/bem.wxs
@@ -12,6 +12,10 @@ function join(name, mods) {
 }
 
 function traversing(mods, conf) {
+  if (!conf) {
+    return;
+  }
+
   if (typeof conf === 'string') {
     mods.push(conf);
   } else if (array.isArray(conf)) {

From 339df6c0e67b4a1b572ccb74f2b03638d1894902 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 15:51:57 +0800
Subject: [PATCH 11/31] [improvement] use wxs.bem instead of computed
 classNames (#1051)

---
 packages/checkbox/index.ts        | 12 ------------
 packages/checkbox/index.wxml      |  4 +++-
 packages/col/index.ts             | 10 ----------
 packages/col/index.wxml           |  4 +++-
 packages/collapse-item/index.ts   | 16 +++-------------
 packages/collapse-item/index.wxml |  4 +++-
 packages/common/class-names.ts    | 29 -----------------------------
 packages/field/index.less         |  8 ++++----
 packages/field/index.ts           | 12 ------------
 packages/field/index.wxml         | 10 ++++++----
 packages/goods-action/index.ts    |  9 ---------
 packages/goods-action/index.wxml  |  4 +++-
 packages/mixins/basic.ts          |  4 ----
 packages/popup/index.ts           | 10 ----------
 packages/popup/index.wxml         |  4 +++-
 packages/radio/index.ts           | 11 -----------
 packages/radio/index.wxml         |  4 +++-
 packages/submit-bar/index.ts      |  7 -------
 packages/submit-bar/index.wxml    |  4 +++-
 packages/switch/index.ts          |  7 -------
 packages/switch/index.wxml        |  4 +++-
 packages/tabbar/index.ts          | 10 ----------
 packages/tabbar/index.wxml        |  4 +++-
 packages/tag/index.ts             | 11 -----------
 packages/tag/index.wxml           |  4 +++-
 packages/wxs/bem.wxs              |  2 +-
 26 files changed, 44 insertions(+), 164 deletions(-)
 delete mode 100644 packages/common/class-names.ts

diff --git a/packages/checkbox/index.ts b/packages/checkbox/index.ts
index 397a9097..defb21df 100644
--- a/packages/checkbox/index.ts
+++ b/packages/checkbox/index.ts
@@ -24,18 +24,6 @@ VantComponent({
   },
 
   computed: {
-    iconClass(): string {
-      const { disabled, value, shape } = this.data;
-      return this.classNames(
-        'van-checkbox__icon',
-        `van-checkbox__icon--${shape}`,
-        {
-          'van-checkbox__icon--disabled': disabled,
-          'van-checkbox__icon--checked': value
-        }
-      );
-    },
-
     iconStyle(): string {
       const { value, disabled, checkedColor } = this.data;
       if (checkedColor && value && !disabled) {
diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml
index ab5637a9..da96d043 100644
--- a/packages/checkbox/index.wxml
+++ b/packages/checkbox/index.wxml
@@ -1,10 +1,12 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-checkbox custom-class">
   <view class="van-checkbox__icon-wrap" bindtap="toggle">
     <slot wx:if="{{ useIconSlot }}" name="icon" />
     <van-icon
       wx:else
       name="success"
-      class="{{ iconClass }}"
+      class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
       style="{{ iconStyle }}"
       custom-class="icon-class"
       custom-style="line-height: 20px;"
diff --git a/packages/col/index.ts b/packages/col/index.ts
index e8577da2..cc5bb20a 100644
--- a/packages/col/index.ts
+++ b/packages/col/index.ts
@@ -15,16 +15,6 @@ VantComponent({
     style: ''
   },
 
-  computed: {
-    classes(): string {
-      const { span, offset } = this.data;
-      return this.classNames('van-col', {
-        [`van-col--${span}`]: span,
-        [`van-col--offset-${offset}`]: offset
-      });
-    }
-  },
-
   methods: {
     setGutter(gutter: number) {
       const padding = `${gutter / 2}px`;
diff --git a/packages/col/index.wxml b/packages/col/index.wxml
index 69e74b16..a759aac5 100644
--- a/packages/col/index.wxml
+++ b/packages/col/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('col', [span]) }} {{ offset ? 'van-col--offset-' + offset : '' }}"
   style="{{ style }}"
 >
   <slot />
diff --git a/packages/collapse-item/index.ts b/packages/collapse-item/index.ts
index 85393c6c..af70c961 100644
--- a/packages/collapse-item/index.ts
+++ b/packages/collapse-item/index.ts
@@ -12,11 +12,11 @@ VantComponent({
   },
 
   props: {
-    name: [String, Number],
+    name: null,
+    title: null,
+    value: null,
     icon: String,
     label: String,
-    title: [String, Number],
-    value: [String, Number],
     disabled: Boolean,
     border: {
       type: Boolean,
@@ -33,16 +33,6 @@ VantComponent({
     expanded: false
   },
 
-  computed: {
-    titleClass() {
-      const { disabled, expanded } = this.data;
-      return this.classNames('van-collapse-item__title', {
-        'van-collapse-item__title--disabled': disabled,
-        'van-collapse-item__title--expanded': expanded
-      });
-    }
-  },
-
   methods: {
     updateExpanded() {
       if (!this.parent) {
diff --git a/packages/collapse-item/index.wxml b/packages/collapse-item/index.wxml
index 6bf5ff10..4f51da13 100644
--- a/packages/collapse-item/index.wxml
+++ b/packages/collapse-item/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-collapse-item van-hairline--top custom-class">
   <van-cell
     title="{{ title }}"
@@ -6,7 +8,7 @@
     value="{{ value }}"
     label="{{ label }}"
     border="{{ border && expanded }}"
-    class="{{ titleClass }}"
+    class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
     right-icon-class="van-cell__right-icon"
     custom-class="van-cell"
     bind:click="onClick"
diff --git a/packages/common/class-names.ts b/packages/common/class-names.ts
deleted file mode 100644
index 5c8e65d0..00000000
--- a/packages/common/class-names.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-const hasOwn = {}.hasOwnProperty;
-
-export function classNames(): string {
-  const classes = [];
-
-  for (let i = 0; i < arguments.length; i++) {
-    const arg = arguments[i];
-    if (!arg) continue;
-
-    const argType = typeof arg;
-
-    if (argType === 'string' || argType === 'number') {
-      classes.push(arg);
-    } else if (Array.isArray(arg) && arg.length) {
-      const inner = classNames.apply(null, arg);
-      if (inner) {
-        classes.push(inner);
-      }
-    } else if (argType === 'object') {
-      for (const key in arg) {
-        if (hasOwn.call(arg, key) && arg[key]) {
-          classes.push(key);
-        }
-      }
-    }
-  }
-
-  return classes.join(' ');
-};
diff --git a/packages/field/index.less b/packages/field/index.less
index 5c225f81..2bb7876c 100644
--- a/packages/field/index.less
+++ b/packages/field/index.less
@@ -37,6 +37,10 @@
     &--right {
       text-align: right;
     }
+
+    &--error {
+      color: @red;
+    }
   }
 
   &__clear-root {
@@ -78,8 +82,4 @@
     font-size: 12px;
     text-align: left;
   }
-
-  &--error {
-    color: @red;
-  }
 }
diff --git a/packages/field/index.ts b/packages/field/index.ts
index 8837d5f1..f25bad44 100644
--- a/packages/field/index.ts
+++ b/packages/field/index.ts
@@ -64,18 +64,6 @@ VantComponent({
     showClear: false
   },
 
-  computed: {
-    inputClass(): string {
-      const { data } = this;
-      return this.classNames('input-class', 'van-field__input', {
-        'van-field--error': data.error,
-        'van-field__textarea': data.type === 'textarea',
-        'van-field__input--disabled': data.disabled,
-        [`van-field__input--${data.inputAlign}`]: data.inputAlign
-      });
-    }
-  },
-
   beforeCreate() {
     this.focused = false;
   },
diff --git a/packages/field/index.wxml b/packages/field/index.wxml
index ba369a1b..e1205906 100644
--- a/packages/field/index.wxml
+++ b/packages/field/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-cell
   icon="{{ leftIcon }}"
   title="{{ label }}"
@@ -14,7 +16,7 @@
   <view class="van-field__body {{ type === 'textarea' ? 'van-field__body--textarea' : '' }}">
     <textarea
       wx:if="{{ type === 'textarea' }}"
-      class="{{ inputClass }}"
+      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
       fixed="{{ fixed }}"
       focus="{{ focus }}"
       value="{{ value }}"
@@ -23,7 +25,7 @@
       auto-height="{{ autosize }}"
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
-      placeholder-class="{{ error ? 'van-field--error' : '' }}"
+      placeholder-class="{{ error ? 'van-field__input--error' : '' }}"
       cursor-spacing="{{ cursorSpacing }}"
       adjust-position="{{ adjustPosition }}"
       show-confirm-bar="{{ showConfirmBar }}"
@@ -34,7 +36,7 @@
     />
     <input
       wx:else
-      class="{{ inputClass }}"
+      class="input-class {{ utils.bem('field__input', [inputAlign, { disabled, error }]) }}"
       type="{{ type }}"
       focus="{{ focus }}"
       value="{{ value }}"
@@ -42,7 +44,7 @@
       maxlength="{{ maxlength }}"
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
-      placeholder-class="{{ error ? 'van-field--error' : '' }}"
+      placeholder-class="{{ error ? 'van-field__input--error' : '' }}"
       confirm-type="{{ confirmType }}"
       confirm-hold="{{ confirmHold }}"
       cursor-spacing="{{ cursorSpacing }}"
diff --git a/packages/goods-action/index.ts b/packages/goods-action/index.ts
index 4dac3734..f6b5b374 100644
--- a/packages/goods-action/index.ts
+++ b/packages/goods-action/index.ts
@@ -9,14 +9,5 @@ VantComponent({
       type: Boolean,
       value: true
     }
-  },
-
-  computed: {
-    rootClass() {
-      const { safeAreaInsetBottom, isIPhoneX } = this.data;
-      return this.classNames('van-goods-action', 'custom-class', {
-        [`van-goods-action--safe`]: isIPhoneX && safeAreaInsetBottom
-      });
-    }
   }
 });
diff --git a/packages/goods-action/index.wxml b/packages/goods-action/index.wxml
index cfc009c7..6e61cc9e 100644
--- a/packages/goods-action/index.wxml
+++ b/packages/goods-action/index.wxml
@@ -1,3 +1,5 @@
-<view class="{{ rootClass }}">
+<wxs src="../wxs/utils.wxs" module="utils" />
+
+<view class="custom-class {{ utils.bem('goods-action', { safe: isIPhoneX && safeAreaInsetBottom }) }}">
   <slot />
 </view>
diff --git a/packages/mixins/basic.ts b/packages/mixins/basic.ts
index 50ede2fc..7de3fbfa 100644
--- a/packages/mixins/basic.ts
+++ b/packages/mixins/basic.ts
@@ -1,9 +1,5 @@
-import { classNames } from '../common/class-names';
-
 export const basic = Behavior({
   methods: {
-    classNames,
-
     $emit() {
       this.triggerEvent.apply(this, arguments);
     },
diff --git a/packages/popup/index.ts b/packages/popup/index.ts
index 0db4abb8..545d6811 100644
--- a/packages/popup/index.ts
+++ b/packages/popup/index.ts
@@ -31,16 +31,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    popupClass() {
-      const { position, safeAreaInsetBottom, isIPhoneX } = this.data;
-      return this.classNames('custom-class', 'van-popup', {
-        [`van-popup--${position}`]: position,
-        [`van-popup--safe`]: isIPhoneX && safeAreaInsetBottom && position === 'bottom'
-      });
-    }
-  },
-
   methods: {
     onClickOverlay() {
       this.$emit('click-overlay');
diff --git a/packages/popup/index.wxml b/packages/popup/index.wxml
index 07bd1ae1..bafbfecb 100644
--- a/packages/popup/index.wxml
+++ b/packages/popup/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-overlay
   wx:if="{{ inited && overlay }}"
   mask
@@ -8,7 +10,7 @@
 />
 <view
   wx:if="{{ inited }}"
-  class="{{ popupClass }}"
+  class="custom-class {{ utils.bem('popup', [position, { safe: isIPhoneX && safeAreaInsetBottom && position === 'bottom' }]) }}"
   style="z-index: {{ zIndex }}; -webkit-animation: van-{{ transition || position }}-{{ type }} {{ duration }}ms both; animation: van-{{ transition || position }}-{{ type }} {{ duration }}ms both; {{ display ? '' : 'display: none;' }}{{ customStyle }}"
   bind:animationend="onAnimationEnd"
 >
diff --git a/packages/radio/index.ts b/packages/radio/index.ts
index e1f1e1e2..ce4a28ef 100644
--- a/packages/radio/index.ts
+++ b/packages/radio/index.ts
@@ -19,17 +19,6 @@ VantComponent({
     checkedColor: String
   },
 
-  computed: {
-    iconClass(): string {
-      const { disabled, name, value } = this.data;
-      return this.classNames('van-radio__icon', {
-        'van-radio__icon--disabled': disabled,
-        'van-radio__icon--checked': !disabled && name === value,
-        'van-radio__icon--check': !disabled && name !== value
-      });
-    }
-  },
-
   methods: {
     emitChange(value) {
       const instance = this.getRelationNodes('../radio-group/index')[0] || this;
diff --git a/packages/radio/index.wxml b/packages/radio/index.wxml
index 29d73956..dc61d3fb 100644
--- a/packages/radio/index.wxml
+++ b/packages/radio/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-radio custom-class">
   <view class="van-radio__input">
     <radio-group bindchange="onChange">
@@ -9,7 +11,7 @@
       />
     </radio-group>
     <van-icon
-      class="{{ iconClass }}"
+      class="{{ utils.bem('radio__icon', { disabled, checked: !disabled && name === value, check: !disabled && name !== value }) }}"
       custom-class="icon-class"
       color="{{ value === name ? checkedColor : '' }}"
       name="{{ value === name ? 'checked' : 'check' }}"
diff --git a/packages/submit-bar/index.ts b/packages/submit-bar/index.ts
index 4a363b93..ddf652de 100644
--- a/packages/submit-bar/index.ts
+++ b/packages/submit-bar/index.ts
@@ -44,13 +44,6 @@ VantComponent({
     tipStr() {
       const { tip } = this.data;
       return typeof tip === 'string' ? tip : '';
-    },
-
-    barClass() {
-      const { isIPhoneX, safeAreaInsetBottom } = this.data;
-      return this.classNames('van-submit-bar__bar', 'bar-class', {
-        'van-submit-bar__bar--safe': safeAreaInsetBottom && isIPhoneX
-      });
     }
   },
 
diff --git a/packages/submit-bar/index.wxml b/packages/submit-bar/index.wxml
index a2bc998d..42fc9516 100644
--- a/packages/submit-bar/index.wxml
+++ b/packages/submit-bar/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="van-submit-bar custom-class">
   <slot name="top" />
 
@@ -5,7 +7,7 @@
     {{ tipStr }}<slot name="tip" />
   </view>
 
-  <view class="{{ barClass }}">
+  <view class="bar-class {{ utils.bem('submit-bar__bar', { safe: safeAreaInsetBottom && isIPhoneX }) }}">
     <slot />
     <view class="van-submit-bar__text">
       <block wx:if="{{ hasPrice }}">
diff --git a/packages/switch/index.ts b/packages/switch/index.ts
index 80a9690d..552de7c0 100644
--- a/packages/switch/index.ts
+++ b/packages/switch/index.ts
@@ -24,13 +24,6 @@ VantComponent({
   },
 
   computed: {
-    classes(): string {
-      return this.classNames('van-switch', {
-        'van-switch--on': this.data.checked,
-        'van-switch--disabled': this.data.disabled
-      });
-    },
-
     style() {
       const backgroundColor = this.data.checked ? this.data.activeColor : this.data.inactiveColor;
       return `font-size: ${this.data.size}; ${ backgroundColor ? `background-color: ${backgroundColor}` : '' }`
diff --git a/packages/switch/index.wxml b/packages/switch/index.wxml
index 6d0a3287..1929fb01 100644
--- a/packages/switch/index.wxml
+++ b/packages/switch/index.wxml
@@ -1,6 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
   style="{{ style }}"
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('switch', { on: checked, disabled }) }}"
   bind:tap="onClick"
 >
   <view class="van-switch__node node-class">
diff --git a/packages/tabbar/index.ts b/packages/tabbar/index.ts
index fa628965..cd0c5aad 100644
--- a/packages/tabbar/index.ts
+++ b/packages/tabbar/index.ts
@@ -42,16 +42,6 @@ VantComponent({
     currentActive: -1
   },
 
-  computed: {
-    tabbarClass() {
-      const { fixed, isIPhoneX, safeAreaInsetBottom } = this.data;
-      return this.classNames('custom-class', 'van-tabbar', 'van-hairline--top-bottom', {
-        'van-tabbar--fixed': fixed,
-        'van-tabbar--safe': isIPhoneX && safeAreaInsetBottom
-      });
-    }
-  },
-
   watch: {
     active(active) {
       this.set({ currentActive: active });
diff --git a/packages/tabbar/index.wxml b/packages/tabbar/index.wxml
index b8eb8e47..f05228e2 100644
--- a/packages/tabbar/index.wxml
+++ b/packages/tabbar/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="{{ tabbarClass }}"
+  class="custom-class van-hairline--top-bottom {{ utils.bem('tabbar', { fixed, safe: isIPhoneX && safeAreaInsetBottom }) }}"
   style="{{ zIndex ? 'z-index: ' + zIndex : '' }}"
 >
   <slot />
diff --git a/packages/tag/index.ts b/packages/tag/index.ts
index 9db7bd8d..9e5a0fe9 100644
--- a/packages/tag/index.ts
+++ b/packages/tag/index.ts
@@ -19,17 +19,6 @@ VantComponent({
   },
 
   computed: {
-    classes() {
-      const { data } = this;
-      return this.classNames('van-tag', {
-        'van-tag--mark': data.mark,
-        'van-tag--plain': data.plain,
-        'van-tag--round': data.round,
-        [`van-tag--${data.size}`]: data.size,
-        'van-hairline--surround': data.plain
-      });
-    },
-
     style() {
       const color = this.data.color || COLOR_MAP[this.data.type] || DEFAULT_COLOR;
       const key = this.data.plain ? 'color' : 'background-color';
diff --git a/packages/tag/index.wxml b/packages/tag/index.wxml
index 69e74b16..e66580cd 100644
--- a/packages/tag/index.wxml
+++ b/packages/tag/index.wxml
@@ -1,5 +1,7 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
-  class="custom-class {{ classes }}"
+  class="custom-class {{ utils.bem('tag', [size, { mark, plain, round }]) }} {{ plain ? 'van-hairline--surround' : '' }}"
   style="{{ style }}"
 >
   <slot />
diff --git a/packages/wxs/bem.wxs b/packages/wxs/bem.wxs
index e6b00faa..93b2777b 100644
--- a/packages/wxs/bem.wxs
+++ b/packages/wxs/bem.wxs
@@ -16,7 +16,7 @@ function traversing(mods, conf) {
     return;
   }
 
-  if (typeof conf === 'string') {
+  if (typeof conf === 'string' || typeof conf === 'number') {
     mods.push(conf);
   } else if (array.isArray(conf)) {
     conf.forEach(function(item) {

From df238651c2d5e238a1ffbe4cf661756308fc4aa7 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 16:05:13 +0800
Subject: [PATCH 12/31] [improvement] extract safeAreaInsetBottom to mixin
 (#1052)

---
 packages/action-sheet/index.ts | 7 +++----
 packages/goods-action/index.ts | 9 +--------
 packages/mixins/iphonex.ts     | 7 +++++++
 packages/popup/index.ts        | 4 ----
 packages/submit-bar/index.ts   | 8 ++------
 packages/tabbar/index.ts       | 8 ++------
 6 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/packages/action-sheet/index.ts b/packages/action-sheet/index.ts
index a1acd00f..8d2ea090 100644
--- a/packages/action-sheet/index.ts
+++ b/packages/action-sheet/index.ts
@@ -1,6 +1,9 @@
 import { VantComponent } from '../common/component';
+import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
+  mixins: [iphonex],
+
   props: {
     show: Boolean,
     title: String,
@@ -20,10 +23,6 @@ VantComponent({
     closeOnClickOverlay: {
       type: Boolean,
       value: true
-    },
-    safeAreaInsetBottom: {
-      type: Boolean,
-      value: true
     }
   },
 
diff --git a/packages/goods-action/index.ts b/packages/goods-action/index.ts
index f6b5b374..f744bd46 100644
--- a/packages/goods-action/index.ts
+++ b/packages/goods-action/index.ts
@@ -2,12 +2,5 @@ import { VantComponent } from '../common/component';
 import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
-  mixins: [iphonex],
-
-  props: {
-    safeAreaInsetBottom: {
-      type: Boolean,
-      value: true
-    }
-  }
+  mixins: [iphonex]
 });
diff --git a/packages/mixins/iphonex.ts b/packages/mixins/iphonex.ts
index c8d9d0ef..4a23ed7d 100644
--- a/packages/mixins/iphonex.ts
+++ b/packages/mixins/iphonex.ts
@@ -19,6 +19,13 @@ function getIsIPhoneX() {
 }
 
 export const iphonex = Behavior({
+  properties: {
+    safeAreaInsetBottom: {
+      type: Boolean,
+      value: true
+    }
+  },
+
   created() {
     getIsIPhoneX().then(isIPhoneX => {
       this.set({ isIPhoneX });
diff --git a/packages/popup/index.ts b/packages/popup/index.ts
index 545d6811..8688a149 100644
--- a/packages/popup/index.ts
+++ b/packages/popup/index.ts
@@ -24,10 +24,6 @@ VantComponent({
     position: {
       type: String,
       value: 'center'
-    },
-    safeAreaInsetBottom: {
-      type: Boolean,
-      value: true
     }
   },
 
diff --git a/packages/submit-bar/index.ts b/packages/submit-bar/index.ts
index ddf652de..252fb806 100644
--- a/packages/submit-bar/index.ts
+++ b/packages/submit-bar/index.ts
@@ -2,14 +2,14 @@ import { VantComponent } from '../common/component';
 import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
+  mixins: [iphonex],
+
   classes: [
     'bar-class',
     'price-class',
     'button-class'
   ],
 
-  mixins: [iphonex],
-
   props: {
     tip: null,
     type: Number,
@@ -25,10 +25,6 @@ VantComponent({
     buttonType: {
       type: String,
       value: 'danger'
-    },
-    safeAreaInsetBottom: {
-      type: Boolean,
-      value: true
     }
   },
 
diff --git a/packages/tabbar/index.ts b/packages/tabbar/index.ts
index cd0c5aad..3d3d6fd8 100644
--- a/packages/tabbar/index.ts
+++ b/packages/tabbar/index.ts
@@ -2,6 +2,8 @@ import { VantComponent } from '../common/component';
 import { iphonex } from '../mixins/iphonex';
 
 VantComponent({
+  mixins: [iphonex],
+
   relation: {
     name: 'tabbar-item',
     type: 'descendant',
@@ -19,8 +21,6 @@ VantComponent({
     }
   },
 
-  mixins: [iphonex],
-
   props: {
     active: Number,
     fixed: {
@@ -30,10 +30,6 @@ VantComponent({
     zIndex: {
       type: Number,
       value: 1
-    },
-    safeAreaInsetBottom: {
-      type: Boolean,
-      value: true
     }
   },
 

From f432571bbe1df69d1f80c0a67f8922e6c58592ad Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 17:32:53 +0800
Subject: [PATCH 13/31] [improvement] memoize bem (#1054)

---
 packages/wxs/memoize.wxs | 52 ++++++++++++++++++++++++++++++++++++++++
 packages/wxs/utils.wxs   |  8 +++++--
 2 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 packages/wxs/memoize.wxs

diff --git a/packages/wxs/memoize.wxs b/packages/wxs/memoize.wxs
new file mode 100644
index 00000000..3e624274
--- /dev/null
+++ b/packages/wxs/memoize.wxs
@@ -0,0 +1,52 @@
+/**
+ * Simple memoize
+ * wxs doesn't support fn.apply, so this memoize only support up to 2 args
+ */
+
+function isPrimitive(value) {
+  var type = typeof value;
+  return (
+    type === 'boolean' ||
+    type === 'number' ||
+    type === 'string' ||
+    type === 'undefined' ||
+    value === null
+  );
+}
+
+// mock simple fn.call in wxs
+function call(fn, args) {
+  if (args.length === 2) {
+    return fn(args[0], args[1]);
+  }
+
+  if (args.length === 1) {
+    return fn(args[0]);
+  }
+
+  return fn();
+}
+
+function serializer(args) {
+  if (args.length === 1 && isPrimitive(args[0])) {
+    return args[0];
+  }
+
+  return JSON.stringify(args.length === 1 ? args[0] : args);
+}
+
+function memoize(fn) {
+  var cache = {};
+
+  return function() {
+    var key = serializer(arguments);
+
+    if (cache[key] === undefined) {
+      cache[key] = call(fn, arguments);
+    }
+
+    return cache[key];
+  };
+}
+
+module.exports.memoize = memoize;
diff --git a/packages/wxs/utils.wxs b/packages/wxs/utils.wxs
index a1ac7674..5deffee0 100644
--- a/packages/wxs/utils.wxs
+++ b/packages/wxs/utils.wxs
@@ -1,8 +1,12 @@
 var bem = require('./bem.wxs').bem;
+var memoize = require('./memoize.wxs').memoize;
 
 function isSrc(url) {
   return url.indexOf('http') === 0 || url.indexOf('data:image') === 0;
 }
 
-module.exports.bem = bem;
-module.exports.isSrc = isSrc;
+module.exports = {
+  bem: memoize(bem),
+  isSrc: isSrc,
+  memoize: memoize
+};

From 7bc78b3870980a2ba738e8c188f6c1896689c176 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 11 Dec 2018 18:00:35 +0800
Subject: [PATCH 14/31] add npmignore

---
 .npmignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .npmignore

diff --git a/.npmignore b/.npmignore
new file mode 100644
index 00000000..b22d8ee4
--- /dev/null
+++ b/.npmignore
@@ -0,0 +1 @@
+changelog.generated.md

From 97476fec761517cae2791da357db936579f6cd50 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 19:17:53 +0800
Subject: [PATCH 15/31] [improvement] Area: optimize performance (#1055)

---
 packages/area/index.less |  3 +--
 packages/area/index.ts   | 18 +++++++++---------
 packages/area/index.wxml |  3 ++-
 packages/wxs/array.wxs   |  4 ++--
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/area/index.less b/packages/area/index.less
index 72b95115..b82bf76d 100644
--- a/packages/area/index.less
+++ b/packages/area/index.less
@@ -57,11 +57,10 @@
 
     &__item {
       padding: 0 5px;
-      color: @gray-dark;
+      color: @text-color;
 
       &--selected {
         font-weight: 500;
-        color: @text-color;
       }
 
       &--disabled {
diff --git a/packages/area/index.ts b/packages/area/index.ts
index c3e0727e..c4f28f73 100644
--- a/packages/area/index.ts
+++ b/packages/area/index.ts
@@ -33,13 +33,6 @@ VantComponent({
     columns: []
   },
 
-  computed: {
-    displayColumns() {
-      const { columns = [], columnsNum } = this.data;
-      return columns.slice(0, +columnsNum);
-    }
-  },
-
   watch: {
     value(value) {
       this.code = value;
@@ -68,7 +61,8 @@ VantComponent({
 
     onChange(event: Weapp.Event) {
       const { value } = event.detail;
-      const { pickerValue, displayColumns } = this.data;
+      const { pickerValue } = this.data;
+      const displayColumns = this.getDisplayColumns();
       const index = pickerValue.findIndex(
         (item, index) => item !== value[index]
       );
@@ -159,7 +153,8 @@ VantComponent({
     },
 
     getValues() {
-      const { displayColumns = [], pickerValue = [] } = this.data;
+      const { pickerValue = [] } = this.data;
+      const displayColumns = this.getDisplayColumns();
       return displayColumns
         .map((option, index) => option[pickerValue[index]])
         .filter(value => !!value);
@@ -201,6 +196,11 @@ VantComponent({
     reset() {
       this.code = '';
       this.setValues();
+    },
+
+    getDisplayColumns() {
+      const { columns = [], columnsNum } = this.data;
+      return columns.slice(0, +columnsNum);
     }
   }
 });
diff --git a/packages/area/index.wxml b/packages/area/index.wxml
index cf401704..bec4249b 100644
--- a/packages/area/index.wxml
+++ b/packages/area/index.wxml
@@ -17,7 +17,8 @@
     class="van-picker__columns"
   >
     <picker-view-column
-      wx:for="{{ displayColumns }}"
+      wx:if="{{ rowIndex < columnsNum }}"
+      wx:for="{{ columns }}"
       wx:for-item="row"
       wx:for-index="rowIndex"
       wx:key="rowIndex"
diff --git a/packages/wxs/array.wxs b/packages/wxs/array.wxs
index 28753fa5..610089cd 100644
--- a/packages/wxs/array.wxs
+++ b/packages/wxs/array.wxs
@@ -1,5 +1,5 @@
-function isArray(obj) {
-  return obj && obj.constructor === 'Array';
+function isArray(array) {
+  return array && array.constructor === 'Array';
 }
 
 module.exports.isArray = isArray;

From b45b601b692dcbec76821400b650956f9d198029 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Tue, 11 Dec 2018 21:07:19 +0800
Subject: [PATCH 16/31] [improvement] Checkbox: optimize performance (#1057)

---
 packages/checkbox-group/index.ts |  4 ++--
 packages/checkbox/index.ts       | 10 ----------
 packages/checkbox/index.wxml     |  2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/packages/checkbox-group/index.ts b/packages/checkbox-group/index.ts
index 0e118056..6cffcfdb 100644
--- a/packages/checkbox-group/index.ts
+++ b/packages/checkbox-group/index.ts
@@ -16,9 +16,9 @@ VantComponent({
   },
 
   props: {
+    max: Number,
     value: Array,
-    disabled: Boolean,
-    max: Number
+    disabled: Boolean
   },
 
   watch: {
diff --git a/packages/checkbox/index.ts b/packages/checkbox/index.ts
index defb21df..73234ee8 100644
--- a/packages/checkbox/index.ts
+++ b/packages/checkbox/index.ts
@@ -23,16 +23,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    iconStyle(): string {
-      const { value, disabled, checkedColor } = this.data;
-      if (checkedColor && value && !disabled) {
-        return `border-color: ${checkedColor}; background-color: ${checkedColor}`;
-      }
-      return '';
-    }
-  },
-
   methods: {
     emitChange(value) {
       const parent = this.getRelationNodes('../checkbox-group/index')[0];
diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml
index da96d043..ce388e9d 100644
--- a/packages/checkbox/index.wxml
+++ b/packages/checkbox/index.wxml
@@ -7,7 +7,7 @@
       wx:else
       name="success"
       class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
-      style="{{ iconStyle }}"
+      style="{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
       custom-class="icon-class"
       custom-style="line-height: 20px;"
     />

From dbc0d6708a1d56389c33ee13d1d3121844412112 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 12 Dec 2018 15:34:58 +0800
Subject: [PATCH 17/31] [improvement] Toast: update icon size (#1064)

---
 packages/common/style/var.less | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index b313db8e..1acd115c 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -49,7 +49,7 @@
 @toast-line-height: 20px;
 @toast-border-radius: 4px;
 @toast-background-color: rgba(0, 0, 0, .7);
-@toast-icon-size: 50px;
+@toast-icon-size: 48px;
 @toast-text-min-width: 96px;
 @toast-text-padding: 8px 12px;
 @toast-default-padding: 15px;

From e4f39e187dad5836af77414e313b8074894b026d Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Wed, 12 Dec 2018 15:35:08 +0800
Subject: [PATCH 18/31] =?UTF-8?q?[new=20feature]=20SwitchCell:=20add=20new?=
 =?UTF-8?q?=20props=20active-color=E3=80=81inactive-color=20(#1061)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/switch-cell/README.md  | 2 ++
 packages/switch-cell/index.ts   | 2 ++
 packages/switch-cell/index.wxml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/packages/switch-cell/README.md b/packages/switch-cell/README.md
index 3541383a..f34c3c84 100644
--- a/packages/switch-cell/README.md
+++ b/packages/switch-cell/README.md
@@ -67,6 +67,8 @@ Page({
 | loading | 是否为加载状态 |  `Boolean` | `false` |
 | disabled | 是否为禁用状态 |  `Boolean` | `false` |
 | size | 开关尺寸 | `String` | `26px` |
+| active-color | 开关打开时的背景色 | `String` | `#1989fa` |
+| inactive-color | 开关关闭时的背景色 | `String` | `#fff` |
 
 ### Event
 
diff --git a/packages/switch-cell/index.ts b/packages/switch-cell/index.ts
index 88385d3e..d4406562 100644
--- a/packages/switch-cell/index.ts
+++ b/packages/switch-cell/index.ts
@@ -9,6 +9,8 @@ VantComponent({
     checked: Boolean,
     loading: Boolean,
     disabled: Boolean,
+    activeColor: String,
+    inactiveColor: String,
     size: {
       type: String,
       value: '26px'
diff --git a/packages/switch-cell/index.wxml b/packages/switch-cell/index.wxml
index 273d0f6d..38877c26 100644
--- a/packages/switch-cell/index.wxml
+++ b/packages/switch-cell/index.wxml
@@ -9,6 +9,8 @@
     checked="{{ checked }}"
     loading="{{ loading }}"
     disabled="{{ disabled }}"
+    active-color="{{ activeColor }}"
+    inactive-color="{{ inactiveColor }}"
     custom-class="van-switch-cell__switch"
     bind:change="onChange"
   />

From acc2b1da2983f53b38daca31534cd20595bce681 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 12 Dec 2018 15:52:32 +0800
Subject: [PATCH 19/31] [improvement] Switch: update style (#1065)

---
 example/pages/switch/index.wxml | 21 ++++++++++++++++++---
 packages/common/style/var.less  | 17 +++++++++++++++++
 packages/switch-cell/README.md  |  2 +-
 packages/switch-cell/index.less |  4 ++--
 packages/switch-cell/index.ts   |  2 +-
 packages/switch/README.md       | 17 +++++++++++++++--
 packages/switch/index.less      | 30 +++++++++++++++---------------
 7 files changed, 69 insertions(+), 24 deletions(-)

diff --git a/example/pages/switch/index.wxml b/example/pages/switch/index.wxml
index fb342d70..f233dc66 100644
--- a/example/pages/switch/index.wxml
+++ b/example/pages/switch/index.wxml
@@ -21,12 +21,27 @@
   />
 </demo-block>
 
-<demo-block title="高级用法" padding>
+<demo-block title="自定义大小" padding>
+  <van-switch
+    checked="{{ checked }}"
+    size="24px"
+    bind:change="onChange"
+  />
+</demo-block>
+
+<demo-block title="自定义颜色" padding>
+  <van-switch
+    checked="{{ checked }}"
+    active-color="#4b0"
+    inactive-color="#f44"
+    bind:change="onChange"
+  />
+</demo-block>
+
+<demo-block title="异步控制" padding>
   <van-switch
     checked="{{ checked2 }}"
     size="36px"
-    active-color="#4b0"
-    inactive-color="#f44"
     bind:change="onChange2"
   />
 </demo-block>
diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index 1acd115c..fbec3342 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -42,6 +42,23 @@
 @notify-font-size: 14px;
 @notify-line-height: 20px;
 
+// Switch
+@switch-width: 2em;
+@switch-height: 1em;
+@switch-node-size: 1em;
+@switch-node-z-index: 1;
+@switch-node-background-color: @white;
+@switch-node-box-shadow: 0 3px 1px 0 rgba(0, 0, 0, .05), 0 2px 2px 0 rgba(0, 0, 0, .1), 0 3px 3px 0 rgba(0, 0, 0, .05);
+@switch-background-color: @white;
+@switch-on-background-color: @blue;
+@switch-transition-duration: .3s;
+@switch-disabled-opacity: .4;
+@switch-border: 1px solid rgba(0, 0, 0, .1);
+
+// SwitchCell
+@switch-cell-padding-top: 9px;
+@switch-cell-padding-bottom: 9px;
+
 // Toast
 @toast-max-width: 70%;
 @toast-font-size: 14px;
diff --git a/packages/switch-cell/README.md b/packages/switch-cell/README.md
index f34c3c84..a293a027 100644
--- a/packages/switch-cell/README.md
+++ b/packages/switch-cell/README.md
@@ -66,7 +66,7 @@ Page({
 | title | 左侧标题 |  `String` | `''` |
 | loading | 是否为加载状态 |  `Boolean` | `false` |
 | disabled | 是否为禁用状态 |  `Boolean` | `false` |
-| size | 开关尺寸 | `String` | `26px` |
+| size | 开关尺寸 | `String` | `24px` |
 | active-color | 开关打开时的背景色 | `String` | `#1989fa` |
 | inactive-color | 开关关闭时的背景色 | `String` | `#fff` |
 
diff --git a/packages/switch-cell/index.less b/packages/switch-cell/index.less
index 91b17ce1..098675f3 100644
--- a/packages/switch-cell/index.less
+++ b/packages/switch-cell/index.less
@@ -1,8 +1,8 @@
 @import '../common/style/var.less';
 
 .van-switch-cell {
-  padding-top: 8px;
-  padding-bottom: 8px;
+  padding-top: @switch-cell-padding-top;
+  padding-bottom: @switch-cell-padding-bottom;
 
   &__switch {
     vertical-align: middle;
diff --git a/packages/switch-cell/index.ts b/packages/switch-cell/index.ts
index d4406562..fa864c04 100644
--- a/packages/switch-cell/index.ts
+++ b/packages/switch-cell/index.ts
@@ -13,7 +13,7 @@ VantComponent({
     inactiveColor: String,
     size: {
       type: String,
-      value: '26px'
+      value: '24px'
     }
   },
 
diff --git a/packages/switch/README.md b/packages/switch/README.md
index e9c3b866..f390653c 100644
--- a/packages/switch/README.md
+++ b/packages/switch/README.md
@@ -42,14 +42,27 @@ Page({
 <van-switch checked="{{ checked }}" loading />
 ```
 
-#### 高级用法
+#### 自定义大小
+
+```html
+<van-switch checked="{{ checked }}" size="24px" />
+```
+
+#### 自定义颜色
 
 ```html
 <van-switch
-  size="36px"
   checked="{{ checked }}"
   active-color="#4b0"
   inactive-color="#f44"
+/>
+```
+
+#### 异步控制
+
+```html
+<van-switch
+  checked="{{ checked }}"
   bind:change="onChange"
 />
 ```
diff --git a/packages/switch/index.less b/packages/switch/index.less
index ba98706f..0c1cdd03 100644
--- a/packages/switch/index.less
+++ b/packages/switch/index.less
@@ -1,27 +1,27 @@
 @import '../common/style/var.less';
 
 .van-switch {
-  height: 1em;
-  width: 1.8em;
   display: inline-block;
   position: relative;
-  border-radius: 1em;
+  width: @switch-width;
+  height: @switch-height;
+  border: @switch-border;
+  border-radius: @switch-node-size;
   box-sizing: content-box;
-  border: 1px solid rgba(0, 0, 0, .1);
-  background-color: @white;
-  transition: background-color .3s;
+  background-color: @switch-background-color;
+  transition: background-color @switch-transition-duration;
 
   &__node {
     top: 0;
     left: 0;
-    z-index: 1;
-    width: 1em;
-    height: 1em;
-    transition: .3s;
     position: absolute;
     border-radius: 100%;
-    background-color: @white;
-    box-shadow: 0 3px 1px 0 rgba(0, 0, 0, .05), 0 2px 2px 0 rgba(0, 0, 0, .1), 0 3px 3px 0 rgba(0, 0, 0, .05);
+    width: @switch-node-size;
+    height: @switch-node-size;
+    z-index: @switch-node-z-index;
+    transition: @switch-transition-duration;
+    box-shadow: @switch-node-box-shadow;
+    background-color: @switch-node-background-color;
   }
 
   &__loading {
@@ -31,14 +31,14 @@
   }
 
   &--on {
-    background-color: @blue;
+    background-color: @switch-on-background-color;
 
     .van-switch__node {
-      transform: translateX(.8em);
+      transform: translateX(@switch-width - @switch-node-size);
     }
   }
 
   &--disabled {
-    opacity: .4;
+    opacity: @switch-disabled-opacity;
   }
 }

From 9eedd9776d4a77aafec6b44f777eb2e1476b7e91 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 12 Dec 2018 16:19:56 +0800
Subject: [PATCH 20/31] [improvement] update info style (#1066)

---
 example/pages/badge/index.wxml  |  2 +-
 example/pages/tabbar/index.wxml |  2 +-
 packages/badge/README.md        |  2 +-
 packages/badge/index.json       |  5 ++++-
 packages/badge/index.less       | 17 ++---------------
 packages/badge/index.ts         |  2 +-
 packages/badge/index.wxml       | 10 ++++++++--
 packages/common/style/var.less  | 10 ++++++++++
 packages/icon/index.json        |  5 ++++-
 packages/icon/index.less        | 20 --------------------
 packages/icon/index.wxml        |  8 +++-----
 packages/info/index.json        |  3 +++
 packages/info/index.less        | 21 +++++++++++++++++++++
 packages/info/index.ts          |  8 ++++++++
 packages/info/index.wxml        |  7 +++++++
 packages/tabbar-item/index.json |  3 ++-
 packages/tabbar-item/index.less | 24 ++----------------------
 packages/tabbar-item/index.wxml | 12 +++++++++---
 packages/tabbar/README.md       |  2 +-
 19 files changed, 88 insertions(+), 75 deletions(-)
 create mode 100644 packages/info/index.json
 create mode 100644 packages/info/index.less
 create mode 100644 packages/info/index.ts
 create mode 100644 packages/info/index.wxml

diff --git a/example/pages/badge/index.wxml b/example/pages/badge/index.wxml
index 7fa324cd..efe5582b 100644
--- a/example/pages/badge/index.wxml
+++ b/example/pages/badge/index.wxml
@@ -4,7 +4,7 @@
       <van-badge title="标签名称" />
       <van-badge title="标签名称" info="8" />
       <van-badge title="标签名称" info="99" />
-      <van-badge title="标签名称" info="199" />
+      <van-badge title="标签名称" info="99+" />
     </van-badge-group>
   </view>
 </demo-block>
diff --git a/example/pages/tabbar/index.wxml b/example/pages/tabbar/index.wxml
index 0d7f220a..cf665aae 100644
--- a/example/pages/tabbar/index.wxml
+++ b/example/pages/tabbar/index.wxml
@@ -9,7 +9,7 @@
 
 <demo-block title="自定义图标">
   <van-tabbar active="{{ active2 }}" custom-class="tabbar" bind:change="onChange" safe-area-inset-bottom="{{ false }}">
-    <van-tabbar-item>
+    <van-tabbar-item info="3">
       <span>自定义</span>
       <image slot="icon" src="{{ icon.normal }}" class="icon" mode="aspectFit" />
       <image slot="icon-active" src="{{ icon.active }}" mode="aspectFit" />
diff --git a/packages/badge/README.md b/packages/badge/README.md
index 953af0a7..0a23bb20 100644
--- a/packages/badge/README.md
+++ b/packages/badge/README.md
@@ -20,7 +20,7 @@
   <van-badge title="标签名称" />
   <van-badge title="标签名称" info="8" />
   <van-badge title="标签名称" info="99" />
-  <van-badge title="标签名称" info="199" />
+  <van-badge title="标签名称" info="99+" />
 </van-badge-group>
 ```
 
diff --git a/packages/badge/index.json b/packages/badge/index.json
index 467ce294..bf0ebe00 100644
--- a/packages/badge/index.json
+++ b/packages/badge/index.json
@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
 }
diff --git a/packages/badge/index.less b/packages/badge/index.less
index 7d7b233f..2b3939f4 100644
--- a/packages/badge/index.less
+++ b/packages/badge/index.less
@@ -36,20 +36,7 @@
     }
   }
 
-  &__info {
-    position: absolute;
-    top: 4px;
-    right: 2px;
-    color: @white;
-    font-size: 12px;
-    font-weight: 500;
-    transform: scale(0.8);
-    text-align: center;
-    box-sizing: border-box;
-    padding: 0 6px;
-    min-width: 18px;
-    line-height: 18px;
-    border-radius: 9px;
-    background-color: @red;
+  &__text {
+    position: relative;
   }
 }
diff --git a/packages/badge/index.ts b/packages/badge/index.ts
index 2bf4168f..c8857364 100644
--- a/packages/badge/index.ts
+++ b/packages/badge/index.ts
@@ -7,7 +7,7 @@ VantComponent({
   },
 
   props: {
-    info: Number,
+    info: null,
     title: String
   },
 
diff --git a/packages/badge/index.wxml b/packages/badge/index.wxml
index 3e55ca3a..425b4739 100644
--- a/packages/badge/index.wxml
+++ b/packages/badge/index.wxml
@@ -1,4 +1,10 @@
 <view class="van-badge van-hairline custom-class {{ active ? 'van-badge--active' : '' }}" bind:tap="onClick">
-  <view wx:if="{{ info }}" class="van-badge__info">{{ info }}</view>
-  {{ title }}
+  <view class="van-badge__text">
+    <van-info
+      wx:if="{{ info !== null }}"
+      info="{{ info }}"
+      custom-style="right: 4px"
+    />
+    {{ title }}
+  </view>
 </view>
diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index fbec3342..81293627 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -37,6 +37,16 @@
 @button-bottom-action-primary-color: @white;
 @button-bottom-action-primary-background-color: @red;
 
+// Info
+@info-size: 16px;
+@info-color: @white;
+@info-padding: 0 3px;
+@info-font-size: 12px;
+@info-font-weight: 500;
+@info-border-width: 1px;
+@info-background-color: @red;
+@info-font-family: PingFang SC, Helvetica Neue, Arial, sans-serif;
+
 // Notify
 @notify-padding: 6px 15px;
 @notify-font-size: 14px;
diff --git a/packages/icon/index.json b/packages/icon/index.json
index 467ce294..bf0ebe00 100644
--- a/packages/icon/index.json
+++ b/packages/icon/index.json
@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "van-info": "../info/index"
+  }
 }
diff --git a/packages/icon/index.less b/packages/icon/index.less
index 85de28bd..9ee115e6 100644
--- a/packages/icon/index.less
+++ b/packages/icon/index.less
@@ -30,26 +30,6 @@
     }
   }
 
-  &__info {
-    position: absolute;
-    right: 0;
-    top: -8px;
-    color: @white;
-    font-size: 12px;
-    font-weight: 500;
-    font-family: PingFang SC, Helvetica Neue, Arial, sans-serif;
-    text-align: center;
-    box-sizing: border-box;
-    padding: 0 3px;
-    min-width: 16px;
-    line-height: 14px;
-    border: 1px solid @white;
-    border-radius: 16px;
-    background-color: @red;
-    transform: translateX(50%);
-    transform-origin: 100%;
-  }
-
   &::before {
     display: inline-block;
   }
diff --git a/packages/icon/index.wxml b/packages/icon/index.wxml
index 156ab17f..0c37bcd3 100644
--- a/packages/icon/index.wxml
+++ b/packages/icon/index.wxml
@@ -5,12 +5,10 @@
   style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + size + ';' : '' }}{{ customStyle }}"
   bind:tap="onClick"
 >
-  <view
+  <van-info
     wx:if="{{ info !== null }}"
-    class="van-icon__info"
-  >
-    {{ info }}
-  </view>
+    info="{{ info }}"
+  />
   <image
     wx:if="{{ utils.isSrc(name) }}"
     src="{{ name }}"
diff --git a/packages/info/index.json b/packages/info/index.json
new file mode 100644
index 00000000..467ce294
--- /dev/null
+++ b/packages/info/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
diff --git a/packages/info/index.less b/packages/info/index.less
new file mode 100644
index 00000000..86d50e88
--- /dev/null
+++ b/packages/info/index.less
@@ -0,0 +1,21 @@
+@import '../common/style/var.less';
+
+.van-info {
+  position: absolute;
+  right: 0;
+  top: -@info-size / 2;
+  color: @info-color;
+  font-size: @info-font-size;
+  font-weight: @info-font-weight;
+  font-family: @info-font-family;
+  text-align: center;
+  box-sizing: border-box;
+  padding: @info-padding;
+  min-width: @info-size;
+  line-height: @info-size - @info-border-width * 2;
+  border: @info-border-width solid @white;
+  border-radius: @info-size;
+  background-color: @info-background-color;
+  transform: translateX(50%);
+  transform-origin: 100%;
+}
diff --git a/packages/info/index.ts b/packages/info/index.ts
new file mode 100644
index 00000000..a90bcf73
--- /dev/null
+++ b/packages/info/index.ts
@@ -0,0 +1,8 @@
+import { VantComponent } from '../common/component';
+
+VantComponent({
+  props: {
+    info: null,
+    customStyle: String
+  }
+});
diff --git a/packages/info/index.wxml b/packages/info/index.wxml
new file mode 100644
index 00000000..7deb39b0
--- /dev/null
+++ b/packages/info/index.wxml
@@ -0,0 +1,7 @@
+<view
+  wx:if="{{ info !== null }}"
+  class="custom-class van-info"
+  style="{{ customStyle }}"
+>
+  {{ info }}
+</view>
diff --git a/packages/tabbar-item/index.json b/packages/tabbar-item/index.json
index 0a336c08..16f174c5 100644
--- a/packages/tabbar-item/index.json
+++ b/packages/tabbar-item/index.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index"
+    "van-icon": "../icon/index",
+    "van-info": "../info/index"
   }
 }
diff --git a/packages/tabbar-item/index.less b/packages/tabbar-item/index.less
index 398cbc75..5aa636bc 100644
--- a/packages/tabbar-item/index.less
+++ b/packages/tabbar-item/index.less
@@ -19,27 +19,6 @@
     margin-bottom: 5px;
     position: relative;
 
-    .van-icon {
-      display: block;
-
-      &__info {
-        color: @white;
-        left: 100%;
-        top: -.5em;
-        font-size: .6em;
-        padding: 0 .25em;
-        text-align: center;
-        min-width: 1.4em;
-        line-height: 1.4;
-        position: absolute;
-        border-radius: .6em;
-        box-sizing: border-box;
-        background-color: @red;
-        transform: translateX(-50%);
-        font-family: PingFang SC, Helvetica Neue, Arial, sans-serif;
-      }
-    }
-
     &--dot {
       &::after {
         top: 0;
@@ -54,8 +33,9 @@
     }
 
     image {
-      width: 50px;
+      width: 30px;
       height: 18px;
+      display: block;
     }
   }
 
diff --git a/packages/tabbar-item/index.wxml b/packages/tabbar-item/index.wxml
index e1da8a18..6f7251f1 100644
--- a/packages/tabbar-item/index.wxml
+++ b/packages/tabbar-item/index.wxml
@@ -6,14 +6,20 @@
     <van-icon
       wx:if="{{ icon }}"
       name="{{ icon }}"
-      info="{{ info }}"
       customStyle="display: block"
     />
     <block wx:else>
-      <slot wx:if="{{ active }}" name="icon-active" />
+      <slot
+        wx:if="{{ active }}"
+        name="icon-active"
+      />
       <slot wx:else name="icon" />
-      <view wx:if="{{ info !== null }}" class="van-icon__info">{{ info }}</view>
     </block>
+    <van-info
+      wx:if="{{ info !== null }}"
+      info="{{ info }}"
+      custom-style="margin-top: 2px"
+    />
   </view>
   <view class="van-tabbar-item__text">
     <slot />
diff --git a/packages/tabbar/README.md b/packages/tabbar/README.md
index 75851724..1a42e1b3 100644
--- a/packages/tabbar/README.md
+++ b/packages/tabbar/README.md
@@ -42,7 +42,7 @@ Page({
 
 ```html
 <van-tabbar active="{{ active }}" bind:change="onChange">
-  <van-tabbar-item>
+  <van-tabbar-item info="3">
     <span>自定义</span>
     <image slot="icon" src="{{ icon.normal }}" class="icon" mode="aspectFit" />
     <image slot="icon-active" src="{{ icon.active }}" mode="aspectFit" />

From 2ca2ced432fe51c9d31ae4bb3fec10e21bf531fa Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 12 Dec 2018 16:28:59 +0800
Subject: [PATCH 21/31] [new feature] Dialog: add message-align prop (#1067)

---
 packages/dialog/README.md  | 3 +++
 packages/dialog/dialog.ts  | 2 ++
 packages/dialog/index.less | 9 +++++++++
 packages/dialog/index.ts   | 1 +
 packages/dialog/index.wxml | 2 +-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/dialog/README.md b/packages/dialog/README.md
index 0b808f44..aa6c0e1b 100644
--- a/packages/dialog/README.md
+++ b/packages/dialog/README.md
@@ -39,6 +39,7 @@ Dialog.alert({
 ```
 
 #### 消息确认
+
 用于确认消息，包含取消和确认按钮
 
 ```javascript
@@ -127,6 +128,7 @@ Page({
 |-----------|-----------|-----------|-------------|
 | title | 标题 | `String` | - |
 | message | 内容 | `String` | - |
+| messageAlign | 内容对齐方式，可选值为`left` `right` | `String` | `center` |
 | zIndex | z-index 层级 | `Number` | `100` |
 | selector | 自定义选择器 | `String` | `van-dialog` |
 | showConfirmButton | 是否展示确认按钮 | `Boolean` | `true` |
@@ -149,6 +151,7 @@ Page({
 | show | 是否显示弹窗 | `Boolean` | - |
 | title | 标题 | `String` | - |
 | message | 内容 | `String` | - |
+| message-align | 内容对齐方式，可选值为`left` `right` | `String` | `center` |
 | z-index | z-index 层级 | `Number` | `100` |
 | show-confirm-button | 是否展示确认按钮 | `Boolean` |  `true` |
 | show-cancel-button | 是否展示取消按钮 | `Boolean` |  `false` |
diff --git a/packages/dialog/dialog.ts b/packages/dialog/dialog.ts
index ebd53622..f8c30609 100644
--- a/packages/dialog/dialog.ts
+++ b/packages/dialog/dialog.ts
@@ -11,6 +11,7 @@ type DialogOptions = {
   selector?: string;
   transition?: string;
   asyncClose?: boolean;
+  messageAlign?: string;
   confirmButtonText?: string;
   cancelButtonText?: string;
   showConfirmButton?: boolean;
@@ -68,6 +69,7 @@ Dialog.defaultOptions = {
   zIndex: 100,
   overlay: true,
   asyncClose: false,
+  messageAlign: '',
   transition: 'scale',
   selector: '#van-dialog',
   confirmButtonText: '确认',
diff --git a/packages/dialog/index.less b/packages/dialog/index.less
index f5a8dfdc..610d8c36 100644
--- a/packages/dialog/index.less
+++ b/packages/dialog/index.less
@@ -23,12 +23,21 @@
     line-height: 1.5;
     max-height: 60vh;
     overflow-y: auto;
+    text-align: center;
     -webkit-overflow-scrolling: touch;
 
     &--has-title {
       padding-top: 12px;
       color: @gray-darker;
     }
+
+    &--left {
+      text-align: left;
+    }
+
+    &--right {
+      text-align: right;
+    }
   }
 
   &__footer {
diff --git a/packages/dialog/index.ts b/packages/dialog/index.ts
index fec7b977..ff75ba48 100644
--- a/packages/dialog/index.ts
+++ b/packages/dialog/index.ts
@@ -10,6 +10,7 @@ VantComponent({
     message: String,
     useSlot: Boolean,
     asyncClose: Boolean,
+    messageAlign: String,
     showCancelButton: Boolean,
     closeOnClickOverlay: Boolean,
     confirmButtonOpenType: String,
diff --git a/packages/dialog/index.wxml b/packages/dialog/index.wxml
index 71edae7a..fe890fd0 100644
--- a/packages/dialog/index.wxml
+++ b/packages/dialog/index.wxml
@@ -17,7 +17,7 @@
   <slot wx:if="{{ useSlot }}" />
   <view
     wx:elif="{{ message }}"
-    class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }}"
+    class="van-dialog__message {{ title ? 'van-dialog__message--has-title' : '' }} {{ messageAlign ? 'van-dialog__message--' + messageAlign : '' }}"
   >
     <text>{{ message }}</text>
   </view>

From 35b0a8e5101b403c4bdae00e4b700155121973e9 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 12 Dec 2018 16:38:06 +0800
Subject: [PATCH 22/31] [improvement] Checkbox: update disabled label color
 (#1068)

---
 packages/checkbox/index.less   | 31 ++++++++++++++++---------------
 packages/checkbox/index.wxml   |  2 +-
 packages/common/style/var.less | 11 +++++++++++
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/packages/checkbox/index.less b/packages/checkbox/index.less
index 1f0df9d3..2f62da7e 100644
--- a/packages/checkbox/index.less
+++ b/packages/checkbox/index.less
@@ -1,7 +1,5 @@
 @import '../common/style/var.less';
 
-@checkbox-size: 20px;
-
 .van-checkbox {
   overflow: hidden;
   user-select: none;
@@ -14,15 +12,15 @@
   }
 
   &__icon {
-    box-sizing: border-box;
     display: block;
+    font-size: 14px;
     width: @checkbox-size;
     height: @checkbox-size;
-    border: 1px solid @gray-light;
     color: transparent;
-    font-size: 14px;
     text-align: center;
-    transition: .2s;
+    box-sizing: border-box;
+    border: 1px solid @checkbox-border-color;
+    transition: @checkbox-transition-duration;
 
     &--round {
       border-radius: 100%;
@@ -30,28 +28,31 @@
 
     &--checked {
       color: @white;
-      border-color: @blue;
-      background-color: @blue;
+      border-color: @checkbox-checked-icon-color;
+      background-color: @checkbox-checked-icon-color;
     }
 
     &--disabled {
-      border-color: @border-color;
-      background-color: currentColor;
-      color: @background-color;
+      border-color: @checkbox-disabled-icon-color;
+      background-color: @checkbox-disabled-background-color;
     }
 
     &--disabled&--checked {
-      border-color: @border-color;
-      background-color: @border-color;
+      color: @checkbox-disabled-icon-color;
     }
   }
 
   &__label {
-    margin-left: 10px;
+    color: @checkbox-label-color;
+    margin-left: @checkbox-label-margin;
 
     &--left {
-      margin: 0 10px 0 0;
       float: left;
+      margin: 0 @checkbox-label-margin 0 0;
+    }
+
+    &--disabled {
+      color: @checkbox-disabled-label-color;
     }
 
     &:empty {
diff --git a/packages/checkbox/index.wxml b/packages/checkbox/index.wxml
index ce388e9d..1659ba43 100644
--- a/packages/checkbox/index.wxml
+++ b/packages/checkbox/index.wxml
@@ -12,7 +12,7 @@
       custom-style="line-height: 20px;"
     />
   </view>
-  <view class="van-checkbox__label van-checkbox__label--{{ labelPosition }} label-class" bindtap="onClickLabel">
+  <view class="label-class {{ utils.bem('checkbox__label', [labelPosition, { disabled }]) }}" bindtap="onClickLabel">
     <slot />
   </view>
 </view>
diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index 81293627..be3adec4 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -37,6 +37,17 @@
 @button-bottom-action-primary-color: @white;
 @button-bottom-action-primary-background-color: @red;
 
+// Checkbox
+@checkbox-size: 20px;
+@checkbox-border-color: @gray-light;
+@checkbox-transition-duration: .2s;
+@checkbox-label-margin: 10px;
+@checkbox-label-color: @text-color;
+@checkbox-checked-icon-color: @blue;
+@checkbox-disabled-icon-color: @gray;
+@checkbox-disabled-label-color: @gray;
+@checkbox-disabled-background-color: @border-color;
+
 // Info
 @info-size: 16px;
 @info-color: @white;

From a2f9e34fac4db5169821747175d745cba661b5e1 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Wed, 12 Dec 2018 17:25:50 +0800
Subject: [PATCH 23/31] [improvement] Collapse: content default style (#1069)

---
 example/pages/collapse/index.wxml | 24 +++++++++---------------
 example/pages/collapse/index.wxss |  6 ------
 packages/collapse-item/index.less | 19 +++++++++++--------
 packages/collapse/README.md       |  2 --
 packages/common/style/var.less    |  9 +++++++++
 5 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/example/pages/collapse/index.wxml b/example/pages/collapse/index.wxml
index 2a28e4e5..eb69cf73 100644
--- a/example/pages/collapse/index.wxml
+++ b/example/pages/collapse/index.wxml
@@ -1,37 +1,31 @@
 <demo-block title="基础用法">
   <van-collapse value="{{ active1 }}" data-key="active1" bind:change="onChange">
-    <van-collapse-item title="{{ title1 }}" content-class="van-collapse-item__content">{{ content1 }}</van-collapse-item>
-    <van-collapse-item title="{{ title2 }}" content-class="van-collapse-item__content">{{ content2 }}</van-collapse-item>
-    <van-collapse-item
-      title="{{ title3 }}"
-      content-class="van-collapse-item__content"
-      disabled
-    >
-      {{ content3 }}
-    </van-collapse-item>
+    <van-collapse-item title="{{ title1 }}">{{ content1 }}</van-collapse-item>
+    <van-collapse-item title="{{ title2 }}">{{ content2 }}</van-collapse-item>
+    <van-collapse-item title="{{ title3 }}" disabled>{{ content3 }}</van-collapse-item>
   </van-collapse>
 </demo-block>
 
 <demo-block title="手风琴">
   <van-collapse value="{{ active2 }}" data-key="active2" accordion bind:change="onChange">
-    <van-collapse-item title="{{ title1 }}" content-class="van-collapse-item__content">{{ content1 }}</van-collapse-item>
-    <van-collapse-item title="{{ title2 }}" content-class="van-collapse-item__content">{{ content2 }}</van-collapse-item>
-    <van-collapse-item title="{{ title3 }}" content-class="van-collapse-item__content">{{ content3 }}</van-collapse-item>
+    <van-collapse-item title="{{ title1 }}">{{ content1 }}</van-collapse-item>
+    <van-collapse-item title="{{ title2 }}">{{ content2 }}</van-collapse-item>
+    <van-collapse-item title="{{ title3 }}">{{ content3 }}</van-collapse-item>
   </van-collapse>
 </demo-block>
 
 <demo-block title="自定义标题内容">
   <van-collapse value="{{ active3 }}" data-key="active3" bind:change="onChange">
-    <van-collapse-item content-class="van-collapse-item__content">
+    <van-collapse-item>
       <view slot="title">{{ title1 }}<van-icon name="question" custom-class="van-icon-question" /></view>
       {{ content1 }}
     </van-collapse-item>
     <van-collapse-item
       title="{{ title2 }}"
-      content-class="van-collapse-item__content"
+     
       value="内容"
       icon="shop"
     >{{ content2 }}</van-collapse-item>
-    <van-collapse-item title="{{ title3 }}" content-class="van-collapse-item__content">{{ content3 }}</van-collapse-item>
+    <van-collapse-item title="{{ title3 }}">{{ content3 }}</van-collapse-item>
   </van-collapse>
 </demo-block>
diff --git a/example/pages/collapse/index.wxss b/example/pages/collapse/index.wxss
index 71c599a9..cad4d831 100644
--- a/example/pages/collapse/index.wxss
+++ b/example/pages/collapse/index.wxss
@@ -1,9 +1,3 @@
-.van-collapse-item__content {
-  font-size: 13px;
-  line-height: 1.5;
-  color: #666;
-}
-
 .van-icon-question {
   margin-left: 5px;
   font-size: 15px !important;
diff --git a/packages/collapse-item/index.less b/packages/collapse-item/index.less
index e883feb2..db118a46 100644
--- a/packages/collapse-item/index.less
+++ b/packages/collapse-item/index.less
@@ -4,7 +4,7 @@
   &__title {
     .van-cell__right-icon {
       transform: rotate(90deg);
-      transition: 0.3s;
+      transition: @collapse-item-transition-duration;
     }
 
     &--expanded {
@@ -14,12 +14,12 @@
     }
 
     &--disabled {
-      & .van-cell,
-      & .van-cell__right-icon {
-        color: @gray !important;
+      .van-cell,
+      .van-cell__right-icon {
+        color: @collapse-item-title-disabled-color !important;
       }
 
-      &:active {
+      .van-cell:active {
         background-color: @white !important;
       }
     }
@@ -28,11 +28,14 @@
   &__wrapper {
     overflow: hidden;
     will-change: max-height;
-    transition: max-height 0.3s ease-in-out;
+    transition: max-height @collapse-item-transition-duration ease-in-out;
   }
 
   &__content {
-    padding: 15px;
-    background-color: @white;
+    color: @collapse-item-content-text-color;
+    padding: @collapse-item-content-padding;
+    font-size: @collapse-item-content-font-size;
+    line-height: @collapse-item-content-line-height;
+    background-color: @collapse-item-content-background-color;
   }
 }
diff --git a/packages/collapse/README.md b/packages/collapse/README.md
index a5b0a179..3fe30f46 100644
--- a/packages/collapse/README.md
+++ b/packages/collapse/README.md
@@ -98,8 +98,6 @@ Page({
 });
 ```
 
-
-
 ### Collapse API
 
 | 参数 | 说明 | 类型 | 默认值 | 版本 |
diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index be3adec4..b0beb322 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -48,6 +48,15 @@
 @checkbox-disabled-label-color: @gray;
 @checkbox-disabled-background-color: @border-color;
 
+// Collapse
+@collapse-item-transition-duration: .3s;
+@collapse-item-content-padding: 15px;
+@collapse-item-content-font-size: 13px;
+@collapse-item-content-line-height: 1.5;
+@collapse-item-content-text-color: @gray-dark;
+@collapse-item-content-background-color: @white;
+@collapse-item-title-disabled-color: @gray;
+
 // Info
 @info-size: 16px;
 @info-color: @white;

From 5aab460b75ca072496c609b40fcb15e6c600b398 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 13 Dec 2018 16:49:35 +0800
Subject: [PATCH 24/31] [new feature] Tag: add text-color prop (#1077)

---
 example/pages/tag/index.wxml |  3 ++-
 packages/tag/README.md       |  8 +++++++-
 packages/tag/index.ts        | 15 +++++++++++++--
 3 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/example/pages/tag/index.wxml b/example/pages/tag/index.wxml
index f85b1119..be5d1d13 100644
--- a/example/pages/tag/index.wxml
+++ b/example/pages/tag/index.wxml
@@ -30,7 +30,8 @@
   <van-tag class="demo-margin-right" color="#f2826a">标签</van-tag>
   <van-tag class="demo-margin-right" color="#f2826a" plain>标签</van-tag>
   <van-tag class="demo-margin-right" color="#7232dd">标签</van-tag>
-  <van-tag color="#7232dd" plain>标签</van-tag>
+  <van-tag class="demo-margin-right" color="#7232dd" plain>标签</van-tag>
+  <van-tag color="#ffe1e1" text-color="#ad0000">标签</van-tag>
 </demo-block>
 
 <demo-block title="标签大小" padding>
diff --git a/packages/tag/README.md b/packages/tag/README.md
index b7f65dcf..03d263af 100644
--- a/packages/tag/README.md
+++ b/packages/tag/README.md
@@ -12,6 +12,7 @@
 ### 代码演示
 
 #### 基础用法
+
 通过 type 属性控制 Tag 颜色，默认为灰色
 
 ```html
@@ -22,6 +23,7 @@
 ```
 
 #### 空心样式
+
 设置`plain`属性设置为空心样式
 
 ```html
@@ -32,6 +34,7 @@
 ```
 
 #### 圆角样式
+
 通过`round`设置为圆角样式
 
 ```html
@@ -42,6 +45,7 @@
 ```
 
 #### 标记样式
+
 通过`mark`设置为标记样式(半圆角)
 
 ```html
@@ -58,6 +62,7 @@
 <van-tag color="#f2826a" plain>标签</van-tag>
 <van-tag color="#7232dd">标签</van-tag>
 <van-tag color="#7232dd" plain>标签</van-tag>
+<van-tag color="#ffe1e1" text-color="#ad0000">标签</van-tag>
 ```
 
 #### 标签大小
@@ -74,10 +79,11 @@
 |-----------|-----------|-----------|-------------|
 | type | 类型，可选值为`primary` `success` `danger` | `String` | - |
 | size | 大小, 可选值为`large` `medium` | `String` | - |
-| color | 自定义标签颜色 | `String` | - |
+| color | 标签颜色 | `String` | - |
 | plain | 是否为空心样式 | `Boolean` | `false` |
 | round | 是否为圆角样式 | `Boolean` | `false` |
 | mark | 是否为标记样式 | `Boolean` | `false` |
+| text-color | 文本颜色，优先级高于`color`属性 | `String` | `white` |
 
 ### Slot
 
diff --git a/packages/tag/index.ts b/packages/tag/index.ts
index 9e5a0fe9..0622f4f1 100644
--- a/packages/tag/index.ts
+++ b/packages/tag/index.ts
@@ -8,6 +8,10 @@ const COLOR_MAP = {
   success: GREEN
 };
 
+type Style = {
+  [key: string]: string;
+};
+
 VantComponent({
   props: {
     size: String,
@@ -15,14 +19,21 @@ VantComponent({
     mark: Boolean,
     color: String,
     plain: Boolean,
-    round: Boolean
+    round: Boolean,
+    textColor: String
   },
 
   computed: {
     style() {
       const color = this.data.color || COLOR_MAP[this.data.type] || DEFAULT_COLOR;
       const key = this.data.plain ? 'color' : 'background-color';
-      return `${key}: ${color}`;
+      const style = { [key]: color } as Style;
+
+      if (this.data.textColor) {
+        style.color = this.data.textColor;
+      }
+
+      return Object.keys(style).map(key => `${key}: ${style[key]}`).join(';');
     }
   }
 });

From 329a1f884d65983e5315ab2c41dff26ff147aeab Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 13 Dec 2018 17:03:09 +0800
Subject: [PATCH 25/31] [improvement] Switch: optimize computed (#1079)

---
 packages/switch/index.ts   | 7 -------
 packages/switch/index.wxml | 2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/switch/index.ts b/packages/switch/index.ts
index 552de7c0..8bf5b019 100644
--- a/packages/switch/index.ts
+++ b/packages/switch/index.ts
@@ -23,13 +23,6 @@ VantComponent({
     }
   },
 
-  computed: {
-    style() {
-      const backgroundColor = this.data.checked ? this.data.activeColor : this.data.inactiveColor;
-      return `font-size: ${this.data.size}; ${ backgroundColor ? `background-color: ${backgroundColor}` : '' }`
-    }
-  },
-
   created() {
     this.set({ value: this.data.checked });
   },
diff --git a/packages/switch/index.wxml b/packages/switch/index.wxml
index 1929fb01..e215473c 100644
--- a/packages/switch/index.wxml
+++ b/packages/switch/index.wxml
@@ -1,8 +1,8 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
 
 <view
-  style="{{ style }}"
   class="custom-class {{ utils.bem('switch', { on: checked, disabled }) }}"
+  style="font-size: {{ size }}; {{ (checked ? activeColor : inactiveColor) ? 'background-color: ' + (checked ? activeColor : inactiveColor ) : '' }}"
   bind:tap="onClick"
 >
   <view class="van-switch__node node-class">

From 4c2efe4c23f245abc0c40357ef2fb1f9ed9a610d 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, 15 Dec 2018 17:47:43 +0800
Subject: [PATCH 26/31] [Doc] Card: fix lazy-load type

---
 packages/card/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/card/README.md b/packages/card/README.md
index d07f6013..c7e28825 100644
--- a/packages/card/README.md
+++ b/packages/card/README.md
@@ -59,7 +59,7 @@
 | currency | 货币符号 |  `String` | `¥` |
 | thumb-link | 点击左侧图片后的跳转链接 | `String` | - |
 | link-type | 链接跳转类型，可选值为 `redirectTo` `switchTab` `reLaunch` | `String` | `navigateTo` |
-| lazy-load | 是否开启图片懒加载 | `String` | `false` |
+| lazy-load | 是否开启图片懒加载 | `Boolean` | `false` |
 
 ### Slot
 

From 3cb142b8f5edddcd6abf97b643ac0e3b7eb524b6 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Mon, 17 Dec 2018 14:23:52 +0800
Subject: [PATCH 27/31] [new feature] Picker: add new component Picker

---
 example/app.json                  |   6 +-
 example/config.js                 |   4 +
 example/pages/picker/index.js     |  48 ++++++++
 example/pages/picker/index.json   |   3 +
 example/pages/picker/index.wxml   |  39 +++++++
 example/pages/picker/index.wxss   |   0
 packages/common/utils.ts          |   7 +-
 packages/picker-column/index.json |   3 +
 packages/picker-column/index.less |  21 ++++
 packages/picker-column/index.ts   | 160 ++++++++++++++++++++++++++
 packages/picker-column/index.wxml |  31 +++++
 packages/picker/README.md         | 185 ++++++++++++++++++++++++++++++
 packages/picker/index.json        |   7 ++
 packages/picker/index.less        |  67 +++++++++++
 packages/picker/index.ts          | 154 +++++++++++++++++++++++++
 packages/picker/index.wxml        |  41 +++++++
 16 files changed, 773 insertions(+), 3 deletions(-)
 create mode 100644 example/pages/picker/index.js
 create mode 100644 example/pages/picker/index.json
 create mode 100644 example/pages/picker/index.wxml
 create mode 100644 example/pages/picker/index.wxss
 create mode 100644 packages/picker-column/index.json
 create mode 100644 packages/picker-column/index.less
 create mode 100644 packages/picker-column/index.ts
 create mode 100644 packages/picker-column/index.wxml
 create mode 100644 packages/picker/README.md
 create mode 100644 packages/picker/index.json
 create mode 100644 packages/picker/index.less
 create mode 100644 packages/picker/index.ts
 create mode 100644 packages/picker/index.wxml

diff --git a/example/app.json b/example/app.json
index 7eec9973..705fe306 100644
--- a/example/app.json
+++ b/example/app.json
@@ -37,7 +37,8 @@
     "pages/swipe-cell/index",
     "pages/datetime-picker/index",
     "pages/rate/index",
-    "pages/collapse/index"
+    "pages/collapse/index",
+    "pages/picker/index"
   ],
   "window": {
     "navigationBarBackgroundColor": "#f8f8f8",
@@ -94,6 +95,7 @@
     "van-datetime-picker": "../../dist/datetime-picker/index",
     "van-rate": "../../dist/rate/index",
     "van-collapse": "../../dist/collapse/index",
-    "van-collapse-item": "../../dist/collapse-item/index"
+    "van-collapse-item": "../../dist/collapse-item/index",
+    "van-picker": "../../dist/picker/index"
   }
 }
diff --git a/example/config.js b/example/config.js
index 71feb7aa..69da8fbf 100644
--- a/example/config.js
+++ b/example/config.js
@@ -43,6 +43,10 @@ export default [
         path: '/field',
         title: 'Field 输入框'
       },
+      {
+        path: '/picker',
+        title: 'Picker 选择器'
+      },
       {
         path: '/radio',
         title: 'Radio 单选框'
diff --git a/example/pages/picker/index.js b/example/pages/picker/index.js
new file mode 100644
index 00000000..9a9315fa
--- /dev/null
+++ b/example/pages/picker/index.js
@@ -0,0 +1,48 @@
+import Page from '../../common/page';
+import Toast from '../../dist/toast/toast';
+
+Page({
+  data: {
+    column1: ['杭州', '宁波', '温州', '嘉兴', '湖州'],
+    column2: [
+      { text: '杭州', disabled: true },
+      { text: '宁波' },
+      { text: '温州' }
+    ],
+    column3: {
+      浙江: ['杭州', { text: '宁波' }, { text: '温州', disabled: true }, '嘉兴', '湖州'],
+      福建: ['福州', '厦门', '莆田', '三明', '泉州']
+    },
+    column4: [
+      {
+        values: ['浙江', '福建'],
+        className: 'column1'
+      },
+      {
+        values: ['杭州', '宁波', '温州', '嘉兴', '湖州'],
+        className: 'column2',
+        defaultIndex: 2
+      }
+    ]
+  },
+
+  onChange1(event) {
+    const { value, index } = event.detail;
+    Toast(`Value: ${value}, Index：${index}`);
+  },
+
+  onConfirm(event) {
+    const { value, index } = event.detail;
+    Toast(`Value: ${value}, Index：${index}`);
+  },
+
+  onCancel() {
+    Toast('取消');
+  },
+
+  onChange2(event) {
+    const { picker, value } = event.detail;
+    picker.setColumnValues(1, this.data.column3[value[0]]);
+    getApp().picker = picker;
+  }
+});
diff --git a/example/pages/picker/index.json b/example/pages/picker/index.json
new file mode 100644
index 00000000..a27185db
--- /dev/null
+++ b/example/pages/picker/index.json
@@ -0,0 +1,3 @@
+{
+  "navigationBarTitleText": "Picker 选择器"
+}
diff --git a/example/pages/picker/index.wxml b/example/pages/picker/index.wxml
new file mode 100644
index 00000000..cb6a1b66
--- /dev/null
+++ b/example/pages/picker/index.wxml
@@ -0,0 +1,39 @@
+<demo-block title="基础用法">
+  <van-picker
+    columns="{{ column1 }}"
+    bind:change="onChange1"
+  />
+</demo-block>
+
+<demo-block title="禁用选项">
+  <van-picker
+    columns="{{ column2 }}"
+  />
+</demo-block>
+
+<demo-block title="展示顶部栏">
+  <van-picker
+    show-toolbar
+    title="标题"
+    columns="{{ column1 }}"
+    bind:change="onChange1"
+    bind:confirm="onConfirm"
+    bind:cancel="onCancel"
+  />
+</demo-block>
+
+<demo-block title="多列联动">
+  <van-picker
+    columns="{{ column4 }}"
+    bind:change="onChange2"
+  />
+</demo-block>
+
+<demo-block title="加载状态">
+  <van-picker
+    loading
+    columns="{{ column4 }}"
+  />
+</demo-block>
+
+<van-toast id="van-toast" />
diff --git a/example/pages/picker/index.wxss b/example/pages/picker/index.wxss
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/common/utils.ts b/packages/common/utils.ts
index 765c483d..f9ff1eb2 100644
--- a/packages/common/utils.ts
+++ b/packages/common/utils.ts
@@ -11,8 +11,13 @@ function isNumber(value) {
   return /^\d+$/.test(value);
 }
 
+function range(num: number, min: number, max: number) {
+  return Math.min(Math.max(num, min), max);
+}
+
 export {
   isObj,
   isDef,
-  isNumber
+  isNumber,
+  range
 };
diff --git a/packages/picker-column/index.json b/packages/picker-column/index.json
new file mode 100644
index 00000000..32640e0d
--- /dev/null
+++ b/packages/picker-column/index.json
@@ -0,0 +1,3 @@
+{
+  "component": true
+}
\ No newline at end of file
diff --git a/packages/picker-column/index.less b/packages/picker-column/index.less
new file mode 100644
index 00000000..d986b4fc
--- /dev/null
+++ b/packages/picker-column/index.less
@@ -0,0 +1,21 @@
+@import '../common/style/var';
+
+.van-picker-column {
+  overflow: hidden;
+  font-size: 16px;
+  text-align: center;
+
+  &__item {
+    padding: 0 5px;
+    color: @gray-dark;
+
+    &--selected {
+      font-weight: 500;
+      color: @text-color;
+    }
+
+    &--disabled {
+      opacity: 0.3;
+    }
+  }
+}
diff --git a/packages/picker-column/index.ts b/packages/picker-column/index.ts
new file mode 100644
index 00000000..668c3876
--- /dev/null
+++ b/packages/picker-column/index.ts
@@ -0,0 +1,160 @@
+import { VantComponent } from '../common/component';
+import { isObj, range } from '../common/utils';
+
+const DEFAULT_DURATION = 200;
+
+VantComponent({
+  classes: ['active-class'],
+
+  props: {
+    valueKey: String,
+    className: String,
+    itemHeight: Number,
+    visibleItemCount: Number,
+    initialOptions: {
+      type: Array,
+      value: []
+    },
+    defaultIndex: {
+      type: Number,
+      value: 0
+    }
+  },
+
+  data: {
+    startY: 0,
+    offset: 0,
+    duration: 0,
+    startOffset: 0,
+    options: [],
+    currentIndex: 0
+  },
+
+  created() {
+    const { defaultIndex, initialOptions } = this.data;
+    this.set({
+      currentIndex: defaultIndex,
+      options: initialOptions
+    });
+  },
+
+  computed: {
+    count() {
+      return this.data.options.length;
+    },
+
+    baseOffset() {
+      const { data } = this;
+      return (data.itemHeight * (data.visibleItemCount - 1)) / 2;
+    },
+
+    wrapperStyle() {
+      const { data } = this;
+      return [
+        `transition: ${data.duration}ms`,
+        `transform: translate3d(0, ${data.offset + data.baseOffset}px, 0)`,
+        `line-height: ${data.itemHeight}px`
+      ].join('; ');
+    }
+  },
+
+  watch: {
+    defaultIndex(value: number) {
+      this.setIndex(value);
+    }
+  },
+
+  methods: {
+    onTouchStart(event: Weapp.TouchEvent) {
+      this.set({
+        startY: event.touches[0].clientY,
+        startOffset: this.data.offset,
+        duration: 0
+      });
+    },
+
+    onTouchMove(event: Weapp.TouchEvent) {
+      const { data } = this;
+      const deltaY = event.touches[0].clientY - data.startY;
+      this.set({
+        offset: range(
+          data.startOffset + deltaY,
+          -(data.count * data.itemHeight),
+          data.itemHeight
+        )
+      });
+    },
+
+    onTouchEnd() {
+      const { data } = this;
+      if (data.offset !== data.startOffset) {
+        this.set({
+          duration: DEFAULT_DURATION
+        });
+        const index = range(
+          Math.round(-data.offset / data.itemHeight),
+          0,
+          data.count - 1
+        );
+        this.setIndex(index, true);
+      }
+    },
+
+    onClickItem(event: Weapp.Event) {
+      const { index } = event.currentTarget.dataset;
+      this.setIndex(index, true);
+    },
+
+    adjustIndex(index: number) {
+      const { data } = this;
+      index = range(index, 0, data.count);
+      for (let i = index; i < data.count; i++) {
+        if (!this.isDisabled(data.options[i])) return i;
+      }
+      for (let i = index - 1; i >= 0; i--) {
+        if (!this.isDisabled(data.options[i])) return i;
+      }
+    },
+
+    isDisabled(option: any) {
+      return isObj(option) && option.disabled;
+    },
+
+    getOptionText(option: any) {
+      const { data } = this;
+      return isObj(option) && data.valueKey in option
+        ? option[data.valueKey]
+        : option;
+    },
+
+    setIndex(index: number, userAction: boolean) {
+      const { data } = this;
+      index = this.adjustIndex(index) || 0;
+
+      this.set({
+        offset: -index * data.itemHeight
+      });
+
+      if (index !== data.currentIndex) {
+        this.set({
+          currentIndex: index
+        });
+        userAction && this.$emit('change', index);
+      }
+    },
+
+    setValue(value: string) {
+      const { options } = this.data;
+      for (let i = 0; i < options.length; i++) {
+        if (this.getOptionText(options[i]) === value) {
+          return this.setIndex(i);
+        }
+      }
+    },
+
+    getValue() {
+      const { data } = this;
+      return data.options[data.currentIndex];
+    }
+  }
+});
diff --git a/packages/picker-column/index.wxml b/packages/picker-column/index.wxml
new file mode 100644
index 00000000..d0ecb33c
--- /dev/null
+++ b/packages/picker-column/index.wxml
@@ -0,0 +1,31 @@
+<view
+  class="van-picker-column custom-class"
+  style="height: {{ itemHeight * visibleItemCount }}px"
+  bind:touchstart="onTouchStart"
+  catch:touchmove="onTouchMove"
+  bind:touchend="onTouchEnd"
+  bind:touchcancel="onTouchEnd"
+>
+  <view style="{{ wrapperStyle }}">
+    <view
+      wx:for="{{ options }}"
+      wx:for-item="option"
+      wx:key="index"
+      data-index="{{ index }}"
+      style="height: {{ itemHeight }}px"
+      class="van-ellipsis van-picker-column__item {{ option && option.disabled ? 'van-picker-column__item--disabled' : '' }} {{ index === currentIndex ? 'van-picker-column__item--selected active-class' : '' }}"
+      bindtap="onClickItem"
+    >{{ getOptionText(option, valueKey) }}</view>
+  </view>
+</view>
+
+<wxs module="getOptionText">
+function isObj(x) {
+  var type = typeof x;
+  return x !== null && (type === 'object' || type === 'function');
+}
+
+module.exports = function (option, valueKey) {
+  return isObj(option) && option[valueKey] ? option[valueKey] : option;
+}
+</wxs>
diff --git a/packages/picker/README.md b/packages/picker/README.md
new file mode 100644
index 00000000..04c3b165
--- /dev/null
+++ b/packages/picker/README.md
@@ -0,0 +1,185 @@
+## Picker 选择器
+选择器组件通常与 [弹出层](#/popup) 组件配合使用
+
+### 使用指南
+在 app.json 或 index.json 中引入组件
+```json
+"usingComponents": {
+  "van-picker": "path/to/vant-weapp/dist/picker/index"
+}
+```
+
+### 代码演示
+
+
+#### 基础用法
+
+```html
+<van-picker columns="{{ columns }}" bind:change="onChange" />
+```
+
+```javascript
+import Toast from 'path/to/vant-weapp/dist/toast/toast';
+
+Page({
+  data: {
+    columns: ['杭州', '宁波', '温州', '嘉兴', '湖州']
+  },
+
+  onChange(event) {
+    const { picker, value, index } = event.detail;
+    Toast(`当前值：${value}, 当前索引：${index}`);
+  }
+});
+```
+
+#### 禁用选项
+选项可以为对象结构，通过设置 disabled 来禁用该选项
+
+```html
+<van-picker columns="{{ columns }}" />
+```
+
+```javascript
+Page({
+  data: {
+    columns: [
+      { text: '杭州', disabled: true },
+      { text: '宁波' },
+      { text: '温州' }
+    ]
+  }
+});
+```
+
+#### 展示顶部栏
+
+```html
+<van-picker
+  show-toolbar
+  title="标题"
+  columns="{{ columns }}"
+  bind:cancel="onCancel"
+  bind:confirm="onConfirm"
+/>
+```
+
+```javascript
+import Toast from 'path/to/vant-weapp/dist/toast/toast';
+
+Page({
+  data: {
+    columns: ['杭州', '宁波', '温州', '嘉兴', '湖州']
+  },
+
+  onConfirm(event) {
+    const { picker, value, index } = event.detail;
+    Toast(`当前值：${value}, 当前索引：${index}`);
+  },
+
+  onCancel() {
+    Toast('取消');
+  }
+});
+```
+
+#### 多列联动
+
+```html
+<van-picker columns="{{ columns }}" bind:change="onChange" />
+```
+
+```javascript
+const citys = {
+  '浙江': ['杭州', '宁波', '温州', '嘉兴', '湖州'],
+  '福建': ['福州', '厦门', '莆田', '三明', '泉州']
+};
+
+Page({
+  data: {
+    columns: [
+      {
+        values: Object.keys(citys),
+        className: 'column1'
+      },
+      {
+        values: citys['浙江'],
+        className: 'column2',
+        defaultIndex: 2
+      }
+    ]
+  },
+
+  onChange(event) {
+    const { picker, value, index } = event.detail;
+    picker.setColumnValues(1, citys[values[0]]);
+  }
+});
+```
+
+#### 加载状态
+当 Picker 数据是通过异步获取时，可以通过 `loading` 属性显示加载提示
+
+```html
+<van-picker columns="{{ columns }}" loading />
+```
+
+### API
+
+| 参数 | 说明 | 类型 | 默认值 | 版本 |
+|------|------|------|------|------|
+| columns | 对象数组，配置每一列显示的数据 | `Array` | `[]` | - |
+| show-toolbar | 是否显示顶部栏 | `Boolean` | `false` | - |
+| title | 顶部栏标题 | `String` | `''` | - |
+| loading | 是否显示加载状态 | `Boolean` | `false` | - |
+| value-key | 选项对象中，文字对应的 key | `String` | `text` | - |
+| item-height | 选项高度 | `Number` | `44` | - |
+| confirm-button-text | 确认按钮文字 | `String` | `确认` | - |
+| cancel-button-text | 取消按钮文字 | `String` | `取消` | - |
+| visible-item-count | 可见的选项个数 | `Number` | `5` | - |
+
+### Event
+
+Picker 组件的事件会根据 columns 是单列或多列返回不同的参数
+
+| 事件名 | 说明 | 参数 |
+|------|------|------|
+| confirm | 点击完成按钮时触发 | 单列：选中值，选中值对应的索引<br>多列：所有列选中值，所有列选中值对应的索引 |
+| cancel | 点击取消按钮时触发 | 单列：选中值，选中值对应的索引<br>多列：所有列选中值，所有列选中值对应的索引 |
+| change | 选项改变时触发 | 单列：Picker 实例，选中值，选中值对应的索引<br>多列：Picker 实例，所有列选中值，当前列对应的索引 |
+
+
+### Columns 数据结构
+
+当传入多列数据时，`columns`为一个对象数组，数组中的每一个对象配置每一列，每一列有以下`key`
+
+| key | 说明 |
+|------|------|
+| values | 列中对应的备选值 |
+| defaultIndex | 初始选中项的索引，默认为 0 |
+
+### 外部样式类
+
+| 类名 | 说明 |
+|-----------|-----------|
+| custom-class | 根节点样式类 |
+| active-class | 选中项样式类 |
+| toolbar-class | 顶部栏样式类 |
+| column-class | 列样式类 |
+
+### 方法
+
+通过 selectComponent 可以获取到 picker 实例并调用实例方法
+
+| 方法名 | 参数 | 返回值 | 介绍 |
+|------|------|------|------|
+| getValues | - | values | 获取所有列选中的值 |
+| setValues | values | - | 设置所有列选中的值 |
+| getIndexes | - | indexes | 获取所有列选中值对应的索引 |
+| setIndexes | indexes | - | 设置所有列选中值对应的索引 |
+| getColumnValue | columnIndex | value | 获取对应列选中的值 |
+| setColumnValue | columnIndex, value | - | 设置对应列选中的值 |
+| getColumnIndex | columnIndex | optionIndex | 获取对应列选中项的索引 |
+| setColumnIndex | columnIndex, optionIndex | - | 设置对应列选中项的索引 |
+| getColumnValues | columnIndex | values | 获取对应列中所有选项 |
+| setColumnValues | columnIndex, values | - | 设置对应列中所有选项 |
diff --git a/packages/picker/index.json b/packages/picker/index.json
new file mode 100644
index 00000000..2fcec899
--- /dev/null
+++ b/packages/picker/index.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "picker-column": "../picker-column/index",
+    "loading": "../loading/index"
+  }
+}
diff --git a/packages/picker/index.less b/packages/picker/index.less
new file mode 100644
index 00000000..f134472b
--- /dev/null
+++ b/packages/picker/index.less
@@ -0,0 +1,67 @@
+@import '../common/style/var';
+
+.van-picker {
+  position: relative;
+  overflow: hidden;
+  -webkit-text-size-adjust: 100%; /* avoid iOS text size adjust */
+  background-color: @white;
+  user-select: none;
+
+  &__toolbar {
+    display: flex;
+    height: 44px;
+    line-height: 44px;
+    justify-content: space-between;
+  }
+
+  &__cancel,
+  &__confirm {
+    padding: 0 15px;
+    font-size: 14px;
+    color: @blue;
+
+    &:active {
+      background-color: @active-color;
+    }
+  }
+
+  &__title {
+    max-width: 50%;
+    font-size: 16px;
+    font-weight: 500;
+    text-align: center;
+  }
+
+  &__columns {
+    position: relative;
+    display: flex;
+  }
+
+  &__column {
+    flex: 1;
+  }
+
+  &__loading {
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    z-index: 4;
+    display: flex;
+    background-color: rgba(255, 255, 255, 0.9);
+    align-items: center;
+    justify-content: center;
+  }
+
+  &__loading .van-loading,
+  &__frame {
+    position: absolute;
+    top: 50%;
+    left: 0;
+    z-index: 1;
+    width: 100%;
+    pointer-events: none;
+    transform: translateY(-50%);
+  }
+}
diff --git a/packages/picker/index.ts b/packages/picker/index.ts
new file mode 100644
index 00000000..115fe3f9
--- /dev/null
+++ b/packages/picker/index.ts
@@ -0,0 +1,154 @@
+import { VantComponent } from '../common/component';
+
+VantComponent({
+  classes: ['active-class', 'toolbar-class', 'column-class'],
+
+  props: {
+    title: String,
+    loading: Boolean,
+    showToolbar: Boolean,
+    confirmButtonText: String,
+    cancelButtonText: String,
+    visibleItemCount: {
+      type: Number,
+      value: 5
+    },
+    valueKey: {
+      type: String,
+      value: 'text'
+    },
+    itemHeight: {
+      type: Number,
+      value: 44
+    },
+    columns: {
+      type: Array,
+      value: [],
+      observer(columns = []) {
+        this.set({
+          simple: columns.length && !columns[0].values
+        }, () => {
+          const children = this.children = this.selectAllComponents('.van-picker__column');
+
+          if (Array.isArray(children) && children.length) {
+            this.setColumns();
+          }
+        });
+      }
+    }
+  },
+
+  methods: {
+    noop() {},
+
+    setColumns() {
+      const { data } = this;
+      const columns = data.simple ? [{ values: data.columns }] : data.columns;
+      columns.forEach((columns, index: number) => {
+        this.setColumnValues(index, columns.values);
+      });
+    },
+
+    emit(event: Weapp.Event) {
+      const { type } = event.currentTarget.dataset;
+      if (this.data.simple) {
+        this.$emit(type, {
+          value: this.getColumnValue(0),
+          index: this.getColumnIndex(0)
+        });
+      } else {
+        this.$emit(type, {
+          value: this.getValues(),
+          index: this.getIndexes()
+        });
+      }
+    },
+
+    onChange(event: Weapp.Event) {
+      if (this.data.simple) {
+        this.$emit('change', {
+          picker: this,
+          value: this.getColumnValue(0),
+          index: this.getColumnIndex(0)
+        });
+      } else {
+        this.$emit('change', {
+          picker: this,
+          value: this.getValues(),
+          index: event.currentTarget.dataset.index
+        });
+      }
+    },
+
+    // get column instance by index
+    getColumn(index: number) {
+      return this.children[index];
+    },
+
+    // get column value by index
+    getColumnValue(index: number) {
+      const column = this.getColumn(index);
+      return column && column.getValue();
+    },
+
+    // set column value by index
+    setColumnValue(index: number, value: any) {
+      const column = this.getColumn(index);
+      column && column.setValue(value);
+    },
+
+    // get column option index by column index
+    getColumnIndex(columnIndex: number) {
+      return (this.getColumn(columnIndex) || {}).data.currentIndex;
+    },
+
+    // set column option index by column index
+    setColumnIndex(columnIndex: number, optionIndex: number) {
+      const column = this.getColumn(columnIndex);
+      column && column.setIndex(optionIndex);
+    },
+
+    // get options of column by index
+    getColumnValues(index: number) {
+      return (this.children[index] || {}).data.options;
+    },
+
+    // set options of column by index
+    setColumnValues(index: number, options: any[]) {
+      const column = this.children[index];
+
+      if (
+        column &&
+        JSON.stringify(column.data.options) !== JSON.stringify(options)
+      ) {
+        column.set({ options }, () => {
+          column.setIndex(0);
+        });
+      }
+    },
+
+    // get values of all columns
+    getValues() {
+      return this.children.map((child: Weapp.Component) => child.getValue());
+    },
+
+    // set values of all columns
+    setValues(values: []) {
+      values.forEach((value, index) => {
+        this.setColumnValue(index, value);
+      });
+    },
+
+    // get indexes of all columns
+    getIndexes() {
+      return this.children.map((child: Weapp.Component) => child.data.currentIndex);
+    },
+
+    // set indexes of all columns
+    setIndexes(indexes: number[]) {
+      indexes.forEach((optionIndex, columnIndex) => {
+        this.setColumnIndex(columnIndex, optionIndex);
+      });
+    }
+  }
+});
diff --git a/packages/picker/index.wxml b/packages/picker/index.wxml
new file mode 100644
index 00000000..fa778f3c
--- /dev/null
+++ b/packages/picker/index.wxml
@@ -0,0 +1,41 @@
+<view class="van-picker custom-class">
+  <view
+    wx:if="{{ showToolbar }}"
+    class="van-picker__toolbar van-hairline--top-bottom toolbar-class"
+  >
+    <view class="van-picker__cancel" data-type="cancel" bindtap="emit">
+      {{ cancelButtonText || '取消' }}
+    </view>
+    <view wx:if="{{ title }}" class="van-picker__title van-ellipsis">{{ title }}</view>
+    <view class="van-picker__confirm" data-type="confirm" bindtap="emit">
+      {{ confirmButtonText || '确认' }}
+    </view>
+  </view>
+  <view wx:if="{{ loading }}" class="van-picker__loading">
+    <loading color="#1989fa"/>
+  </view>
+  <view
+    class="van-picker__columns"
+    style="height: {{ itemHeight * visibleItemCount }}px"
+    catch:touchmove="noop"
+  >
+    <picker-column
+      class="van-picker__column"
+      wx:for="{{ simple ? [columns] : columns }}"
+      wx:key="index"
+      data-index="{{ index }}"
+      custom-class="column-class"
+      value-key="{{ valueKey }}"
+      initial-options="{{ simple ? item : item.values }}"
+      default-index="{{ item.defaultIndex }}"
+      item-height="{{ itemHeight }}"
+      visible-item-count="{{ visibleItemCount }}"
+      active-class="active-class"
+      bind:change="onChange"
+    />
+    <view
+      class="van-picker__frame van-hairline--top-bottom"
+      style="height: {{ itemHeight }}px"
+    />
+  </view>
+</view>

From 5fe840ad2b4574d469228db70f801bd90df0e6cf Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 18 Dec 2018 14:01:25 +0800
Subject: [PATCH 28/31] =?UTF-8?q?[bugfix]=20Stepper:=20=E4=BF=AE=E5=A4=8Di?=
 =?UTF-8?q?Pad=E4=B8=8B=E6=88=96=E4=BF=AE=E6=94=B9input=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E6=97=B6=E8=BE=93=E5=85=A5=E6=A1=86=E6=A0=B7=E5=BC=8F=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=20(#1086)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/pages/stepper/index.wxss |  2 +-
 packages/stepper/index.less      | 41 +++++++++++++++++++-------------
 packages/stepper/index.ts        | 10 ++++++++
 packages/stepper/index.wxml      | 19 ++++++++-------
 4 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/example/pages/stepper/index.wxss b/example/pages/stepper/index.wxss
index 1f476854..27f2c4ac 100644
--- a/example/pages/stepper/index.wxss
+++ b/example/pages/stepper/index.wxss
@@ -1 +1 @@
-/* pages/stepper/index.wxss */
\ No newline at end of file
+/* pages/stepper/index.wxss */
diff --git a/packages/stepper/index.less b/packages/stepper/index.less
index dde4dbc8..1f352746 100644
--- a/packages/stepper/index.less
+++ b/packages/stepper/index.less
@@ -5,7 +5,7 @@
 
   &__minus,
   &__plus,
-  &__input {
+  &__input-wrapper {
     display: inline-block;
     vertical-align: middle;
     background-color: @white;
@@ -13,12 +13,12 @@
 
   &__minus,
   &__plus {
+    position: relative;
     width: 40px;
     height: 30px;
-    box-sizing: border-box;
-    border: 1px solid @border-color;
-    position: relative;
     padding: 5px;
+    border: 1px solid @border-color;
+    box-sizing: border-box;
 
     &::before {
       width: 9px;
@@ -32,14 +32,14 @@
 
     &::before,
     &::after {
-      content: '';
       position: absolute;
-      margin: auto;
       top: 0;
-      left: 0;
       right: 0;
       bottom: 0;
+      left: 0;
+      margin: auto;
       background-color: @gray-darker;
+      content: '';
     }
 
     &:active {
@@ -72,23 +72,32 @@
     border-radius: 0 2px 2px 0;
   }
 
-  &__input {
-    width: 33px;
-    height: 26px;
+  &__input-wrapper {
+    position: relative;
+    width: 35px;
+    height: 30px;
     padding: 1px;
-    min-height: 0; // reset wechat default min height
+    font-size: 14px;
+    color: @gray-darker;
+    text-align: center;
     border: 1px solid @border-color;
     border-width: 1px 0;
     border-radius: 0;
-    box-sizing: content-box;
-    color: @gray-darker;
-    font-size: 14px;
-    text-align: center;
-    -webkit-appearance: none;
+    box-sizing: border-box;
 
     &--disabled {
       color: @gray;
       background-color: @background-color;
     }
   }
+
+  &__input {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    width: 100%;
+    min-height: 0; // reset wechat default min height
+    transform: translate3d(-50%, -50%, 0);
+    appearance: none;
+  }
 }
diff --git a/packages/stepper/index.ts b/packages/stepper/index.ts
index 9b54fbae..27ee09e5 100644
--- a/packages/stepper/index.ts
+++ b/packages/stepper/index.ts
@@ -50,6 +50,10 @@ VantComponent({
     }
   },
 
+  data: {
+    focus: false
+  },
+
   created() {
     this.set({
       value: this.range(this.data.value)
@@ -57,6 +61,12 @@ VantComponent({
   },
 
   methods: {
+    onFocus() {
+      this.setData({
+        focus: true
+      });
+    },
+
     // limit value range
     range(value) {
       return Math.max(Math.min(this.data.max, value), this.data.min);
diff --git a/packages/stepper/index.wxml b/packages/stepper/index.wxml
index b7363152..b31068f4 100644
--- a/packages/stepper/index.wxml
+++ b/packages/stepper/index.wxml
@@ -3,14 +3,17 @@
     class="minus-class van-stepper__minus {{ minusDisabled ? 'van-stepper__minus--disabled' : '' }}"
     bind:tap="onMinus"
   />
-  <input
-    type="{{ integer ? 'number' : 'digit' }}"
-    class="input-class van-stepper__input {{ disabled || disableInput ? 'van-stepper__input--disabled' : '' }}"
-    value="{{ value }}"
-    disabled="{{ disabled || disableInput }}"
-    bindinput="onInput"
-    bind:blur="onBlur"
-  />
+  <view class="input-class van-stepper__input-wrapper {{ disabled || disableInput ? 'van-stepper__input-wrapper--disabled' : '' }}" bindtap="onFocus">
+    <input
+      type="{{ integer ? 'number' : 'digit' }}"
+      class="van-stepper__input"
+      value="{{ value }}"
+      focus="{{ focus }}"
+      disabled="{{ disabled || disableInput }}"
+      bindinput="onInput"
+      bind:blur="onBlur"
+    />
+  </view>
   <view
     class="plus-class van-stepper__plus {{ plusDisabled ? 'van-stepper__plus--disabled' : '' }}"
     bind:tap="onPlus"

From 41b11bc4545ac0f81dd400d3c7805e404ddab180 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 18 Dec 2018 14:02:34 +0800
Subject: [PATCH 29/31] [new feature] Card: update style (#1085)

---
 example/pages/card/index.wxml | 15 ++++++--
 example/pages/card/index.wxss |  4 +++
 packages/card/index.less      | 66 +++++++++++++++++++----------------
 packages/card/index.wxml      | 17 +++++----
 4 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/example/pages/card/index.wxml b/example/pages/card/index.wxml
index 25c2aae7..f1a583bb 100644
--- a/example/pages/card/index.wxml
+++ b/example/pages/card/index.wxml
@@ -9,6 +9,15 @@
     />
   </demo-block>
 
+  <demo-block title="没有商品图片">
+    <van-card
+      num="2"
+      price="2.00"
+      desc="描述信息"
+      title="商品标题"
+    />
+  </demo-block>
+
   <demo-block title="高级用法">
     <van-card
       num="2"
@@ -22,9 +31,9 @@
       <view slot="tags">
         <van-tag plain type="danger">满减</van-tag>
       </view>
-      <view slot="footer">
-        <van-button size="mini" custom-class="button">按钮</van-button>
-        <van-button size="mini">按钮</van-button>
+      <view slot="footer" class="van-card__footer">
+        <van-button size="mini" round custom-class="button">按钮</van-button>
+        <van-button size="mini" round>按钮</van-button>
       </view>
     </van-card>
   </demo-block>
diff --git a/example/pages/card/index.wxss b/example/pages/card/index.wxss
index f849019b..ed9b38f3 100644
--- a/example/pages/card/index.wxss
+++ b/example/pages/card/index.wxss
@@ -6,3 +6,7 @@
 .button {
   margin-right: 5px;
 }
+
+.van-card__footer {
+  margin-top: 5px;
+}
diff --git a/packages/card/index.less b/packages/card/index.less
index 5fc0024d..fd9eb73b 100644
--- a/packages/card/index.less
+++ b/packages/card/index.less
@@ -1,13 +1,14 @@
 @import '../common/style/var.less';
 
 .van-card {
-  box-sizing: border-box;
   position: relative;
-  height: 100px;
+  display: flex;
+  padding: 5px 15px;
   font-size: 12px;
   color: @text-color;
-  padding: 5px 15px 5px 115px;
   background: @background-color-light;
+  box-sizing: border-box;
+  flex-wrap: wrap;
 
   &--center {
     align-items: center;
@@ -15,11 +16,15 @@
   }
 
   &__thumb {
-    position: absolute;
-    top: 5px;
-    left: 15px;
+    position: relative;
     width: 90px;
     height: 90px;
+    margin-right: 10px;
+    flex: none;
+
+    &:empty {
+      display: none;
+    }
   }
 
   &__img {
@@ -27,49 +32,52 @@
     height: 100%;
   }
 
-  &,
   &__content {
-    display: flex;
-  }
-
-  &__content {
-    width: 100%;
+    position: relative;
+    height: 90px;
+    flex: 1;
   }
 
   &__title,
   &__desc {
-    line-height: 20px;
+    line-height: 17px;
     word-break: break-all;
   }
 
   &__title {
-    max-height: 40px;
+    max-height: 34px;
+    font-weight: bold;
   }
 
   &__desc {
-    max-height: 20px;
+    max-height: 17px;
     color: @gray-darker;
   }
 
-  &__left {
-    flex: 1;
-    min-width: 0; // hack for flex box ellipsis
+  &__bottom {
+    position: absolute;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    line-height: 17px;
   }
 
-  &__right {
-    flex: none;
-    padding-left: 10px;
-    line-height: 20px;
-    text-align: right;
+  &__price {
+    display: inline-block;
+    font-weight: bold;
+    color: @red;
   }
 
   &__origin-price {
+    display: inline-block;
+    margin-left: 5px;
+    font-size: 10px;
     color: @gray-darker;
     text-decoration: line-through;
   }
 
   &__num {
-    color: @gray-darker;
+    float: right;
   }
 
   &__tag {
@@ -79,12 +87,8 @@
   }
 
   &__footer {
-    position: absolute;
-    right: 15px;
-    bottom: 5px;
-
-    .van-button {
-      margin-left: 5px;
-    }
+    width: 100%;
+    text-align: right;
+    flex: none;
   }
 }
diff --git a/packages/card/index.wxml b/packages/card/index.wxml
index a5869519..a8416056 100644
--- a/packages/card/index.wxml
+++ b/packages/card/index.wxml
@@ -7,7 +7,7 @@
       lazy-load="{{ lazyLoad }}"
       class="van-card__img thumb-class"
     />
-    <slot wx:else name="thumb" />
+    <slot name="thumb" />
     <van-tag
       wx:if="{{ tag }}"
       mark
@@ -19,16 +19,15 @@
   </view>
 
   <view class="van-card__content">
-    <view class="van-card__left">
-      <view wx:if="{{ title }}" class="van-card__title van-multi-ellipsis--l2 title-class">{{ title }}</view>
-      <slot wx:else name="title" />
+    <view wx:if="{{ title }}" class="van-card__title van-multi-ellipsis--l2 title-class">{{ title }}</view>
+    <slot wx:else name="title" />
 
-      <view wx:if="{{ desc }}" class="van-card__desc van-ellipsis desc-class">{{ desc }}</view>
-      <slot wx:else name="desc" />
+    <view wx:if="{{ desc }}" class="van-card__desc van-ellipsis desc-class">{{ desc }}</view>
+    <slot wx:else name="desc" />
 
-      <slot name="tags" />
-    </view>
-    <view class="van-card__right">
+    <slot name="tags" />
+
+    <view class="van-card__bottom">
       <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }} {{ price }}</view>
       <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
       <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>

From 5aacd6ca1ba5688241043c121567810a298313bd Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 18 Dec 2018 16:36:10 +0800
Subject: [PATCH 30/31] =?UTF-8?q?[new=20feature]=20TreeSelect:=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=A0=B7=E5=BC=8F=E3=80=81=E6=94=AF=E6=8C=81=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E7=A6=81=E7=94=A8=E3=80=81=E5=A2=9E=E5=8A=A0=E5=A4=96?=
 =?UTF-8?q?=E9=83=A8=E6=A0=B7=E5=BC=8F=E7=B1=BB=20(#1084)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/pages/tree-select/config.js  |  8 +++++
 example/pages/tree-select/index.js   |  4 +++
 example/pages/tree-select/index.wxml |  1 +
 example/pages/tree-select/index.wxss |  2 +-
 packages/tree-select/README.md       | 13 +++++++
 packages/tree-select/index.json      |  3 +-
 packages/tree-select/index.less      | 53 ++++++++++++++++++----------
 packages/tree-select/index.ts        | 17 +++++++--
 packages/tree-select/index.wxml      |  9 +++--
 packages/wxs/memoize.wxs             |  8 +++--
 10 files changed, 89 insertions(+), 29 deletions(-)

diff --git a/example/pages/tree-select/config.js b/example/pages/tree-select/config.js
index 6e1e80ab..7ea405b4 100644
--- a/example/pages/tree-select/config.js
+++ b/example/pages/tree-select/config.js
@@ -27,5 +27,13 @@ export default {
   }, {
     text: '苏州',
     id: 8
+  }],
+  pro3Name: '福建',
+  pro3: [{
+    text: '泉州',
+    id: 9
+  }, {
+    text: '厦门',
+    id: 10
   }]
 };
diff --git a/example/pages/tree-select/index.js b/example/pages/tree-select/index.js
index e4d8e547..4b0e49ca 100644
--- a/example/pages/tree-select/index.js
+++ b/example/pages/tree-select/index.js
@@ -17,6 +17,10 @@ Page({
       }, {
         text: config.pro2Name,
         children: config.pro2
+      }, {
+        text: config.pro3Name,
+        disabled: true,
+        children: config.pro3
       }
     ],
     mainActiveIndex: 0,
diff --git a/example/pages/tree-select/index.wxml b/example/pages/tree-select/index.wxml
index d1754047..ab6cb2fc 100644
--- a/example/pages/tree-select/index.wxml
+++ b/example/pages/tree-select/index.wxml
@@ -5,5 +5,6 @@
     active-id="{{ activeId }}"
     bind:click-item="onClickItem"
     bind:click-nav="onClickNav"
+    content-item-class="content-item-class"
   ></van-tree-select>
 </demo-block>
diff --git a/example/pages/tree-select/index.wxss b/example/pages/tree-select/index.wxss
index a05c6e76..d57997ae 100644
--- a/example/pages/tree-select/index.wxss
+++ b/example/pages/tree-select/index.wxss
@@ -1 +1 @@
-/* pages/tree-select/index.wxss */
\ No newline at end of file
+/* pages/tree-select/index.wxss */
diff --git a/packages/tree-select/README.md b/packages/tree-select/README.md
index 0cb329bf..13b3e344 100644
--- a/packages/tree-select/README.md
+++ b/packages/tree-select/README.md
@@ -67,6 +67,8 @@ Page({
   {
     // 导航名称
     text: '所有城市',
+    // 禁用选项
+    disabled: false,
     // 该导航下所有的可选项
     children: [
       {
@@ -86,6 +88,17 @@ Page({
 ]
 ```
 
+### 外部样式类
+
+| 类名 | 说明 |
+|-----------|-----------|
+| main-item-class | 左侧选项样式类 |
+| content-item-class | 右侧选项样式类 |
+| main-active-class | 左侧选项选中样式类 |
+| content-active-class | 右侧选项选中样式类 |
+| main-disabled-class | 左侧选项禁用样式类 |
+| content-disabled-class | 右侧选项禁用样式类 |
+
 ### 更新日志
 
 | 版本 | 类型 | 内容 |
diff --git a/packages/tree-select/index.json b/packages/tree-select/index.json
index 0a336c08..d2a8d90e 100644
--- a/packages/tree-select/index.json
+++ b/packages/tree-select/index.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index"
+    "van-icon": "../icon/index",
+    "van-cell": "../cell/index"
   }
 }
diff --git a/packages/tree-select/index.less b/packages/tree-select/index.less
index 236798cb..b34ac270 100644
--- a/packages/tree-select/index.less
+++ b/packages/tree-select/index.less
@@ -1,46 +1,62 @@
 @import '../common/style/var.less';
 
 .van-tree-select {
-  user-select: none;
   position: relative;
-  font-size: 16px;
+  font-size: 14px;
+  user-select: none;
 
   &__nav {
-    width: 35%;
     position: absolute;
-    left: 0;
     top: 0;
     bottom: 0;
-    background-color: @white;
+    left: 0;
+    width: 35%;
+    min-width: 120px;
+    background-color: @background-color-light;
   }
 
   &__nitem {
+    position: relative;
+    padding: 0 9px 0 15px;
     line-height: 44px;
-    padding: 0 15px;
-    background-color: @white;
 
-    &:active,
-    &--active {
-      background-color: @background-color;
+    &:active::after,
+    &--active::after {
+      position: absolute;
+      top: 0;
+      bottom: 0;
+      left: 0;
+      width: 3.6px;
+      background-color: @red;
+      content: '';
     }
 
     &--active {
-      font-weight: 500;
+      font-weight: bold;
+      background-color: @white;
+    }
+
+    &--disabled {
+      color: @gray-dark;
+    }
+
+    &--disabled:active::after {
+      display: none;
     }
   }
 
   &__content {
     width: 65%;
-    padding: 0 15px;
+    padding-left: 15px;
     margin-left: 35%;
+    background-color: @white;
     box-sizing: border-box;
   }
 
   &__item {
     position: relative;
+    font-weight: bold;
     line-height: 44px;
-    padding-left: 5px;
-    padding-right: 18px;
 
     &:active,
     &--active {
@@ -49,16 +65,17 @@
 
     &--disabled,
     &--disabled:active {
-      color: @gray;
+      color: @gray-dark;
     }
   }
 
   &__selected {
-    float: right;
     position: absolute;
-    right: 0;
     top: 0;
+    right: 15px;
     bottom: 0;
-    line-height: inherit;
+    height: 24px;
+    margin: auto 0;
+    line-height: 24px;
   }
 }
diff --git a/packages/tree-select/index.ts b/packages/tree-select/index.ts
index 7f186b63..8b5c97f1 100644
--- a/packages/tree-select/index.ts
+++ b/packages/tree-select/index.ts
@@ -3,6 +3,15 @@ import { VantComponent } from '../common/component';
 const ITEM_HEIGHT = 44;
 
 VantComponent({
+  classes: [
+    'main-item-class',
+    'content-item-class',
+    'main-active-class',
+    'content-active-class',
+    'main-disabled-class',
+    'content-disabled-class'
+  ],
+
   props: {
     items: Array,
     mainActiveIndex: {
@@ -10,8 +19,7 @@ VantComponent({
       value: 0
     },
     activeId: {
-      type: Number,
-      value: 0
+      type: [Number, String]
     },
     maxHeight: {
       type: Number,
@@ -51,7 +59,10 @@ VantComponent({
     // 当一个导航被点击时
     onClickNav(event: Weapp.Event) {
       const { index } = event.currentTarget.dataset;
-      this.$emit('click-nav', { index });
+      const item = this.data.items[index];
+      if (!item.disabled) {
+        this.$emit('click-nav', { index });
+      }
     },
 
     // 更新子项列表
diff --git a/packages/tree-select/index.wxml b/packages/tree-select/index.wxml
index 8260da0b..124d5d6a 100644
--- a/packages/tree-select/index.wxml
+++ b/packages/tree-select/index.wxml
@@ -1,3 +1,5 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
   class="van-tree-select"
   style="height: {{ mainHeight }}px"
@@ -6,7 +8,7 @@
     <view
       wx:for="{{ items }}"
       wx:key="index"
-      class="van-tree-select__nitem van-ellipsis {{ mainActiveIndex === index ? 'van-tree-select__nitem--active' : '' }}"
+      class="van-ellipsis main-item-class {{ utils.bem('tree-select__nitem', { active: mainActiveIndex === index, disabled: item.disabled }) }} {{ mainActiveIndex === index ? 'main-active-class' : '' }} {{ item.disabled ? 'main-disabled-class' : '' }}"
       data-index="{{ index }}"
       bind:tap="onClickNav"
     >
@@ -21,14 +23,15 @@
     <view
       wx:for="{{ subItems }}"
       wx:key="item.id"
-      class="van-tree-select__item van-ellipsis {{ activeId === item.id ? 'van-tree-select__item--active' : '' }} {{ item.disabled ? 'van-tree-select__item--disabled' : '' }}"
+      class="van-ellipsis van-hairline--bottom content-item-class {{ utils.bem('tree-select__item', { active: activeId === item.id, disabled: item.disabled }) }} {{ activeId === item.id ? 'content-active-class' : '' }} {{ item.disabled ? 'content-disabled-class' : '' }}"
       data-item="{{ item }}"
       bind:tap="onSelectItem"
     >
       {{ item.text }}
       <van-icon
         wx:if="{{ activeId === item.id }}"
-        name="success"
+        name="checked"
+        size="16px"
         class="van-tree-select__selected"
       />
     </view>
diff --git a/packages/wxs/memoize.wxs b/packages/wxs/memoize.wxs
index 3e624274..261ae67d 100644
--- a/packages/wxs/memoize.wxs
+++ b/packages/wxs/memoize.wxs
@@ -31,8 +31,11 @@ function serializer(args) {
   if (args.length === 1 && isPrimitive(args[0])) {
     return args[0];
   }
-
-  return JSON.stringify(args.length === 1 ? args[0] : args);
+  var obj = {};
+  for (var i = 0; i < args.length; i++) {
+    obj['key' + i] = args[i];
+  }
+  return JSON.stringify(obj);
 }
 
 function memoize(fn) {
@@ -40,7 +43,6 @@ function memoize(fn) {
 
   return function() {
     var key = serializer(arguments);
-
     if (cache[key] === undefined) {
       cache[key] = call(fn, arguments);
     }

From a1b87f510f92f8a38eca8e08873126499195c2a8 Mon Sep 17 00:00:00 2001
From: Tony <luozhuming@gmail.com>
Date: Tue, 18 Dec 2018 16:45:04 +0800
Subject: [PATCH 31/31] [bugfix] Collapse: fix collapse-item height error when
 set content async (#1094)

fix #1074
---
 packages/collapse-item/index.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/collapse-item/index.ts b/packages/collapse-item/index.ts
index af70c961..55394096 100644
--- a/packages/collapse-item/index.ts
+++ b/packages/collapse-item/index.ts
@@ -58,11 +58,9 @@ VantComponent({
 
     updateStyle(expanded) {
       if (expanded) {
-        this.getRect('.van-collapse-item__content').then(res => {
-          this.set({
-            contentHeight: res.height ? res.height + 'px' : null
+        this.set({
+            contentHeight: 'auto'
           });
-        });
       } else {
         this.set({
           contentHeight: 0