diff --git a/dist/button/index.js b/dist/button/index.js
index 0fb37987..d94def85 100644
--- a/dist/button/index.js
+++ b/dist/button/index.js
@@ -5,6 +5,7 @@ VantComponent({
     mixins: [button, openType],
     classes: ['hover-class', 'loading-class'],
     props: {
+        icon: String,
         plain: Boolean,
         block: Boolean,
         round: Boolean,
diff --git a/dist/button/index.json b/dist/button/index.json
index cae21702..e00a5887 100644
--- a/dist/button/index.json
+++ b/dist/button/index.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
+    "van-icon": "../icon/index",
     "van-loading": "../loading/index"
   }
-}
\ No newline at end of file
+}
diff --git a/dist/button/index.wxml b/dist/button/index.wxml
index 0b0763ad..6b3cf016 100644
--- a/dist/button/index.wxml
+++ b/dist/button/index.wxml
@@ -35,5 +35,16 @@
       {{ loadingText }}
     </view>
   </block>
-  <slot wx:else />
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
 </button>
diff --git a/dist/button/index.wxss b/dist/button/index.wxss
index e6da32d8..72a10e78 100644
--- a/dist/button/index.wxss
+++ b/dist/button/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:" ";opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#07c160;border:1px solid #07c160}.van-button--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#07c160}.van-button--plain.van-button--info{color:#1989fa}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;min-width:60px;padding:0 8px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;font-size:10px;line-height:20px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:block;width:100%}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:" ";opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#07c160;border:1px solid #07c160}.van-button--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#07c160}.van-button--plain.van-button--info{color:#1989fa}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;min-width:60px;padding:0 8px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;font-size:10px;line-height:20px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:block;width:100%}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}.van-button__text{display:inline}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}.van-button__icon{min-width:1em;line-height:inherit!important;vertical-align:top}.van-button__icon+.van-button__text:not(:empty){display:inline-block;margin-left:5px;vertical-align:top}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}
\ No newline at end of file
diff --git a/dist/checkbox-group/index.json b/dist/checkbox-group/index.json
index 0a336c08..467ce294 100644
--- a/dist/checkbox-group/index.json
+++ b/dist/checkbox-group/index.json
@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }
diff --git a/dist/collapse-item/index.js b/dist/collapse-item/index.js
index 592dfbb9..596350ea 100644
--- a/dist/collapse-item/index.js
+++ b/dist/collapse-item/index.js
@@ -35,7 +35,11 @@ VantComponent({
         this.updateExpanded()
             .then(nextTick)
             .then(() => {
-            this.set({ transition: true });
+            const data = { transition: true };
+            if (this.data.expanded) {
+                data.contentHeight = 'auto';
+            }
+            this.set(data);
         });
     },
     methods: {
diff --git a/dist/dialog/dialog.js b/dist/dialog/dialog.js
index 875701ef..51902e6c 100644
--- a/dist/dialog/dialog.js
+++ b/dist/dialog/dialog.js
@@ -8,6 +8,7 @@ const Dialog = options => {
     return new Promise((resolve, reject) => {
         const context = options.context || getContext();
         const dialog = context.selectComponent(options.selector);
+        delete options.context;
         delete options.selector;
         if (dialog) {
             dialog.set(Object.assign({ onCancel: reject, onConfirm: resolve }, options));
diff --git a/dist/field/index.js b/dist/field/index.js
index a346cd84..eb553df3 100644
--- a/dist/field/index.js
+++ b/dist/field/index.js
@@ -21,7 +21,6 @@ VantComponent({
         iconClass: String,
         clearable: Boolean,
         inputAlign: String,
-        customClass: String,
         customStyle: String,
         confirmType: String,
         confirmHold: Boolean,
diff --git a/dist/field/index.wxss b/dist/field/index.wxss
index bcce1735..c4eade8a 100644
--- a/dist/field/index.wxss
+++ b/dist/field/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
\ No newline at end of file
+@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--error{color:#f44}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
\ No newline at end of file
diff --git a/dist/icon/index.wxml b/dist/icon/index.wxml
index bfbb57cd..3c1bbad0 100644
--- a/dist/icon/index.wxml
+++ b/dist/icon/index.wxml
@@ -13,6 +13,7 @@
   <image
     wx:if="{{ utils.isSrc(name) }}"
     src="{{ name }}"
+    mode="aspectFit"
     class="van-icon__image"
   />
 </view>
diff --git a/dist/icon/index.wxss b/dist/icon/index.wxss
index ee1e1a5d..7a4c0f08 100644
--- a/dist/icon/index.wxss
+++ b/dist/icon/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';@font-face{font-style:normal;font-weight:400;font-family:vant-icon;src:url(https://img.yzcdn.cn/vant/vant-icon-c2acf5.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-c2acf5.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-c2acf5.ttf) format("truetype")}.van-icon{position:relative;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.van-icon,.van-icon:before{display:inline-block}.van-icon-add-o:before{content:"\F000"}.van-icon-add-square:before{content:"\F001"}.van-icon-add:before{content:"\F002"}.van-icon-after-sale:before{content:"\F003"}.van-icon-aim:before{content:"\F004"}.van-icon-alipay:before{content:"\F005"}.van-icon-apps-o:before{content:"\F006"}.van-icon-arrow-down:before{content:"\F007"}.van-icon-arrow-left:before{content:"\F008"}.van-icon-arrow-up:before{content:"\F009"}.van-icon-arrow:before{content:"\F00A"}.van-icon-ascending:before{content:"\F00B"}.van-icon-audio:before{content:"\F00C"}.van-icon-award-o:before{content:"\F00D"}.van-icon-award:before{content:"\F00E"}.van-icon-bag-o:before{content:"\F00F"}.van-icon-bag:before{content:"\F010"}.van-icon-balance-list-o:before{content:"\F011"}.van-icon-balance-list:before{content:"\F012"}.van-icon-balance-o:before{content:"\F013"}.van-icon-balance-pay:before{content:"\F014"}.van-icon-bar-chart-o:before{content:"\F015"}.van-icon-bars:before{content:"\F016"}.van-icon-bell:before{content:"\F017"}.van-icon-bill-o:before{content:"\F018"}.van-icon-bill:before{content:"\F019"}.van-icon-birthday-cake-o:before{content:"\F01A"}.van-icon-bookmark-o:before{content:"\F01B"}.van-icon-bookmark:before{content:"\F01C"}.van-icon-browsing-history-o:before{content:"\F01D"}.van-icon-browsing-history:before{content:"\F01E"}.van-icon-brush-o:before{content:"\F01F"}.van-icon-bulb-o:before{content:"\F020"}.van-icon-bullhorn-o:before{content:"\F021"}.van-icon-calender-o:before{content:"\F022"}.van-icon-card:before{content:"\F023"}.van-icon-cart-circle-o:before{content:"\F024"}.van-icon-cart-circle:before{content:"\F025"}.van-icon-cart-o:before{content:"\F026"}.van-icon-cart:before{content:"\F027"}.van-icon-cash-back-record:before{content:"\F028"}.van-icon-cash-on-deliver:before{content:"\F029"}.van-icon-cashier-o:before{content:"\F02A"}.van-icon-certificate:before{content:"\F02B"}.van-icon-chart-trending-o:before{content:"\F02C"}.van-icon-chat-o:before{content:"\F02D"}.van-icon-chat:before{content:"\F02E"}.van-icon-checked:before{content:"\F02F"}.van-icon-circle:before{content:"\F030"}.van-icon-clear:before{content:"\F031"}.van-icon-clock-o:before{content:"\F032"}.van-icon-clock:before{content:"\F033"}.van-icon-close:before{content:"\F034"}.van-icon-closed-eye:before{content:"\F035"}.van-icon-cluster-o:before{content:"\F036"}.van-icon-cluster:before{content:"\F037"}.van-icon-column:before{content:"\F038"}.van-icon-comment-circle-o:before{content:"\F039"}.van-icon-comment-o:before{content:"\F03A"}.van-icon-comment:before{content:"\F03B"}.van-icon-completed:before{content:"\F03C"}.van-icon-contact:before{content:"\F03D"}.van-icon-coupon-o:before{content:"\F03E"}.van-icon-coupon:before{content:"\F03F"}.van-icon-credit-pay:before{content:"\F040"}.van-icon-cross:before{content:"\F041"}.van-icon-debit-pay:before{content:"\F042"}.van-icon-delete:before{content:"\F043"}.van-icon-descending:before{content:"\F044"}.van-icon-description:before{content:"\F045"}.van-icon-desktop-o:before{content:"\F046"}.van-icon-diamond-o:before{content:"\F047"}.van-icon-diamond:before{content:"\F048"}.van-icon-discount:before{content:"\F049"}.van-icon-ecard-pay:before{content:"\F04A"}.van-icon-edit:before{content:"\F04B"}.van-icon-ellipsis:before{content:"\F04C"}.van-icon-empty:before{content:"\F04D"}.van-icon-envelop-o:before{content:"\F04E"}.van-icon-exchange:before{content:"\F04F"}.van-icon-expand-o:before{content:"\F050"}.van-icon-expand:before{content:"\F051"}.van-icon-eye-o:before{content:"\F052"}.van-icon-eye:before{content:"\F053"}.van-icon-fail:before{content:"\F054"}.van-icon-failure:before{content:"\F055"}.van-icon-filter-o:before{content:"\F056"}.van-icon-fire-o:before{content:"\F057"}.van-icon-fire:before{content:"\F058"}.van-icon-flag-o:before{content:"\F059"}.van-icon-flower-o:before{content:"\F05A"}.van-icon-free-postage:before{content:"\F05B"}.van-icon-friends-o:before{content:"\F05C"}.van-icon-friends:before{content:"\F05D"}.van-icon-gem-o:before{content:"\F05E"}.van-icon-gem:before{content:"\F05F"}.van-icon-gift-card-o:before{content:"\F060"}.van-icon-gift-card:before{content:"\F061"}.van-icon-gift-o:before{content:"\F062"}.van-icon-gift:before{content:"\F063"}.van-icon-gold-coin-o:before{content:"\F064"}.van-icon-gold-coin:before{content:"\F065"}.van-icon-goods-collect-o:before{content:"\F066"}.van-icon-goods-collect:before{content:"\F067"}.van-icon-graphic:before{content:"\F068"}.van-icon-home-o:before{content:"\F069"}.van-icon-hot-o:before{content:"\F06A"}.van-icon-hot-sale-o:before{content:"\F06B"}.van-icon-hot-sale:before{content:"\F06C"}.van-icon-hot:before{content:"\F06D"}.van-icon-hotel-o:before{content:"\F06E"}.van-icon-idcard:before{content:"\F06F"}.van-icon-info-o:before{content:"\F070"}.van-icon-info:before{content:"\F071"}.van-icon-invition:before{content:"\F072"}.van-icon-label-o:before{content:"\F073"}.van-icon-label:before{content:"\F074"}.van-icon-like-o:before{content:"\F075"}.van-icon-like:before{content:"\F076"}.van-icon-live:before{content:"\F077"}.van-icon-location-o:before{content:"\F078"}.van-icon-location:before{content:"\F079"}.van-icon-lock:before{content:"\F07A"}.van-icon-logistics:before{content:"\F07B"}.van-icon-manager-o:before{content:"\F07C"}.van-icon-manager:before{content:"\F07D"}.van-icon-map-marked:before{content:"\F07E"}.van-icon-medel-o:before{content:"\F07F"}.van-icon-medel:before{content:"\F080"}.van-icon-more-o:before{content:"\F081"}.van-icon-more:before{content:"\F082"}.van-icon-music-o:before{content:"\F083"}.van-icon-new-arrival-o:before{content:"\F084"}.van-icon-new-arrival:before{content:"\F085"}.van-icon-new-o:before{content:"\F086"}.van-icon-new:before{content:"\F087"}.van-icon-newspaper-o:before{content:"\F088"}.van-icon-notes-o:before{content:"\F089"}.van-icon-orders-o:before{content:"\F08A"}.van-icon-other-pay:before{content:"\F08B"}.van-icon-paid:before{content:"\F08C"}.van-icon-passed:before{content:"\F08D"}.van-icon-pause-circle-o:before{content:"\F08E"}.van-icon-pause-circle:before{content:"\F08F"}.van-icon-pause:before{content:"\F090"}.van-icon-peer-pay:before{content:"\F091"}.van-icon-pending-payment:before{content:"\F092"}.van-icon-phone-circle-o:before{content:"\F093"}.van-icon-phone-o:before{content:"\F094"}.van-icon-phone:before{content:"\F095"}.van-icon-photo-o:before{content:"\F096"}.van-icon-photo:before{content:"\F097"}.van-icon-photograph:before{content:"\F098"}.van-icon-play-circle-o:before{content:"\F099"}.van-icon-play-circle:before{content:"\F09A"}.van-icon-play:before{content:"\F09B"}.van-icon-plus:before{content:"\F09C"}.van-icon-point-gift-o:before{content:"\F09D"}.van-icon-point-gift:before{content:"\F09E"}.van-icon-points:before{content:"\F09F"}.van-icon-printer:before{content:"\F0A0"}.van-icon-qr-invalid:before{content:"\F0A1"}.van-icon-qr:before{content:"\F0A2"}.van-icon-question-o:before{content:"\F0A3"}.van-icon-question:before{content:"\F0A4"}.van-icon-records:before{content:"\F0A5"}.van-icon-refund-o:before{content:"\F0A6"}.van-icon-replay:before{content:"\F0A7"}.van-icon-scan:before{content:"\F0A8"}.van-icon-search:before{content:"\F0A9"}.van-icon-send-gift-o:before{content:"\F0AA"}.van-icon-send-gift:before{content:"\F0AB"}.van-icon-service-o:before{content:"\F0AC"}.van-icon-service:before{content:"\F0AD"}.van-icon-setting-o:before{content:"\F0AE"}.van-icon-setting:before{content:"\F0AF"}.van-icon-share:before{content:"\F0B0"}.van-icon-shop-collect-o:before{content:"\F0B1"}.van-icon-shop-collect:before{content:"\F0B2"}.van-icon-shop-o:before{content:"\F0B3"}.van-icon-shop:before{content:"\F0B4"}.van-icon-shopping-cart-o:before{content:"\F0B5"}.van-icon-shopping-cart:before{content:"\F0B6"}.van-icon-shrink:before{content:"\F0B7"}.van-icon-sign:before{content:"\F0B8"}.van-icon-smile-comment-o:before{content:"\F0B9"}.van-icon-smile-comment:before{content:"\F0BA"}.van-icon-smile-o:before{content:"\F0BB"}.van-icon-star-o:before{content:"\F0BC"}.van-icon-star:before{content:"\F0BD"}.van-icon-stop-circle-o:before{content:"\F0BE"}.van-icon-stop-circle:before{content:"\F0BF"}.van-icon-stop:before{content:"\F0C0"}.van-icon-success:before{content:"\F0C1"}.van-icon-thumb-circle-o:before{content:"\F0C2"}.van-icon-todo-list-o:before{content:"\F0C3"}.van-icon-todo-list:before{content:"\F0C4"}.van-icon-tosend:before{content:"\F0C5"}.van-icon-tv-o:before{content:"\F0C6"}.van-icon-umbrella-circle:before{content:"\F0C7"}.van-icon-underway-o:before{content:"\F0C8"}.van-icon-underway:before{content:"\F0C9"}.van-icon-upgrade:before{content:"\F0CA"}.van-icon-user-circle-o:before{content:"\F0CB"}.van-icon-user-o:before{content:"\F0CC"}.van-icon-video-o:before{content:"\F0CD"}.van-icon-video:before{content:"\F0CE"}.van-icon-vip-card-o:before{content:"\F0CF"}.van-icon-vip-card:before{content:"\F0D0"}.van-icon-volume-o:before{content:"\F0D1"}.van-icon-volume:before{content:"\F0D2"}.van-icon-wap-home:before{content:"\F0D3"}.van-icon-wap-nav:before{content:"\F0D4"}.van-icon-warn-o:before{content:"\F0D5"}.van-icon-warning-o:before{content:"\F0D6"}.van-icon-weapp-nav:before{content:"\F0D7"}.van-icon-wechat:before{content:"\F0D8"}.van-icon-youzan-shield:before{content:"\F0D9"}.van-icon--image{width:1em;height:1em}.van-icon__image{position:absolute;top:0;right:0;bottom:0;left:0;max-width:100%;max-height:100%;margin:auto}.van-icon__info{z-index:1}
\ No newline at end of file
+@import '../common/index.wxss';@font-face{font-style:normal;font-weight:400;font-family:vant-icon;src:url(https://img.yzcdn.cn/vant/vant-icon-6f9881.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-6f9881.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-6f9881.ttf) format("truetype")}.van-icon{position:relative;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.van-icon,.van-icon:before{display:inline-block}.van-icon-add-o:before{content:"\F000"}.van-icon-add-square:before{content:"\F001"}.van-icon-add:before{content:"\F002"}.van-icon-after-sale:before{content:"\F003"}.van-icon-aim:before{content:"\F004"}.van-icon-alipay:before{content:"\F005"}.van-icon-apps-o:before{content:"\F006"}.van-icon-arrow-down:before{content:"\F007"}.van-icon-arrow-left:before{content:"\F008"}.van-icon-arrow-up:before{content:"\F009"}.van-icon-arrow:before{content:"\F00A"}.van-icon-ascending:before{content:"\F00B"}.van-icon-audio:before{content:"\F00C"}.van-icon-award-o:before{content:"\F00D"}.van-icon-award:before{content:"\F00E"}.van-icon-bag-o:before{content:"\F00F"}.van-icon-bag:before{content:"\F010"}.van-icon-balance-list-o:before{content:"\F011"}.van-icon-balance-list:before{content:"\F012"}.van-icon-balance-o:before{content:"\F013"}.van-icon-balance-pay:before{content:"\F014"}.van-icon-bar-chart-o:before{content:"\F015"}.van-icon-bars:before{content:"\F016"}.van-icon-bell:before{content:"\F017"}.van-icon-bill-o:before{content:"\F018"}.van-icon-bill:before{content:"\F019"}.van-icon-birthday-cake-o:before{content:"\F01A"}.van-icon-bookmark-o:before{content:"\F01B"}.van-icon-bookmark:before{content:"\F01C"}.van-icon-browsing-history-o:before{content:"\F01D"}.van-icon-browsing-history:before{content:"\F01E"}.van-icon-brush-o:before{content:"\F01F"}.van-icon-bulb-o:before{content:"\F020"}.van-icon-bullhorn-o:before{content:"\F021"}.van-icon-calender-o:before{content:"\F022"}.van-icon-card:before{content:"\F023"}.van-icon-cart-circle-o:before{content:"\F024"}.van-icon-cart-circle:before{content:"\F025"}.van-icon-cart-o:before{content:"\F026"}.van-icon-cart:before{content:"\F027"}.van-icon-cash-back-record:before{content:"\F028"}.van-icon-cash-on-deliver:before{content:"\F029"}.van-icon-cashier-o:before{content:"\F02A"}.van-icon-certificate:before{content:"\F02B"}.van-icon-chart-trending-o:before{content:"\F02C"}.van-icon-chat-o:before{content:"\F02D"}.van-icon-chat:before{content:"\F02E"}.van-icon-checked:before{content:"\F02F"}.van-icon-circle:before{content:"\F030"}.van-icon-clear:before{content:"\F031"}.van-icon-clock-o:before{content:"\F032"}.van-icon-clock:before{content:"\F033"}.van-icon-close:before{content:"\F034"}.van-icon-closed-eye:before{content:"\F035"}.van-icon-cluster-o:before{content:"\F036"}.van-icon-cluster:before{content:"\F037"}.van-icon-column:before{content:"\F038"}.van-icon-comment-circle-o:before{content:"\F039"}.van-icon-comment-circle:before{content:"\F03A"}.van-icon-comment-o:before{content:"\F03B"}.van-icon-comment:before{content:"\F03C"}.van-icon-completed:before{content:"\F03D"}.van-icon-contact:before{content:"\F03E"}.van-icon-coupon-o:before{content:"\F03F"}.van-icon-coupon:before{content:"\F040"}.van-icon-credit-pay:before{content:"\F041"}.van-icon-cross:before{content:"\F042"}.van-icon-debit-pay:before{content:"\F043"}.van-icon-delete:before{content:"\F044"}.van-icon-descending:before{content:"\F045"}.van-icon-description:before{content:"\F046"}.van-icon-desktop-o:before{content:"\F047"}.van-icon-diamond-o:before{content:"\F048"}.van-icon-diamond:before{content:"\F049"}.van-icon-discount:before{content:"\F04A"}.van-icon-ecard-pay:before{content:"\F04B"}.van-icon-edit:before{content:"\F04C"}.van-icon-ellipsis:before{content:"\F04D"}.van-icon-empty:before{content:"\F04E"}.van-icon-envelop-o:before{content:"\F04F"}.van-icon-exchange:before{content:"\F050"}.van-icon-expand-o:before{content:"\F051"}.van-icon-expand:before{content:"\F052"}.van-icon-eye-o:before{content:"\F053"}.van-icon-eye:before{content:"\F054"}.van-icon-fail:before{content:"\F055"}.van-icon-failure:before{content:"\F056"}.van-icon-filter-o:before{content:"\F057"}.van-icon-fire-o:before{content:"\F058"}.van-icon-fire:before{content:"\F059"}.van-icon-flag-o:before{content:"\F05A"}.van-icon-flower-o:before{content:"\F05B"}.van-icon-free-postage:before{content:"\F05C"}.van-icon-friends-o:before{content:"\F05D"}.van-icon-friends:before{content:"\F05E"}.van-icon-gem-o:before{content:"\F05F"}.van-icon-gem:before{content:"\F060"}.van-icon-gift-card-o:before{content:"\F061"}.van-icon-gift-card:before{content:"\F062"}.van-icon-gift-o:before{content:"\F063"}.van-icon-gift:before{content:"\F064"}.van-icon-gold-coin-o:before{content:"\F065"}.van-icon-gold-coin:before{content:"\F066"}.van-icon-good-job-o:before{content:"\F067"}.van-icon-good-job:before{content:"\F068"}.van-icon-goods-collect-o:before{content:"\F069"}.van-icon-goods-collect:before{content:"\F06A"}.van-icon-graphic:before{content:"\F06B"}.van-icon-home-o:before{content:"\F06C"}.van-icon-hot-o:before{content:"\F06D"}.van-icon-hot-sale-o:before{content:"\F06E"}.van-icon-hot-sale:before{content:"\F06F"}.van-icon-hot:before{content:"\F070"}.van-icon-hotel-o:before{content:"\F071"}.van-icon-idcard:before{content:"\F072"}.van-icon-info-o:before{content:"\F073"}.van-icon-info:before{content:"\F074"}.van-icon-invition:before{content:"\F075"}.van-icon-label-o:before{content:"\F076"}.van-icon-label:before{content:"\F077"}.van-icon-like-o:before{content:"\F078"}.van-icon-like:before{content:"\F079"}.van-icon-live:before{content:"\F07A"}.van-icon-location-o:before{content:"\F07B"}.van-icon-location:before{content:"\F07C"}.van-icon-lock:before{content:"\F07D"}.van-icon-logistics:before{content:"\F07E"}.van-icon-manager-o:before{content:"\F07F"}.van-icon-manager:before{content:"\F080"}.van-icon-map-marked:before{content:"\F081"}.van-icon-medel-o:before{content:"\F082"}.van-icon-medel:before{content:"\F083"}.van-icon-more-o:before{content:"\F084"}.van-icon-more:before{content:"\F085"}.van-icon-music-o:before{content:"\F086"}.van-icon-music:before{content:"\F087"}.van-icon-new-arrival-o:before{content:"\F088"}.van-icon-new-arrival:before{content:"\F089"}.van-icon-new-o:before{content:"\F08A"}.van-icon-new:before{content:"\F08B"}.van-icon-newspaper-o:before{content:"\F08C"}.van-icon-notes-o:before{content:"\F08D"}.van-icon-orders-o:before{content:"\F08E"}.van-icon-other-pay:before{content:"\F08F"}.van-icon-paid:before{content:"\F090"}.van-icon-passed:before{content:"\F091"}.van-icon-pause-circle-o:before{content:"\F092"}.van-icon-pause-circle:before{content:"\F093"}.van-icon-pause:before{content:"\F094"}.van-icon-peer-pay:before{content:"\F095"}.van-icon-pending-payment:before{content:"\F096"}.van-icon-phone-circle-o:before{content:"\F097"}.van-icon-phone-circle:before{content:"\F098"}.van-icon-phone-o:before{content:"\F099"}.van-icon-phone:before{content:"\F09A"}.van-icon-photo-o:before{content:"\F09B"}.van-icon-photo:before{content:"\F09C"}.van-icon-photograph:before{content:"\F09D"}.van-icon-play-circle-o:before{content:"\F09E"}.van-icon-play-circle:before{content:"\F09F"}.van-icon-play:before{content:"\F0A0"}.van-icon-plus:before{content:"\F0A1"}.van-icon-point-gift-o:before{content:"\F0A2"}.van-icon-point-gift:before{content:"\F0A3"}.van-icon-points:before{content:"\F0A4"}.van-icon-printer:before{content:"\F0A5"}.van-icon-qr-invalid:before{content:"\F0A6"}.van-icon-qr:before{content:"\F0A7"}.van-icon-question-o:before{content:"\F0A8"}.van-icon-question:before{content:"\F0A9"}.van-icon-records:before{content:"\F0AA"}.van-icon-refund-o:before{content:"\F0AB"}.van-icon-replay:before{content:"\F0AC"}.van-icon-scan:before{content:"\F0AD"}.van-icon-search:before{content:"\F0AE"}.van-icon-send-gift-o:before{content:"\F0AF"}.van-icon-send-gift:before{content:"\F0B0"}.van-icon-service-o:before{content:"\F0B1"}.van-icon-service:before{content:"\F0B2"}.van-icon-setting-o:before{content:"\F0B3"}.van-icon-setting:before{content:"\F0B4"}.van-icon-share:before{content:"\F0B5"}.van-icon-shop-collect-o:before{content:"\F0B6"}.van-icon-shop-collect:before{content:"\F0B7"}.van-icon-shop-o:before{content:"\F0B8"}.van-icon-shop:before{content:"\F0B9"}.van-icon-shopping-cart-o:before{content:"\F0BA"}.van-icon-shopping-cart:before{content:"\F0BB"}.van-icon-shrink:before{content:"\F0BC"}.van-icon-sign:before{content:"\F0BD"}.van-icon-smile-comment-o:before{content:"\F0BE"}.van-icon-smile-comment:before{content:"\F0BF"}.van-icon-smile-o:before{content:"\F0C0"}.van-icon-smile:before{content:"\F0C1"}.van-icon-star-o:before{content:"\F0C2"}.van-icon-star:before{content:"\F0C3"}.van-icon-stop-circle-o:before{content:"\F0C4"}.van-icon-stop-circle:before{content:"\F0C5"}.van-icon-stop:before{content:"\F0C6"}.van-icon-success:before{content:"\F0C7"}.van-icon-thumb-circle-o:before{content:"\F0C8"}.van-icon-thumb-circle:before{content:"\F0C9"}.van-icon-todo-list-o:before{content:"\F0CA"}.van-icon-todo-list:before{content:"\F0CB"}.van-icon-tosend:before{content:"\F0CC"}.van-icon-tv-o:before{content:"\F0CD"}.van-icon-umbrella-circle:before{content:"\F0CE"}.van-icon-underway-o:before{content:"\F0CF"}.van-icon-underway:before{content:"\F0D0"}.van-icon-upgrade:before{content:"\F0D1"}.van-icon-user-circle-o:before{content:"\F0D2"}.van-icon-user-o:before{content:"\F0D3"}.van-icon-video-o:before{content:"\F0D4"}.van-icon-video:before{content:"\F0D5"}.van-icon-vip-card-o:before{content:"\F0D6"}.van-icon-vip-card:before{content:"\F0D7"}.van-icon-volume-o:before{content:"\F0D8"}.van-icon-volume:before{content:"\F0D9"}.van-icon-wap-home:before{content:"\F0DA"}.van-icon-wap-nav:before{content:"\F0DB"}.van-icon-warn-o:before{content:"\F0DC"}.van-icon-warning-o:before{content:"\F0DD"}.van-icon-warning:before{content:"\F0DE"}.van-icon-weapp-nav:before{content:"\F0DF"}.van-icon-wechat:before{content:"\F0E0"}.van-icon-youzan-shield:before{content:"\F0E1"}.van-icon--image{width:1em;height:1em}.van-icon__image{width:100%;height:100%}.van-icon__info{z-index:1}
\ No newline at end of file
diff --git a/dist/notify/notify.js b/dist/notify/notify.js
index 0f6f3e10..2b89df00 100644
--- a/dist/notify/notify.js
+++ b/dist/notify/notify.js
@@ -14,6 +14,7 @@ export default function Notify(options) {
     options = Object.assign({}, defaultOptions, parseOptions(options));
     const context = options.context || getContext();
     const notify = context.selectComponent(options.selector);
+    delete options.context;
     delete options.selector;
     if (notify) {
         notify.set(options);
diff --git a/dist/radio-group/index.json b/dist/radio-group/index.json
index 0a336c08..467ce294 100644
--- a/dist/radio-group/index.json
+++ b/dist/radio-group/index.json
@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }
diff --git a/dist/search/index.json b/dist/search/index.json
index e39fb2d0..b4cfe918 100644
--- a/dist/search/index.json
+++ b/dist/search/index.json
@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
     "van-field": "../field/index"
   }
 }
diff --git a/dist/stepper/index.js b/dist/stepper/index.js
index 76cccdf5..0bae3261 100644
--- a/dist/stepper/index.js
+++ b/dist/stepper/index.js
@@ -24,6 +24,14 @@ VantComponent({
         step: {
             type: null,
             value: 1
+        },
+        showPlus: {
+            type: Boolean,
+            value: true
+        },
+        showMinus: {
+            type: Boolean,
+            value: true
         }
     },
     computed: {
@@ -77,7 +85,7 @@ VantComponent({
                 return;
             }
             const diff = type === 'minus' ? -this.data.step : +this.data.step;
-            const value = Math.round((this.data.value + diff) * 100) / 100;
+            const value = Math.round((+this.data.value + diff) * 100) / 100;
             this.triggerInput(this.range(value));
             this.$emit(type);
         },
diff --git a/dist/stepper/index.wxml b/dist/stepper/index.wxml
index 7d16f4d9..33c257ef 100644
--- a/dist/stepper/index.wxml
+++ b/dist/stepper/index.wxml
@@ -3,6 +3,7 @@
 <view class="van-stepper custom-class">
   <view
     class="minus-class {{ utils.bem('stepper__minus', { disabled: minusDisabled }) }}"
+    style="{{ showMinus ? '' : 'display: none;' }}"
     hover-class="van-stepper__minus--hover"
     hover-stay-time="70"
     bind:tap="onMinus"
@@ -20,6 +21,7 @@
   />
   <view
     class="plus-class {{ utils.bem('stepper__plus', { disabled: plusDisabled }) }}"
+    style="{{ showPlus ? '' : 'display: none;' }}"
     hover-class="van-stepper__plus--hover"
     hover-stay-time="70"
     bind:tap="onPlus"
diff --git a/dist/tree-select/index.json b/dist/tree-select/index.json
index d2a8d90e..0a336c08 100644
--- a/dist/tree-select/index.json
+++ b/dist/tree-select/index.json
@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-cell": "../cell/index"
+    "van-icon": "../icon/index"
   }
 }
diff --git a/lib/button/index.js b/lib/button/index.js
index 59c454a1..ec448acf 100644
--- a/lib/button/index.js
+++ b/lib/button/index.js
@@ -7,6 +7,7 @@ component_1.VantComponent({
     mixins: [button_1.button, open_type_1.openType],
     classes: ['hover-class', 'loading-class'],
     props: {
+        icon: String,
         plain: Boolean,
         block: Boolean,
         round: Boolean,
diff --git a/lib/button/index.json b/lib/button/index.json
index cae21702..e00a5887 100644
--- a/lib/button/index.json
+++ b/lib/button/index.json
@@ -1,6 +1,7 @@
 {
   "component": true,
   "usingComponents": {
+    "van-icon": "../icon/index",
     "van-loading": "../loading/index"
   }
-}
\ No newline at end of file
+}
diff --git a/lib/button/index.wxml b/lib/button/index.wxml
index 0b0763ad..6b3cf016 100644
--- a/lib/button/index.wxml
+++ b/lib/button/index.wxml
@@ -35,5 +35,16 @@
       {{ loadingText }}
     </view>
   </block>
-  <slot wx:else />
+  <block wx:else>
+    <van-icon
+      wx:if="{{ icon }}"
+      size="1.2em"
+      name="{{ icon }}"
+      class="van-button__icon"
+      custom-style="line-height: inherit;"
+    />
+    <view class="van-button__text">
+      <slot />
+    </view>
+  </block>
 </button>
diff --git a/lib/button/index.wxss b/lib/button/index.wxss
index e6da32d8..72a10e78 100644
--- a/lib/button/index.wxss
+++ b/lib/button/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:" ";opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#07c160;border:1px solid #07c160}.van-button--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#07c160}.van-button--plain.van-button--info{color:#1989fa}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;min-width:60px;padding:0 8px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;font-size:10px;line-height:20px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:block;width:100%}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-button{position:relative;display:inline-block;height:44px;padding:0;font-size:16px;line-height:42px;text-align:center;vertical-align:middle;box-sizing:border-box;border-radius:2px;-webkit-appearance:none;-webkit-text-size-adjust:100%}.van-button:before{position:absolute;top:50%;left:50%;width:100%;height:100%;background-color:#000;border:inherit;border-color:#000;border-radius:inherit;content:" ";opacity:0;-webkit-transform:translate(-50%,-50%);transform:translate(-50%,-50%)}.van-button:after{border-width:0}.van-button--active:before{opacity:.15}.van-button--unclickable:after{display:none}.van-button--default{color:#333;background-color:#fff;border:1px solid #eee}.van-button--primary{color:#fff;background-color:#07c160;border:1px solid #07c160}.van-button--info{color:#fff;background-color:#1989fa;border:1px solid #1989fa}.van-button--danger{color:#fff;background-color:#f44;border:1px solid #f44}.van-button--warning{color:#fff;background-color:#ff976a;border:1px solid #ff976a}.van-button--plain{background-color:#fff}.van-button--plain.van-button--primary{color:#07c160}.van-button--plain.van-button--info{color:#1989fa}.van-button--plain.van-button--danger{color:#f44}.van-button--plain.van-button--warning{color:#ff976a}.van-button--large{width:100%;height:50px;line-height:48px}.van-button--normal{padding:0 15px;font-size:14px}.van-button--small{height:30px;min-width:60px;padding:0 8px;font-size:12px;line-height:28px}.van-button--mini{display:inline-block;width:50px;height:22px;font-size:10px;line-height:20px}.van-button--mini+.van-button--mini{margin-left:5px}.van-button--block{display:block;width:100%}.van-button--round{border-radius:10em}.van-button--square{border-radius:0}.van-button--disabled{opacity:.5}.van-button__text{display:inline}.van-button__loading-text{margin-left:5px;display:inline-block;vertical-align:middle}.van-button__icon{min-width:1em;line-height:inherit!important;vertical-align:top}.van-button__icon+.van-button__text:not(:empty){display:inline-block;margin-left:5px;vertical-align:top}.van-button--hairline{border-width:0;padding-top:1px}.van-button--hairline:after{border-width:1px;border-color:inherit;border-radius:4px}.van-button--hairline.van-button--round:after{border-radius:10em}.van-button--hairline.van-button--square:after{border-radius:0}
\ No newline at end of file
diff --git a/lib/checkbox-group/index.json b/lib/checkbox-group/index.json
index 0a336c08..467ce294 100644
--- a/lib/checkbox-group/index.json
+++ b/lib/checkbox-group/index.json
@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }
diff --git a/lib/collapse-item/index.js b/lib/collapse-item/index.js
index 96c72fac..08bb4db3 100644
--- a/lib/collapse-item/index.js
+++ b/lib/collapse-item/index.js
@@ -38,7 +38,11 @@ component_1.VantComponent({
         this.updateExpanded()
             .then(nextTick)
             .then(function () {
-            _this.set({ transition: true });
+            var data = { transition: true };
+            if (_this.data.expanded) {
+                data.contentHeight = 'auto';
+            }
+            _this.set(data);
         });
     },
     methods: {
diff --git a/lib/dialog/dialog.js b/lib/dialog/dialog.js
index 8cdf888b..78e40d79 100644
--- a/lib/dialog/dialog.js
+++ b/lib/dialog/dialog.js
@@ -21,6 +21,7 @@ var Dialog = function (options) {
     return new Promise(function (resolve, reject) {
         var context = options.context || getContext();
         var dialog = context.selectComponent(options.selector);
+        delete options.context;
         delete options.selector;
         if (dialog) {
             dialog.set(__assign({ onCancel: reject, onConfirm: resolve }, options));
diff --git a/lib/field/index.js b/lib/field/index.js
index 8acba596..1deb71d5 100644
--- a/lib/field/index.js
+++ b/lib/field/index.js
@@ -23,7 +23,6 @@ component_1.VantComponent({
         iconClass: String,
         clearable: Boolean,
         inputAlign: String,
-        customClass: String,
         customStyle: String,
         confirmType: String,
         confirmHold: Boolean,
diff --git a/lib/field/index.wxss b/lib/field/index.wxss
index bcce1735..c4eade8a 100644
--- a/lib/field/index.wxss
+++ b/lib/field/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
\ No newline at end of file
+@import '../common/index.wxss';.van-field__body{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center}.van-field__body--textarea{min-height:24px}.van-field__input{position:relative;display:block;width:100%;height:24px;min-height:24px;padding:0;margin:0;line-height:inherit;color:#333;text-align:left;background-color:initial;border:0;box-sizing:border-box;resize:none}.van-field__input--error{color:#f44}.van-field__input--disabled{color:#999;background-color:initial;opacity:1}.van-field__input--center{text-align:center}.van-field__input--right{text-align:right}.van-field__placeholder{position:absolute;top:0;right:0;left:0;color:#999;pointer-events:none}.van-field__placeholder--error{color:#f44}.van-field__icon-root{display:-webkit-flex;display:flex;min-height:24px;-webkit-align-items:center;align-items:center}.van-field__clear-root,.van-field__icon-container{padding:0 10px;margin-right:-10px;line-height:inherit;vertical-align:middle}.van-field__button,.van-field__clear-root,.van-field__icon-container{-webkit-flex-shrink:0;flex-shrink:0}.van-field__clear-root{color:#c9c9c9}.van-field__icon-container{color:#999}.van-field__icon-container:empty{display:none}.van-field__button{padding-left:10px}.van-field__button:empty{display:none}.van-field__error-message{font-size:12px;color:#f44;text-align:left}.van-field__error-message--center{text-align:center}.van-field__error-message--right{text-align:right}
\ No newline at end of file
diff --git a/lib/icon/index.wxml b/lib/icon/index.wxml
index bfbb57cd..3c1bbad0 100644
--- a/lib/icon/index.wxml
+++ b/lib/icon/index.wxml
@@ -13,6 +13,7 @@
   <image
     wx:if="{{ utils.isSrc(name) }}"
     src="{{ name }}"
+    mode="aspectFit"
     class="van-icon__image"
   />
 </view>
diff --git a/lib/icon/index.wxss b/lib/icon/index.wxss
index ee1e1a5d..7a4c0f08 100644
--- a/lib/icon/index.wxss
+++ b/lib/icon/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';@font-face{font-style:normal;font-weight:400;font-family:vant-icon;src:url(https://img.yzcdn.cn/vant/vant-icon-c2acf5.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-c2acf5.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-c2acf5.ttf) format("truetype")}.van-icon{position:relative;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.van-icon,.van-icon:before{display:inline-block}.van-icon-add-o:before{content:"\F000"}.van-icon-add-square:before{content:"\F001"}.van-icon-add:before{content:"\F002"}.van-icon-after-sale:before{content:"\F003"}.van-icon-aim:before{content:"\F004"}.van-icon-alipay:before{content:"\F005"}.van-icon-apps-o:before{content:"\F006"}.van-icon-arrow-down:before{content:"\F007"}.van-icon-arrow-left:before{content:"\F008"}.van-icon-arrow-up:before{content:"\F009"}.van-icon-arrow:before{content:"\F00A"}.van-icon-ascending:before{content:"\F00B"}.van-icon-audio:before{content:"\F00C"}.van-icon-award-o:before{content:"\F00D"}.van-icon-award:before{content:"\F00E"}.van-icon-bag-o:before{content:"\F00F"}.van-icon-bag:before{content:"\F010"}.van-icon-balance-list-o:before{content:"\F011"}.van-icon-balance-list:before{content:"\F012"}.van-icon-balance-o:before{content:"\F013"}.van-icon-balance-pay:before{content:"\F014"}.van-icon-bar-chart-o:before{content:"\F015"}.van-icon-bars:before{content:"\F016"}.van-icon-bell:before{content:"\F017"}.van-icon-bill-o:before{content:"\F018"}.van-icon-bill:before{content:"\F019"}.van-icon-birthday-cake-o:before{content:"\F01A"}.van-icon-bookmark-o:before{content:"\F01B"}.van-icon-bookmark:before{content:"\F01C"}.van-icon-browsing-history-o:before{content:"\F01D"}.van-icon-browsing-history:before{content:"\F01E"}.van-icon-brush-o:before{content:"\F01F"}.van-icon-bulb-o:before{content:"\F020"}.van-icon-bullhorn-o:before{content:"\F021"}.van-icon-calender-o:before{content:"\F022"}.van-icon-card:before{content:"\F023"}.van-icon-cart-circle-o:before{content:"\F024"}.van-icon-cart-circle:before{content:"\F025"}.van-icon-cart-o:before{content:"\F026"}.van-icon-cart:before{content:"\F027"}.van-icon-cash-back-record:before{content:"\F028"}.van-icon-cash-on-deliver:before{content:"\F029"}.van-icon-cashier-o:before{content:"\F02A"}.van-icon-certificate:before{content:"\F02B"}.van-icon-chart-trending-o:before{content:"\F02C"}.van-icon-chat-o:before{content:"\F02D"}.van-icon-chat:before{content:"\F02E"}.van-icon-checked:before{content:"\F02F"}.van-icon-circle:before{content:"\F030"}.van-icon-clear:before{content:"\F031"}.van-icon-clock-o:before{content:"\F032"}.van-icon-clock:before{content:"\F033"}.van-icon-close:before{content:"\F034"}.van-icon-closed-eye:before{content:"\F035"}.van-icon-cluster-o:before{content:"\F036"}.van-icon-cluster:before{content:"\F037"}.van-icon-column:before{content:"\F038"}.van-icon-comment-circle-o:before{content:"\F039"}.van-icon-comment-o:before{content:"\F03A"}.van-icon-comment:before{content:"\F03B"}.van-icon-completed:before{content:"\F03C"}.van-icon-contact:before{content:"\F03D"}.van-icon-coupon-o:before{content:"\F03E"}.van-icon-coupon:before{content:"\F03F"}.van-icon-credit-pay:before{content:"\F040"}.van-icon-cross:before{content:"\F041"}.van-icon-debit-pay:before{content:"\F042"}.van-icon-delete:before{content:"\F043"}.van-icon-descending:before{content:"\F044"}.van-icon-description:before{content:"\F045"}.van-icon-desktop-o:before{content:"\F046"}.van-icon-diamond-o:before{content:"\F047"}.van-icon-diamond:before{content:"\F048"}.van-icon-discount:before{content:"\F049"}.van-icon-ecard-pay:before{content:"\F04A"}.van-icon-edit:before{content:"\F04B"}.van-icon-ellipsis:before{content:"\F04C"}.van-icon-empty:before{content:"\F04D"}.van-icon-envelop-o:before{content:"\F04E"}.van-icon-exchange:before{content:"\F04F"}.van-icon-expand-o:before{content:"\F050"}.van-icon-expand:before{content:"\F051"}.van-icon-eye-o:before{content:"\F052"}.van-icon-eye:before{content:"\F053"}.van-icon-fail:before{content:"\F054"}.van-icon-failure:before{content:"\F055"}.van-icon-filter-o:before{content:"\F056"}.van-icon-fire-o:before{content:"\F057"}.van-icon-fire:before{content:"\F058"}.van-icon-flag-o:before{content:"\F059"}.van-icon-flower-o:before{content:"\F05A"}.van-icon-free-postage:before{content:"\F05B"}.van-icon-friends-o:before{content:"\F05C"}.van-icon-friends:before{content:"\F05D"}.van-icon-gem-o:before{content:"\F05E"}.van-icon-gem:before{content:"\F05F"}.van-icon-gift-card-o:before{content:"\F060"}.van-icon-gift-card:before{content:"\F061"}.van-icon-gift-o:before{content:"\F062"}.van-icon-gift:before{content:"\F063"}.van-icon-gold-coin-o:before{content:"\F064"}.van-icon-gold-coin:before{content:"\F065"}.van-icon-goods-collect-o:before{content:"\F066"}.van-icon-goods-collect:before{content:"\F067"}.van-icon-graphic:before{content:"\F068"}.van-icon-home-o:before{content:"\F069"}.van-icon-hot-o:before{content:"\F06A"}.van-icon-hot-sale-o:before{content:"\F06B"}.van-icon-hot-sale:before{content:"\F06C"}.van-icon-hot:before{content:"\F06D"}.van-icon-hotel-o:before{content:"\F06E"}.van-icon-idcard:before{content:"\F06F"}.van-icon-info-o:before{content:"\F070"}.van-icon-info:before{content:"\F071"}.van-icon-invition:before{content:"\F072"}.van-icon-label-o:before{content:"\F073"}.van-icon-label:before{content:"\F074"}.van-icon-like-o:before{content:"\F075"}.van-icon-like:before{content:"\F076"}.van-icon-live:before{content:"\F077"}.van-icon-location-o:before{content:"\F078"}.van-icon-location:before{content:"\F079"}.van-icon-lock:before{content:"\F07A"}.van-icon-logistics:before{content:"\F07B"}.van-icon-manager-o:before{content:"\F07C"}.van-icon-manager:before{content:"\F07D"}.van-icon-map-marked:before{content:"\F07E"}.van-icon-medel-o:before{content:"\F07F"}.van-icon-medel:before{content:"\F080"}.van-icon-more-o:before{content:"\F081"}.van-icon-more:before{content:"\F082"}.van-icon-music-o:before{content:"\F083"}.van-icon-new-arrival-o:before{content:"\F084"}.van-icon-new-arrival:before{content:"\F085"}.van-icon-new-o:before{content:"\F086"}.van-icon-new:before{content:"\F087"}.van-icon-newspaper-o:before{content:"\F088"}.van-icon-notes-o:before{content:"\F089"}.van-icon-orders-o:before{content:"\F08A"}.van-icon-other-pay:before{content:"\F08B"}.van-icon-paid:before{content:"\F08C"}.van-icon-passed:before{content:"\F08D"}.van-icon-pause-circle-o:before{content:"\F08E"}.van-icon-pause-circle:before{content:"\F08F"}.van-icon-pause:before{content:"\F090"}.van-icon-peer-pay:before{content:"\F091"}.van-icon-pending-payment:before{content:"\F092"}.van-icon-phone-circle-o:before{content:"\F093"}.van-icon-phone-o:before{content:"\F094"}.van-icon-phone:before{content:"\F095"}.van-icon-photo-o:before{content:"\F096"}.van-icon-photo:before{content:"\F097"}.van-icon-photograph:before{content:"\F098"}.van-icon-play-circle-o:before{content:"\F099"}.van-icon-play-circle:before{content:"\F09A"}.van-icon-play:before{content:"\F09B"}.van-icon-plus:before{content:"\F09C"}.van-icon-point-gift-o:before{content:"\F09D"}.van-icon-point-gift:before{content:"\F09E"}.van-icon-points:before{content:"\F09F"}.van-icon-printer:before{content:"\F0A0"}.van-icon-qr-invalid:before{content:"\F0A1"}.van-icon-qr:before{content:"\F0A2"}.van-icon-question-o:before{content:"\F0A3"}.van-icon-question:before{content:"\F0A4"}.van-icon-records:before{content:"\F0A5"}.van-icon-refund-o:before{content:"\F0A6"}.van-icon-replay:before{content:"\F0A7"}.van-icon-scan:before{content:"\F0A8"}.van-icon-search:before{content:"\F0A9"}.van-icon-send-gift-o:before{content:"\F0AA"}.van-icon-send-gift:before{content:"\F0AB"}.van-icon-service-o:before{content:"\F0AC"}.van-icon-service:before{content:"\F0AD"}.van-icon-setting-o:before{content:"\F0AE"}.van-icon-setting:before{content:"\F0AF"}.van-icon-share:before{content:"\F0B0"}.van-icon-shop-collect-o:before{content:"\F0B1"}.van-icon-shop-collect:before{content:"\F0B2"}.van-icon-shop-o:before{content:"\F0B3"}.van-icon-shop:before{content:"\F0B4"}.van-icon-shopping-cart-o:before{content:"\F0B5"}.van-icon-shopping-cart:before{content:"\F0B6"}.van-icon-shrink:before{content:"\F0B7"}.van-icon-sign:before{content:"\F0B8"}.van-icon-smile-comment-o:before{content:"\F0B9"}.van-icon-smile-comment:before{content:"\F0BA"}.van-icon-smile-o:before{content:"\F0BB"}.van-icon-star-o:before{content:"\F0BC"}.van-icon-star:before{content:"\F0BD"}.van-icon-stop-circle-o:before{content:"\F0BE"}.van-icon-stop-circle:before{content:"\F0BF"}.van-icon-stop:before{content:"\F0C0"}.van-icon-success:before{content:"\F0C1"}.van-icon-thumb-circle-o:before{content:"\F0C2"}.van-icon-todo-list-o:before{content:"\F0C3"}.van-icon-todo-list:before{content:"\F0C4"}.van-icon-tosend:before{content:"\F0C5"}.van-icon-tv-o:before{content:"\F0C6"}.van-icon-umbrella-circle:before{content:"\F0C7"}.van-icon-underway-o:before{content:"\F0C8"}.van-icon-underway:before{content:"\F0C9"}.van-icon-upgrade:before{content:"\F0CA"}.van-icon-user-circle-o:before{content:"\F0CB"}.van-icon-user-o:before{content:"\F0CC"}.van-icon-video-o:before{content:"\F0CD"}.van-icon-video:before{content:"\F0CE"}.van-icon-vip-card-o:before{content:"\F0CF"}.van-icon-vip-card:before{content:"\F0D0"}.van-icon-volume-o:before{content:"\F0D1"}.van-icon-volume:before{content:"\F0D2"}.van-icon-wap-home:before{content:"\F0D3"}.van-icon-wap-nav:before{content:"\F0D4"}.van-icon-warn-o:before{content:"\F0D5"}.van-icon-warning-o:before{content:"\F0D6"}.van-icon-weapp-nav:before{content:"\F0D7"}.van-icon-wechat:before{content:"\F0D8"}.van-icon-youzan-shield:before{content:"\F0D9"}.van-icon--image{width:1em;height:1em}.van-icon__image{position:absolute;top:0;right:0;bottom:0;left:0;max-width:100%;max-height:100%;margin:auto}.van-icon__info{z-index:1}
\ No newline at end of file
+@import '../common/index.wxss';@font-face{font-style:normal;font-weight:400;font-family:vant-icon;src:url(https://img.yzcdn.cn/vant/vant-icon-6f9881.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-6f9881.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-6f9881.ttf) format("truetype")}.van-icon{position:relative;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased}.van-icon,.van-icon:before{display:inline-block}.van-icon-add-o:before{content:"\F000"}.van-icon-add-square:before{content:"\F001"}.van-icon-add:before{content:"\F002"}.van-icon-after-sale:before{content:"\F003"}.van-icon-aim:before{content:"\F004"}.van-icon-alipay:before{content:"\F005"}.van-icon-apps-o:before{content:"\F006"}.van-icon-arrow-down:before{content:"\F007"}.van-icon-arrow-left:before{content:"\F008"}.van-icon-arrow-up:before{content:"\F009"}.van-icon-arrow:before{content:"\F00A"}.van-icon-ascending:before{content:"\F00B"}.van-icon-audio:before{content:"\F00C"}.van-icon-award-o:before{content:"\F00D"}.van-icon-award:before{content:"\F00E"}.van-icon-bag-o:before{content:"\F00F"}.van-icon-bag:before{content:"\F010"}.van-icon-balance-list-o:before{content:"\F011"}.van-icon-balance-list:before{content:"\F012"}.van-icon-balance-o:before{content:"\F013"}.van-icon-balance-pay:before{content:"\F014"}.van-icon-bar-chart-o:before{content:"\F015"}.van-icon-bars:before{content:"\F016"}.van-icon-bell:before{content:"\F017"}.van-icon-bill-o:before{content:"\F018"}.van-icon-bill:before{content:"\F019"}.van-icon-birthday-cake-o:before{content:"\F01A"}.van-icon-bookmark-o:before{content:"\F01B"}.van-icon-bookmark:before{content:"\F01C"}.van-icon-browsing-history-o:before{content:"\F01D"}.van-icon-browsing-history:before{content:"\F01E"}.van-icon-brush-o:before{content:"\F01F"}.van-icon-bulb-o:before{content:"\F020"}.van-icon-bullhorn-o:before{content:"\F021"}.van-icon-calender-o:before{content:"\F022"}.van-icon-card:before{content:"\F023"}.van-icon-cart-circle-o:before{content:"\F024"}.van-icon-cart-circle:before{content:"\F025"}.van-icon-cart-o:before{content:"\F026"}.van-icon-cart:before{content:"\F027"}.van-icon-cash-back-record:before{content:"\F028"}.van-icon-cash-on-deliver:before{content:"\F029"}.van-icon-cashier-o:before{content:"\F02A"}.van-icon-certificate:before{content:"\F02B"}.van-icon-chart-trending-o:before{content:"\F02C"}.van-icon-chat-o:before{content:"\F02D"}.van-icon-chat:before{content:"\F02E"}.van-icon-checked:before{content:"\F02F"}.van-icon-circle:before{content:"\F030"}.van-icon-clear:before{content:"\F031"}.van-icon-clock-o:before{content:"\F032"}.van-icon-clock:before{content:"\F033"}.van-icon-close:before{content:"\F034"}.van-icon-closed-eye:before{content:"\F035"}.van-icon-cluster-o:before{content:"\F036"}.van-icon-cluster:before{content:"\F037"}.van-icon-column:before{content:"\F038"}.van-icon-comment-circle-o:before{content:"\F039"}.van-icon-comment-circle:before{content:"\F03A"}.van-icon-comment-o:before{content:"\F03B"}.van-icon-comment:before{content:"\F03C"}.van-icon-completed:before{content:"\F03D"}.van-icon-contact:before{content:"\F03E"}.van-icon-coupon-o:before{content:"\F03F"}.van-icon-coupon:before{content:"\F040"}.van-icon-credit-pay:before{content:"\F041"}.van-icon-cross:before{content:"\F042"}.van-icon-debit-pay:before{content:"\F043"}.van-icon-delete:before{content:"\F044"}.van-icon-descending:before{content:"\F045"}.van-icon-description:before{content:"\F046"}.van-icon-desktop-o:before{content:"\F047"}.van-icon-diamond-o:before{content:"\F048"}.van-icon-diamond:before{content:"\F049"}.van-icon-discount:before{content:"\F04A"}.van-icon-ecard-pay:before{content:"\F04B"}.van-icon-edit:before{content:"\F04C"}.van-icon-ellipsis:before{content:"\F04D"}.van-icon-empty:before{content:"\F04E"}.van-icon-envelop-o:before{content:"\F04F"}.van-icon-exchange:before{content:"\F050"}.van-icon-expand-o:before{content:"\F051"}.van-icon-expand:before{content:"\F052"}.van-icon-eye-o:before{content:"\F053"}.van-icon-eye:before{content:"\F054"}.van-icon-fail:before{content:"\F055"}.van-icon-failure:before{content:"\F056"}.van-icon-filter-o:before{content:"\F057"}.van-icon-fire-o:before{content:"\F058"}.van-icon-fire:before{content:"\F059"}.van-icon-flag-o:before{content:"\F05A"}.van-icon-flower-o:before{content:"\F05B"}.van-icon-free-postage:before{content:"\F05C"}.van-icon-friends-o:before{content:"\F05D"}.van-icon-friends:before{content:"\F05E"}.van-icon-gem-o:before{content:"\F05F"}.van-icon-gem:before{content:"\F060"}.van-icon-gift-card-o:before{content:"\F061"}.van-icon-gift-card:before{content:"\F062"}.van-icon-gift-o:before{content:"\F063"}.van-icon-gift:before{content:"\F064"}.van-icon-gold-coin-o:before{content:"\F065"}.van-icon-gold-coin:before{content:"\F066"}.van-icon-good-job-o:before{content:"\F067"}.van-icon-good-job:before{content:"\F068"}.van-icon-goods-collect-o:before{content:"\F069"}.van-icon-goods-collect:before{content:"\F06A"}.van-icon-graphic:before{content:"\F06B"}.van-icon-home-o:before{content:"\F06C"}.van-icon-hot-o:before{content:"\F06D"}.van-icon-hot-sale-o:before{content:"\F06E"}.van-icon-hot-sale:before{content:"\F06F"}.van-icon-hot:before{content:"\F070"}.van-icon-hotel-o:before{content:"\F071"}.van-icon-idcard:before{content:"\F072"}.van-icon-info-o:before{content:"\F073"}.van-icon-info:before{content:"\F074"}.van-icon-invition:before{content:"\F075"}.van-icon-label-o:before{content:"\F076"}.van-icon-label:before{content:"\F077"}.van-icon-like-o:before{content:"\F078"}.van-icon-like:before{content:"\F079"}.van-icon-live:before{content:"\F07A"}.van-icon-location-o:before{content:"\F07B"}.van-icon-location:before{content:"\F07C"}.van-icon-lock:before{content:"\F07D"}.van-icon-logistics:before{content:"\F07E"}.van-icon-manager-o:before{content:"\F07F"}.van-icon-manager:before{content:"\F080"}.van-icon-map-marked:before{content:"\F081"}.van-icon-medel-o:before{content:"\F082"}.van-icon-medel:before{content:"\F083"}.van-icon-more-o:before{content:"\F084"}.van-icon-more:before{content:"\F085"}.van-icon-music-o:before{content:"\F086"}.van-icon-music:before{content:"\F087"}.van-icon-new-arrival-o:before{content:"\F088"}.van-icon-new-arrival:before{content:"\F089"}.van-icon-new-o:before{content:"\F08A"}.van-icon-new:before{content:"\F08B"}.van-icon-newspaper-o:before{content:"\F08C"}.van-icon-notes-o:before{content:"\F08D"}.van-icon-orders-o:before{content:"\F08E"}.van-icon-other-pay:before{content:"\F08F"}.van-icon-paid:before{content:"\F090"}.van-icon-passed:before{content:"\F091"}.van-icon-pause-circle-o:before{content:"\F092"}.van-icon-pause-circle:before{content:"\F093"}.van-icon-pause:before{content:"\F094"}.van-icon-peer-pay:before{content:"\F095"}.van-icon-pending-payment:before{content:"\F096"}.van-icon-phone-circle-o:before{content:"\F097"}.van-icon-phone-circle:before{content:"\F098"}.van-icon-phone-o:before{content:"\F099"}.van-icon-phone:before{content:"\F09A"}.van-icon-photo-o:before{content:"\F09B"}.van-icon-photo:before{content:"\F09C"}.van-icon-photograph:before{content:"\F09D"}.van-icon-play-circle-o:before{content:"\F09E"}.van-icon-play-circle:before{content:"\F09F"}.van-icon-play:before{content:"\F0A0"}.van-icon-plus:before{content:"\F0A1"}.van-icon-point-gift-o:before{content:"\F0A2"}.van-icon-point-gift:before{content:"\F0A3"}.van-icon-points:before{content:"\F0A4"}.van-icon-printer:before{content:"\F0A5"}.van-icon-qr-invalid:before{content:"\F0A6"}.van-icon-qr:before{content:"\F0A7"}.van-icon-question-o:before{content:"\F0A8"}.van-icon-question:before{content:"\F0A9"}.van-icon-records:before{content:"\F0AA"}.van-icon-refund-o:before{content:"\F0AB"}.van-icon-replay:before{content:"\F0AC"}.van-icon-scan:before{content:"\F0AD"}.van-icon-search:before{content:"\F0AE"}.van-icon-send-gift-o:before{content:"\F0AF"}.van-icon-send-gift:before{content:"\F0B0"}.van-icon-service-o:before{content:"\F0B1"}.van-icon-service:before{content:"\F0B2"}.van-icon-setting-o:before{content:"\F0B3"}.van-icon-setting:before{content:"\F0B4"}.van-icon-share:before{content:"\F0B5"}.van-icon-shop-collect-o:before{content:"\F0B6"}.van-icon-shop-collect:before{content:"\F0B7"}.van-icon-shop-o:before{content:"\F0B8"}.van-icon-shop:before{content:"\F0B9"}.van-icon-shopping-cart-o:before{content:"\F0BA"}.van-icon-shopping-cart:before{content:"\F0BB"}.van-icon-shrink:before{content:"\F0BC"}.van-icon-sign:before{content:"\F0BD"}.van-icon-smile-comment-o:before{content:"\F0BE"}.van-icon-smile-comment:before{content:"\F0BF"}.van-icon-smile-o:before{content:"\F0C0"}.van-icon-smile:before{content:"\F0C1"}.van-icon-star-o:before{content:"\F0C2"}.van-icon-star:before{content:"\F0C3"}.van-icon-stop-circle-o:before{content:"\F0C4"}.van-icon-stop-circle:before{content:"\F0C5"}.van-icon-stop:before{content:"\F0C6"}.van-icon-success:before{content:"\F0C7"}.van-icon-thumb-circle-o:before{content:"\F0C8"}.van-icon-thumb-circle:before{content:"\F0C9"}.van-icon-todo-list-o:before{content:"\F0CA"}.van-icon-todo-list:before{content:"\F0CB"}.van-icon-tosend:before{content:"\F0CC"}.van-icon-tv-o:before{content:"\F0CD"}.van-icon-umbrella-circle:before{content:"\F0CE"}.van-icon-underway-o:before{content:"\F0CF"}.van-icon-underway:before{content:"\F0D0"}.van-icon-upgrade:before{content:"\F0D1"}.van-icon-user-circle-o:before{content:"\F0D2"}.van-icon-user-o:before{content:"\F0D3"}.van-icon-video-o:before{content:"\F0D4"}.van-icon-video:before{content:"\F0D5"}.van-icon-vip-card-o:before{content:"\F0D6"}.van-icon-vip-card:before{content:"\F0D7"}.van-icon-volume-o:before{content:"\F0D8"}.van-icon-volume:before{content:"\F0D9"}.van-icon-wap-home:before{content:"\F0DA"}.van-icon-wap-nav:before{content:"\F0DB"}.van-icon-warn-o:before{content:"\F0DC"}.van-icon-warning-o:before{content:"\F0DD"}.van-icon-warning:before{content:"\F0DE"}.van-icon-weapp-nav:before{content:"\F0DF"}.van-icon-wechat:before{content:"\F0E0"}.van-icon-youzan-shield:before{content:"\F0E1"}.van-icon--image{width:1em;height:1em}.van-icon__image{width:100%;height:100%}.van-icon__info{z-index:1}
\ No newline at end of file
diff --git a/lib/notify/notify.js b/lib/notify/notify.js
index 621aefd4..a64e3e62 100644
--- a/lib/notify/notify.js
+++ b/lib/notify/notify.js
@@ -16,6 +16,7 @@ function Notify(options) {
     options = Object.assign({}, defaultOptions, parseOptions(options));
     var context = options.context || getContext();
     var notify = context.selectComponent(options.selector);
+    delete options.context;
     delete options.selector;
     if (notify) {
         notify.set(options);
diff --git a/lib/radio-group/index.json b/lib/radio-group/index.json
index 0a336c08..467ce294 100644
--- a/lib/radio-group/index.json
+++ b/lib/radio-group/index.json
@@ -1,6 +1,3 @@
 {
-  "component": true,
-  "usingComponents": {
-    "van-icon": "../icon/index"
-  }
+  "component": true
 }
diff --git a/lib/search/index.json b/lib/search/index.json
index e39fb2d0..b4cfe918 100644
--- a/lib/search/index.json
+++ b/lib/search/index.json
@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
     "van-field": "../field/index"
   }
 }
diff --git a/lib/stepper/index.js b/lib/stepper/index.js
index 74e95f24..bbe57768 100644
--- a/lib/stepper/index.js
+++ b/lib/stepper/index.js
@@ -26,6 +26,14 @@ component_1.VantComponent({
         step: {
             type: null,
             value: 1
+        },
+        showPlus: {
+            type: Boolean,
+            value: true
+        },
+        showMinus: {
+            type: Boolean,
+            value: true
         }
     },
     computed: {
@@ -79,7 +87,7 @@ component_1.VantComponent({
                 return;
             }
             var diff = type === 'minus' ? -this.data.step : +this.data.step;
-            var value = Math.round((this.data.value + diff) * 100) / 100;
+            var value = Math.round((+this.data.value + diff) * 100) / 100;
             this.triggerInput(this.range(value));
             this.$emit(type);
         },
diff --git a/lib/stepper/index.wxml b/lib/stepper/index.wxml
index 7d16f4d9..33c257ef 100644
--- a/lib/stepper/index.wxml
+++ b/lib/stepper/index.wxml
@@ -3,6 +3,7 @@
 <view class="van-stepper custom-class">
   <view
     class="minus-class {{ utils.bem('stepper__minus', { disabled: minusDisabled }) }}"
+    style="{{ showMinus ? '' : 'display: none;' }}"
     hover-class="van-stepper__minus--hover"
     hover-stay-time="70"
     bind:tap="onMinus"
@@ -20,6 +21,7 @@
   />
   <view
     class="plus-class {{ utils.bem('stepper__plus', { disabled: plusDisabled }) }}"
+    style="{{ showPlus ? '' : 'display: none;' }}"
     hover-class="van-stepper__plus--hover"
     hover-stay-time="70"
     bind:tap="onPlus"
diff --git a/lib/tree-select/index.json b/lib/tree-select/index.json
index d2a8d90e..0a336c08 100644
--- a/lib/tree-select/index.json
+++ b/lib/tree-select/index.json
@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "van-icon": "../icon/index",
-    "van-cell": "../cell/index"
+    "van-icon": "../icon/index"
   }
 }