diff --git a/dist/card/index.wxml b/dist/card/index.wxml
index 39b4b33a..62173e4a 100644
--- a/dist/card/index.wxml
+++ b/dist/card/index.wxml
@@ -10,7 +10,7 @@
         lazy-load="{{ lazyLoad }}"
         class="van-card__img thumb-class"
       />
-      <slot name="thumb" />
+      <slot wx:else name="thumb" />
       <van-tag
         wx:if="{{ tag }}"
         mark
@@ -19,6 +19,7 @@
       >
         {{ tag }}
       </van-tag>
+      <slot wx:else name="tag" />
     </view>
 
     <view class="van-card__content {{ utils.bem('card__content', { center: centered }) }}">
@@ -34,9 +35,14 @@
 
       <view class="van-card__bottom">
         <slot name="price-top" />
-        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }}<text class="van-card__price-integer">{{ integerStr }}</text><text class="van-card__price-decimal">{{ decimalStr }}</text></view>
+        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">
+          <text>{{ currency }}</text>
+          <text class="van-card__price-integer">{{ integerStr }}</text>
+          <text class="van-card__price-decimal">{{ decimalStr }}</text>
+        </view>
         <slot wx:else name="price" />
         <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
+        <slot wx:else name="origin-price" />
         <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
         <slot wx:else  name="num" />
         <slot name="bottom" />
