diff --git a/dist/button/index.wxml b/dist/button/index.wxml
index b5abebbd..b87b9b8f 100644
--- a/dist/button/index.wxml
+++ b/dist/button/index.wxml
@@ -22,6 +22,7 @@
   bindgetuserinfo="onGetUserInfo"
   bindcontact="onContact"
   bindgetphonenumber="onGetPhoneNumber"
+  bindgetrealtimephonenumber="onGetRealTimePhoneNumber"
   binderror="onError"
   bindlaunchapp="onLaunchApp"
   bindopensetting="onOpenSetting"
diff --git a/dist/calendar/index.js b/dist/calendar/index.js
index 0d2c61a7..18fb0ce9 100644
--- a/dist/calendar/index.js
+++ b/dist/calendar/index.js
@@ -40,6 +40,7 @@ VantComponent({
         },
         defaultDate: {
             type: null,
+            value: getToday().getTime(),
             observer(val) {
                 this.setData({ currentDate: val });
                 this.scrollIntoView();
@@ -164,6 +165,8 @@ VantComponent({
         },
         getInitialDate(defaultDate = null) {
             const { type, minDate, maxDate, allowSameDay } = this.data;
+            if (!defaultDate)
+                return [];
             const now = getToday().getTime();
             if (type === 'range') {
                 if (!Array.isArray(defaultDate)) {
@@ -190,6 +193,8 @@ VantComponent({
         scrollIntoView() {
             requestAnimationFrame(() => {
                 const { currentDate, type, show, poppable, minDate, maxDate } = this.data;
+                if (!currentDate)
+                    return;
                 // @ts-ignore
                 const targetDate = type === 'single' ? currentDate : currentDate[0];
                 const displayed = show || !poppable;
diff --git a/dist/circle/index.js b/dist/circle/index.js
index 2a4baf59..0b608882 100644
--- a/dist/circle/index.js
+++ b/dist/circle/index.js
@@ -93,6 +93,8 @@ VantComponent({
             const { color, size } = this.data;
             if (isObj(color)) {
                 return this.getContext().then((context) => {
+                    if (!context)
+                        return;
                     const LinearColor = context.createLinearGradient(size, 0, 0, 0);
                     Object.keys(color)
                         .sort((a, b) => parseFloat(a) - parseFloat(b))
@@ -134,6 +136,8 @@ VantComponent({
         drawCircle(currentValue) {
             const { size } = this.data;
             this.getContext().then((context) => {
+                if (!context)
+                    return;
                 context.clearRect(0, 0, size, size);
                 this.renderLayerCircle(context);
                 const formatValue = format(currentValue);
diff --git a/dist/common/utils.d.ts b/dist/common/utils.d.ts
index 0f3bc874..805b3999 100644
--- a/dist/common/utils.d.ts
+++ b/dist/common/utils.d.ts
@@ -17,3 +17,4 @@ export declare function toPromise(promiseLike: Promise<unknown> | unknown): Prom
 export declare function addNumber(num1: any, num2: any): number;
 export declare const clamp: (num: any, min: any, max: any) => number;
 export declare function getCurrentPage<T>(): T & WechatMiniprogram.OptionalInterface<WechatMiniprogram.Page.ILifetime> & WechatMiniprogram.Page.InstanceProperties & WechatMiniprogram.Page.InstanceMethods<WechatMiniprogram.IAnyObject> & WechatMiniprogram.Page.Data<WechatMiniprogram.IAnyObject> & WechatMiniprogram.IAnyObject;
+export declare const isPC: boolean;
diff --git a/dist/common/utils.js b/dist/common/utils.js
index 78afc950..88cc17b5 100644
--- a/dist/common/utils.js
+++ b/dist/common/utils.js
@@ -1,5 +1,5 @@
 import { isDef, isNumber, isPlainObject, isPromise } from './validator';
-import { canIUseGroupSetData, canIUseNextTick } from './version';
+import { canIUseGroupSetData, canIUseNextTick, getSystemInfoSync, } from './version';
 export { isDef } from './validator';
 export { getSystemInfoSync } from './version';
 export function range(num, min, max) {
@@ -81,3 +81,4 @@ export function getCurrentPage() {
     const pages = getCurrentPages();
     return pages[pages.length - 1];
 }
+export const isPC = ['mac', 'windows'].includes(getSystemInfoSync().platform);
diff --git a/dist/dialog/index.js b/dist/dialog/index.js
index 6f24cf4a..72a6fa0f 100644
--- a/dist/dialog/index.js
+++ b/dist/dialog/index.js
@@ -4,6 +4,7 @@ import { GRAY, RED } from '../common/color';
 import { toPromise } from '../common/utils';
 VantComponent({
     mixins: [button],
+    classes: ['cancle-button-class', 'confirm-button-class'],
     props: {
         show: {
             type: Boolean,
diff --git a/dist/dialog/index.wxml b/dist/dialog/index.wxml
index e1ac81eb..364dd4c2 100644
--- a/dist/dialog/index.wxml
+++ b/dist/dialog/index.wxml
@@ -33,7 +33,7 @@
       size="large"
       loading="{{ loading.cancel }}"
       class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel"
+      custom-class="van-dialog__cancel cancle-button-class"
       custom-style="color: {{ cancelButtonColor }}"
       bind:click="onCancel"
     >
@@ -44,7 +44,7 @@
       size="large"
       class="van-dialog__button"
       loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm"
+      custom-class="van-dialog__confirm confirm-button-class"
       custom-style="color: {{ confirmButtonColor }}"
 
       open-type="{{ confirmButtonOpenType }}"
@@ -75,7 +75,7 @@
       size="large"
       loading="{{ loading.cancel }}"
       class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel"
+      custom-class="van-dialog__cancel cancle-button-class"
       custom-style="color: {{ cancelButtonColor }}"
       bind:click="onCancel"
     >
@@ -86,7 +86,7 @@
       size="large"
       class="van-dialog__button"
       loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm"
+      custom-class="van-dialog__confirm confirm-button-class"
       custom-style="color: {{ confirmButtonColor }}"
 
       open-type="{{ confirmButtonOpenType }}"
diff --git a/dist/field/index.wxml b/dist/field/index.wxml
index ec2e0ea8..60189933 100644
--- a/dist/field/index.wxml
+++ b/dist/field/index.wxml
@@ -13,12 +13,12 @@
   title-style="margin-right: 12px;"
   custom-style="{{ customStyle }}"
   arrow-direction="{{ arrowDirection }}"
-  custom-class="van-field"
+  custom-class="custom-class van-field"
 >
   <slot name="left-icon" slot="icon" />
-  <view wx:if="{{ label }}" class="label-class {{ utils.bem('field__label', { disabled }) }}" slot="title">
+  <label for="{{ name }}" wx:if="{{ label }}" class="label-class {{ utils.bem('field__label', { disabled }) }}" slot="title">
     {{ label }}
-  </view>
+  </label>
   <slot wx:else name="label" slot="title" />
   <view class="{{ utils.bem('field__body', [type]) }}">
     <view class="{{ utils.bem('field__control', [inputAlign, 'custom']) }}" bindtap="onClickInput">
@@ -47,10 +47,10 @@
       <slot name="button" />
     </view>
   </view>
-  <view wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
+  <label for="{{ name }}" wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
     <view class="{{ utils.bem('field__word-num', { full: value.length >= maxlength }) }}">{{ value.length >= maxlength ? maxlength : value.length }}</view>/{{ maxlength }}
-  </view>
-  <view wx:if="{{ errorMessage }}" class="{{ utils.bem('field__error-message', [errorMessageAlign, { disabled, error }]) }}">
+  </label>
+  <label for="{{ name }}"  wx:if="{{ errorMessage }}" class="{{ utils.bem('field__error-message', [errorMessageAlign, { disabled, error }]) }}">
     {{ errorMessage }}
-  </view>
+  </label>
 </van-cell>
diff --git a/dist/field/input.wxml b/dist/field/input.wxml
index efe9a08d..e39a5ee3 100644
--- a/dist/field/input.wxml
+++ b/dist/field/input.wxml
@@ -1,4 +1,5 @@
 <input
+  id="{{ name }}"
   class="{{ utils.bem('field__control', [inputAlign, { disabled, error }]) }} input-class"
   type="{{ type }}"
   focus="{{ focus }}"
diff --git a/dist/field/textarea.wxml b/dist/field/textarea.wxml
index 5015a51d..d42c1849 100644
--- a/dist/field/textarea.wxml
+++ b/dist/field/textarea.wxml
@@ -1,4 +1,5 @@
 <textarea
+  id="{{ name }}"
   class="{{ utils.bem('field__control', [inputAlign, type, { disabled, error }]) }} input-class"
   fixed="{{ fixed }}"
   focus="{{ focus }}"
diff --git a/dist/goods-action-button/index.wxml b/dist/goods-action-button/index.wxml
index b4dfe10a..6451c65a 100644
--- a/dist/goods-action-button/index.wxml
+++ b/dist/goods-action-button/index.wxml
@@ -10,7 +10,7 @@
   disabled="{{ disabled }}"
   open-type="{{ openType }}"
   class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain: plain }])}}"
-  custom-class="van-goods-action-button__inner"
+  custom-class="van-goods-action-button__inner custom-class"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"
diff --git a/dist/mixins/button.js b/dist/mixins/button.js
index bc48768c..225c32e4 100644
--- a/dist/mixins/button.js
+++ b/dist/mixins/button.js
@@ -28,6 +28,9 @@ export const button = Behavior({
         onGetPhoneNumber(event) {
             this.triggerEvent('getphonenumber', event.detail);
         },
+        onGetRealTimePhoneNumber(event) {
+            this.triggerEvent('getrealtimephonenumber', event.detail);
+        },
         onError(event) {
             this.triggerEvent('error', event.detail);
         },
diff --git a/dist/sticky/index.js b/dist/sticky/index.js
index e1ae6dfa..c48d5264 100644
--- a/dist/sticky/index.js
+++ b/dist/sticky/index.js
@@ -57,10 +57,8 @@ VantComponent({
             }
             this.scrollTop = scrollTop || this.scrollTop;
             if (typeof container === 'function') {
-                Promise.all([
-                    getRect(this, ROOT_ELEMENT),
-                    this.getContainerRect(),
-                ]).then(([root, container]) => {
+                Promise.all([getRect(this, ROOT_ELEMENT), this.getContainerRect()])
+                    .then(([root, container]) => {
                     if (offsetTop + root.height > container.height + container.top) {
                         this.setDataAfterDiff({
                             fixed: false,
@@ -77,7 +75,8 @@ VantComponent({
                     else {
                         this.setDataAfterDiff({ fixed: false, transform: 0 });
                     }
-                });
+                })
+                    .catch(() => { });
                 return;
             }
             getRect(this, ROOT_ELEMENT).then((root) => {
@@ -112,6 +111,9 @@ VantComponent({
         },
         getContainerRect() {
             const nodesRef = this.data.container();
+            if (!nodesRef) {
+                return Promise.reject(new Error('not found container'));
+            }
             return new Promise((resolve) => nodesRef.boundingClientRect(resolve).exec());
         },
     },
diff --git a/dist/uploader/index.js b/dist/uploader/index.js
index 007bc38a..5379c1ba 100644
--- a/dist/uploader/index.js
+++ b/dist/uploader/index.js
@@ -34,6 +34,9 @@ VantComponent({
         }, previewFullImage: {
             type: Boolean,
             value: true,
+        }, videoFit: {
+            type: String,
+            value: 'contain',
         }, imageFit: {
             type: String,
             value: 'scaleToFill',
diff --git a/dist/uploader/index.wxml b/dist/uploader/index.wxml
index 50fb0c89..3e61fd9f 100644
--- a/dist/uploader/index.wxml
+++ b/dist/uploader/index.wxml
@@ -28,6 +28,7 @@
         title="{{ item.name || ('视频' + index) }}"
         poster="{{ item.thumb }}"
         autoplay="{{ item.autoplay }}"
+        object-fit="{{videoFit}}"
         class="van-uploader__preview-image"
         style="{{ computed.sizeStyle({ previewSize }) }}"
         data-index="{{ index }}"
diff --git a/dist/uploader/utils.js b/dist/uploader/utils.js
index 19aa7c6b..9c7a62e4 100644
--- a/dist/uploader/utils.js
+++ b/dist/uploader/utils.js
@@ -1,4 +1,4 @@
-import { pickExclude } from '../common/utils';
+import { pickExclude, isPC } from '../common/utils';
 import { isImageUrl, isVideoUrl } from '../common/validator';
 export function isImageFile(item) {
     if (item.isImage != null) {
@@ -25,7 +25,7 @@ export function isVideoFile(item) {
     return false;
 }
 function formatImage(res) {
-    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['path'])), { type: 'image', url: item.tempFilePath, thumb: item.tempFilePath })));
+    return res.tempFiles.map((item) => (Object.assign(Object.assign({}, pickExclude(item, ['path'])), { type: 'image', url: item.tempFilePath || item.path, thumb: item.tempFilePath || item.path })));
 }
 function formatVideo(res) {
     return [
@@ -42,16 +42,27 @@ export function chooseFile({ accept, multiple, capture, compressed, maxDuration,
     return new Promise((resolve, reject) => {
         switch (accept) {
             case 'image':
-                wx.chooseMedia({
-                    count: multiple ? Math.min(maxCount, 9) : 1,
-                    mediaType: ['image'],
-                    sourceType: capture,
-                    maxDuration,
-                    sizeType,
-                    camera,
-                    success: (res) => resolve(formatImage(res)),
-                    fail: reject,
-                });
+                if (isPC) {
+                    wx.chooseImage({
+                        count: multiple ? Math.min(maxCount, 9) : 1,
+                        sourceType: capture,
+                        sizeType,
+                        success: (res) => resolve(formatImage(res)),
+                        fail: reject,
+                    });
+                }
+                else {
+                    wx.chooseMedia({
+                        count: multiple ? Math.min(maxCount, 9) : 1,
+                        mediaType: ['image'],
+                        sourceType: capture,
+                        maxDuration,
+                        sizeType,
+                        camera,
+                        success: (res) => resolve(formatImage(res)),
+                        fail: reject,
+                    });
+                }
                 break;
             case 'media':
                 wx.chooseMedia({
diff --git a/lib/button/index.wxml b/lib/button/index.wxml
index b5abebbd..b87b9b8f 100644
--- a/lib/button/index.wxml
+++ b/lib/button/index.wxml
@@ -22,6 +22,7 @@
   bindgetuserinfo="onGetUserInfo"
   bindcontact="onContact"
   bindgetphonenumber="onGetPhoneNumber"
+  bindgetrealtimephonenumber="onGetRealTimePhoneNumber"
   binderror="onError"
   bindlaunchapp="onLaunchApp"
   bindopensetting="onOpenSetting"
diff --git a/lib/calendar/index.js b/lib/calendar/index.js
index f206468f..d4fbd91a 100644
--- a/lib/calendar/index.js
+++ b/lib/calendar/index.js
@@ -56,6 +56,7 @@ var getTime = function (date) {
         },
         defaultDate: {
             type: null,
+            value: (0, utils_1.getToday)().getTime(),
             observer: function (val) {
                 this.setData({ currentDate: val });
                 this.scrollIntoView();
@@ -185,6 +186,8 @@ var getTime = function (date) {
             var _this = this;
             if (defaultDate === void 0) { defaultDate = null; }
             var _a = this.data, type = _a.type, minDate = _a.minDate, maxDate = _a.maxDate, allowSameDay = _a.allowSameDay;
+            if (!defaultDate)
+                return [];
             var now = (0, utils_1.getToday)().getTime();
             if (type === 'range') {
                 if (!Array.isArray(defaultDate)) {
@@ -212,6 +215,8 @@ var getTime = function (date) {
             var _this = this;
             (0, utils_2.requestAnimationFrame)(function () {
                 var _a = _this.data, currentDate = _a.currentDate, type = _a.type, show = _a.show, poppable = _a.poppable, minDate = _a.minDate, maxDate = _a.maxDate;
+                if (!currentDate)
+                    return;
                 // @ts-ignore
                 var targetDate = type === 'single' ? currentDate : currentDate[0];
                 var displayed = show || !poppable;
diff --git a/lib/circle/index.js b/lib/circle/index.js
index 9037e1cf..e131e4be 100644
--- a/lib/circle/index.js
+++ b/lib/circle/index.js
@@ -98,6 +98,8 @@ var STEP = 1;
             var _a = this.data, color = _a.color, size = _a.size;
             if ((0, validator_1.isObj)(color)) {
                 return this.getContext().then(function (context) {
+                    if (!context)
+                        return;
                     var LinearColor = context.createLinearGradient(size, 0, 0, 0);
                     Object.keys(color)
                         .sort(function (a, b) { return parseFloat(a) - parseFloat(b); })
@@ -142,6 +144,8 @@ var STEP = 1;
             var _this = this;
             var size = this.data.size;
             this.getContext().then(function (context) {
+                if (!context)
+                    return;
                 context.clearRect(0, 0, size, size);
                 _this.renderLayerCircle(context);
                 var formatValue = format(currentValue);
diff --git a/lib/common/utils.d.ts b/lib/common/utils.d.ts
index 0f3bc874..805b3999 100644
--- a/lib/common/utils.d.ts
+++ b/lib/common/utils.d.ts
@@ -17,3 +17,4 @@ export declare function toPromise(promiseLike: Promise<unknown> | unknown): Prom
 export declare function addNumber(num1: any, num2: any): number;
 export declare const clamp: (num: any, min: any, max: any) => number;
 export declare function getCurrentPage<T>(): T & WechatMiniprogram.OptionalInterface<WechatMiniprogram.Page.ILifetime> & WechatMiniprogram.Page.InstanceProperties & WechatMiniprogram.Page.InstanceMethods<WechatMiniprogram.IAnyObject> & WechatMiniprogram.Page.Data<WechatMiniprogram.IAnyObject> & WechatMiniprogram.IAnyObject;
+export declare const isPC: boolean;
diff --git a/lib/common/utils.js b/lib/common/utils.js
index c5e4ced7..80fb803f 100644
--- a/lib/common/utils.js
+++ b/lib/common/utils.js
@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentPage = exports.clamp = exports.addNumber = exports.toPromise = exports.groupSetData = exports.getAllRect = exports.getRect = exports.pickExclude = exports.requestAnimationFrame = exports.addUnit = exports.nextTick = exports.range = exports.getSystemInfoSync = exports.isDef = void 0;
+exports.isPC = exports.getCurrentPage = exports.clamp = exports.addNumber = exports.toPromise = exports.groupSetData = exports.getAllRect = exports.getRect = exports.pickExclude = exports.requestAnimationFrame = exports.addUnit = exports.nextTick = exports.range = exports.getSystemInfoSync = exports.isDef = void 0;
 var validator_1 = require("./validator");
 var version_1 = require("./version");
 var validator_2 = require("./validator");
@@ -104,3 +104,4 @@ function getCurrentPage() {
     return pages[pages.length - 1];
 }
 exports.getCurrentPage = getCurrentPage;
+exports.isPC = ['mac', 'windows'].includes((0, version_1.getSystemInfoSync)().platform);
diff --git a/lib/dialog/index.js b/lib/dialog/index.js
index 3d59264b..3ca0b443 100644
--- a/lib/dialog/index.js
+++ b/lib/dialog/index.js
@@ -6,6 +6,7 @@ var color_1 = require("../common/color");
 var utils_1 = require("../common/utils");
 (0, component_1.VantComponent)({
     mixins: [button_1.button],
+    classes: ['cancle-button-class', 'confirm-button-class'],
     props: {
         show: {
             type: Boolean,
diff --git a/lib/dialog/index.wxml b/lib/dialog/index.wxml
index e1ac81eb..364dd4c2 100644
--- a/lib/dialog/index.wxml
+++ b/lib/dialog/index.wxml
@@ -33,7 +33,7 @@
       size="large"
       loading="{{ loading.cancel }}"
       class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel"
+      custom-class="van-dialog__cancel cancle-button-class"
       custom-style="color: {{ cancelButtonColor }}"
       bind:click="onCancel"
     >
@@ -44,7 +44,7 @@
       size="large"
       class="van-dialog__button"
       loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm"
+      custom-class="van-dialog__confirm confirm-button-class"
       custom-style="color: {{ confirmButtonColor }}"
 
       open-type="{{ confirmButtonOpenType }}"
@@ -75,7 +75,7 @@
       size="large"
       loading="{{ loading.cancel }}"
       class="van-dialog__button van-hairline--right"
-      custom-class="van-dialog__cancel"
+      custom-class="van-dialog__cancel cancle-button-class"
       custom-style="color: {{ cancelButtonColor }}"
       bind:click="onCancel"
     >
@@ -86,7 +86,7 @@
       size="large"
       class="van-dialog__button"
       loading="{{ loading.confirm }}"
-      custom-class="van-dialog__confirm"
+      custom-class="van-dialog__confirm confirm-button-class"
       custom-style="color: {{ confirmButtonColor }}"
 
       open-type="{{ confirmButtonOpenType }}"
diff --git a/lib/field/index.wxml b/lib/field/index.wxml
index ec2e0ea8..60189933 100644
--- a/lib/field/index.wxml
+++ b/lib/field/index.wxml
@@ -13,12 +13,12 @@
   title-style="margin-right: 12px;"
   custom-style="{{ customStyle }}"
   arrow-direction="{{ arrowDirection }}"
-  custom-class="van-field"
+  custom-class="custom-class van-field"
 >
   <slot name="left-icon" slot="icon" />
-  <view wx:if="{{ label }}" class="label-class {{ utils.bem('field__label', { disabled }) }}" slot="title">
+  <label for="{{ name }}" wx:if="{{ label }}" class="label-class {{ utils.bem('field__label', { disabled }) }}" slot="title">
     {{ label }}
-  </view>
+  </label>
   <slot wx:else name="label" slot="title" />
   <view class="{{ utils.bem('field__body', [type]) }}">
     <view class="{{ utils.bem('field__control', [inputAlign, 'custom']) }}" bindtap="onClickInput">
@@ -47,10 +47,10 @@
       <slot name="button" />
     </view>
   </view>
-  <view wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
+  <label for="{{ name }}" wx:if="{{ showWordLimit && maxlength }}" class="van-field__word-limit">
     <view class="{{ utils.bem('field__word-num', { full: value.length >= maxlength }) }}">{{ value.length >= maxlength ? maxlength : value.length }}</view>/{{ maxlength }}
-  </view>
-  <view wx:if="{{ errorMessage }}" class="{{ utils.bem('field__error-message', [errorMessageAlign, { disabled, error }]) }}">
+  </label>
+  <label for="{{ name }}"  wx:if="{{ errorMessage }}" class="{{ utils.bem('field__error-message', [errorMessageAlign, { disabled, error }]) }}">
     {{ errorMessage }}
-  </view>
+  </label>
 </van-cell>
diff --git a/lib/field/input.wxml b/lib/field/input.wxml
index efe9a08d..e39a5ee3 100644
--- a/lib/field/input.wxml
+++ b/lib/field/input.wxml
@@ -1,4 +1,5 @@
 <input
+  id="{{ name }}"
   class="{{ utils.bem('field__control', [inputAlign, { disabled, error }]) }} input-class"
   type="{{ type }}"
   focus="{{ focus }}"
diff --git a/lib/field/textarea.wxml b/lib/field/textarea.wxml
index 5015a51d..d42c1849 100644
--- a/lib/field/textarea.wxml
+++ b/lib/field/textarea.wxml
@@ -1,4 +1,5 @@
 <textarea
+  id="{{ name }}"
   class="{{ utils.bem('field__control', [inputAlign, type, { disabled, error }]) }} input-class"
   fixed="{{ fixed }}"
   focus="{{ focus }}"
diff --git a/lib/goods-action-button/index.wxml b/lib/goods-action-button/index.wxml
index b4dfe10a..6451c65a 100644
--- a/lib/goods-action-button/index.wxml
+++ b/lib/goods-action-button/index.wxml
@@ -10,7 +10,7 @@
   disabled="{{ disabled }}"
   open-type="{{ openType }}"
   class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain: plain }])}}"
-  custom-class="van-goods-action-button__inner"
+  custom-class="van-goods-action-button__inner custom-class"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"
diff --git a/lib/mixins/button.js b/lib/mixins/button.js
index 24c54bc4..0667f813 100644
--- a/lib/mixins/button.js
+++ b/lib/mixins/button.js
@@ -31,6 +31,9 @@ exports.button = Behavior({
         onGetPhoneNumber: function (event) {
             this.triggerEvent('getphonenumber', event.detail);
         },
+        onGetRealTimePhoneNumber: function (event) {
+            this.triggerEvent('getrealtimephonenumber', event.detail);
+        },
         onError: function (event) {
             this.triggerEvent('error', event.detail);
         },
diff --git a/lib/sticky/index.js b/lib/sticky/index.js
index 6f50dd38..49dbed8a 100644
--- a/lib/sticky/index.js
+++ b/lib/sticky/index.js
@@ -61,10 +61,8 @@ var ROOT_ELEMENT = '.van-sticky';
             }
             this.scrollTop = scrollTop || this.scrollTop;
             if (typeof container === 'function') {
-                Promise.all([
-                    (0, utils_1.getRect)(this, ROOT_ELEMENT),
-                    this.getContainerRect(),
-                ]).then(function (_a) {
+                Promise.all([(0, utils_1.getRect)(this, ROOT_ELEMENT), this.getContainerRect()])
+                    .then(function (_a) {
                     var root = _a[0], container = _a[1];
                     if (offsetTop + root.height > container.height + container.top) {
                         _this.setDataAfterDiff({
@@ -82,7 +80,8 @@ var ROOT_ELEMENT = '.van-sticky';
                     else {
                         _this.setDataAfterDiff({ fixed: false, transform: 0 });
                     }
-                });
+                })
+                    .catch(function () { });
                 return;
             }
             (0, utils_1.getRect)(this, ROOT_ELEMENT).then(function (root) {
@@ -118,6 +117,9 @@ var ROOT_ELEMENT = '.van-sticky';
         },
         getContainerRect: function () {
             var nodesRef = this.data.container();
+            if (!nodesRef) {
+                return Promise.reject(new Error('not found container'));
+            }
             return new Promise(function (resolve) { return nodesRef.boundingClientRect(resolve).exec(); });
         },
     },
diff --git a/lib/uploader/index.js b/lib/uploader/index.js
index 69b40617..5492d408 100644
--- a/lib/uploader/index.js
+++ b/lib/uploader/index.js
@@ -47,6 +47,9 @@ var validator_1 = require("../common/validator");
         }, previewFullImage: {
             type: Boolean,
             value: true,
+        }, videoFit: {
+            type: String,
+            value: 'contain',
         }, imageFit: {
             type: String,
             value: 'scaleToFill',
diff --git a/lib/uploader/index.wxml b/lib/uploader/index.wxml
index 50fb0c89..3e61fd9f 100644
--- a/lib/uploader/index.wxml
+++ b/lib/uploader/index.wxml
@@ -28,6 +28,7 @@
         title="{{ item.name || ('视频' + index) }}"
         poster="{{ item.thumb }}"
         autoplay="{{ item.autoplay }}"
+        object-fit="{{videoFit}}"
         class="van-uploader__preview-image"
         style="{{ computed.sizeStyle({ previewSize }) }}"
         data-index="{{ index }}"
diff --git a/lib/uploader/utils.js b/lib/uploader/utils.js
index 565e1ea4..b8cf4526 100644
--- a/lib/uploader/utils.js
+++ b/lib/uploader/utils.js
@@ -41,7 +41,7 @@ function isVideoFile(item) {
 }
 exports.isVideoFile = isVideoFile;
 function formatImage(res) {
-    return res.tempFiles.map(function (item) { return (__assign(__assign({}, (0, utils_1.pickExclude)(item, ['path'])), { type: 'image', url: item.tempFilePath, thumb: item.tempFilePath })); });
+    return res.tempFiles.map(function (item) { return (__assign(__assign({}, (0, utils_1.pickExclude)(item, ['path'])), { type: 'image', url: item.tempFilePath || item.path, thumb: item.tempFilePath || item.path })); });
 }
 function formatVideo(res) {
     return [
@@ -59,16 +59,27 @@ function chooseFile(_a) {
     return new Promise(function (resolve, reject) {
         switch (accept) {
             case 'image':
-                wx.chooseMedia({
-                    count: multiple ? Math.min(maxCount, 9) : 1,
-                    mediaType: ['image'],
-                    sourceType: capture,
-                    maxDuration: maxDuration,
-                    sizeType: sizeType,
-                    camera: camera,
-                    success: function (res) { return resolve(formatImage(res)); },
-                    fail: reject,
-                });
+                if (utils_1.isPC) {
+                    wx.chooseImage({
+                        count: multiple ? Math.min(maxCount, 9) : 1,
+                        sourceType: capture,
+                        sizeType: sizeType,
+                        success: function (res) { return resolve(formatImage(res)); },
+                        fail: reject,
+                    });
+                }
+                else {
+                    wx.chooseMedia({
+                        count: multiple ? Math.min(maxCount, 9) : 1,
+                        mediaType: ['image'],
+                        sourceType: capture,
+                        maxDuration: maxDuration,
+                        sizeType: sizeType,
+                        camera: camera,
+                        success: function (res) { return resolve(formatImage(res)); },
+                        fail: reject,
+                    });
+                }
                 break;
             case 'media':
                 wx.chooseMedia({