diff --git a/dist/calendar/index.js b/dist/calendar/index.js
index fbc5b6d3..b4c4cb83 100644
--- a/dist/calendar/index.js
+++ b/dist/calendar/index.js
@@ -64,11 +64,11 @@ VantComponent({
       observer: 'reset',
     },
     minDate: {
-      type: null,
+      type: Number,
       value: initialMinDate,
     },
     maxDate: {
-      type: null,
+      type: Number,
       value: initialMaxDate,
     },
     position: {
@@ -127,7 +127,7 @@ VantComponent({
   },
   created() {
     this.setData({
-      currentDate: this.getInitialDate(),
+      currentDate: this.getInitialDate(this.data.defaultDate),
     });
   },
   mounted() {
@@ -180,11 +180,11 @@ VantComponent({
         const start = this.limitDateRange(
           startDay || now,
           minDate,
-          getPrevDay(maxDate).getTime()
+          getPrevDay(new Date(maxDate)).getTime()
         );
         const end = this.limitDateRange(
           endDay || now,
-          getNextDay(minDate).getTime()
+          getNextDay(new Date(minDate)).getTime()
         );
         return [start, end];
       }
diff --git a/dist/checkbox/index.wxss b/dist/checkbox/index.wxss
index 62f37d49..b0128379 100644
--- a/dist/checkbox/index.wxss
+++ b/dist/checkbox/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-checkbox{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox--horizontal{margin-right:12px}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{flex:none}.van-checkbox__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;font-size:20px;font-size:var(--checkbox-size,20px);border:1px solid #c8c9cc;border:1px solid var(--checkbox-border-color,#c8c9cc);transition-duration:.2s;transition-duration:var(--checkbox-transition-duration,.2s)}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--checkbox-checked-icon-color,#1989fa)}.van-checkbox__icon--disabled{background-color:#ebedf0;background-color:var(--checkbox-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c8c9cc;color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__label{word-wrap:break-word;margin-left:10px;margin-left:var(--checkbox-label-margin,10px);color:#323233;color:var(--checkbox-label-color,#323233)}.van-checkbox__label--left{float:left;margin:0 10px 0 0;margin:0 var(--checkbox-label-margin,10px) 0 0}.van-checkbox__label--disabled{color:#c8c9cc;color:var(--checkbox-disabled-label-color,#c8c9cc)}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-checkbox{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox--horizontal{margin-right:12px}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{flex:none}.van-checkbox__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;font-size:20px;font-size:var(--checkbox-size,20px);border:1px solid #c8c9cc;border:1px solid var(--checkbox-border-color,#c8c9cc);transition-duration:.2s;transition-duration:var(--checkbox-transition-duration,.2s)}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--checkbox-checked-icon-color,#1989fa)}.van-checkbox__icon--disabled{background-color:#ebedf0;background-color:var(--checkbox-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c8c9cc;color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__label{word-wrap:break-word;padding-left:10px;padding-left:var(--checkbox-label-margin,10px);color:#323233;color:var(--checkbox-label-color,#323233)}.van-checkbox__label--left{float:left;margin:0 10px 0 0;margin:0 var(--checkbox-label-margin,10px) 0 0}.van-checkbox__label--disabled{color:#c8c9cc;color:var(--checkbox-disabled-label-color,#c8c9cc)}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
diff --git a/dist/popup/index.js b/dist/popup/index.js
index eb2d43e0..295ee198 100644
--- a/dist/popup/index.js
+++ b/dist/popup/index.js
@@ -53,6 +53,10 @@ VantComponent({
       type: Boolean,
       value: false,
     },
+    lockScroll: {
+      type: Boolean,
+      value: true,
+    },
   },
   created() {
     this.observeClass();
diff --git a/dist/popup/index.wxml b/dist/popup/index.wxml
index 0be99d46..ea7d696b 100644
--- a/dist/popup/index.wxml
+++ b/dist/popup/index.wxml
@@ -8,6 +8,7 @@
   custom-style="{{ overlayStyle }}"
   duration="{{ duration }}"
   bind:click="onClickOverlay"
+  lock-scroll="{{ lockScroll }}"
 />
 <view
   wx:if="{{ inited }}"
diff --git a/dist/radio/index.wxss b/dist/radio/index.wxss
index cf515285..c2ac570c 100644
--- a/dist/radio/index.wxss
+++ b/dist/radio/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-radio{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{flex:none}.van-radio--horizontal{margin-right:12px;margin-right:var(--padding-sm,12px)}.van-radio__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;border:1px solid #c8c9cc;border:1px solid var(--radio-border-color,#c8c9cc);font-size:20px;font-size:var(--radio-size,20px);transition-duration:.2s;transition-duration:var(--radio-transition-duration,.2s)}.van-radio__icon--round{border-radius:100%}.van-radio__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--radio-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--radio-checked-icon-color,#1989fa)}.van-radio__icon--disabled{background-color:#ebedf0;background-color:var(--radio-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__icon--disabled.van-radio__icon--checked{color:#c8c9cc;color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__label{word-wrap:break-word;margin-left:10px;margin-left:var(--radio-label-margin,10px);color:#323233;color:var(--radio-label-color,#323233);line-height:20px;line-height:var(--radio-size,20px)}.van-radio__label--left{float:left;margin:0 10px 0 0;margin:0 var(--radio-label-margin,10px) 0 0}.van-radio__label--disabled{color:#c8c9cc;color:var(--radio-disabled-label-color,#c8c9cc)}.van-radio__label:empty{margin:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-radio{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{flex:none}.van-radio--horizontal{margin-right:12px;margin-right:var(--padding-sm,12px)}.van-radio__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;border:1px solid #c8c9cc;border:1px solid var(--radio-border-color,#c8c9cc);font-size:20px;font-size:var(--radio-size,20px);transition-duration:.2s;transition-duration:var(--radio-transition-duration,.2s)}.van-radio__icon--round{border-radius:100%}.van-radio__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--radio-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--radio-checked-icon-color,#1989fa)}.van-radio__icon--disabled{background-color:#ebedf0;background-color:var(--radio-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__icon--disabled.van-radio__icon--checked{color:#c8c9cc;color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__label{word-wrap:break-word;padding-left:10px;padding-left:var(--radio-label-margin,10px);color:#323233;color:var(--radio-label-color,#323233);line-height:20px;line-height:var(--radio-size,20px)}.van-radio__label--left{float:left;margin:0 10px 0 0;margin:0 var(--radio-label-margin,10px) 0 0}.van-radio__label--disabled{color:#c8c9cc;color:var(--radio-disabled-label-color,#c8c9cc)}.van-radio__label:empty{margin:0}
\ No newline at end of file
diff --git a/dist/share-sheet/index.js b/dist/share-sheet/index.js
index 27d0c7be..470dea68 100644
--- a/dist/share-sheet/index.js
+++ b/dist/share-sheet/index.js
@@ -4,7 +4,7 @@ VantComponent({
     // whether to show popup
     show: Boolean,
     // overlay custom style
-    overlayStyle: Object,
+    overlayStyle: String,
     // z-index
     zIndex: {
       type: Number,
diff --git a/dist/stepper/index.wxml b/dist/stepper/index.wxml
index b49140e5..8172d15c 100644
--- a/dist/stepper/index.wxml
+++ b/dist/stepper/index.wxml
@@ -13,7 +13,7 @@
     bind:touchstart="onTouchStart"
     bind:touchend="onTouchEnd"
   >
-    <slot name="plus" />
+    <slot name="minus" />
   </view>
   <input
     type="{{ integer ? 'number' : 'digit' }}"
@@ -37,6 +37,6 @@
     bind:touchstart="onTouchStart"
     bind:touchend="onTouchEnd"
   >
-    <slot name="minus" />
+    <slot name="plus" />
   </view>
 </view>
diff --git a/dist/sticky/index.js b/dist/sticky/index.js
index 23aa7eaa..01f10989 100644
--- a/dist/sticky/index.js
+++ b/dist/sticky/index.js
@@ -1,5 +1,6 @@
 import { getRect } from '../common/utils';
 import { VantComponent } from '../common/component';
+import { isDef } from '../common/validator';
 import { pageScrollMixin } from '../mixins/page-scroll';
 const ROOT_ELEMENT = '.van-sticky';
 VantComponent({
@@ -78,6 +79,9 @@ VantComponent({
         return;
       }
       getRect(this, ROOT_ELEMENT).then((root) => {
+        if (!isDef(root)) {
+          return;
+        }
         if (offsetTop >= root.top) {
           this.setDataAfterDiff({ fixed: true, height: root.height });
           this.transform = 0;
diff --git a/lib/calendar/index.js b/lib/calendar/index.js
index 2962b66d..38a84b90 100644
--- a/lib/calendar/index.js
+++ b/lib/calendar/index.js
@@ -66,11 +66,11 @@ component_1.VantComponent({
       observer: 'reset',
     },
     minDate: {
-      type: null,
+      type: Number,
       value: initialMinDate,
     },
     maxDate: {
-      type: null,
+      type: Number,
       value: initialMaxDate,
     },
     position: {
@@ -129,7 +129,7 @@ component_1.VantComponent({
   },
   created: function () {
     this.setData({
-      currentDate: this.getInitialDate(),
+      currentDate: this.getInitialDate(this.data.defaultDate),
     });
   },
   mounted: function () {
@@ -200,11 +200,11 @@ component_1.VantComponent({
         var start = this.limitDateRange(
           startDay || now,
           minDate,
-          utils_1.getPrevDay(maxDate).getTime()
+          utils_1.getPrevDay(new Date(maxDate)).getTime()
         );
         var end = this.limitDateRange(
           endDay || now,
-          utils_1.getNextDay(minDate).getTime()
+          utils_1.getNextDay(new Date(minDate)).getTime()
         );
         return [start, end];
       }
diff --git a/lib/checkbox/index.wxss b/lib/checkbox/index.wxss
index 62f37d49..b0128379 100644
--- a/lib/checkbox/index.wxss
+++ b/lib/checkbox/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-checkbox{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox--horizontal{margin-right:12px}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{flex:none}.van-checkbox__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;font-size:20px;font-size:var(--checkbox-size,20px);border:1px solid #c8c9cc;border:1px solid var(--checkbox-border-color,#c8c9cc);transition-duration:.2s;transition-duration:var(--checkbox-transition-duration,.2s)}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--checkbox-checked-icon-color,#1989fa)}.van-checkbox__icon--disabled{background-color:#ebedf0;background-color:var(--checkbox-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c8c9cc;color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__label{word-wrap:break-word;margin-left:10px;margin-left:var(--checkbox-label-margin,10px);color:#323233;color:var(--checkbox-label-color,#323233)}.van-checkbox__label--left{float:left;margin:0 10px 0 0;margin:0 var(--checkbox-label-margin,10px) 0 0}.van-checkbox__label--disabled{color:#c8c9cc;color:var(--checkbox-disabled-label-color,#c8c9cc)}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-checkbox{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox--horizontal{margin-right:12px}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{flex:none}.van-checkbox__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;font-size:20px;font-size:var(--checkbox-size,20px);border:1px solid #c8c9cc;border:1px solid var(--checkbox-border-color,#c8c9cc);transition-duration:.2s;transition-duration:var(--checkbox-transition-duration,.2s)}.van-checkbox__icon--round{border-radius:100%}.van-checkbox__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--checkbox-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--checkbox-checked-icon-color,#1989fa)}.van-checkbox__icon--disabled{background-color:#ebedf0;background-color:var(--checkbox-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__icon--disabled.van-checkbox__icon--checked{color:#c8c9cc;color:var(--checkbox-disabled-icon-color,#c8c9cc)}.van-checkbox__label{word-wrap:break-word;padding-left:10px;padding-left:var(--checkbox-label-margin,10px);color:#323233;color:var(--checkbox-label-color,#323233)}.van-checkbox__label--left{float:left;margin:0 10px 0 0;margin:0 var(--checkbox-label-margin,10px) 0 0}.van-checkbox__label--disabled{color:#c8c9cc;color:var(--checkbox-disabled-label-color,#c8c9cc)}.van-checkbox__label:empty{margin:0}
\ No newline at end of file
diff --git a/lib/popup/index.js b/lib/popup/index.js
index fbe673cd..7d819a47 100644
--- a/lib/popup/index.js
+++ b/lib/popup/index.js
@@ -55,6 +55,10 @@ component_1.VantComponent({
       type: Boolean,
       value: false,
     },
+    lockScroll: {
+      type: Boolean,
+      value: true,
+    },
   },
   created: function () {
     this.observeClass();
diff --git a/lib/popup/index.wxml b/lib/popup/index.wxml
index 0be99d46..ea7d696b 100644
--- a/lib/popup/index.wxml
+++ b/lib/popup/index.wxml
@@ -8,6 +8,7 @@
   custom-style="{{ overlayStyle }}"
   duration="{{ duration }}"
   bind:click="onClickOverlay"
+  lock-scroll="{{ lockScroll }}"
 />
 <view
   wx:if="{{ inited }}"
diff --git a/lib/radio/index.wxss b/lib/radio/index.wxss
index cf515285..c2ac570c 100644
--- a/lib/radio/index.wxss
+++ b/lib/radio/index.wxss
@@ -1 +1 @@
-@import '../common/index.wxss';.van-radio{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{flex:none}.van-radio--horizontal{margin-right:12px;margin-right:var(--padding-sm,12px)}.van-radio__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;border:1px solid #c8c9cc;border:1px solid var(--radio-border-color,#c8c9cc);font-size:20px;font-size:var(--radio-size,20px);transition-duration:.2s;transition-duration:var(--radio-transition-duration,.2s)}.van-radio__icon--round{border-radius:100%}.van-radio__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--radio-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--radio-checked-icon-color,#1989fa)}.van-radio__icon--disabled{background-color:#ebedf0;background-color:var(--radio-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__icon--disabled.van-radio__icon--checked{color:#c8c9cc;color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__label{word-wrap:break-word;margin-left:10px;margin-left:var(--radio-label-margin,10px);color:#323233;color:var(--radio-label-color,#323233);line-height:20px;line-height:var(--radio-size,20px)}.van-radio__label--left{float:left;margin:0 10px 0 0;margin:0 var(--radio-label-margin,10px) 0 0}.van-radio__label--disabled{color:#c8c9cc;color:var(--radio-disabled-label-color,#c8c9cc)}.van-radio__label:empty{margin:0}
\ No newline at end of file
+@import '../common/index.wxss';.van-radio{display:flex;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{flex:none}.van-radio--horizontal{margin-right:12px;margin-right:var(--padding-sm,12px)}.van-radio__icon{display:flex;align-items:center;justify-content:center;box-sizing:border-box;width:1em;height:1em;color:transparent;text-align:center;transition-property:color,border-color,background-color;border:1px solid #c8c9cc;border:1px solid var(--radio-border-color,#c8c9cc);font-size:20px;font-size:var(--radio-size,20px);transition-duration:.2s;transition-duration:var(--radio-transition-duration,.2s)}.van-radio__icon--round{border-radius:100%}.van-radio__icon--checked{color:#fff;color:var(--white,#fff);background-color:#1989fa;background-color:var(--radio-checked-icon-color,#1989fa);border-color:#1989fa;border-color:var(--radio-checked-icon-color,#1989fa)}.van-radio__icon--disabled{background-color:#ebedf0;background-color:var(--radio-disabled-background-color,#ebedf0);border-color:#c8c9cc;border-color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__icon--disabled.van-radio__icon--checked{color:#c8c9cc;color:var(--radio-disabled-icon-color,#c8c9cc)}.van-radio__label{word-wrap:break-word;padding-left:10px;padding-left:var(--radio-label-margin,10px);color:#323233;color:var(--radio-label-color,#323233);line-height:20px;line-height:var(--radio-size,20px)}.van-radio__label--left{float:left;margin:0 10px 0 0;margin:0 var(--radio-label-margin,10px) 0 0}.van-radio__label--disabled{color:#c8c9cc;color:var(--radio-disabled-label-color,#c8c9cc)}.van-radio__label:empty{margin:0}
\ No newline at end of file
diff --git a/lib/share-sheet/index.js b/lib/share-sheet/index.js
index 440caf84..0040e147 100644
--- a/lib/share-sheet/index.js
+++ b/lib/share-sheet/index.js
@@ -6,7 +6,7 @@ component_1.VantComponent({
     // whether to show popup
     show: Boolean,
     // overlay custom style
-    overlayStyle: Object,
+    overlayStyle: String,
     // z-index
     zIndex: {
       type: Number,
diff --git a/lib/stepper/index.wxml b/lib/stepper/index.wxml
index b49140e5..8172d15c 100644
--- a/lib/stepper/index.wxml
+++ b/lib/stepper/index.wxml
@@ -13,7 +13,7 @@
     bind:touchstart="onTouchStart"
     bind:touchend="onTouchEnd"
   >
-    <slot name="plus" />
+    <slot name="minus" />
   </view>
   <input
     type="{{ integer ? 'number' : 'digit' }}"
@@ -37,6 +37,6 @@
     bind:touchstart="onTouchStart"
     bind:touchend="onTouchEnd"
   >
-    <slot name="minus" />
+    <slot name="plus" />
   </view>
 </view>
diff --git a/lib/sticky/index.js b/lib/sticky/index.js
index c2a1e0b9..3bb20a4f 100644
--- a/lib/sticky/index.js
+++ b/lib/sticky/index.js
@@ -2,6 +2,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 var utils_1 = require('../common/utils');
 var component_1 = require('../common/component');
+var validator_1 = require('../common/validator');
 var page_scroll_1 = require('../mixins/page-scroll');
 var ROOT_ELEMENT = '.van-sticky';
 component_1.VantComponent({
@@ -88,6 +89,9 @@ component_1.VantComponent({
         return;
       }
       utils_1.getRect(this, ROOT_ELEMENT).then(function (root) {
+        if (!validator_1.isDef(root)) {
+          return;
+        }
         if (offsetTop >= root.top) {
           _this.setDataAfterDiff({ fixed: true, height: root.height });
           _this.transform = 0;