diff --git a/dist/card/index.wxss b/dist/card/index.wxss
index 0a90c3c3..a21a5995 100644
--- a/dist/card/index.wxss
+++ b/dist/card/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-card{position:relative;box-sizing:border-box;padding:8px 16px;padding:var(--card-padding,8px 16px);font-size:12px;font-size:var(--card-font-size,12px);color:#323233;color:var(--card-text-color,#323233);background-color:#fafafa;background-color:var(--card-background-color,#fafafa)}.van-card__header{display:-webkit-flex;display:flex}.van-card__header--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:relative;-webkit-flex:none;flex:none;width:88px;width:var(--card-thumb-size,88px);height:88px;height:var(--card-thumb-size,88px);margin-right:8px;margin-right:var(--padding-xs,8px)}.van-card__thumb:empty{display:none}.van-card__img{width:100%;height:100%;border-radius:8px;border-radius:var(--border-radius-lg,8px)}.van-card__content{position:relative;display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:space-between;justify-content:space-between;min-width:0;min-height:88px;min-height:var(--card-thumb-size,88px)}.van-card__content--center{-webkit-justify-content:center;justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:16px;line-height:var(--card-title-line-height,16px)}.van-card__desc{line-height:20px;line-height:var(--card-desc-line-height,20px);color:#646566;color:var(--card-desc-color,#646566)}.van-card__bottom{line-height:20px}.van-card__price{display:inline-block;font-weight:700;color:#ee0a24;color:var(--card-price-color,#ee0a24);font-size:12px;font-size:var(--card-price-font-size,12px)}.van-card__price-integer{font-size:16px;font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{display:inline-block;margin-left:5px;text-decoration:line-through;font-size:10px;font-size:var(--card-origin-price-font-size,10px);color:#646566;color:var(--card-origin-price-color,#646566)}.van-card__num{float:right}.van-card__tag{position:absolute;top:2px;left:0}.van-card__footer{-webkit-flex:none;flex:none;width:100%;text-align:right}
\ No newline at end of file
+@import '../common/index.wxss';.van-card{position:relative;box-sizing:border-box;padding:8px 16px;padding:var(--card-padding,8px 16px);font-size:12px;font-size:var(--card-font-size,12px);color:#323233;color:var(--card-text-color,#323233);background-color:#fafafa;background-color:var(--card-background-color,#fafafa)}.van-card__header{display:-webkit-flex;display:flex}.van-card__header--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:relative;-webkit-flex:none;flex:none;width:88px;width:var(--card-thumb-size,88px);height:88px;height:var(--card-thumb-size,88px);margin-right:8px;margin-right:var(--padding-xs,8px)}.van-card__thumb:empty{display:none}.van-card__img{width:100%;height:100%;border-radius:8px;border-radius:var(--border-radius-lg,8px)}.van-card__content{position:relative;display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:space-between;justify-content:space-between;min-width:0;min-height:88px;min-height:var(--card-thumb-size,88px)}.van-card__content--center{-webkit-justify-content:center;justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:16px;line-height:var(--card-title-line-height,16px)}.van-card__desc{line-height:20px;line-height:var(--card-desc-line-height,20px);color:#646566;color:var(--card-desc-color,#646566)}.van-card__bottom{line-height:20px}.van-card__price{display:inline-block;font-weight:700;color:#ee0a24;color:var(--card-price-color,#ee0a24);font-size:12px;font-size:var(--card-price-font-size,12px)}.van-card__price-integer{font-size:16px;font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{display:inline-block;margin-left:5px;text-decoration:line-through;font-size:10px;font-size:var(--card-origin-price-font-size,10px);color:#646566;color:var(--card-origin-price-color,#646566)}.van-card__num{float:right}.van-card__tag{position:absolute!important;top:2px;left:0}.van-card__footer{-webkit-flex:none;flex:none;width:100%;text-align:right}
\ No newline at end of file
diff --git a/dist/circle/canvas.d.ts b/dist/circle/canvas.d.ts
index 2ba9531d..84c7caa7 100644
--- a/dist/circle/canvas.d.ts
+++ b/dist/circle/canvas.d.ts
@@ -1,4 +1,4 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 declare type CanvasContext = WechatMiniprogram.CanvasContext;
 export declare function adaptor(
   ctx: CanvasRenderingContext2D
diff --git a/dist/common/utils.d.ts b/dist/common/utils.d.ts
index 2bff69f9..f2c50c5d 100644
--- a/dist/common/utils.d.ts
+++ b/dist/common/utils.d.ts
@@ -1,4 +1,4 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 export declare function isDef(value: any): boolean;
 export declare function isObj(x: any): boolean;
 export declare function isNumber(value: any): boolean;
@@ -9,3 +9,11 @@ export declare function addUnit(value?: string | number): string | undefined;
 export declare function requestAnimationFrame(
   cb: Function
 ): void | WechatMiniprogram.NodesRef;
+export declare function getRect(
+  this: WechatMiniprogram.Component.TrivialInstance,
+  selector: string
+): Promise<WechatMiniprogram.BoundingClientRectCallbackResult>;
+export declare function getAllRect(
+  this: WechatMiniprogram.Component.TrivialInstance,
+  selector: string
+): Promise<WechatMiniprogram.BoundingClientRectCallbackResult[]>;
diff --git a/dist/common/utils.js b/dist/common/utils.js
index 30edc486..6969d102 100644
--- a/dist/common/utils.js
+++ b/dist/common/utils.js
@@ -16,7 +16,7 @@ export function nextTick(fn) {
     fn();
   }, 1000 / 30);
 }
-let systemInfo = null;
+let systemInfo;
 export function getSystemInfoSync() {
   if (systemInfo == null) {
     systemInfo = wx.getSystemInfoSync();
@@ -43,3 +43,21 @@ export function requestAnimationFrame(cb) {
       cb();
     });
 }
+export function getRect(selector) {
+  return new Promise((resolve) => {
+    wx.createSelectorQuery()
+      .in(this)
+      .select(selector)
+      .boundingClientRect()
+      .exec((rect = []) => resolve(rect[0]));
+  });
+}
+export function getAllRect(selector) {
+  return new Promise((resolve) => {
+    wx.createSelectorQuery()
+      .in(this)
+      .selectAll(selector)
+      .boundingClientRect()
+      .exec((rect = []) => resolve(rect[0]));
+  });
+}
diff --git a/dist/definitions/index.d.ts b/dist/definitions/index.d.ts
index fadb5b21..65e3aab6 100644
--- a/dist/definitions/index.d.ts
+++ b/dist/definitions/index.d.ts
@@ -1,29 +1,31 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 import { Weapp } from './weapp';
 declare type RecordToAny<T> = {
-    [K in keyof T]: any;
+  [K in keyof T]: any;
 };
-export declare type CombinedComponentInstance<Data, Props, Methods> = Methods & WechatMiniprogram.Component.TrivialInstance & Weapp.FormField & {
+export declare type CombinedComponentInstance<Data, Props, Methods> = Methods &
+  WechatMiniprogram.Component.TrivialInstance &
+  Weapp.FormField & {
     data: Data & RecordToAny<Props>;
-};
+  };
 export interface VantComponentOptions<Data, Props, Methods, Instance> {
-    data?: Data;
-    field?: boolean;
-    classes?: string[];
-    mixins?: string[];
-    props?: Props & Weapp.PropertyOption;
-    relation?: Weapp.RelationOption<Instance> & {
-        type: 'ancestor' | 'descendant';
-        name: string;
-        current: string;
-    };
-    relations?: {
-        [componentName: string]: Weapp.RelationOption<Instance>;
-    };
-    methods?: Methods & Weapp.MethodOption<Instance>;
-    beforeCreate?: (this: Instance) => void;
-    created?: (this: Instance) => void;
-    mounted?: (this: Instance) => void;
-    destroyed?: (this: Instance) => void;
+  data?: Data;
+  field?: boolean;
+  classes?: string[];
+  mixins?: string[];
+  props?: Props & Weapp.PropertyOption;
+  relation?: Weapp.RelationOption<Instance> & {
+    type: 'ancestor' | 'descendant';
+    name: string;
+    current: string;
+  };
+  relations?: {
+    [componentName: string]: Weapp.RelationOption<Instance>;
+  };
+  methods?: Methods & Weapp.MethodOption<Instance>;
+  beforeCreate?: (this: Instance) => void;
+  created?: (this: Instance) => void;
+  mounted?: (this: Instance) => void;
+  destroyed?: (this: Instance) => void;
 }
 export {};
diff --git a/dist/definitions/weapp.d.ts b/dist/definitions/weapp.d.ts
index b34923f3..bcc203a2 100644
--- a/dist/definitions/weapp.d.ts
+++ b/dist/definitions/weapp.d.ts
@@ -1,106 +1,132 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 export declare namespace Weapp {
-    export interface FormField {
-        data: {
-            name: string;
-            value: any;
-        };
-    }
-    interface Target {
-        id: string;
-        tagName: string;
-        dataset: {
-            [key: string]: any;
-        };
-    }
-    export interface Event {
-        /**
-         * 代表事件的类型。
-         */
-        type: string;
-        /**
-         * 页面打开到触发事件所经过的毫秒数。
-         */
-        timeStamp: number;
-        /**
-         * 触发事件的源组件。
-         */
-        target: Target;
-        /**
-         * 事件绑定的当前组件。
-         */
-        currentTarget: Target;
-        /**
-         * 额外的信息
-         */
-        detail: any;
-    }
-    interface Touch {
-        /**
-         * 触摸点的标识符
-         */
-        identifier: number;
-        /**
-         * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
-         */
-        pageX: number;
-        /**
-         * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
-         */
-        pageY: number;
-        /**
-         * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
-         */
-        clientX: number;
-        /**
-         * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
-         */
-        clientY: number;
-    }
-    export interface TouchEvent extends Event {
-        touches: Array<Touch>;
-        changedTouches: Array<Touch>;
-    }
+  export interface FormField {
+    data: {
+      name: string;
+      value: any;
+    };
+  }
+  interface Target {
+    id: string;
+    tagName: string;
+    dataset: {
+      [key: string]: any;
+    };
+  }
+  export interface Event {
     /**
-     * relation定义，miniprogram-api-typings缺少this定义
+     * 代表事件的类型。
      */
-    export interface RelationOption<Instance> {
-        /** 目标组件的相对关系 */
-        type: 'parent' | 'child' | 'ancestor' | 'descendant';
-        /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
-        linked?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
-        /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
-        linkChanged?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
-        /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
-        unlinked?(this: Instance, target: WechatMiniprogram.Component.TrivialInstance): void;
-        /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
-        target?: string;
-    }
+    type: string;
     /**
-     * obverser定义，miniprogram-api-typings缺少this定义
+     * 页面打开到触发事件所经过的毫秒数。
      */
-    type Observer<Instance, T> = (this: Instance, newVal: T, oldVal: T, changedPath: Array<string | number>) => void;
+    timeStamp: number;
     /**
-     * methods定义，miniprogram-api-typings缺少this定义
+     * 触发事件的源组件。
      */
-    export interface MethodOption<Instance> {
-        [name: string]: (this: Instance, ...args: any[]) => any;
-    }
-    export interface ComputedOption<Instance> {
-        [name: string]: (this: Instance) => any;
-    }
-    type PropertyType = StringConstructor | NumberConstructor | BooleanConstructor | ArrayConstructor | ObjectConstructor | FunctionConstructor | null;
-    export interface PropertyOption {
-        [name: string]: PropertyType | PropertyType[] | {
-            /** 属性类型 */
-            type: PropertyType | PropertyType[];
-            /** 属性初始值 */
-            value?: any;
-            /** 属性值被更改时的响应函数 */
-            observer?: string | Observer<WechatMiniprogram.Component.TrivialInstance, any>;
-            /** 属性的类型（可以指定多个） */
-            optionalTypes?: PropertyType[];
+    target: Target;
+    /**
+     * 事件绑定的当前组件。
+     */
+    currentTarget: Target;
+    /**
+     * 额外的信息
+     */
+    detail: any;
+  }
+  interface Touch {
+    /**
+     * 触摸点的标识符
+     */
+    identifier: number;
+    /**
+     * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
+     */
+    pageX: number;
+    /**
+     * 距离文档左上角的距离，文档的左上角为原点 ，横向为X轴，纵向为Y轴
+     */
+    pageY: number;
+    /**
+     * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
+     */
+    clientX: number;
+    /**
+     * 距离页面可显示区域（屏幕除去导航条）左上角距离，横向为X轴，纵向为Y轴
+     */
+    clientY: number;
+  }
+  export interface TouchEvent extends Event {
+    touches: Array<Touch>;
+    changedTouches: Array<Touch>;
+  }
+  /**
+   * relation定义，miniprogram-api-typings缺少this定义
+   */
+  export interface RelationOption<Instance> {
+    /** 目标组件的相对关系 */
+    type: 'parent' | 'child' | 'ancestor' | 'descendant';
+    /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
+    linked?(
+      this: Instance,
+      target: WechatMiniprogram.Component.TrivialInstance
+    ): void;
+    /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
+    linkChanged?(
+      this: Instance,
+      target: WechatMiniprogram.Component.TrivialInstance
+    ): void;
+    /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
+    unlinked?(
+      this: Instance,
+      target: WechatMiniprogram.Component.TrivialInstance
+    ): void;
+    /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
+    target?: string;
+  }
+  /**
+   * obverser定义，miniprogram-api-typings缺少this定义
+   */
+  type Observer<Instance, T> = (
+    this: Instance,
+    newVal: T,
+    oldVal: T,
+    changedPath: Array<string | number>
+  ) => void;
+  /**
+   * methods定义，miniprogram-api-typings缺少this定义
+   */
+  export interface MethodOption<Instance> {
+    [name: string]: (this: Instance, ...args: any[]) => any;
+  }
+  export interface ComputedOption<Instance> {
+    [name: string]: (this: Instance) => any;
+  }
+  type PropertyType =
+    | StringConstructor
+    | NumberConstructor
+    | BooleanConstructor
+    | ArrayConstructor
+    | ObjectConstructor
+    | FunctionConstructor
+    | null;
+  export interface PropertyOption {
+    [name: string]:
+      | PropertyType
+      | PropertyType[]
+      | {
+          /** 属性类型 */
+          type: PropertyType | PropertyType[];
+          /** 属性初始值 */
+          value?: any;
+          /** 属性值被更改时的响应函数 */
+          observer?:
+            | string
+            | Observer<WechatMiniprogram.Component.TrivialInstance, any>;
+          /** 属性的类型（可以指定多个） */
+          optionalTypes?: PropertyType[];
         };
-    }
-    export {};
+  }
+  export {};
 }
diff --git a/dist/dialog/dialog.d.ts b/dist/dialog/dialog.d.ts
index 2bffd13e..e964e88b 100644
--- a/dist/dialog/dialog.d.ts
+++ b/dist/dialog/dialog.d.ts
@@ -1,5 +1,4 @@
-/// <reference types="miniprogram-api-typings" />
-declare type DialogAction = 'confirm' | 'cancel';
+/// <reference types="wechat-miniprogram" />
 declare type DialogOptions = {
   lang?: string;
   show?: boolean;
@@ -34,17 +33,35 @@ declare type DialogOptions = {
   closeOnClickOverlay?: boolean;
   confirmButtonOpenType?: string;
 };
-interface Dialog {
-  (options: DialogOptions): Promise<DialogAction>;
-  alert?: (options: DialogOptions) => Promise<DialogAction>;
-  confirm?: (options: DialogOptions) => Promise<DialogAction>;
-  close?: () => void;
-  stopLoading?: () => void;
-  install?: () => void;
-  setDefaultOptions?: (options: DialogOptions) => void;
-  resetDefaultOptions?: () => void;
-  defaultOptions?: DialogOptions;
-  currentOptions?: DialogOptions;
-}
-declare const Dialog: Dialog;
+declare const Dialog: {
+  (options: DialogOptions): Promise<
+    WechatMiniprogram.Component.TrivialInstance
+  >;
+  alert(
+    options: DialogOptions
+  ): Promise<
+    WechatMiniprogram.Component.Instance<
+      Record<string, any>,
+      Record<string, any>,
+      Record<string, any>,
+      Record<string, any>
+    >
+  >;
+  confirm(
+    options: DialogOptions
+  ): Promise<
+    WechatMiniprogram.Component.Instance<
+      Record<string, any>,
+      Record<string, any>,
+      Record<string, any>,
+      Record<string, any>
+    >
+  >;
+  close(): void;
+  stopLoading(): void;
+  currentOptions: DialogOptions;
+  defaultOptions: DialogOptions;
+  setDefaultOptions(options: DialogOptions): void;
+  resetDefaultOptions(): void;
+};
 export default Dialog;
diff --git a/dist/dialog/dialog.js b/dist/dialog/dialog.js
index 9ba35ce9..94f1d3db 100644
--- a/dist/dialog/dialog.js
+++ b/dist/dialog/dialog.js
@@ -1,31 +1,5 @@
 let queue = [];
-function getContext() {
-  const pages = getCurrentPages();
-  return pages[pages.length - 1];
-}
-const Dialog = (options) => {
-  options = Object.assign(Object.assign({}, Dialog.currentOptions), 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.setData(
-        Object.assign({ onCancel: reject, onConfirm: resolve }, options)
-      );
-      wx.nextTick(() => {
-        dialog.setData({ show: true });
-      });
-      queue.push(dialog);
-    } else {
-      console.warn(
-        '未找到 van-dialog 节点，请确认 selector 及 context 是否正确'
-      );
-    }
-  });
-};
-Dialog.defaultOptions = {
+const defaultOptions = {
   show: false,
   title: '',
   width: null,
@@ -47,7 +21,34 @@ Dialog.defaultOptions = {
   closeOnClickOverlay: false,
   confirmButtonOpenType: '',
 };
-Dialog.alert = Dialog;
+let currentOptions = Object.assign({}, defaultOptions);
+function getContext() {
+  const pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+const Dialog = (options) => {
+  options = Object.assign(Object.assign({}, currentOptions), 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.setData(
+        Object.assign({ onCancel: reject, onConfirm: resolve }, options)
+      );
+      wx.nextTick(() => {
+        dialog.setData({ show: true });
+      });
+      queue.push(dialog);
+    } else {
+      console.warn(
+        '未找到 van-dialog 节点，请确认 selector 及 context 是否正确'
+      );
+    }
+  });
+};
+Dialog.alert = (options) => Dialog(options);
 Dialog.confirm = (options) =>
   Dialog(Object.assign({ showCancelButton: true }, options));
 Dialog.close = () => {
@@ -61,11 +62,15 @@ Dialog.stopLoading = () => {
     dialog.stopLoading();
   });
 };
+Dialog.currentOptions = currentOptions;
+Dialog.defaultOptions = defaultOptions;
 Dialog.setDefaultOptions = (options) => {
-  Object.assign(Dialog.currentOptions, options);
+  currentOptions = Object.assign(Object.assign({}, currentOptions), options);
+  Dialog.currentOptions = currentOptions;
 };
 Dialog.resetDefaultOptions = () => {
-  Dialog.currentOptions = Object.assign({}, Dialog.defaultOptions);
+  currentOptions = Object.assign({}, defaultOptions);
+  Dialog.currentOptions = currentOptions;
 };
 Dialog.resetDefaultOptions();
 export default Dialog;
diff --git a/dist/icon/index.wxss b/dist/icon/index.wxss
index 921d1b63..6cf4bcd5 100644
--- a/dist/icon/index.wxss
+++ b/dist/icon/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';@font-face{font-weight:400;font-family:vant-icon;font-style:normal;font-display:auto;src:url(https://img.yzcdn.cn/vant/vant-icon-eeb192.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-eeb192.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-eeb192.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-back-top:before{content:"\F0E6"}.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-down:before{content:"\F04B"}.van-icon-ecard-pay:before{content:"\F04C"}.van-icon-edit:before{content:"\F04D"}.van-icon-ellipsis:before{content:"\F04E"}.van-icon-empty:before{content:"\F04F"}.van-icon-enlarge:before{content:"\F0E4"}.van-icon-envelop-o:before{content:"\F050"}.van-icon-exchange:before{content:"\F051"}.van-icon-expand-o:before{content:"\F052"}.van-icon-expand:before{content:"\F053"}.van-icon-eye-o:before{content:"\F054"}.van-icon-eye:before{content:"\F055"}.van-icon-fail:before{content:"\F056"}.van-icon-failure:before{content:"\F057"}.van-icon-filter-o:before{content:"\F058"}.van-icon-fire-o:before{content:"\F059"}.van-icon-fire:before{content:"\F05A"}.van-icon-flag-o:before{content:"\F05B"}.van-icon-flower-o:before{content:"\F05C"}.van-icon-free-postage:before{content:"\F05D"}.van-icon-friends-o:before{content:"\F05E"}.van-icon-friends:before{content:"\F05F"}.van-icon-gem-o:before{content:"\F060"}.van-icon-gem:before{content:"\F061"}.van-icon-gift-card-o:before{content:"\F062"}.van-icon-gift-card:before{content:"\F063"}.van-icon-gift-o:before{content:"\F064"}.van-icon-gift:before{content:"\F065"}.van-icon-gold-coin-o:before{content:"\F066"}.van-icon-gold-coin:before{content:"\F067"}.van-icon-good-job-o:before{content:"\F068"}.van-icon-good-job:before{content:"\F069"}.van-icon-goods-collect-o:before{content:"\F06A"}.van-icon-goods-collect:before{content:"\F06B"}.van-icon-graphic:before{content:"\F06C"}.van-icon-home-o:before{content:"\F06D"}.van-icon-hot-o:before{content:"\F06E"}.van-icon-hot-sale-o:before{content:"\F06F"}.van-icon-hot-sale:before{content:"\F070"}.van-icon-hot:before{content:"\F071"}.van-icon-hotel-o:before{content:"\F072"}.van-icon-idcard:before{content:"\F073"}.van-icon-info-o:before{content:"\F074"}.van-icon-info:before{content:"\F075"}.van-icon-invition:before{content:"\F076"}.van-icon-label-o:before{content:"\F077"}.van-icon-label:before{content:"\F078"}.van-icon-like-o:before{content:"\F079"}.van-icon-like:before{content:"\F07A"}.van-icon-live:before{content:"\F07B"}.van-icon-location-o:before{content:"\F07C"}.van-icon-location:before{content:"\F07D"}.van-icon-lock:before{content:"\F07E"}.van-icon-logistics:before{content:"\F07F"}.van-icon-manager-o:before{content:"\F080"}.van-icon-manager:before{content:"\F081"}.van-icon-map-marked:before{content:"\F082"}.van-icon-medal-o:before{content:"\F083"}.van-icon-medal:before{content:"\F084"}.van-icon-more-o:before{content:"\F085"}.van-icon-more:before{content:"\F086"}.van-icon-music-o:before{content:"\F087"}.van-icon-music:before{content:"\F088"}.van-icon-new-arrival-o:before{content:"\F089"}.van-icon-new-arrival:before{content:"\F08A"}.van-icon-new-o:before{content:"\F08B"}.van-icon-new:before{content:"\F08C"}.van-icon-newspaper-o:before{content:"\F08D"}.van-icon-notes-o:before{content:"\F08E"}.van-icon-orders-o:before{content:"\F08F"}.van-icon-other-pay:before{content:"\F090"}.van-icon-paid:before{content:"\F091"}.van-icon-passed:before{content:"\F092"}.van-icon-pause-circle-o:before{content:"\F093"}.van-icon-pause-circle:before{content:"\F094"}.van-icon-pause:before{content:"\F095"}.van-icon-peer-pay:before{content:"\F096"}.van-icon-pending-payment:before{content:"\F097"}.van-icon-phone-circle-o:before{content:"\F098"}.van-icon-phone-circle:before{content:"\F099"}.van-icon-phone-o:before{content:"\F09A"}.van-icon-phone:before{content:"\F09B"}.van-icon-photo-fail:before{content:"\F0E5"}.van-icon-photo-o:before{content:"\F09C"}.van-icon-photo:before{content:"\F09D"}.van-icon-photograph:before{content:"\F09E"}.van-icon-play-circle-o:before{content:"\F09F"}.van-icon-play-circle:before{content:"\F0A0"}.van-icon-play:before{content:"\F0A1"}.van-icon-plus:before{content:"\F0A2"}.van-icon-point-gift-o:before{content:"\F0A3"}.van-icon-point-gift:before{content:"\F0A4"}.van-icon-points:before{content:"\F0A5"}.van-icon-printer:before{content:"\F0A6"}.van-icon-qr-invalid:before{content:"\F0A7"}.van-icon-qr:before{content:"\F0A8"}.van-icon-question-o:before{content:"\F0A9"}.van-icon-question:before{content:"\F0AA"}.van-icon-records:before{content:"\F0AB"}.van-icon-refund-o:before{content:"\F0AC"}.van-icon-replay:before{content:"\F0AD"}.van-icon-scan:before{content:"\F0AE"}.van-icon-search:before{content:"\F0AF"}.van-icon-send-gift-o:before{content:"\F0B0"}.van-icon-send-gift:before{content:"\F0B1"}.van-icon-service-o:before{content:"\F0B2"}.van-icon-service:before{content:"\F0B3"}.van-icon-setting-o:before{content:"\F0B4"}.van-icon-setting:before{content:"\F0B5"}.van-icon-share:before{content:"\F0B6"}.van-icon-shop-collect-o:before{content:"\F0B7"}.van-icon-shop-collect:before{content:"\F0B8"}.van-icon-shop-o:before{content:"\F0B9"}.van-icon-shop:before{content:"\F0BA"}.van-icon-shopping-cart-o:before{content:"\F0BB"}.van-icon-shopping-cart:before{content:"\F0BC"}.van-icon-shrink:before{content:"\F0BD"}.van-icon-sign:before{content:"\F0BE"}.van-icon-smile-comment-o:before{content:"\F0BF"}.van-icon-smile-comment:before{content:"\F0C0"}.van-icon-smile-o:before{content:"\F0C1"}.van-icon-smile:before{content:"\F0C2"}.van-icon-star-o:before{content:"\F0C3"}.van-icon-star:before{content:"\F0C4"}.van-icon-stop-circle-o:before{content:"\F0C5"}.van-icon-stop-circle:before{content:"\F0C6"}.van-icon-stop:before{content:"\F0C7"}.van-icon-success:before{content:"\F0C8"}.van-icon-thumb-circle-o:before{content:"\F0C9"}.van-icon-thumb-circle:before{content:"\F0CA"}.van-icon-todo-list-o:before{content:"\F0CB"}.van-icon-todo-list:before{content:"\F0CC"}.van-icon-tosend:before{content:"\F0CD"}.van-icon-tv-o:before{content:"\F0CE"}.van-icon-umbrella-circle:before{content:"\F0CF"}.van-icon-underway-o:before{content:"\F0D0"}.van-icon-underway:before{content:"\F0D1"}.van-icon-upgrade:before{content:"\F0D2"}.van-icon-user-circle-o:before{content:"\F0D3"}.van-icon-user-o:before{content:"\F0D4"}.van-icon-video-o:before{content:"\F0D5"}.van-icon-video:before{content:"\F0D6"}.van-icon-vip-card-o:before{content:"\F0D7"}.van-icon-vip-card:before{content:"\F0D8"}.van-icon-volume-o:before{content:"\F0D9"}.van-icon-volume:before{content:"\F0DA"}.van-icon-wap-home-o:before{content:"\F0DB"}.van-icon-wap-home:before{content:"\F0DC"}.van-icon-wap-nav:before{content:"\F0DD"}.van-icon-warn-o:before{content:"\F0DE"}.van-icon-warning-o:before{content:"\F0DF"}.van-icon-warning:before{content:"\F0E0"}.van-icon-weapp-nav:before{content:"\F0E1"}.van-icon-wechat:before{content:"\F0E2"}.van-icon-youzan-shield:before{content:"\F0E3"}:host{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.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
+@import '../common/index.wxss';@font-face{font-weight:400;font-family:vant-icon;font-style:normal;font-display:auto;src:url(https://img.yzcdn.cn/vant/vant-icon-0c347b.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-0c347b.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-0c347b.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-back-top:before{content:"\F0E6"}.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-calendar-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-down:before{content:"\F04B"}.van-icon-ecard-pay:before{content:"\F04C"}.van-icon-edit:before{content:"\F04D"}.van-icon-ellipsis:before{content:"\F04E"}.van-icon-empty:before{content:"\F04F"}.van-icon-enlarge:before{content:"\F0E4"}.van-icon-envelop-o:before{content:"\F050"}.van-icon-exchange:before{content:"\F051"}.van-icon-expand-o:before{content:"\F052"}.van-icon-expand:before{content:"\F053"}.van-icon-eye-o:before{content:"\F054"}.van-icon-eye:before{content:"\F055"}.van-icon-fail:before{content:"\F056"}.van-icon-failure:before{content:"\F057"}.van-icon-filter-o:before{content:"\F058"}.van-icon-fire-o:before{content:"\F059"}.van-icon-fire:before{content:"\F05A"}.van-icon-flag-o:before{content:"\F05B"}.van-icon-flower-o:before{content:"\F05C"}.van-icon-free-postage:before{content:"\F05D"}.van-icon-friends-o:before{content:"\F05E"}.van-icon-friends:before{content:"\F05F"}.van-icon-gem-o:before{content:"\F060"}.van-icon-gem:before{content:"\F061"}.van-icon-gift-card-o:before{content:"\F062"}.van-icon-gift-card:before{content:"\F063"}.van-icon-gift-o:before{content:"\F064"}.van-icon-gift:before{content:"\F065"}.van-icon-gold-coin-o:before{content:"\F066"}.van-icon-gold-coin:before{content:"\F067"}.van-icon-good-job-o:before{content:"\F068"}.van-icon-good-job:before{content:"\F069"}.van-icon-goods-collect-o:before{content:"\F06A"}.van-icon-goods-collect:before{content:"\F06B"}.van-icon-graphic:before{content:"\F06C"}.van-icon-home-o:before{content:"\F06D"}.van-icon-hot-o:before{content:"\F06E"}.van-icon-hot-sale-o:before{content:"\F06F"}.van-icon-hot-sale:before{content:"\F070"}.van-icon-hot:before{content:"\F071"}.van-icon-hotel-o:before{content:"\F072"}.van-icon-idcard:before{content:"\F073"}.van-icon-info-o:before{content:"\F074"}.van-icon-info:before{content:"\F075"}.van-icon-invition:before{content:"\F076"}.van-icon-label-o:before{content:"\F077"}.van-icon-label:before{content:"\F078"}.van-icon-like-o:before{content:"\F079"}.van-icon-like:before{content:"\F07A"}.van-icon-live:before{content:"\F07B"}.van-icon-location-o:before{content:"\F07C"}.van-icon-location:before{content:"\F07D"}.van-icon-lock:before{content:"\F07E"}.van-icon-logistics:before{content:"\F07F"}.van-icon-manager-o:before{content:"\F080"}.van-icon-manager:before{content:"\F081"}.van-icon-map-marked:before{content:"\F082"}.van-icon-medal-o:before{content:"\F083"}.van-icon-medal:before{content:"\F084"}.van-icon-more-o:before{content:"\F085"}.van-icon-more:before{content:"\F086"}.van-icon-music-o:before{content:"\F087"}.van-icon-music:before{content:"\F088"}.van-icon-new-arrival-o:before{content:"\F089"}.van-icon-new-arrival:before{content:"\F08A"}.van-icon-new-o:before{content:"\F08B"}.van-icon-new:before{content:"\F08C"}.van-icon-newspaper-o:before{content:"\F08D"}.van-icon-notes-o:before{content:"\F08E"}.van-icon-orders-o:before{content:"\F08F"}.van-icon-other-pay:before{content:"\F090"}.van-icon-paid:before{content:"\F091"}.van-icon-passed:before{content:"\F092"}.van-icon-pause-circle-o:before{content:"\F093"}.van-icon-pause-circle:before{content:"\F094"}.van-icon-pause:before{content:"\F095"}.van-icon-peer-pay:before{content:"\F096"}.van-icon-pending-payment:before{content:"\F097"}.van-icon-phone-circle-o:before{content:"\F098"}.van-icon-phone-circle:before{content:"\F099"}.van-icon-phone-o:before{content:"\F09A"}.van-icon-phone:before{content:"\F09B"}.van-icon-photo-fail:before{content:"\F0E5"}.van-icon-photo-o:before{content:"\F09C"}.van-icon-photo:before{content:"\F09D"}.van-icon-photograph:before{content:"\F09E"}.van-icon-play-circle-o:before{content:"\F09F"}.van-icon-play-circle:before{content:"\F0A0"}.van-icon-play:before{content:"\F0A1"}.van-icon-plus:before{content:"\F0A2"}.van-icon-point-gift-o:before{content:"\F0A3"}.van-icon-point-gift:before{content:"\F0A4"}.van-icon-points:before{content:"\F0A5"}.van-icon-printer:before{content:"\F0A6"}.van-icon-qr-invalid:before{content:"\F0A7"}.van-icon-qr:before{content:"\F0A8"}.van-icon-question-o:before{content:"\F0A9"}.van-icon-question:before{content:"\F0AA"}.van-icon-records:before{content:"\F0AB"}.van-icon-refund-o:before{content:"\F0AC"}.van-icon-replay:before{content:"\F0AD"}.van-icon-scan:before{content:"\F0AE"}.van-icon-search:before{content:"\F0AF"}.van-icon-send-gift-o:before{content:"\F0B0"}.van-icon-send-gift:before{content:"\F0B1"}.van-icon-service-o:before{content:"\F0B2"}.van-icon-service:before{content:"\F0B3"}.van-icon-setting-o:before{content:"\F0B4"}.van-icon-setting:before{content:"\F0B5"}.van-icon-share-o:before{content:"\F0E7"}.van-icon-share:before{content:"\F0B6"}.van-icon-shop-collect-o:before{content:"\F0B7"}.van-icon-shop-collect:before{content:"\F0B8"}.van-icon-shop-o:before{content:"\F0B9"}.van-icon-shop:before{content:"\F0BA"}.van-icon-shopping-cart-o:before{content:"\F0BB"}.van-icon-shopping-cart:before{content:"\F0BC"}.van-icon-shrink:before{content:"\F0BD"}.van-icon-sign:before{content:"\F0BE"}.van-icon-smile-comment-o:before{content:"\F0BF"}.van-icon-smile-comment:before{content:"\F0C0"}.van-icon-smile-o:before{content:"\F0C1"}.van-icon-smile:before{content:"\F0C2"}.van-icon-star-o:before{content:"\F0C3"}.van-icon-star:before{content:"\F0C4"}.van-icon-stop-circle-o:before{content:"\F0C5"}.van-icon-stop-circle:before{content:"\F0C6"}.van-icon-stop:before{content:"\F0C7"}.van-icon-success:before{content:"\F0C8"}.van-icon-thumb-circle-o:before{content:"\F0C9"}.van-icon-thumb-circle:before{content:"\F0CA"}.van-icon-todo-list-o:before{content:"\F0CB"}.van-icon-todo-list:before{content:"\F0CC"}.van-icon-tosend:before{content:"\F0CD"}.van-icon-tv-o:before{content:"\F0CE"}.van-icon-umbrella-circle:before{content:"\F0CF"}.van-icon-underway-o:before{content:"\F0D0"}.van-icon-underway:before{content:"\F0D1"}.van-icon-upgrade:before{content:"\F0D2"}.van-icon-user-circle-o:before{content:"\F0D3"}.van-icon-user-o:before{content:"\F0D4"}.van-icon-video-o:before{content:"\F0D5"}.van-icon-video:before{content:"\F0D6"}.van-icon-vip-card-o:before{content:"\F0D7"}.van-icon-vip-card:before{content:"\F0D8"}.van-icon-volume-o:before{content:"\F0D9"}.van-icon-volume:before{content:"\F0DA"}.van-icon-wap-home-o:before{content:"\F0DB"}.van-icon-wap-home:before{content:"\F0DC"}.van-icon-wap-nav:before{content:"\F0DD"}.van-icon-warn-o:before{content:"\F0DE"}.van-icon-warning-o:before{content:"\F0DF"}.van-icon-warning:before{content:"\F0E0"}.van-icon-weapp-nav:before{content:"\F0E1"}.van-icon-wechat:before{content:"\F0E2"}.van-icon-youzan-shield:before{content:"\F0E3"}:host{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.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/mixins/page-scroll.d.ts b/dist/mixins/page-scroll.d.ts
index 7e9a80f1..08d89d61 100644
--- a/dist/mixins/page-scroll.d.ts
+++ b/dist/mixins/page-scroll.d.ts
@@ -1,4 +1,4 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 declare type IPageScrollOption = WechatMiniprogram.Page.IPageScrollOption;
 declare type Scroller = (event: IPageScrollOption) => void;
 export declare const pageScrollMixin: (scroller: Scroller) => string;
diff --git a/dist/nav-bar/index.js b/dist/nav-bar/index.js
index b94132fa..6541e3a7 100644
--- a/dist/nav-bar/index.js
+++ b/dist/nav-bar/index.js
@@ -1,5 +1,5 @@
 import { VantComponent } from '../common/component';
-import { getSystemInfoSync } from '../common/utils';
+import { getRect, getSystemInfoSync } from '../common/utils';
 VantComponent({
   classes: ['title-class'],
   props: {
@@ -30,19 +30,13 @@ VantComponent({
     },
   },
   data: {
-    statusBarHeight: 0,
-    height: 44,
-    baseStyle: '',
+    height: 46,
   },
   created() {
     const { statusBarHeight } = getSystemInfoSync();
-    const { safeAreaInsetTop, zIndex } = this.data;
-    const paddingTop = safeAreaInsetTop ? statusBarHeight : 0;
-    const baseStyle = `z-index: ${zIndex};padding-top: ${paddingTop}px;`;
     this.setData({
       statusBarHeight,
-      height: 44 + statusBarHeight,
-      baseStyle,
+      height: 46 + statusBarHeight,
     });
   },
   mounted() {
@@ -60,7 +54,7 @@ VantComponent({
         return;
       }
       wx.nextTick(() => {
-        this.getRect('.van-nav-bar').then((res) => {
+        getRect.call(this, '.van-nav-bar').then((res) => {
           this.setData({ height: res.height });
         });
       });
diff --git a/dist/nav-bar/index.wxml b/dist/nav-bar/index.wxml
index b805f142..b6405fd5 100644
--- a/dist/nav-bar/index.wxml
+++ b/dist/nav-bar/index.wxml
@@ -1,10 +1,11 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
 
 <view wx:if="{{ fixed && placeholder }}" style="height: {{ height }}px;" />
 
 <view
   class="{{ utils.bem('nav-bar', { fixed }) }} custom-class {{ border ? 'van-hairline--bottom' : '' }}"
-  style="{{ baseStyle }}; {{ customStyle }}"
+  style="{{ computed.barStyle({ zIndex, statusBarHeight, safeAreaInsetTop }) }}; {{ customStyle }}"
 >
   <view class="van-nav-bar__content">
     <view class="van-nav-bar__left" bind:tap="onClickLeft">
diff --git a/dist/nav-bar/index.wxs b/dist/nav-bar/index.wxs
new file mode 100644
index 00000000..64828328
--- /dev/null
+++ b/dist/nav-bar/index.wxs
@@ -0,0 +1,17 @@
+/* eslint-disable */
+function barStyle(data) {
+  var styles = [
+    ['z-index', data.zIndex],
+    ['padding-top', data.safeAreaInsetTop ? data.statusBarHeight + 'px' : 0],
+  ];
+
+  return styles
+    .map(function (item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  barStyle: barStyle,
+};
diff --git a/dist/nav-bar/index.wxss b/dist/nav-bar/index.wxss
index a2331281..48e9e3f5 100644
--- a/dist/nav-bar/index.wxss
+++ b/dist/nav-bar/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-nav-bar{text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar,.van-nav-bar__content{position:relative}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)}
\ No newline at end of file
+@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:46px;height:var(--nav-bar-height,46px);line-height:46px;line-height:var(--nav-bar-height,46px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar__content{position:relative;height:100%}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px!important;font-size:var(--nav-bar-arrow-size,16px)!important;color:#1989fa!important;color:var(--nav-bar-icon-color,#1989fa)!important}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)}
\ No newline at end of file
diff --git a/dist/share-sheet/index.js b/dist/share-sheet/index.js
index 495dee74..27d0c7be 100644
--- a/dist/share-sheet/index.js
+++ b/dist/share-sheet/index.js
@@ -6,7 +6,10 @@ VantComponent({
     // overlay custom style
     overlayStyle: Object,
     // z-index
-    zIndex: [Number, String],
+    zIndex: {
+      type: Number,
+      value: 100,
+    },
     title: String,
     cancelText: {
       type: String,
diff --git a/dist/share-sheet/options.wxml b/dist/share-sheet/options.wxml
index cb38c7ec..cad68377 100644
--- a/dist/share-sheet/options.wxml
+++ b/dist/share-sheet/options.wxml
@@ -9,7 +9,9 @@
     data-index="{{ index }}"
     bindtap="onSelect"
   >
-    <image src="{{ computed.getIconURL(item.icon) }}" class="van-share-sheet__icon" />
+    <button class="van-share-sheet__button" open-type="{{ item.openType }}">
+      <image src="{{ computed.getIconURL(item.icon) }}" class="van-share-sheet__icon" />
+    </button>
     <view wx:if="{{ item.name }}" class="van-share-sheet__name">{{ item.name }}</view>
     <view wx:if="{{ item.description }}" class="van-share-sheet__option-description">
       {{ item.description }}
diff --git a/dist/share-sheet/options.wxss b/dist/share-sheet/options.wxss
index e43444fb..e01da2fb 100644
--- a/dist/share-sheet/options.wxss
+++ b/dist/share-sheet/options.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-share-sheet__options{position:relative;display:-webkit-flex;display:flex;padding:16px 0 16px 8px;overflow-x:auto;overflow-y:visible;-webkit-overflow-scrolling:touch}.van-share-sheet__options--border:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;top:0;right:0;left:16px;border-top:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-share-sheet__options::-webkit-scrollbar{height:0}.van-share-sheet__option{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-user-select:none;user-select:none}.van-share-sheet__option:active{opacity:.7}.van-share-sheet__icon{width:48px;height:48px;margin:0 16px}.van-share-sheet__name{margin-top:8px;padding:0 4px;color:#646566;font-size:12px}.van-share-sheet__option-description{padding:0 4px;color:#c8c9cc;font-size:12px}
\ No newline at end of file
+@import '../common/index.wxss';.van-share-sheet__options{position:relative;display:-webkit-flex;display:flex;padding:16px 0 16px 8px;overflow-x:auto;overflow-y:visible;-webkit-overflow-scrolling:touch}.van-share-sheet__options--border:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;top:0;right:0;left:16px;border-top:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-share-sheet__options::-webkit-scrollbar{height:0}.van-share-sheet__option{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-user-select:none;user-select:none}.van-share-sheet__option:active{opacity:.7}.van-share-sheet__button{height:auto;padding:0;line-height:inherit;background-color:initial;border:0}.van-share-sheet__button:after{border:0}.van-share-sheet__icon{width:48px;height:48px;margin:0 16px}.van-share-sheet__name{margin-top:8px;padding:0 4px;color:#646566;font-size:12px}.van-share-sheet__option-description{padding:0 4px;color:#c8c9cc;font-size:12px}
\ No newline at end of file
diff --git a/dist/tabs/index.js b/dist/tabs/index.js
index 20faeab5..0198f0eb 100644
--- a/dist/tabs/index.js
+++ b/dist/tabs/index.js
@@ -1,6 +1,6 @@
 import { VantComponent } from '../common/component';
 import { touch } from '../mixins/touch';
-import { isDef, addUnit } from '../common/utils';
+import { getAllRect, getRect, isDef } from '../common/utils';
 VantComponent({
   mixins: [touch],
   classes: ['nav-class', 'tab-class', 'tab-active-class', 'line-class'],
@@ -26,10 +26,7 @@ VantComponent({
     swipeable: Boolean,
     titleActiveColor: String,
     titleInactiveColor: String,
-    color: {
-      type: String,
-      observer: 'setLine',
-    },
+    color: String,
     animated: {
       type: Boolean,
       observer() {
@@ -46,7 +43,6 @@ VantComponent({
     lineHeight: {
       type: [String, Number],
       value: -1,
-      observer: 'setLine',
     },
     active: {
       type: [String, Number],
@@ -97,8 +93,10 @@ VantComponent({
     scrollLeft: 0,
     scrollable: false,
     trackStyle: '',
-    currentIndex: null,
+    currentIndex: 0,
     container: null,
+    skipTransition: true,
+    lineOffsetLeft: 0,
   },
   mounted() {
     wx.nextTick(() => {
@@ -191,44 +189,26 @@ VantComponent({
         return activeTab.getComputedName();
       }
     },
-    setLine(skipTransition) {
+    setLine(skipTransition = false) {
       if (this.data.type !== 'line') {
         return;
       }
-      const {
-        color,
-        duration,
-        currentIndex,
-        lineWidth,
-        lineHeight,
-      } = this.data;
-      this.getRect('.van-tab', true).then((rects = []) => {
+      const { currentIndex } = this.data;
+      Promise.all([
+        getAllRect.call(this, '.van-tab'),
+        getRect.call(this, '.van-tabs__line'),
+      ]).then(([rects = [], lineRect]) => {
         const rect = rects[currentIndex];
         if (rect == null) {
           return;
         }
-        const height =
-          lineHeight !== -1
-            ? `height: ${addUnit(lineHeight)}; border-radius: ${addUnit(
-                lineHeight
-              )};`
-            : '';
-        let left = rects
+        let lineOffsetLeft = rects
           .slice(0, currentIndex)
           .reduce((prev, curr) => prev + curr.width, 0);
-        left += (rect.width - lineWidth) / 2;
-        const transition = skipTransition
-          ? ''
-          : `transition-duration: ${duration}s; -webkit-transition-duration: ${duration}s;`;
+        lineOffsetLeft += (rect.width - lineRect.width) / 2;
         this.setData({
-          lineStyle: `
-            ${height}
-            width: ${addUnit(lineWidth)};
-            background-color: ${color};
-            -webkit-transform: translateX(${left}px);
-            transform: translateX(${left}px);
-            ${transition}
-          `,
+          lineOffsetLeft,
+          skipTransition,
         });
       });
     },
@@ -239,8 +219,8 @@ VantComponent({
         return;
       }
       Promise.all([
-        this.getRect('.van-tab', true),
-        this.getRect('.van-tabs__nav'),
+        getAllRect.call(this, '.van-tab'),
+        getRect.call(this, '.van-tabs__nav'),
       ]).then(([tabRects, navRect]) => {
         const tabRect = tabRects[currentIndex];
         const offsetLeft = tabRects
diff --git a/dist/tabs/index.wxml b/dist/tabs/index.wxml
index c8195ae2..dd92ac49 100644
--- a/dist/tabs/index.wxml
+++ b/dist/tabs/index.wxml
@@ -20,7 +20,7 @@
         style="{{ color ? 'border-color: ' + color : '' }}"
       >
         <view class="{{ utils.bem('tabs__nav', [type, { complete: !ellipsis }]) }} nav-class" style="{{ getters.tabCardTypeBorderStyle(color, type) }}">
-          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
+          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ getters.lineStyle({ color, lineOffsetLeft, lineHeight, skipTransition, duration, lineWidth }) }}" />
           <view
             wx:for="{{ tabs }}"
             wx:key="index"
diff --git a/dist/tabs/index.wxs b/dist/tabs/index.wxs
index 88bcafd3..87b553f5 100644
--- a/dist/tabs/index.wxs
+++ b/dist/tabs/index.wxs
@@ -1,4 +1,6 @@
 /* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
 function tabClass(active, ellipsis) {
   var classes = ['tab-class'];
 
@@ -68,11 +70,42 @@ function trackStyle(data) {
   return [
     'transform: translate3d(' + -100 * data.currentIndex + '%, 0, 0)',
     '-webkit-transition-duration: ' + data.duration + 's',
-    'transition-duration: ' + data.duration + 's'
+    'transition-duration: ' + data.duration + 's',
   ].join(';');
 }
 
-module.exports.tabClass = tabClass;
-module.exports.tabStyle = tabStyle;
-module.exports.trackStyle = trackStyle;
-module.exports.tabCardTypeBorderStyle = tabCardTypeBorderStyle;
+function lineStyle(data) {
+  var styles = [
+    ['width', utils.addUnit(data.lineWidth)],
+    ['transform', 'translateX(' + data.lineOffsetLeft + 'px)'],
+    ['-webkit-transform', 'translateX(' + data.lineOffsetLeft + 'px)'],
+  ];
+
+  if (data.color) {
+    styles.push(['background-color', data.color]);
+  }
+
+  if (data.lineHeight !== -1) {
+    styles.push(['height', utils.addUnit(data.lineHeight)]);
+    styles.push(['border-radius', utils.addUnit(data.lineHeight)]);
+  }
+
+  if (!data.skipTransition) {
+    styles.push(['transition-duration', data.duration + 's']);
+    styles.push(['-webkit-transition-duration', data.duration + 's']);
+  }
+
+  return styles
+    .map(function (item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  tabClass: tabClass,
+  tabStyle: tabStyle,
+  trackStyle: trackStyle,
+  lineStyle: lineStyle,
+  tabCardTypeBorderStyle: tabCardTypeBorderStyle,
+};
diff --git a/dist/toast/toast.d.ts b/dist/toast/toast.d.ts
index f7148a03..b7a7d6ec 100644
--- a/dist/toast/toast.d.ts
+++ b/dist/toast/toast.d.ts
@@ -1,26 +1,51 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 declare type ToastMessage = string | number;
 interface ToastOptions {
-    show?: boolean;
-    type?: string;
-    mask?: boolean;
-    zIndex?: number;
-    context?: WechatMiniprogram.Component.TrivialInstance | WechatMiniprogram.Page.TrivialInstance;
-    position?: string;
-    duration?: number;
-    selector?: string;
-    forbidClick?: boolean;
-    loadingType?: string;
-    message?: ToastMessage;
-    onClose?: () => void;
+  show?: boolean;
+  type?: string;
+  mask?: boolean;
+  zIndex?: number;
+  context?:
+    | WechatMiniprogram.Component.TrivialInstance
+    | WechatMiniprogram.Page.TrivialInstance;
+  position?: string;
+  duration?: number;
+  selector?: string;
+  forbidClick?: boolean;
+  loadingType?: string;
+  message?: ToastMessage;
+  onClose?: () => void;
 }
-declare function Toast(toastOptions: ToastOptions | ToastMessage): WechatMiniprogram.Component.TrivialInstance;
+declare function Toast(
+  toastOptions: ToastOptions | ToastMessage
+): WechatMiniprogram.Component.TrivialInstance;
 declare namespace Toast {
-    var loading: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
-    var success: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
-    var fail: (options: string | number | ToastOptions) => WechatMiniprogram.Component.Instance<Record<string, any>, Record<string, any>, Record<string, any>>;
-    var clear: () => void;
-    var setDefaultOptions: (options: ToastOptions) => void;
-    var resetDefaultOptions: () => void;
+  var loading: (
+    options: string | number | ToastOptions
+  ) => WechatMiniprogram.Component.Instance<
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>
+  >;
+  var success: (
+    options: string | number | ToastOptions
+  ) => WechatMiniprogram.Component.Instance<
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>
+  >;
+  var fail: (
+    options: string | number | ToastOptions
+  ) => WechatMiniprogram.Component.Instance<
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>,
+    Record<string, any>
+  >;
+  var clear: () => void;
+  var setDefaultOptions: (options: ToastOptions) => void;
+  var resetDefaultOptions: () => void;
 }
 export default Toast;
diff --git a/dist/uploader/index.js b/dist/uploader/index.js
index f72f3473..957f0612 100644
--- a/dist/uploader/index.js
+++ b/dist/uploader/index.js
@@ -176,6 +176,27 @@ VantComponent({
         },
       });
     },
+    // fix: accept 为 video 时不能展示视频
+    onPreviewVideo: function (event) {
+      if (!this.data.previewFullImage) return;
+      var index = event.currentTarget.dataset.index;
+      var lists = this.data.lists;
+      wx.previewMedia({
+        sources: lists
+          .filter(function (item) {
+            return item.isVideo;
+          })
+          .map(function (item) {
+            item.type = 'video';
+            item.url = item.url || item.path;
+            return item;
+          }),
+        current: index,
+        fail: function () {
+          wx.showToast({ title: '预览视频失败', icon: 'none' });
+        },
+      });
+    },
     onClickPreview(event) {
       const { index } = event.currentTarget.dataset;
       const item = this.data.lists[index];
diff --git a/dist/uploader/index.wxml b/dist/uploader/index.wxml
index e01da80d..c7ebf945 100644
--- a/dist/uploader/index.wxml
+++ b/dist/uploader/index.wxml
@@ -21,6 +21,16 @@
         data-index="{{ index }}"
         bind:tap="onPreviewImage"
       />
+      <video
+        wx:elif="{{ item.isVideo }}"
+        src="{{item.url || item.path}}"
+        autoplay="{{item.autoplay}}"
+        class="van-uploader__preview-image"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
+        data-index="{{ index }}"
+        bind:tap="onPreviewVideo"
+      >
+      </video>      
       <view
         wx:else
         class="van-uploader__file"
diff --git a/dist/uploader/index.wxss b/dist/uploader/index.wxss
index 5d104901..61ef7a5c 100644
--- a/dist/uploader/index.wxss
+++ b/dist/uploader/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0;width:14px;height:14px;background-color:rgba(0,0,0,.7);border-radius:0 0 0 12px}.van-uploader__preview-delete-icon{position:absolute;top:-2px;right:-2px;color:#fff;font-size:16px;-webkit-transform:scale(.5);transform:scale(.5)}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88)}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff!important}
\ No newline at end of file
+@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0;width:14px;height:14px;padding:0 0 8px 8px}.van-uploader__preview-delete:after{position:absolute;top:0;right:0;width:14px;height:14px;background-color:rgba(0,0,0,.7);border-radius:0 0 0 12px;content:""}.van-uploader__preview-delete-icon{position:absolute;top:-2px;right:-2px;z-index:1;color:#fff;font-size:16px;-webkit-transform:scale(.5);transform:scale(.5)}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88)}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff!important}
\ No newline at end of file
diff --git a/dist/uploader/utils.d.ts b/dist/uploader/utils.d.ts
index 324a435d..1036ef57 100644
--- a/dist/uploader/utils.d.ts
+++ b/dist/uploader/utils.d.ts
@@ -1,4 +1,4 @@
-/// <reference types="miniprogram-api-typings" />
+/// <reference types="wechat-miniprogram" />
 interface File {
   path: string;
   url: string;
diff --git a/lib/card/index.wxml b/lib/card/index.wxml
index 39b4b33a..62173e4a 100644
--- a/lib/card/index.wxml
+++ b/lib/card/index.wxml
@@ -10,7 +10,7 @@
         lazy-load="{{ lazyLoad }}"
         class="van-card__img thumb-class"
       />
-      <slot name="thumb" />
+      <slot wx:else name="thumb" />
       <van-tag
         wx:if="{{ tag }}"
         mark
@@ -19,6 +19,7 @@
       >
         {{ tag }}
       </van-tag>
+      <slot wx:else name="tag" />
     </view>
 
     <view class="van-card__content {{ utils.bem('card__content', { center: centered }) }}">
@@ -34,9 +35,14 @@
 
       <view class="van-card__bottom">
         <slot name="price-top" />
-        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">{{ currency }}<text class="van-card__price-integer">{{ integerStr }}</text><text class="van-card__price-decimal">{{ decimalStr }}</text></view>
+        <view wx:if="{{ price || price === 0 }}" class="van-card__price price-class">
+          <text>{{ currency }}</text>
+          <text class="van-card__price-integer">{{ integerStr }}</text>
+          <text class="van-card__price-decimal">{{ decimalStr }}</text>
+        </view>
         <slot wx:else name="price" />
         <view wx:if="{{ originPrice || originPrice === 0 }}" class="van-card__origin-price origin-price-class">{{ currency }} {{ originPrice }}</view>
+        <slot wx:else name="origin-price" />
         <view wx:if="{{ num }}" class="van-card__num num-class">x {{ num }}</view>
         <slot wx:else  name="num" />
         <slot name="bottom" />
diff --git a/lib/card/index.wxss b/lib/card/index.wxss
index 0a90c3c3..a21a5995 100644
--- a/lib/card/index.wxss
+++ b/lib/card/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-card{position:relative;box-sizing:border-box;padding:8px 16px;padding:var(--card-padding,8px 16px);font-size:12px;font-size:var(--card-font-size,12px);color:#323233;color:var(--card-text-color,#323233);background-color:#fafafa;background-color:var(--card-background-color,#fafafa)}.van-card__header{display:-webkit-flex;display:flex}.van-card__header--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:relative;-webkit-flex:none;flex:none;width:88px;width:var(--card-thumb-size,88px);height:88px;height:var(--card-thumb-size,88px);margin-right:8px;margin-right:var(--padding-xs,8px)}.van-card__thumb:empty{display:none}.van-card__img{width:100%;height:100%;border-radius:8px;border-radius:var(--border-radius-lg,8px)}.van-card__content{position:relative;display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:space-between;justify-content:space-between;min-width:0;min-height:88px;min-height:var(--card-thumb-size,88px)}.van-card__content--center{-webkit-justify-content:center;justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:16px;line-height:var(--card-title-line-height,16px)}.van-card__desc{line-height:20px;line-height:var(--card-desc-line-height,20px);color:#646566;color:var(--card-desc-color,#646566)}.van-card__bottom{line-height:20px}.van-card__price{display:inline-block;font-weight:700;color:#ee0a24;color:var(--card-price-color,#ee0a24);font-size:12px;font-size:var(--card-price-font-size,12px)}.van-card__price-integer{font-size:16px;font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{display:inline-block;margin-left:5px;text-decoration:line-through;font-size:10px;font-size:var(--card-origin-price-font-size,10px);color:#646566;color:var(--card-origin-price-color,#646566)}.van-card__num{float:right}.van-card__tag{position:absolute;top:2px;left:0}.van-card__footer{-webkit-flex:none;flex:none;width:100%;text-align:right}
\ No newline at end of file
+@import '../common/index.wxss';.van-card{position:relative;box-sizing:border-box;padding:8px 16px;padding:var(--card-padding,8px 16px);font-size:12px;font-size:var(--card-font-size,12px);color:#323233;color:var(--card-text-color,#323233);background-color:#fafafa;background-color:var(--card-background-color,#fafafa)}.van-card__header{display:-webkit-flex;display:flex}.van-card__header--center{-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.van-card__thumb{position:relative;-webkit-flex:none;flex:none;width:88px;width:var(--card-thumb-size,88px);height:88px;height:var(--card-thumb-size,88px);margin-right:8px;margin-right:var(--padding-xs,8px)}.van-card__thumb:empty{display:none}.van-card__img{width:100%;height:100%;border-radius:8px;border-radius:var(--border-radius-lg,8px)}.van-card__content{position:relative;display:-webkit-flex;display:flex;-webkit-flex:1;flex:1;-webkit-flex-direction:column;flex-direction:column;-webkit-justify-content:space-between;justify-content:space-between;min-width:0;min-height:88px;min-height:var(--card-thumb-size,88px)}.van-card__content--center{-webkit-justify-content:center;justify-content:center}.van-card__desc,.van-card__title{word-wrap:break-word}.van-card__title{font-weight:700;line-height:16px;line-height:var(--card-title-line-height,16px)}.van-card__desc{line-height:20px;line-height:var(--card-desc-line-height,20px);color:#646566;color:var(--card-desc-color,#646566)}.van-card__bottom{line-height:20px}.van-card__price{display:inline-block;font-weight:700;color:#ee0a24;color:var(--card-price-color,#ee0a24);font-size:12px;font-size:var(--card-price-font-size,12px)}.van-card__price-integer{font-size:16px;font-size:var(--card-price-integer-font-size,16px)}.van-card__price-decimal,.van-card__price-integer{font-family:Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif;font-family:var(--card-price-font-family,Avenir-Heavy,PingFang SC,Helvetica Neue,Arial,sans-serif)}.van-card__origin-price{display:inline-block;margin-left:5px;text-decoration:line-through;font-size:10px;font-size:var(--card-origin-price-font-size,10px);color:#646566;color:var(--card-origin-price-color,#646566)}.van-card__num{float:right}.van-card__tag{position:absolute!important;top:2px;left:0}.van-card__footer{-webkit-flex:none;flex:none;width:100%;text-align:right}
\ No newline at end of file
diff --git a/lib/common/utils.js b/lib/common/utils.js
index 09707c27..1a056bd7 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -1,6 +1,6 @@
 'use strict';
 Object.defineProperty(exports, '__esModule', { value: true });
-exports.requestAnimationFrame = exports.addUnit = exports.getSystemInfoSync = exports.nextTick = exports.range = exports.isNumber = exports.isObj = exports.isDef = void 0;
+exports.getAllRect = exports.getRect = exports.requestAnimationFrame = exports.addUnit = exports.getSystemInfoSync = exports.nextTick = exports.range = exports.isNumber = exports.isObj = exports.isDef = void 0;
 function isDef(value) {
   return value !== undefined && value !== null;
 }
@@ -24,7 +24,7 @@ function nextTick(fn) {
   }, 1000 / 30);
 }
 exports.nextTick = nextTick;
-var systemInfo = null;
+var systemInfo;
 function getSystemInfoSync() {
   if (systemInfo == null) {
     systemInfo = wx.getSystemInfoSync();
@@ -54,3 +54,35 @@ function requestAnimationFrame(cb) {
     });
 }
 exports.requestAnimationFrame = requestAnimationFrame;
+function getRect(selector) {
+  var _this = this;
+  return new Promise(function (resolve) {
+    wx.createSelectorQuery()
+      .in(_this)
+      .select(selector)
+      .boundingClientRect()
+      .exec(function (rect) {
+        if (rect === void 0) {
+          rect = [];
+        }
+        return resolve(rect[0]);
+      });
+  });
+}
+exports.getRect = getRect;
+function getAllRect(selector) {
+  var _this = this;
+  return new Promise(function (resolve) {
+    wx.createSelectorQuery()
+      .in(_this)
+      .selectAll(selector)
+      .boundingClientRect()
+      .exec(function (rect) {
+        if (rect === void 0) {
+          rect = [];
+        }
+        return resolve(rect[0]);
+      });
+  });
+}
+exports.getAllRect = getAllRect;
diff --git a/lib/dialog/dialog.js b/lib/dialog/dialog.js
index 250f03fa..5a09dbc0 100644
--- a/lib/dialog/dialog.js
+++ b/lib/dialog/dialog.js
@@ -16,33 +16,7 @@ var __assign =
   };
 Object.defineProperty(exports, '__esModule', { value: true });
 var queue = [];
-function getContext() {
-  var pages = getCurrentPages();
-  return pages[pages.length - 1];
-}
-var Dialog = function (options) {
-  options = __assign(__assign({}, Dialog.currentOptions), 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.setData(
-        __assign({ onCancel: reject, onConfirm: resolve }, options)
-      );
-      wx.nextTick(function () {
-        dialog.setData({ show: true });
-      });
-      queue.push(dialog);
-    } else {
-      console.warn(
-        '未找到 van-dialog 节点，请确认 selector 及 context 是否正确'
-      );
-    }
-  });
-};
-Dialog.defaultOptions = {
+var defaultOptions = {
   show: false,
   title: '',
   width: null,
@@ -64,7 +38,36 @@ Dialog.defaultOptions = {
   closeOnClickOverlay: false,
   confirmButtonOpenType: '',
 };
-Dialog.alert = Dialog;
+var currentOptions = __assign({}, defaultOptions);
+function getContext() {
+  var pages = getCurrentPages();
+  return pages[pages.length - 1];
+}
+var Dialog = function (options) {
+  options = __assign(__assign({}, currentOptions), 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.setData(
+        __assign({ onCancel: reject, onConfirm: resolve }, options)
+      );
+      wx.nextTick(function () {
+        dialog.setData({ show: true });
+      });
+      queue.push(dialog);
+    } else {
+      console.warn(
+        '未找到 van-dialog 节点，请确认 selector 及 context 是否正确'
+      );
+    }
+  });
+};
+Dialog.alert = function (options) {
+  return Dialog(options);
+};
 Dialog.confirm = function (options) {
   return Dialog(__assign({ showCancelButton: true }, options));
 };
@@ -79,11 +82,15 @@ Dialog.stopLoading = function () {
     dialog.stopLoading();
   });
 };
+Dialog.currentOptions = currentOptions;
+Dialog.defaultOptions = defaultOptions;
 Dialog.setDefaultOptions = function (options) {
-  Object.assign(Dialog.currentOptions, options);
+  currentOptions = __assign(__assign({}, currentOptions), options);
+  Dialog.currentOptions = currentOptions;
 };
 Dialog.resetDefaultOptions = function () {
-  Dialog.currentOptions = __assign({}, Dialog.defaultOptions);
+  currentOptions = __assign({}, defaultOptions);
+  Dialog.currentOptions = currentOptions;
 };
 Dialog.resetDefaultOptions();
 exports.default = Dialog;
diff --git a/lib/icon/index.wxss b/lib/icon/index.wxss
index 921d1b63..6cf4bcd5 100644
--- a/lib/icon/index.wxss
+++ b/lib/icon/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';@font-face{font-weight:400;font-family:vant-icon;font-style:normal;font-display:auto;src:url(https://img.yzcdn.cn/vant/vant-icon-eeb192.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-eeb192.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-eeb192.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-back-top:before{content:"\F0E6"}.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-down:before{content:"\F04B"}.van-icon-ecard-pay:before{content:"\F04C"}.van-icon-edit:before{content:"\F04D"}.van-icon-ellipsis:before{content:"\F04E"}.van-icon-empty:before{content:"\F04F"}.van-icon-enlarge:before{content:"\F0E4"}.van-icon-envelop-o:before{content:"\F050"}.van-icon-exchange:before{content:"\F051"}.van-icon-expand-o:before{content:"\F052"}.van-icon-expand:before{content:"\F053"}.van-icon-eye-o:before{content:"\F054"}.van-icon-eye:before{content:"\F055"}.van-icon-fail:before{content:"\F056"}.van-icon-failure:before{content:"\F057"}.van-icon-filter-o:before{content:"\F058"}.van-icon-fire-o:before{content:"\F059"}.van-icon-fire:before{content:"\F05A"}.van-icon-flag-o:before{content:"\F05B"}.van-icon-flower-o:before{content:"\F05C"}.van-icon-free-postage:before{content:"\F05D"}.van-icon-friends-o:before{content:"\F05E"}.van-icon-friends:before{content:"\F05F"}.van-icon-gem-o:before{content:"\F060"}.van-icon-gem:before{content:"\F061"}.van-icon-gift-card-o:before{content:"\F062"}.van-icon-gift-card:before{content:"\F063"}.van-icon-gift-o:before{content:"\F064"}.van-icon-gift:before{content:"\F065"}.van-icon-gold-coin-o:before{content:"\F066"}.van-icon-gold-coin:before{content:"\F067"}.van-icon-good-job-o:before{content:"\F068"}.van-icon-good-job:before{content:"\F069"}.van-icon-goods-collect-o:before{content:"\F06A"}.van-icon-goods-collect:before{content:"\F06B"}.van-icon-graphic:before{content:"\F06C"}.van-icon-home-o:before{content:"\F06D"}.van-icon-hot-o:before{content:"\F06E"}.van-icon-hot-sale-o:before{content:"\F06F"}.van-icon-hot-sale:before{content:"\F070"}.van-icon-hot:before{content:"\F071"}.van-icon-hotel-o:before{content:"\F072"}.van-icon-idcard:before{content:"\F073"}.van-icon-info-o:before{content:"\F074"}.van-icon-info:before{content:"\F075"}.van-icon-invition:before{content:"\F076"}.van-icon-label-o:before{content:"\F077"}.van-icon-label:before{content:"\F078"}.van-icon-like-o:before{content:"\F079"}.van-icon-like:before{content:"\F07A"}.van-icon-live:before{content:"\F07B"}.van-icon-location-o:before{content:"\F07C"}.van-icon-location:before{content:"\F07D"}.van-icon-lock:before{content:"\F07E"}.van-icon-logistics:before{content:"\F07F"}.van-icon-manager-o:before{content:"\F080"}.van-icon-manager:before{content:"\F081"}.van-icon-map-marked:before{content:"\F082"}.van-icon-medal-o:before{content:"\F083"}.van-icon-medal:before{content:"\F084"}.van-icon-more-o:before{content:"\F085"}.van-icon-more:before{content:"\F086"}.van-icon-music-o:before{content:"\F087"}.van-icon-music:before{content:"\F088"}.van-icon-new-arrival-o:before{content:"\F089"}.van-icon-new-arrival:before{content:"\F08A"}.van-icon-new-o:before{content:"\F08B"}.van-icon-new:before{content:"\F08C"}.van-icon-newspaper-o:before{content:"\F08D"}.van-icon-notes-o:before{content:"\F08E"}.van-icon-orders-o:before{content:"\F08F"}.van-icon-other-pay:before{content:"\F090"}.van-icon-paid:before{content:"\F091"}.van-icon-passed:before{content:"\F092"}.van-icon-pause-circle-o:before{content:"\F093"}.van-icon-pause-circle:before{content:"\F094"}.van-icon-pause:before{content:"\F095"}.van-icon-peer-pay:before{content:"\F096"}.van-icon-pending-payment:before{content:"\F097"}.van-icon-phone-circle-o:before{content:"\F098"}.van-icon-phone-circle:before{content:"\F099"}.van-icon-phone-o:before{content:"\F09A"}.van-icon-phone:before{content:"\F09B"}.van-icon-photo-fail:before{content:"\F0E5"}.van-icon-photo-o:before{content:"\F09C"}.van-icon-photo:before{content:"\F09D"}.van-icon-photograph:before{content:"\F09E"}.van-icon-play-circle-o:before{content:"\F09F"}.van-icon-play-circle:before{content:"\F0A0"}.van-icon-play:before{content:"\F0A1"}.van-icon-plus:before{content:"\F0A2"}.van-icon-point-gift-o:before{content:"\F0A3"}.van-icon-point-gift:before{content:"\F0A4"}.van-icon-points:before{content:"\F0A5"}.van-icon-printer:before{content:"\F0A6"}.van-icon-qr-invalid:before{content:"\F0A7"}.van-icon-qr:before{content:"\F0A8"}.van-icon-question-o:before{content:"\F0A9"}.van-icon-question:before{content:"\F0AA"}.van-icon-records:before{content:"\F0AB"}.van-icon-refund-o:before{content:"\F0AC"}.van-icon-replay:before{content:"\F0AD"}.van-icon-scan:before{content:"\F0AE"}.van-icon-search:before{content:"\F0AF"}.van-icon-send-gift-o:before{content:"\F0B0"}.van-icon-send-gift:before{content:"\F0B1"}.van-icon-service-o:before{content:"\F0B2"}.van-icon-service:before{content:"\F0B3"}.van-icon-setting-o:before{content:"\F0B4"}.van-icon-setting:before{content:"\F0B5"}.van-icon-share:before{content:"\F0B6"}.van-icon-shop-collect-o:before{content:"\F0B7"}.van-icon-shop-collect:before{content:"\F0B8"}.van-icon-shop-o:before{content:"\F0B9"}.van-icon-shop:before{content:"\F0BA"}.van-icon-shopping-cart-o:before{content:"\F0BB"}.van-icon-shopping-cart:before{content:"\F0BC"}.van-icon-shrink:before{content:"\F0BD"}.van-icon-sign:before{content:"\F0BE"}.van-icon-smile-comment-o:before{content:"\F0BF"}.van-icon-smile-comment:before{content:"\F0C0"}.van-icon-smile-o:before{content:"\F0C1"}.van-icon-smile:before{content:"\F0C2"}.van-icon-star-o:before{content:"\F0C3"}.van-icon-star:before{content:"\F0C4"}.van-icon-stop-circle-o:before{content:"\F0C5"}.van-icon-stop-circle:before{content:"\F0C6"}.van-icon-stop:before{content:"\F0C7"}.van-icon-success:before{content:"\F0C8"}.van-icon-thumb-circle-o:before{content:"\F0C9"}.van-icon-thumb-circle:before{content:"\F0CA"}.van-icon-todo-list-o:before{content:"\F0CB"}.van-icon-todo-list:before{content:"\F0CC"}.van-icon-tosend:before{content:"\F0CD"}.van-icon-tv-o:before{content:"\F0CE"}.van-icon-umbrella-circle:before{content:"\F0CF"}.van-icon-underway-o:before{content:"\F0D0"}.van-icon-underway:before{content:"\F0D1"}.van-icon-upgrade:before{content:"\F0D2"}.van-icon-user-circle-o:before{content:"\F0D3"}.van-icon-user-o:before{content:"\F0D4"}.van-icon-video-o:before{content:"\F0D5"}.van-icon-video:before{content:"\F0D6"}.van-icon-vip-card-o:before{content:"\F0D7"}.van-icon-vip-card:before{content:"\F0D8"}.van-icon-volume-o:before{content:"\F0D9"}.van-icon-volume:before{content:"\F0DA"}.van-icon-wap-home-o:before{content:"\F0DB"}.van-icon-wap-home:before{content:"\F0DC"}.van-icon-wap-nav:before{content:"\F0DD"}.van-icon-warn-o:before{content:"\F0DE"}.van-icon-warning-o:before{content:"\F0DF"}.van-icon-warning:before{content:"\F0E0"}.van-icon-weapp-nav:before{content:"\F0E1"}.van-icon-wechat:before{content:"\F0E2"}.van-icon-youzan-shield:before{content:"\F0E3"}:host{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.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
+@import '../common/index.wxss';@font-face{font-weight:400;font-family:vant-icon;font-style:normal;font-display:auto;src:url(https://img.yzcdn.cn/vant/vant-icon-0c347b.woff2) format("woff2"),url(https://img.yzcdn.cn/vant/vant-icon-0c347b.woff) format("woff"),url(https://img.yzcdn.cn/vant/vant-icon-0c347b.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-back-top:before{content:"\F0E6"}.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-calendar-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-down:before{content:"\F04B"}.van-icon-ecard-pay:before{content:"\F04C"}.van-icon-edit:before{content:"\F04D"}.van-icon-ellipsis:before{content:"\F04E"}.van-icon-empty:before{content:"\F04F"}.van-icon-enlarge:before{content:"\F0E4"}.van-icon-envelop-o:before{content:"\F050"}.van-icon-exchange:before{content:"\F051"}.van-icon-expand-o:before{content:"\F052"}.van-icon-expand:before{content:"\F053"}.van-icon-eye-o:before{content:"\F054"}.van-icon-eye:before{content:"\F055"}.van-icon-fail:before{content:"\F056"}.van-icon-failure:before{content:"\F057"}.van-icon-filter-o:before{content:"\F058"}.van-icon-fire-o:before{content:"\F059"}.van-icon-fire:before{content:"\F05A"}.van-icon-flag-o:before{content:"\F05B"}.van-icon-flower-o:before{content:"\F05C"}.van-icon-free-postage:before{content:"\F05D"}.van-icon-friends-o:before{content:"\F05E"}.van-icon-friends:before{content:"\F05F"}.van-icon-gem-o:before{content:"\F060"}.van-icon-gem:before{content:"\F061"}.van-icon-gift-card-o:before{content:"\F062"}.van-icon-gift-card:before{content:"\F063"}.van-icon-gift-o:before{content:"\F064"}.van-icon-gift:before{content:"\F065"}.van-icon-gold-coin-o:before{content:"\F066"}.van-icon-gold-coin:before{content:"\F067"}.van-icon-good-job-o:before{content:"\F068"}.van-icon-good-job:before{content:"\F069"}.van-icon-goods-collect-o:before{content:"\F06A"}.van-icon-goods-collect:before{content:"\F06B"}.van-icon-graphic:before{content:"\F06C"}.van-icon-home-o:before{content:"\F06D"}.van-icon-hot-o:before{content:"\F06E"}.van-icon-hot-sale-o:before{content:"\F06F"}.van-icon-hot-sale:before{content:"\F070"}.van-icon-hot:before{content:"\F071"}.van-icon-hotel-o:before{content:"\F072"}.van-icon-idcard:before{content:"\F073"}.van-icon-info-o:before{content:"\F074"}.van-icon-info:before{content:"\F075"}.van-icon-invition:before{content:"\F076"}.van-icon-label-o:before{content:"\F077"}.van-icon-label:before{content:"\F078"}.van-icon-like-o:before{content:"\F079"}.van-icon-like:before{content:"\F07A"}.van-icon-live:before{content:"\F07B"}.van-icon-location-o:before{content:"\F07C"}.van-icon-location:before{content:"\F07D"}.van-icon-lock:before{content:"\F07E"}.van-icon-logistics:before{content:"\F07F"}.van-icon-manager-o:before{content:"\F080"}.van-icon-manager:before{content:"\F081"}.van-icon-map-marked:before{content:"\F082"}.van-icon-medal-o:before{content:"\F083"}.van-icon-medal:before{content:"\F084"}.van-icon-more-o:before{content:"\F085"}.van-icon-more:before{content:"\F086"}.van-icon-music-o:before{content:"\F087"}.van-icon-music:before{content:"\F088"}.van-icon-new-arrival-o:before{content:"\F089"}.van-icon-new-arrival:before{content:"\F08A"}.van-icon-new-o:before{content:"\F08B"}.van-icon-new:before{content:"\F08C"}.van-icon-newspaper-o:before{content:"\F08D"}.van-icon-notes-o:before{content:"\F08E"}.van-icon-orders-o:before{content:"\F08F"}.van-icon-other-pay:before{content:"\F090"}.van-icon-paid:before{content:"\F091"}.van-icon-passed:before{content:"\F092"}.van-icon-pause-circle-o:before{content:"\F093"}.van-icon-pause-circle:before{content:"\F094"}.van-icon-pause:before{content:"\F095"}.van-icon-peer-pay:before{content:"\F096"}.van-icon-pending-payment:before{content:"\F097"}.van-icon-phone-circle-o:before{content:"\F098"}.van-icon-phone-circle:before{content:"\F099"}.van-icon-phone-o:before{content:"\F09A"}.van-icon-phone:before{content:"\F09B"}.van-icon-photo-fail:before{content:"\F0E5"}.van-icon-photo-o:before{content:"\F09C"}.van-icon-photo:before{content:"\F09D"}.van-icon-photograph:before{content:"\F09E"}.van-icon-play-circle-o:before{content:"\F09F"}.van-icon-play-circle:before{content:"\F0A0"}.van-icon-play:before{content:"\F0A1"}.van-icon-plus:before{content:"\F0A2"}.van-icon-point-gift-o:before{content:"\F0A3"}.van-icon-point-gift:before{content:"\F0A4"}.van-icon-points:before{content:"\F0A5"}.van-icon-printer:before{content:"\F0A6"}.van-icon-qr-invalid:before{content:"\F0A7"}.van-icon-qr:before{content:"\F0A8"}.van-icon-question-o:before{content:"\F0A9"}.van-icon-question:before{content:"\F0AA"}.van-icon-records:before{content:"\F0AB"}.van-icon-refund-o:before{content:"\F0AC"}.van-icon-replay:before{content:"\F0AD"}.van-icon-scan:before{content:"\F0AE"}.van-icon-search:before{content:"\F0AF"}.van-icon-send-gift-o:before{content:"\F0B0"}.van-icon-send-gift:before{content:"\F0B1"}.van-icon-service-o:before{content:"\F0B2"}.van-icon-service:before{content:"\F0B3"}.van-icon-setting-o:before{content:"\F0B4"}.van-icon-setting:before{content:"\F0B5"}.van-icon-share-o:before{content:"\F0E7"}.van-icon-share:before{content:"\F0B6"}.van-icon-shop-collect-o:before{content:"\F0B7"}.van-icon-shop-collect:before{content:"\F0B8"}.van-icon-shop-o:before{content:"\F0B9"}.van-icon-shop:before{content:"\F0BA"}.van-icon-shopping-cart-o:before{content:"\F0BB"}.van-icon-shopping-cart:before{content:"\F0BC"}.van-icon-shrink:before{content:"\F0BD"}.van-icon-sign:before{content:"\F0BE"}.van-icon-smile-comment-o:before{content:"\F0BF"}.van-icon-smile-comment:before{content:"\F0C0"}.van-icon-smile-o:before{content:"\F0C1"}.van-icon-smile:before{content:"\F0C2"}.van-icon-star-o:before{content:"\F0C3"}.van-icon-star:before{content:"\F0C4"}.van-icon-stop-circle-o:before{content:"\F0C5"}.van-icon-stop-circle:before{content:"\F0C6"}.van-icon-stop:before{content:"\F0C7"}.van-icon-success:before{content:"\F0C8"}.van-icon-thumb-circle-o:before{content:"\F0C9"}.van-icon-thumb-circle:before{content:"\F0CA"}.van-icon-todo-list-o:before{content:"\F0CB"}.van-icon-todo-list:before{content:"\F0CC"}.van-icon-tosend:before{content:"\F0CD"}.van-icon-tv-o:before{content:"\F0CE"}.van-icon-umbrella-circle:before{content:"\F0CF"}.van-icon-underway-o:before{content:"\F0D0"}.van-icon-underway:before{content:"\F0D1"}.van-icon-upgrade:before{content:"\F0D2"}.van-icon-user-circle-o:before{content:"\F0D3"}.van-icon-user-o:before{content:"\F0D4"}.van-icon-video-o:before{content:"\F0D5"}.van-icon-video:before{content:"\F0D6"}.van-icon-vip-card-o:before{content:"\F0D7"}.van-icon-vip-card:before{content:"\F0D8"}.van-icon-volume-o:before{content:"\F0D9"}.van-icon-volume:before{content:"\F0DA"}.van-icon-wap-home-o:before{content:"\F0DB"}.van-icon-wap-home:before{content:"\F0DC"}.van-icon-wap-nav:before{content:"\F0DD"}.van-icon-warn-o:before{content:"\F0DE"}.van-icon-warning-o:before{content:"\F0DF"}.van-icon-warning:before{content:"\F0E0"}.van-icon-weapp-nav:before{content:"\F0E1"}.van-icon-wechat:before{content:"\F0E2"}.van-icon-youzan-shield:before{content:"\F0E3"}:host{display:-webkit-inline-flex;display:inline-flex;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center}.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/nav-bar/index.js b/lib/nav-bar/index.js
index fb4fd97a..2627de4d 100644
--- a/lib/nav-bar/index.js
+++ b/lib/nav-bar/index.js
@@ -32,22 +32,13 @@ component_1.VantComponent({
     },
   },
   data: {
-    statusBarHeight: 0,
-    height: 44,
-    baseStyle: '',
+    height: 46,
   },
   created: function () {
     var statusBarHeight = utils_1.getSystemInfoSync().statusBarHeight;
-    var _a = this.data,
-      safeAreaInsetTop = _a.safeAreaInsetTop,
-      zIndex = _a.zIndex;
-    var paddingTop = safeAreaInsetTop ? statusBarHeight : 0;
-    var baseStyle =
-      'z-index: ' + zIndex + ';padding-top: ' + paddingTop + 'px;';
     this.setData({
       statusBarHeight: statusBarHeight,
-      height: 44 + statusBarHeight,
-      baseStyle: baseStyle,
+      height: 46 + statusBarHeight,
     });
   },
   mounted: function () {
@@ -66,7 +57,7 @@ component_1.VantComponent({
         return;
       }
       wx.nextTick(function () {
-        _this.getRect('.van-nav-bar').then(function (res) {
+        utils_1.getRect.call(_this, '.van-nav-bar').then(function (res) {
           _this.setData({ height: res.height });
         });
       });
diff --git a/lib/nav-bar/index.wxml b/lib/nav-bar/index.wxml
index b805f142..b6405fd5 100644
--- a/lib/nav-bar/index.wxml
+++ b/lib/nav-bar/index.wxml
@@ -1,10 +1,11 @@
 <wxs src="../wxs/utils.wxs" module="utils" />
+<wxs src="./index.wxs" module="computed" />
 
 <view wx:if="{{ fixed && placeholder }}" style="height: {{ height }}px;" />
 
 <view
   class="{{ utils.bem('nav-bar', { fixed }) }} custom-class {{ border ? 'van-hairline--bottom' : '' }}"
-  style="{{ baseStyle }}; {{ customStyle }}"
+  style="{{ computed.barStyle({ zIndex, statusBarHeight, safeAreaInsetTop }) }}; {{ customStyle }}"
 >
   <view class="van-nav-bar__content">
     <view class="van-nav-bar__left" bind:tap="onClickLeft">
diff --git a/lib/nav-bar/index.wxs b/lib/nav-bar/index.wxs
new file mode 100644
index 00000000..64828328
--- /dev/null
+++ b/lib/nav-bar/index.wxs
@@ -0,0 +1,17 @@
+/* eslint-disable */
+function barStyle(data) {
+  var styles = [
+    ['z-index', data.zIndex],
+    ['padding-top', data.safeAreaInsetTop ? data.statusBarHeight + 'px' : 0],
+  ];
+
+  return styles
+    .map(function (item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  barStyle: barStyle,
+};
diff --git a/lib/nav-bar/index.wxss b/lib/nav-bar/index.wxss
index a2331281..48e9e3f5 100644
--- a/lib/nav-bar/index.wxss
+++ b/lib/nav-bar/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-nav-bar{text-align:center;-webkit-user-select:none;user-select:none;height:44px;height:var(--nav-bar-height,44px);line-height:44px;line-height:var(--nav-bar-height,44px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar,.van-nav-bar__content{position:relative}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px;font-size:var(--nav-bar-arrow-size,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)}
\ No newline at end of file
+@import '../common/index.wxss';.van-nav-bar{position:relative;text-align:center;-webkit-user-select:none;user-select:none;height:46px;height:var(--nav-bar-height,46px);line-height:46px;line-height:var(--nav-bar-height,46px);background-color:#fff;background-color:var(--nav-bar-background-color,#fff)}.van-nav-bar__content{position:relative;height:100%}.van-nav-bar__text{display:inline-block;vertical-align:middle;margin:0 -16px;margin:0 -var(--padding-md,16px);padding:0 16px;padding:0 var(--padding-md,16px);color:#1989fa;color:var(--nav-bar-text-color,#1989fa)}.van-nav-bar__text--hover{background-color:#f2f3f5;background-color:var(--active-color,#f2f3f5)}.van-nav-bar__arrow{vertical-align:middle;font-size:16px!important;font-size:var(--nav-bar-arrow-size,16px)!important;color:#1989fa!important;color:var(--nav-bar-icon-color,#1989fa)!important}.van-nav-bar__arrow+.van-nav-bar__text{margin-left:-20px;padding-left:25px}.van-nav-bar--fixed{position:fixed;top:0;left:0;width:100%}.van-nav-bar__title{max-width:60%;margin:0 auto;color:#323233;color:var(--nav-bar-title-text-color,#323233);font-weight:500;font-weight:var(--font-weight-bold,500);font-size:16px;font-size:var(--nav-bar-title-font-size,16px)}.van-nav-bar__left,.van-nav-bar__right{position:absolute;top:0;bottom:0;display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;font-size:14px;font-size:var(--font-size-md,14px)}.van-nav-bar__left{left:16px;left:var(--padding-md,16px)}.van-nav-bar__right{right:16px;right:var(--padding-md,16px)}
\ No newline at end of file
diff --git a/lib/share-sheet/index.js b/lib/share-sheet/index.js
index 60fe4e6f..440caf84 100644
--- a/lib/share-sheet/index.js
+++ b/lib/share-sheet/index.js
@@ -8,7 +8,10 @@ component_1.VantComponent({
     // overlay custom style
     overlayStyle: Object,
     // z-index
-    zIndex: [Number, String],
+    zIndex: {
+      type: Number,
+      value: 100,
+    },
     title: String,
     cancelText: {
       type: String,
diff --git a/lib/share-sheet/options.wxml b/lib/share-sheet/options.wxml
index cb38c7ec..cad68377 100644
--- a/lib/share-sheet/options.wxml
+++ b/lib/share-sheet/options.wxml
@@ -9,7 +9,9 @@
     data-index="{{ index }}"
     bindtap="onSelect"
   >
-    <image src="{{ computed.getIconURL(item.icon) }}" class="van-share-sheet__icon" />
+    <button class="van-share-sheet__button" open-type="{{ item.openType }}">
+      <image src="{{ computed.getIconURL(item.icon) }}" class="van-share-sheet__icon" />
+    </button>
     <view wx:if="{{ item.name }}" class="van-share-sheet__name">{{ item.name }}</view>
     <view wx:if="{{ item.description }}" class="van-share-sheet__option-description">
       {{ item.description }}
diff --git a/lib/share-sheet/options.wxss b/lib/share-sheet/options.wxss
index e43444fb..e01da2fb 100644
--- a/lib/share-sheet/options.wxss
+++ b/lib/share-sheet/options.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-share-sheet__options{position:relative;display:-webkit-flex;display:flex;padding:16px 0 16px 8px;overflow-x:auto;overflow-y:visible;-webkit-overflow-scrolling:touch}.van-share-sheet__options--border:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;top:0;right:0;left:16px;border-top:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-share-sheet__options::-webkit-scrollbar{height:0}.van-share-sheet__option{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-user-select:none;user-select:none}.van-share-sheet__option:active{opacity:.7}.van-share-sheet__icon{width:48px;height:48px;margin:0 16px}.van-share-sheet__name{margin-top:8px;padding:0 4px;color:#646566;font-size:12px}.van-share-sheet__option-description{padding:0 4px;color:#c8c9cc;font-size:12px}
\ No newline at end of file
+@import '../common/index.wxss';.van-share-sheet__options{position:relative;display:-webkit-flex;display:flex;padding:16px 0 16px 8px;overflow-x:auto;overflow-y:visible;-webkit-overflow-scrolling:touch}.van-share-sheet__options--border:before{position:absolute;box-sizing:border-box;content:" ";pointer-events:none;top:0;right:0;left:16px;border-top:1px solid #ebedf0;-webkit-transform:scaleY(.5);transform:scaleY(.5)}.van-share-sheet__options::-webkit-scrollbar{height:0}.van-share-sheet__option{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-user-select:none;user-select:none}.van-share-sheet__option:active{opacity:.7}.van-share-sheet__button{height:auto;padding:0;line-height:inherit;background-color:initial;border:0}.van-share-sheet__button:after{border:0}.van-share-sheet__icon{width:48px;height:48px;margin:0 16px}.van-share-sheet__name{margin-top:8px;padding:0 4px;color:#646566;font-size:12px}.van-share-sheet__option-description{padding:0 4px;color:#c8c9cc;font-size:12px}
\ No newline at end of file
diff --git a/lib/tabs/index.js b/lib/tabs/index.js
index 0d5a243a..8a96f8a9 100644
--- a/lib/tabs/index.js
+++ b/lib/tabs/index.js
@@ -28,10 +28,7 @@ component_1.VantComponent({
     swipeable: Boolean,
     titleActiveColor: String,
     titleInactiveColor: String,
-    color: {
-      type: String,
-      observer: 'setLine',
-    },
+    color: String,
     animated: {
       type: Boolean,
       observer: function () {
@@ -49,7 +46,6 @@ component_1.VantComponent({
     lineHeight: {
       type: [String, Number],
       value: -1,
-      observer: 'setLine',
     },
     active: {
       type: [String, Number],
@@ -100,8 +96,10 @@ component_1.VantComponent({
     scrollLeft: 0,
     scrollable: false,
     trackStyle: '',
-    currentIndex: null,
+    currentIndex: 0,
     container: null,
+    skipTransition: true,
+    lineOffsetLeft: 0,
   },
   mounted: function () {
     var _this = this;
@@ -211,57 +209,33 @@ component_1.VantComponent({
     },
     setLine: function (skipTransition) {
       var _this = this;
+      if (skipTransition === void 0) {
+        skipTransition = false;
+      }
       if (this.data.type !== 'line') {
         return;
       }
-      var _a = this.data,
-        color = _a.color,
-        duration = _a.duration,
-        currentIndex = _a.currentIndex,
-        lineWidth = _a.lineWidth,
-        lineHeight = _a.lineHeight;
-      this.getRect('.van-tab', true).then(function (rects) {
-        if (rects === void 0) {
-          rects = [];
-        }
+      var currentIndex = this.data.currentIndex;
+      Promise.all([
+        utils_1.getAllRect.call(this, '.van-tab'),
+        utils_1.getRect.call(this, '.van-tabs__line'),
+      ]).then(function (_a) {
+        var _b = _a[0],
+          rects = _b === void 0 ? [] : _b,
+          lineRect = _a[1];
         var rect = rects[currentIndex];
         if (rect == null) {
           return;
         }
-        var height =
-          lineHeight !== -1
-            ? 'height: ' +
-              utils_1.addUnit(lineHeight) +
-              '; border-radius: ' +
-              utils_1.addUnit(lineHeight) +
-              ';'
-            : '';
-        var left = rects.slice(0, currentIndex).reduce(function (prev, curr) {
-          return prev + curr.width;
-        }, 0);
-        left += (rect.width - lineWidth) / 2;
-        var transition = skipTransition
-          ? ''
-          : 'transition-duration: ' +
-            duration +
-            's; -webkit-transition-duration: ' +
-            duration +
-            's;';
+        var lineOffsetLeft = rects
+          .slice(0, currentIndex)
+          .reduce(function (prev, curr) {
+            return prev + curr.width;
+          }, 0);
+        lineOffsetLeft += (rect.width - lineRect.width) / 2;
         _this.setData({
-          lineStyle:
-            '\n            ' +
-            height +
-            '\n            width: ' +
-            utils_1.addUnit(lineWidth) +
-            ';\n            background-color: ' +
-            color +
-            ';\n            -webkit-transform: translateX(' +
-            left +
-            'px);\n            transform: translateX(' +
-            left +
-            'px);\n            ' +
-            transition +
-            '\n          ',
+          lineOffsetLeft: lineOffsetLeft,
+          skipTransition: skipTransition,
         });
       });
     },
@@ -275,8 +249,8 @@ component_1.VantComponent({
         return;
       }
       Promise.all([
-        this.getRect('.van-tab', true),
-        this.getRect('.van-tabs__nav'),
+        utils_1.getAllRect.call(this, '.van-tab'),
+        utils_1.getRect.call(this, '.van-tabs__nav'),
       ]).then(function (_a) {
         var tabRects = _a[0],
           navRect = _a[1];
diff --git a/lib/tabs/index.wxml b/lib/tabs/index.wxml
index c8195ae2..dd92ac49 100644
--- a/lib/tabs/index.wxml
+++ b/lib/tabs/index.wxml
@@ -20,7 +20,7 @@
         style="{{ color ? 'border-color: ' + color : '' }}"
       >
         <view class="{{ utils.bem('tabs__nav', [type, { complete: !ellipsis }]) }} nav-class" style="{{ getters.tabCardTypeBorderStyle(color, type) }}">
-          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ lineStyle }}" />
+          <view wx:if="{{ type === 'line' }}" class="van-tabs__line" style="{{ getters.lineStyle({ color, lineOffsetLeft, lineHeight, skipTransition, duration, lineWidth }) }}" />
           <view
             wx:for="{{ tabs }}"
             wx:key="index"
diff --git a/lib/tabs/index.wxs b/lib/tabs/index.wxs
index 88bcafd3..87b553f5 100644
--- a/lib/tabs/index.wxs
+++ b/lib/tabs/index.wxs
@@ -1,4 +1,6 @@
 /* eslint-disable */
+var utils = require('../wxs/utils.wxs');
+
 function tabClass(active, ellipsis) {
   var classes = ['tab-class'];
 
@@ -68,11 +70,42 @@ function trackStyle(data) {
   return [
     'transform: translate3d(' + -100 * data.currentIndex + '%, 0, 0)',
     '-webkit-transition-duration: ' + data.duration + 's',
-    'transition-duration: ' + data.duration + 's'
+    'transition-duration: ' + data.duration + 's',
   ].join(';');
 }
 
-module.exports.tabClass = tabClass;
-module.exports.tabStyle = tabStyle;
-module.exports.trackStyle = trackStyle;
-module.exports.tabCardTypeBorderStyle = tabCardTypeBorderStyle;
+function lineStyle(data) {
+  var styles = [
+    ['width', utils.addUnit(data.lineWidth)],
+    ['transform', 'translateX(' + data.lineOffsetLeft + 'px)'],
+    ['-webkit-transform', 'translateX(' + data.lineOffsetLeft + 'px)'],
+  ];
+
+  if (data.color) {
+    styles.push(['background-color', data.color]);
+  }
+
+  if (data.lineHeight !== -1) {
+    styles.push(['height', utils.addUnit(data.lineHeight)]);
+    styles.push(['border-radius', utils.addUnit(data.lineHeight)]);
+  }
+
+  if (!data.skipTransition) {
+    styles.push(['transition-duration', data.duration + 's']);
+    styles.push(['-webkit-transition-duration', data.duration + 's']);
+  }
+
+  return styles
+    .map(function (item) {
+      return item.join(':');
+    })
+    .join(';');
+}
+
+module.exports = {
+  tabClass: tabClass,
+  tabStyle: tabStyle,
+  trackStyle: trackStyle,
+  lineStyle: lineStyle,
+  tabCardTypeBorderStyle: tabCardTypeBorderStyle,
+};
diff --git a/lib/uploader/index.js b/lib/uploader/index.js
index ba27c50d..03652eba 100644
--- a/lib/uploader/index.js
+++ b/lib/uploader/index.js
@@ -214,6 +214,27 @@ component_1.VantComponent({
         },
       });
     },
+    // fix: accept 为 video 时不能展示视频
+    onPreviewVideo: function (event) {
+      if (!this.data.previewFullImage) return;
+      var index = event.currentTarget.dataset.index;
+      var lists = this.data.lists;
+      wx.previewMedia({
+        sources: lists
+          .filter(function (item) {
+            return item.isVideo;
+          })
+          .map(function (item) {
+            item.type = 'video';
+            item.url = item.url || item.path;
+            return item;
+          }),
+        current: index,
+        fail: function () {
+          wx.showToast({ title: '预览视频失败', icon: 'none' });
+        },
+      });
+    },
     onClickPreview: function (event) {
       var index = event.currentTarget.dataset.index;
       var item = this.data.lists[index];
diff --git a/lib/uploader/index.wxml b/lib/uploader/index.wxml
index e01da80d..c7ebf945 100644
--- a/lib/uploader/index.wxml
+++ b/lib/uploader/index.wxml
@@ -21,6 +21,16 @@
         data-index="{{ index }}"
         bind:tap="onPreviewImage"
       />
+      <video
+        wx:elif="{{ item.isVideo }}"
+        src="{{item.url || item.path}}"
+        autoplay="{{item.autoplay}}"
+        class="van-uploader__preview-image"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
+        data-index="{{ index }}"
+        bind:tap="onPreviewVideo"
+      >
+      </video>      
       <view
         wx:else
         class="van-uploader__file"
diff --git a/lib/uploader/index.wxss b/lib/uploader/index.wxss
index 5d104901..61ef7a5c 100644
--- a/lib/uploader/index.wxss
+++ b/lib/uploader/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0;width:14px;height:14px;background-color:rgba(0,0,0,.7);border-radius:0 0 0 12px}.van-uploader__preview-delete-icon{position:absolute;top:-2px;right:-2px;color:#fff;font-size:16px;-webkit-transform:scale(.5);transform:scale(.5)}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88)}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff!important}
\ No newline at end of file
+@import '../common/index.wxss';.van-uploader{position:relative;display:inline-block}.van-uploader__wrapper{display:-webkit-flex;display:flex;-webkit-flex-wrap:wrap;flex-wrap:wrap}.van-uploader__slot:empty{display:none}.van-uploader__slot:not(:empty)+.van-uploader__upload{display:none!important}.van-uploader__upload{position:relative;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;box-sizing:border-box;width:80px;height:80px;margin:0 8px 8px 0;background-color:#f7f8fa}.van-uploader__upload:active{background-color:#f2f3f5}.van-uploader__upload-icon{color:#dcdee0;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__upload--disabled{opacity:.5;opacity:var(--uploader-disabled-opacity,.5)}.van-uploader__preview{position:relative;margin:0 8px 8px 0;cursor:pointer}.van-uploader__preview-image{display:block;width:80px;height:80px;overflow:hidden}.van-uploader__preview-delete{position:absolute;top:0;right:0;width:14px;height:14px;padding:0 0 8px 8px}.van-uploader__preview-delete:after{position:absolute;top:0;right:0;width:14px;height:14px;background-color:rgba(0,0,0,.7);border-radius:0 0 0 12px;content:""}.van-uploader__preview-delete-icon{position:absolute;top:-2px;right:-2px;z-index:1;color:#fff;font-size:16px;-webkit-transform:scale(.5);transform:scale(.5)}.van-uploader__file{display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;width:80px;height:80px;background-color:#f7f8fa}.van-uploader__file-icon{color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 4px;color:#646566;font-size:12px;text-align:center}.van-uploader__mask{position:absolute;top:0;right:0;bottom:0;left:0;display:-webkit-flex;display:flex;-webkit-flex-direction:column;flex-direction:column;-webkit-align-items:center;align-items:center;-webkit-justify-content:center;justify-content:center;color:#fff;background-color:rgba(50,50,51,.88)}.van-uploader__mask-icon{font-size:22px}.van-uploader__mask-message{margin-top:6px;padding:0 4px;font-size:12px;line-height:14px}.van-uploader__loading{width:22px;height:22px;color:#fff!important}
\ No newline at end of file