diff --git a/dist/dialog/index.js b/dist/dialog/index.js
index 72a6fa0f..1c593aaa 100644
--- a/dist/dialog/index.js
+++ b/dist/dialog/index.js
@@ -18,14 +18,16 @@ VantComponent({
             type: String,
             value: 'default',
         },
-        useSlot: Boolean,
         className: String,
         customStyle: String,
         asyncClose: Boolean,
         messageAlign: String,
         beforeClose: null,
         overlayStyle: String,
+        useSlot: Boolean,
         useTitleSlot: Boolean,
+        useConfirmButtonSlot: Boolean,
+        useCancelButtonSlot: Boolean,
         showCancelButton: Boolean,
         closeOnClickOverlay: Boolean,
         confirmButtonOpenType: String,
diff --git a/dist/dialog/index.wxml b/dist/dialog/index.wxml
index 364dd4c2..24ab9986 100644
--- a/dist/dialog/index.wxml
+++ b/dist/dialog/index.wxml
@@ -70,44 +70,53 @@
   </van-goods-action>
 
   <view wx:elif="{{ showCancelButton || showConfirmButton }}" class="van-hairline--top van-dialog__footer">
-    <van-button
-      wx:if="{{ showCancelButton }}"
-      size="large"
-      loading="{{ loading.cancel }}"
-      class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel cancle-button-class"
-      custom-style="color: {{ cancelButtonColor }}"
-      bind:click="onCancel"
-    >
-      {{ cancelButtonText }}
-    </van-button>
-    <van-button
-      wx:if="{{ showConfirmButton }}"
-      size="large"
-      class="van-dialog__button"
-      loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm confirm-button-class"
-      custom-style="color: {{ confirmButtonColor }}"
+    <block wx:if="{{ showCancelButton }}">
+      <slot wx:if="{{ useCancelButtonSlot }}" name="cancel-button" />
 
-      open-type="{{ confirmButtonOpenType }}"
-      lang="{{ lang }}"
-      business-id="{{ businessId }}"
-      session-from="{{ sessionFrom }}"
-      send-message-title="{{ sendMessageTitle }}"
-      send-message-path="{{ sendMessagePath }}"
-      send-message-img="{{ sendMessageImg }}"
-      show-message-card="{{ showMessageCard }}"
-      app-parameter="{{ appParameter }}"
+      <van-button
+        wx:else
+        size="large"
+        loading="{{ loading.cancel }}"
+        class="van-dialog__button van-hairline--right"
+        custom-class="van-dialog__cancel cancle-button-class"
+        custom-style="color: {{ cancelButtonColor }}"
+        bind:click="onCancel"
+      >
+        {{ cancelButtonText }}
+      </van-button>
+    </block>
 
-      bind:click="onConfirm"
-      bindgetuserinfo="onGetUserInfo"
-      bindcontact="onContact"
-      bindgetphonenumber="onGetPhoneNumber"
-      binderror="onError"
-      bindlaunchapp="onLaunchApp"
-      bindopensetting="onOpenSetting"
-    >
-      {{ confirmButtonText }}
-    </van-button>
+    <block wx:if="{{ showConfirmButton }}">
+      <slot wx:if="{{ useConfirmButtonSlot }}" name="confirm-button" />
+
+      <van-button
+        wx:else
+        size="large"
+        class="van-dialog__button"
+        loading="{{ loading.confirm }}"
+        custom-class="van-dialog__confirm confirm-button-class"
+        custom-style="color: {{ confirmButtonColor }}"
+
+        open-type="{{ confirmButtonOpenType }}"
+        lang="{{ lang }}"
+        business-id="{{ businessId }}"
+        session-from="{{ sessionFrom }}"
+        send-message-title="{{ sendMessageTitle }}"
+        send-message-path="{{ sendMessagePath }}"
+        send-message-img="{{ sendMessageImg }}"
+        show-message-card="{{ showMessageCard }}"
+        app-parameter="{{ appParameter }}"
+
+        bind:click="onConfirm"
+        bindgetuserinfo="onGetUserInfo"
+        bindcontact="onContact"
+        bindgetphonenumber="onGetPhoneNumber"
+        binderror="onError"
+        bindlaunchapp="onLaunchApp"
+        bindopensetting="onOpenSetting"
+      >
+        {{ confirmButtonText }}
+      </van-button>
+    </block>
   </view>
 </van-popup>
diff --git a/dist/search/index.js b/dist/search/index.js
index 158396ce..d3c1bcd2 100644
--- a/dist/search/index.js
+++ b/dist/search/index.js
@@ -53,6 +53,10 @@ VantComponent({
             type: String,
             value: 'clear',
         },
+        cursorSpacing: {
+            type: Number,
+            value: 0,
+        },
     },
     methods: {
         onChange(event) {
diff --git a/dist/search/index.wxml b/dist/search/index.wxml
index e772ee4b..cbcb47af 100644
--- a/dist/search/index.wxml
+++ b/dist/search/index.wxml
@@ -28,6 +28,7 @@
       input-class="input-class"
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
+      cursor-spacing="{{ cursorSpacing }}"
       custom-style="padding: 5px 10px 5px 0; background-color: transparent;"
       bind:blur="onBlur"
       bind:focus="onFocus"
diff --git a/lib/dialog/index.js b/lib/dialog/index.js
index 3ca0b443..6944bb99 100644
--- a/lib/dialog/index.js
+++ b/lib/dialog/index.js
@@ -20,14 +20,16 @@ var utils_1 = require("../common/utils");
             type: String,
             value: 'default',
         },
-        useSlot: Boolean,
         className: String,
         customStyle: String,
         asyncClose: Boolean,
         messageAlign: String,
         beforeClose: null,
         overlayStyle: String,
+        useSlot: Boolean,
         useTitleSlot: Boolean,
+        useConfirmButtonSlot: Boolean,
+        useCancelButtonSlot: Boolean,
         showCancelButton: Boolean,
         closeOnClickOverlay: Boolean,
         confirmButtonOpenType: String,
diff --git a/lib/dialog/index.wxml b/lib/dialog/index.wxml
index 364dd4c2..24ab9986 100644
--- a/lib/dialog/index.wxml
+++ b/lib/dialog/index.wxml
@@ -70,44 +70,53 @@
   </van-goods-action>
 
   <view wx:elif="{{ showCancelButton || showConfirmButton }}" class="van-hairline--top van-dialog__footer">
-    <van-button
-      wx:if="{{ showCancelButton }}"
-      size="large"
-      loading="{{ loading.cancel }}"
-      class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel cancle-button-class"
-      custom-style="color: {{ cancelButtonColor }}"
-      bind:click="onCancel"
-    >
-      {{ cancelButtonText }}
-    </van-button>
-    <van-button
-      wx:if="{{ showConfirmButton }}"
-      size="large"
-      class="van-dialog__button"
-      loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm confirm-button-class"
-      custom-style="color: {{ confirmButtonColor }}"
+    <block wx:if="{{ showCancelButton }}">
+      <slot wx:if="{{ useCancelButtonSlot }}" name="cancel-button" />
 
-      open-type="{{ confirmButtonOpenType }}"
-      lang="{{ lang }}"
-      business-id="{{ businessId }}"
-      session-from="{{ sessionFrom }}"
-      send-message-title="{{ sendMessageTitle }}"
-      send-message-path="{{ sendMessagePath }}"
-      send-message-img="{{ sendMessageImg }}"
-      show-message-card="{{ showMessageCard }}"
-      app-parameter="{{ appParameter }}"
+      <van-button
+        wx:else
+        size="large"
+        loading="{{ loading.cancel }}"
+        class="van-dialog__button van-hairline--right"
+        custom-class="van-dialog__cancel cancle-button-class"
+        custom-style="color: {{ cancelButtonColor }}"
+        bind:click="onCancel"
+      >
+        {{ cancelButtonText }}
+      </van-button>
+    </block>
 
-      bind:click="onConfirm"
-      bindgetuserinfo="onGetUserInfo"
-      bindcontact="onContact"
-      bindgetphonenumber="onGetPhoneNumber"
-      binderror="onError"
-      bindlaunchapp="onLaunchApp"
-      bindopensetting="onOpenSetting"
-    >
-      {{ confirmButtonText }}
-    </van-button>
+    <block wx:if="{{ showConfirmButton }}">
+      <slot wx:if="{{ useConfirmButtonSlot }}" name="confirm-button" />
+
+      <van-button
+        wx:else
+        size="large"
+        class="van-dialog__button"
+        loading="{{ loading.confirm }}"
+        custom-class="van-dialog__confirm confirm-button-class"
+        custom-style="color: {{ confirmButtonColor }}"
+
+        open-type="{{ confirmButtonOpenType }}"
+        lang="{{ lang }}"
+        business-id="{{ businessId }}"
+        session-from="{{ sessionFrom }}"
+        send-message-title="{{ sendMessageTitle }}"
+        send-message-path="{{ sendMessagePath }}"
+        send-message-img="{{ sendMessageImg }}"
+        show-message-card="{{ showMessageCard }}"
+        app-parameter="{{ appParameter }}"
+
+        bind:click="onConfirm"
+        bindgetuserinfo="onGetUserInfo"
+        bindcontact="onContact"
+        bindgetphonenumber="onGetPhoneNumber"
+        binderror="onError"
+        bindlaunchapp="onLaunchApp"
+        bindopensetting="onOpenSetting"
+      >
+        {{ confirmButtonText }}
+      </van-button>
+    </block>
   </view>
 </van-popup>
diff --git a/lib/search/index.js b/lib/search/index.js
index 0d28b995..b5348b0b 100644
--- a/lib/search/index.js
+++ b/lib/search/index.js
@@ -55,6 +55,10 @@ var version_1 = require("../common/version");
             type: String,
             value: 'clear',
         },
+        cursorSpacing: {
+            type: Number,
+            value: 0,
+        },
     },
     methods: {
         onChange: function (event) {
diff --git a/lib/search/index.wxml b/lib/search/index.wxml
index e772ee4b..cbcb47af 100644
--- a/lib/search/index.wxml
+++ b/lib/search/index.wxml
@@ -28,6 +28,7 @@
       input-class="input-class"
       placeholder="{{ placeholder }}"
       placeholder-style="{{ placeholderStyle }}"
+      cursor-spacing="{{ cursorSpacing }}"
       custom-style="padding: 5px 10px 5px 0; background-color: transparent;"
       bind:blur="onBlur"
       bind:focus="onFocus"