From 51b05ed1a545fc6577ffbd17fc248d2fd1d02f65 Mon Sep 17 00:00:00 2001
From: rex-zsd <rexkaneki@gmail.com>
Date: Wed, 24 Oct 2018 21:58:23 +0800
Subject: [PATCH] [build] 0.4.3

---
 dist/action-sheet/index.wxml        | 16 +++++++++-------
 dist/action-sheet/index.wxss        |  2 +-
 dist/goods-action-button/index.js   |  6 ++++--
 dist/goods-action-button/index.wxml | 18 ++++++++++++++++++
 dist/goods-action-icon/index.js     |  6 ++++--
 dist/goods-action-icon/index.wxml   | 24 ++++++++++++++++++++++--
 dist/icon/index.wxss                |  2 +-
 dist/toast/toast.js                 | 17 ++++++++++++++---
 8 files changed, 73 insertions(+), 18 deletions(-)

diff --git a/dist/action-sheet/index.wxml b/dist/action-sheet/index.wxml
index 5bfe879d..f0c391a0 100644
--- a/dist/action-sheet/index.wxml
+++ b/dist/action-sheet/index.wxml
@@ -29,12 +29,14 @@
     </block>
     <van-loading wx:else size="20px" />
   </button>
-  <view
-    wx:if="{{ cancelText }}"
-    class="van-action-sheet__cancel"
-    bind:tap="onCancel"
-  >
-    {{ cancelText }}
-  </view>
+  <block wx:if="{{ cancelText }}">
+    <view class="van-action-sheet__blank" />
+    <view
+      class="van-action-sheet__cancel"
+      bind:tap="onCancel"
+    >
+      {{ cancelText }}
+    </view>
+  </block>
   <slot />
 </van-popup>
diff --git a/dist/action-sheet/index.wxss b/dist/action-sheet/index.wxss
index 15f3a60b..259c8a84 100644
--- a/dist/action-sheet/index.wxss
+++ b/dist/action-sheet/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-action-sheet{color:#333;max-height:90%!important;background-color:#f8f8f8!important}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;font-size:16px;line-height:50px;text-align:center;background-color:#fff}.van-action-sheet__cancel:active,.van-action-sheet__item:active{background-color:#e8e8e8}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled:active{background-color:#fff}.van-action-sheet__subname{font-size:12px;color:#666;margin-left:5px}.van-action-sheet__cancel{margin-top:10px}.van-action-sheet__header{font-size:16px;font-weight:500;line-height:44px;text-align:center}.van-action-sheet__close{top:0;right:0;padding:0 15px;color:#999;font-size:18px!important;position:absolute!important;line-height:inherit!important}
\ No newline at end of file
+@import '../common/index.wxss';.van-action-sheet{max-height:90%!important;color:#333}.van-action-sheet__cancel,.van-action-sheet__item{height:50px;font-size:16px;line-height:50px;text-align:center;background-color:#fff}.van-action-sheet__cancel:active,.van-action-sheet__item:active{background-color:#e8e8e8}.van-action-sheet__item--disabled{color:#c9c9c9}.van-action-sheet__item--disabled:active{background-color:#fff}.van-action-sheet__subname{margin-left:5px;font-size:12px;color:#666}.van-action-sheet__blank{height:10px;background-color:#f8f8f8}.van-action-sheet__header{font-size:16px;font-weight:500;line-height:44px;text-align:center}.van-action-sheet__close{position:absolute!important;top:0;right:0;padding:0 15px;font-size:18px!important;line-height:inherit!important;color:#999}
\ No newline at end of file
diff --git a/dist/goods-action-button/index.js b/dist/goods-action-button/index.js
index 7e79a074..82ae7f8e 100644
--- a/dist/goods-action-button/index.js
+++ b/dist/goods-action-button/index.js
@@ -1,7 +1,9 @@
-import { link } from '../mixins/link';
 import { VantComponent } from '../common/component';
+import { link } from '../mixins/link';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
 VantComponent({
-  mixins: [link],
+  mixins: [link, button, openType],
   props: {
     text: String,
     loading: Boolean,
diff --git a/dist/goods-action-button/index.wxml b/dist/goods-action-button/index.wxml
index a4e6084e..69c838dd 100644
--- a/dist/goods-action-button/index.wxml
+++ b/dist/goods-action-button/index.wxml
@@ -1,10 +1,28 @@
 <van-button
   square
+  id="{{ id }}"
   size="large"
+  lang="{{ lang }}"
   type="{{ type }}"
   loading="{{ loading }}"
   disabled="{{ disabled }}"
+  open-type="{{ openType }}"
+  custom-class="custom-class"
+  app-parameter="{{ appParameter }}"
+  hover-stay-time="{{ hoverStayTime }}"
+  hover-start-time="{{ hoverStartTime }}"
+  hover-stop-propagation="{{ hoverStopPropagation }}"
+  session-from="{{ sessionFrom }}"
+  send-message-title="{{ sendMessageTitle }}"
+  send-message-path="{{ sendMessagePath }}"
+  send-message-img="{{ sendMessageImg }}"
+  show-message-card="{{ showMessageCard }}"
   bind:click="onClick"
+  binderror="bindError"
+  bindcontact="bindContact"
+  bindopensetting="bindOpenSetting"
+  bindgetuserinfo="bindGetUserInfo"
+  bindgetphonenumber="bindGetPhoneNumber"
 >
   {{ text }}
 </van-button>
diff --git a/dist/goods-action-icon/index.js b/dist/goods-action-icon/index.js
index 6aa87d17..09390520 100644
--- a/dist/goods-action-icon/index.js
+++ b/dist/goods-action-icon/index.js
@@ -1,7 +1,9 @@
-import { link } from '../mixins/link';
 import { VantComponent } from '../common/component';
+import { link } from '../mixins/link';
+import { button } from '../mixins/button';
+import { openType } from '../mixins/open-type';
 VantComponent({
-  mixins: [link],
+  mixins: [link, button, openType],
   props: {
     text: String,
     info: String,
diff --git a/dist/goods-action-icon/index.wxml b/dist/goods-action-icon/index.wxml
index 647b287c..58b17ee2 100644
--- a/dist/goods-action-icon/index.wxml
+++ b/dist/goods-action-icon/index.wxml
@@ -1,7 +1,27 @@
 <van-button
-  custom-class="van-goods-action-icon"
+  square
+  id="{{ id }}"
   size="large"
-  bind:tap="onClick"
+  lang="{{ lang }}"
+  loading="{{ loading }}"
+  disabled="{{ disabled }}"
+  open-type="{{ openType }}"
+  custom-class="van-goods-action-icon"
+  app-parameter="{{ appParameter }}"
+  hover-stay-time="{{ hoverStayTime }}"
+  hover-start-time="{{ hoverStartTime }}"
+  hover-stop-propagation="{{ hoverStopPropagation }}"
+  session-from="{{ sessionFrom }}"
+  send-message-title="{{ sendMessageTitle }}"
+  send-message-path="{{ sendMessagePath }}"
+  send-message-img="{{ sendMessageImg }}"
+  show-message-card="{{ showMessageCard }}"
+  bind:click="onClick"
+  binderror="bindError"
+  bindcontact="bindContact"
+  bindopensetting="bindOpenSetting"
+  bindgetuserinfo="bindGetUserInfo"
+  bindgetphonenumber="bindGetPhoneNumber"
 >
   <view class="van-goods-action-icon__content van-hairline--right">
     <van-icon
diff --git a/dist/icon/index.wxss b/dist/icon/index.wxss
index 0e06562d..e6235c5e 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-82b481.ttf) format('truetype')}.van-icon{position:relative;display:inline-block;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto}.van-icon__info{color:#fff;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:#f44;-webkit-transform:translateX(-50%);transform:translateX(-50%);font-family:PingFang SC,Helvetica Neue,Arial,sans-serif}.van-icon::before{display:inline-block}.van-icon-add-o::before{content:"\F000"}.van-icon-add::before{content:"\F001"}.van-icon-add2::before{content:"\F002"}.van-icon-after-sale::before{content:"\F003"}.van-icon-aim::before{content:"\F004"}.van-icon-alipay::before{content:"\F005"}.van-icon-arrow-left::before{content:"\F006"}.van-icon-arrow::before{content:"\F007"}.van-icon-balance-pay::before{content:"\F008"}.van-icon-browsing-history::before{content:"\F009"}.van-icon-card::before{content:"\F00A"}.van-icon-cart-o::before{content:"\F00B"}.van-icon-cart::before{content:"\F00C"}.van-icon-cash-back-record::before{content:"\F00D"}.van-icon-cash-on-deliver::before{content:"\F00E"}.van-icon-certificate::before{content:"\F00F"}.van-icon-chat::before{content:"\F010"}.van-icon-check::before{content:"\F011"}.van-icon-checked::before{content:"\F012"}.van-icon-clear::before{content:"\F013"}.van-icon-clock::before{content:"\F014"}.van-icon-close::before{content:"\F015"}.van-icon-completed::before{content:"\F016"}.van-icon-contact::before{content:"\F017"}.van-icon-coupon::before{content:"\F018"}.van-icon-credit-pay::before{content:"\F019"}.van-icon-debit-pay::before{content:"\F01A"}.van-icon-delete::before{content:"\F01B"}.van-icon-description::before{content:"\F01C"}.van-icon-discount::before{content:"\F01D"}.van-icon-ecard-pay::before{content:"\F01E"}.van-icon-edit-data::before{content:"\F01F"}.van-icon-edit::before{content:"\F020"}.van-icon-exchange-record::before{content:"\F021"}.van-icon-exchange::before{content:"\F022"}.van-icon-fail::before{content:"\F023"}.van-icon-free-postage::before{content:"\F024"}.van-icon-gift-card-pay::before{content:"\F025"}.van-icon-gift-card::before{content:"\F026"}.van-icon-gift::before{content:"\F027"}.van-icon-gold-coin::before{content:"\F028"}.van-icon-goods-collect::before{content:"\F029"}.van-icon-home::before{content:"\F02A"}.van-icon-hot-sale::before{content:"\F02B"}.van-icon-hot::before{content:"\F02C"}.van-icon-idcard::before{content:"\F02D"}.van-icon-info-o::before{content:"\F02E"}.van-icon-like-o::before{content:"\F02F"}.van-icon-like::before{content:"\F030"}.van-icon-location::before{content:"\F031"}.van-icon-logistics::before{content:"\F032"}.van-icon-more-o::before{content:"\F033"}.van-icon-more::before{content:"\F034"}.van-icon-new-arrival::before{content:"\F035"}.van-icon-new::before{content:"\F036"}.van-icon-other-pay::before{content:"\F037"}.van-icon-passed::before{content:"\F038"}.van-icon-password-not-view::before{content:"\F039"}.van-icon-password-view::before{content:"\F03A"}.van-icon-pause::before{content:"\F03B"}.van-icon-peer-pay::before{content:"\F03C"}.van-icon-pending-deliver::before{content:"\F03D"}.van-icon-pending-evaluate::before{content:"\F03E"}.van-icon-pending-orders::before{content:"\F03F"}.van-icon-pending-payment::before{content:"\F040"}.van-icon-phone::before{content:"\F041"}.van-icon-photo::before{content:"\F042"}.van-icon-photograph::before{content:"\F043"}.van-icon-play::before{content:"\F044"}.van-icon-point-gift::before{content:"\F045"}.van-icon-points-mall::before{content:"\F046"}.van-icon-points::before{content:"\F047"}.van-icon-qr-invalid::before{content:"\F048"}.van-icon-qr::before{content:"\F049"}.van-icon-question::before{content:"\F04A"}.van-icon-receive-gift::before{content:"\F04B"}.van-icon-records::before{content:"\F04C"}.van-icon-search::before{content:"\F04D"}.van-icon-send-gift::before{content:"\F04E"}.van-icon-setting::before{content:"\F04F"}.van-icon-share::before{content:"\F050"}.van-icon-shop-collect::before{content:"\F051"}.van-icon-shop::before{content:"\F052"}.van-icon-shopping-cart::before{content:"\F053"}.van-icon-sign::before{content:"\F054"}.van-icon-stop::before{content:"\F055"}.van-icon-success::before{content:"\F056"}.van-icon-tosend::before{content:"\F057"}.van-icon-underway::before{content:"\F058"}.van-icon-upgrade::before{content:"\F059"}.van-icon-value-card::before{content:"\F05A"}.van-icon-wap-home::before{content:"\F05B"}.van-icon-wap-nav::before{content:"\F05C"}.van-icon-warn::before{content:"\F05D"}.van-icon-wechat::before{content:"\F05E"}
\ 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-f4e97b.ttf) format('truetype')}.van-icon{position:relative;display:inline-block;font:normal normal normal 14px/1 vant-icon;font-size:inherit;text-rendering:auto}.van-icon__info{color:#fff;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:#f44;-webkit-transform:translateX(-50%);transform:translateX(-50%);font-family:PingFang SC,Helvetica Neue,Arial,sans-serif}.van-icon::before{display:inline-block}.van-icon-add-o::before{content:"\F000"}.van-icon-add::before{content:"\F001"}.van-icon-add2::before{content:"\F002"}.van-icon-after-sale::before{content:"\F003"}.van-icon-aim::before{content:"\F004"}.van-icon-alipay::before{content:"\F005"}.van-icon-arrow-left::before{content:"\F006"}.van-icon-arrow::before{content:"\F007"}.van-icon-balance-pay::before{content:"\F008"}.van-icon-browsing-history::before{content:"\F009"}.van-icon-card::before{content:"\F00A"}.van-icon-cart-o::before{content:"\F00B"}.van-icon-cart::before{content:"\F00C"}.van-icon-cash-back-record::before{content:"\F00D"}.van-icon-cash-on-deliver::before{content:"\F00E"}.van-icon-certificate::before{content:"\F00F"}.van-icon-chat::before{content:"\F010"}.van-icon-check::before{content:"\F011"}.van-icon-checked::before{content:"\F012"}.van-icon-clear::before{content:"\F013"}.van-icon-clock::before{content:"\F014"}.van-icon-close::before{content:"\F015"}.van-icon-completed::before{content:"\F016"}.van-icon-contact::before{content:"\F017"}.van-icon-coupon::before{content:"\F018"}.van-icon-credit-pay::before{content:"\F019"}.van-icon-debit-pay::before{content:"\F01A"}.van-icon-delete::before{content:"\F01B"}.van-icon-description::before{content:"\F01C"}.van-icon-discount::before{content:"\F01D"}.van-icon-ecard-pay::before{content:"\F01E"}.van-icon-edit-data::before{content:"\F01F"}.van-icon-edit::before{content:"\F020"}.van-icon-exchange-record::before{content:"\F021"}.van-icon-exchange::before{content:"\F022"}.van-icon-fail::before{content:"\F023"}.van-icon-free-postage::before{content:"\F024"}.van-icon-gift-card-pay::before{content:"\F025"}.van-icon-gift-card::before{content:"\F026"}.van-icon-gift::before{content:"\F027"}.van-icon-gold-coin::before{content:"\F028"}.van-icon-goods-collect::before{content:"\F029"}.van-icon-home::before{content:"\F02A"}.van-icon-hot-sale::before{content:"\F02B"}.van-icon-hot::before{content:"\F02C"}.van-icon-idcard::before{content:"\F02D"}.van-icon-info-o::before{content:"\F02E"}.van-icon-like-o::before{content:"\F02F"}.van-icon-like::before{content:"\F030"}.van-icon-location::before{content:"\F031"}.van-icon-logistics::before{content:"\F032"}.van-icon-more-o::before{content:"\F033"}.van-icon-more::before{content:"\F034"}.van-icon-new-arrival::before{content:"\F035"}.van-icon-new::before{content:"\F036"}.van-icon-other-pay::before{content:"\F037"}.van-icon-passed::before{content:"\F038"}.van-icon-password-not-view::before{content:"\F039"}.van-icon-password-view::before{content:"\F03A"}.van-icon-pause::before{content:"\F03B"}.van-icon-peer-pay::before{content:"\F03C"}.van-icon-pending-deliver::before{content:"\F03D"}.van-icon-pending-evaluate::before{content:"\F03E"}.van-icon-pending-orders::before{content:"\F03F"}.van-icon-pending-payment::before{content:"\F040"}.van-icon-phone::before{content:"\F041"}.van-icon-photo::before{content:"\F042"}.van-icon-photograph::before{content:"\F043"}.van-icon-play::before{content:"\F044"}.van-icon-point-gift::before{content:"\F045"}.van-icon-points-mall::before{content:"\F046"}.van-icon-points::before{content:"\F047"}.van-icon-qr-invalid::before{content:"\F048"}.van-icon-qr::before{content:"\F049"}.van-icon-question::before{content:"\F04A"}.van-icon-receive-gift::before{content:"\F04B"}.van-icon-records::before{content:"\F04C"}.van-icon-search::before{content:"\F04D"}.van-icon-send-gift::before{content:"\F04E"}.van-icon-setting::before{content:"\F04F"}.van-icon-share::before{content:"\F050"}.van-icon-shop-collect::before{content:"\F051"}.van-icon-shop::before{content:"\F052"}.van-icon-shopping-cart::before{content:"\F053"}.van-icon-sign::before{content:"\F054"}.van-icon-stop::before{content:"\F055"}.van-icon-success::before{content:"\F056"}.van-icon-tosend::before{content:"\F057"}.van-icon-underway::before{content:"\F058"}.van-icon-upgrade::before{content:"\F059"}.van-icon-value-card::before{content:"\F05A"}.van-icon-wap-home::before{content:"\F05B"}.van-icon-wap-nav::before{content:"\F05C"}.van-icon-warn::before{content:"\F05D"}.van-icon-wechat::before{content:"\F05E"}
\ No newline at end of file
diff --git a/dist/toast/toast.js b/dist/toast/toast.js
index d927bc11..45ef94a7 100644
--- a/dist/toast/toast.js
+++ b/dist/toast/toast.js
@@ -23,15 +23,26 @@ function parseOptions(message) {
   };
 }
 
+function getContext() {
+  var pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+
 var Toast = function Toast(options) {
   if (options === void 0) {
     options = {};
   }
 
   options = _extends({}, currentOptions, parseOptions(options));
-  var pages = getCurrentPages();
-  var ctx = pages[pages.length - 1];
-  var toast = ctx.selectComponent(options.selector);
+  var context = options.context || getContext();
+  var toast = context.selectComponent(options.selector);
+
+  if (!toast) {
+    console.warn('未找到 van-toast 节点，请确认 selector 及 context 是否正确');
+    return;
+  }
+
+  delete options.context;
   delete options.selector;
   queue.push(toast);
   toast.setData(options);