build: compile 1.0.1

dist/checkbox/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
 function emit(target, value) {
     target.$emit('input', value);
     target.$emit('change', value);
@@ -30,12 +29,9 @@ VantComponent({
         },
         iconSize: {
             type: null,
-            observer: 'setSizeWithUnit'
+            value: 20
         }
     },
-    data: {
-        sizeWithUnit: '20px'
-    },
     methods: {
         emitChange(value) {
             if (this.parent) {
@@ -77,11 +73,6 @@ VantComponent({
                     emit(parent, parentValue);
                 }
             }
-        },
+        }
-        setSizeWithUnit(size) {
-            this.set({
-                sizeWithUnit: addUnit(size)
-            });
-        },
     }
 });

dist/checkbox/index.wxml

@@ -8,7 +8,7 @@
       name="success"
       size="0.8em"
       class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
-      style="font-size: {{ sizeWithUnit }};{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
+      style="font-size: {{ utils.addUnit(iconSize) }};{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
       custom-class="icon-class"
       custom-style="line-height: 1.25em;"
     />

dist/checkbox/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content: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}
+@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content: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}

dist/dialog/index.js

@@ -1,7 +1,6 @@
 import { VantComponent } from '../common/component';
 import { button } from '../mixins/button';
 import { openType } from '../mixins/open-type';
-import { addUnit } from '../common/utils';
 import { GRAY, BLUE } from '../common/color';
 VantComponent({
     mixins: [button, openType],
@@ -19,10 +18,7 @@ VantComponent({
         showCancelButton: Boolean,
         closeOnClickOverlay: Boolean,
         confirmButtonOpenType: String,
-        width: {
+        width: null,
-            type: null,
-            observer: 'setWidthWithUnit'
-        },
         zIndex: {
             type: Number,
             value: 2000
@@ -109,11 +105,6 @@ VantComponent({
             if (callback) {
                 callback(this);
             }
-        },
-        setWidthWithUnit(val) {
-            this.setData({
-                widthWithUnit: addUnit(val)
-            });
         }
     }
 });

dist/dialog/index.wxml

@@ -1,10 +1,12 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-popup
   show="{{ show }}"
   z-index="{{ zIndex }}"
   overlay="{{ overlay }}"
   transition="{{ transition }}"
   custom-class="van-dialog {{ className }}"
-  custom-style="{{ widthWithUnit ? 'width: ' + widthWithUnit + ';' : '' }}{{ customStyle }}"
+  custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   bind:close="onClickOverlay"

dist/goods-action-button/index.js

@@ -16,6 +16,7 @@ VantComponent({
         color: String,
         loading: Boolean,
         disabled: Boolean,
+        plain: Boolean,
         type: {
             type: String,
             value: 'danger'
@@ -31,10 +32,16 @@ VantComponent({
         },
         updateStyle() {
             const { children = [] } = this.parent;
+            const { length } = children;
             const index = children.indexOf(this);
+            let rightBorderLess = false;
+            if (length > 1) {
+                rightBorderLess = index !== length - 1;
+            }
             this.setData({
                 isFirst: index === 0,
-                isLast: index === children.length - 1
+                rightBorderLess,
+                isLast: index === length - 1
             });
         }
     }

dist/goods-action-button/index.wxml

@@ -5,10 +5,11 @@
   lang="{{ lang }}"
   type="{{ type }}"
   color="{{ color }}"
+  plain="{{ plain }}"
   loading="{{ loading }}"
   disabled="{{ disabled }}"
   open-type="{{ openType }}"
-  custom-class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast }]) }}"
+  custom-class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain : plain, ordinary: !plain }])}} {{ rightBorderLess ?'van-goods-action-button--no-right-border': ''}}"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"

dist/goods-action-button/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{border:none!important;height:40px!important;height:var(--goods-action-button-height,40px)!important;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important;line-height:40px!important;line-height:var(--goods-action-button-height,40px)!important}.van-goods-action-button--first{display:block!important;margin-left:5px;border-top-left-radius:20px!important;border-top-left-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-left-radius:20px!important;border-bottom-left-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--last{display:block!important;margin-right:5px;border-top-right-radius:20px!important;border-top-right-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-right-radius:20px!important;border-bottom-right-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--warning{background:linear-gradient(90deg,#ffd01e,#ff8917);background:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917))}.van-goods-action-button--danger{background:linear-gradient(90deg,#ff6034,#ee0a24);background:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24))}@media (max-width:321px){.van-goods-action-button{font-size:13px}}
+@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{height:40px!important;height:var(--goods-action-button-height,40px)!important;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important;line-height:40px!important;line-height:var(--goods-action-button-height,40px)!important}.van-goods-action-button--first{display:block!important;margin-left:5px;border-top-left-radius:20px!important;border-top-left-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-left-radius:20px!important;border-bottom-left-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--last{display:block!important;margin-right:5px;border-top-right-radius:20px!important;border-top-right-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-right-radius:20px!important;border-bottom-right-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--warning{background:linear-gradient(90deg,#ffd01e,#ff8917);background:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917))}.van-goods-action-button--danger{background:linear-gradient(90deg,#ff6034,#ee0a24);background:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24))}.van-goods-action-button--ordinary{border:none!important}.van-goods-action-button--plain{background:#fff;background:var(--goods-action-button-plain-color,#fff)}.van-goods-action-button--no-right-border{border-right-width:0!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}

dist/icon/index.js

@@ -1,13 +1,9 @@
 import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
 VantComponent({
     props: {
         dot: Boolean,
         info: null,
-        size: {
+        size: null,
-            type: null,
-            observer: 'setSizeWithUnit'
-        },
         color: String,
         customStyle: String,
         classPrefix: {
@@ -23,17 +19,9 @@ VantComponent({
             }
         }
     },
-    data: {
-        sizeWithUnit: null,
-    },
     methods: {
         onClick() {
             this.$emit('click');
-        },
-        setSizeWithUnit(size) {
-            this.setData({
-                sizeWithUnit: addUnit(size)
-            });
         }
     }
 });

dist/icon/index.wxml

@@ -1,6 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
   class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
-  style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + sizeWithUnit + ';' : '' }}{{ customStyle }}"
+  style="color: {{ color }};font-size: {{ utils.addUnit(size) }};{{ customStyle }}"
   bind:tap="onClick"
 >
   <van-info

dist/loading/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
 VantComponent({
     props: {
         color: String,
@@ -8,25 +7,7 @@ VantComponent({
             type: String,
             value: 'circular'
         },
-        size: {
+        size: String,
-            type: String,
+        textSize: String
-            observer: 'setSizeWithUnit'
-        },
-        textSize: {
-            type: String,
-            observer: 'setTextSizeWithUnit'
-        }
-    },
-    methods: {
-        setSizeWithUnit(size) {
-            this.setData({
-                sizeWithUnit: addUnit(size)
-            });
-        },
-        setTextSizeWithUnit(size) {
-            this.set({
-                textSizeWithUnit: addUnit(size)
-            });
-        }
     }
 });

dist/loading/index.wxml

@@ -1,7 +1,9 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="custom-class van-loading {{ vertical ? 'van-loading--vertical' : '' }}">
   <view
     class="van-loading__spinner van-loading__spinner--{{ type }}"
-    style="color: {{ color }}; width: {{ sizeWithUnit }}; height: {{ sizeWithUnit }}"
+    style="color: {{ color }}; width: {{ utils.addUnit(size) }}; height: {{ utils.addUnit(size) }}"
   >
     <view
       wx:if="{{ type === 'spinner' }}"
@@ -10,7 +12,7 @@
       class="van-loading__dot"
     />
   </view>
-  <view class="van-loading__text" style="font-size: {{ textSizeWithUnit }};">
+  <view class="van-loading__text" style="font-size: {{ utils.addUnit(textSize) }};">
     <slot />
   </view>
 </view>

dist/mixins/observer/behavior.js

@@ -1,14 +1,8 @@
 export const behavior = Behavior({
     methods: {
         set(data, callback) {
-            return new Promise(resolve => {
+            this.setData(data, callback);
-                this.setData(data, () => {
+            return new Promise(resolve => wx.nextTick(resolve));
-                    if (callback && typeof callback === 'function') {
-                        callback.call(this);
-                    }
-                    resolve();
-                });
-            });
         }
     }
 });

dist/notice-bar/index.js

@@ -51,6 +51,9 @@ VantComponent({
     watch: {
         text() {
             this.setData({}, this.init);
+        },
+        speed() {
+            this.setData({}, this.init);
         }
     },
     created() {

dist/notify/index.js

@@ -33,9 +33,8 @@ VantComponent({
         show() {
             const { duration, onOpened } = this.data;
             clearTimeout(this.timer);
-            this.setData({
+            this.setData({ show: true });
-                show: true
+            wx.nextTick(onOpened);
-            }, onOpened);
             if (duration > 0 && duration !== Infinity) {
                 this.timer = setTimeout(() => {
                     this.hide();
@@ -45,9 +44,8 @@ VantComponent({
         hide() {
             const { onClose } = this.data;
             clearTimeout(this.timer);
-            this.setData({
+            this.setData({ show: false });
-                show: false
+            wx.nextTick(onClose);
-            }, onClose);
         },
         onTap(event) {
             const { onClick } = this.data;

dist/notify/index.wxml

@@ -9,7 +9,10 @@
     class="van-notify van-notify--{{ type }}"
     style="background:{{ background }};color:{{ color }};"
   >
-    <view wx:if="{{ safeAreaInsetTop }}" class="van-notify__safe-area"></view>
+    <view
+      wx:if="{{ safeAreaInsetTop }}"
+      style="height: {{ statusBarHeight }}px"
+    ></view>
     <text>{{ message }}</text>
   </view>
 </van-transition>

dist/notify/notify.js

@@ -7,6 +7,7 @@ const defaultOptions = {
     duration: 3000,
     zIndex: 110,
     color: WHITE,
+    safeAreaInsetTop: false,
     onClick: () => { },
     onOpened: () => { },
     onClose: () => { }
@@ -25,7 +26,7 @@ export default function Notify(options) {
     delete options.context;
     delete options.selector;
     if (notify) {
-        notify.set(options);
+        notify.setData(options);
         notify.show();
         return notify;
     }

dist/progress/index.js

@@ -1,6 +1,5 @@
 import { VantComponent } from '../common/component';
 import { BLUE } from '../common/color';
-import { addUnit } from '../common/utils';
 VantComponent({
     props: {
         inactive: Boolean,
@@ -22,17 +21,7 @@ VantComponent({
         },
         strokeWidth: {
             type: null,
-            observer: 'setStrokeWidthUnit'
+            value: 4
-        }
-    },
-    data: {
-        strokeWidthUnit: '4px'
-    },
-    methods: {
-        setStrokeWidthUnit(val) {
-            this.setData({
-                strokeWidthUnit: addUnit(val)
-            });
         }
     }
 });

dist/progress/index.wxml

@@ -1,8 +1,9 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
 <wxs src="./index.wxs" module="getters" />
 
 <view
   class="van-progress custom-class"
-  style="height: {{ strokeWidthUnit }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
+  style="height: {{ utils.addUnit(strokeWidth) }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
 >
   <view
     class="van-progress__portion"

dist/radio/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
 VantComponent({
     field: true,
     relation: {
@@ -29,18 +28,10 @@ VantComponent({
         },
         iconSize: {
             type: null,
-            observer: 'setIconSizeUnit'
+            value: 20
         }
     },
-    data: {
-        iconSizeWithUnit: '20px'
-    },
     methods: {
-        setIconSizeUnit(val) {
-            this.setData({
-                iconSizeWithUnit: addUnit(val)
-            });
-        },
         emitChange(value) {
             const instance = this.parent || this;
             instance.$emit('input', value);

dist/radio/index.wxml

@@ -8,15 +8,15 @@
   >
     <slot />
   </view>
-  <view class="van-radio__icon-wrap" style="font-size: {{ iconSizeWithUnit }};" bindtap="onChange">
+  <view class="van-radio__icon-wrap" style="font-size: {{ utils.addUnit(iconSize) }};" bindtap="onChange">
     <slot wx:if="{{ useIconSlot }}" name="icon" />
     <van-icon
       wx:else
       name="success"
       class="{{ utils.bem('radio__icon', [shape, { disabled, checked: value === name }]) }}"
-      style="{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
+      style="font-size: {{ utils.addUnit(iconSize) }};{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
       custom-class="icon-class"
-      custom-style="line-height: {{ iconSizeWithUnit }};font-size: .8em;display: block;"
+      custom-style="line-height: {{ utils.addUnit(iconSize) }};font-size: .8em;display: block;"
     />
   </view>
   <view

dist/radio/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-radio{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{-webkit-flex:none;flex:none}.van-radio__icon{display:block;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}
+@import '../common/index.wxss';.van-radio{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{-webkit-flex:none;flex:none}.van-radio__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content: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}

dist/rate/index.js

@@ -1,17 +1,20 @@
 import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
 VantComponent({
     field: true,
     classes: ['icon-class'],
     props: {
-        value: Number,
+        value: {
+            type: Number,
+            observer(value) {
+                if (value !== this.data.innerValue) {
+                    this.setData({ innerValue: value });
+                }
+            }
+        },
         readonly: Boolean,
         disabled: Boolean,
         allowHalf: Boolean,
-        size: {
+        size: null,
-            type: null,
-            observer: 'setSizeWithUnit'
-        },
         icon: {
             type: String,
             value: 'star'
@@ -36,38 +39,16 @@ VantComponent({
             type: Number,
             value: 5
         },
-        gutter: {
+        gutter: null,
-            type: null,
-            observer: 'setGutterWithUnit'
-        },
         touchable: {
             type: Boolean,
             value: true
         }
     },
     data: {
-        innerValue: 0,
+        innerValue: 0
-        gutterWithUnit: undefined,
-        sizeWithUnit: null
-    },
-    watch: {
-        value(value) {
-            if (value !== this.data.innerValue) {
-                this.setData({ innerValue: value });
-            }
-        }
     },
     methods: {
-        setGutterWithUnit(val) {
-            this.setData({
-                gutterWithUnit: addUnit(val)
-            });
-        },
-        setSizeWithUnit(size) {
-            this.setData({
-                sizeWithUnit: addUnit(size)
-            });
-        },
         onSelect(event) {
             const { data } = this;
             const { score } = event.currentTarget.dataset;

dist/rate/index.wxml

@@ -8,12 +8,12 @@
     class="van-rate__item"
     wx:for="{{ count }}"
     wx:key="index"
-    style="padding-right: {{ index !== count - 1 ? gutterWithUnit : '' }}"
+    style="padding-right: {{ index !== count - 1 ? utils.addUnit(gutter) : '' }}"
   >
     <van-icon
       name="{{ index + 1 <= innerValue ? icon : voidIcon }}"
       class="van-rate__icon"
-      style="font-size :{{ size? sizeWithUnit : ''}}"
+      style="font-size: {{ utils.addUnit(size) }}"
       custom-class="icon-class"
       data-score="{{ index }}"
       color="{{ disabled ? disabledColor : index + 1 <= innerValue ? color : voidColor }}"
@@ -24,7 +24,7 @@
       wx:if="{{ allowHalf }}"
       name="{{ index + 0.5 <= innerValue ? icon : voidIcon }}"
       class="{{ utils.bem('rate__icon', ['half']) }}"
-      style="font-size :{{ size? sizeWithUnit : ''}}"
+      style="font-size: {{ utils.addUnit(size) }}"
       custom-class="icon-class"
       data-score="{{ index - 0.5 }}"
       color="{{ disabled ? disabledColor : index + 0.5 <= innerValue ? color : voidColor }}"

dist/steps/index.js

@@ -1,5 +1,5 @@
 import { VantComponent } from '../common/component';
-import { GREEN } from '../common/color';
+import { GREEN, GRAY_DARK } from '../common/color';
 VantComponent({
     props: {
         icon: String,
@@ -13,6 +13,10 @@ VantComponent({
             type: String,
             value: GREEN
         },
+        inactiveColor: {
+            type: String,
+            value: GRAY_DARK
+        },
         activeIcon: {
             type: String,
             value: 'checked'

dist/steps/index.wxml

@@ -6,6 +6,7 @@
       wx:for="{{ steps }}"
       wx:key="index"
       class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
+      style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
     >
       <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
         <view>{{ item.text }}</view>
@@ -15,14 +16,14 @@
         <block wx:if="{{ index !== active }}">
           <van-icon
             wx:if="{{ inactiveIcon }}"
-            color="#969799"
+            color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}"
             name="{{ inactiveIcon }}"
             custom-class="van-step__icon"
           />
           <view
             wx:else
             class="van-step__circle"
-            style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+            style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
           />
         </block>
 
@@ -30,7 +31,7 @@
       </view>
       <view
         wx:if="{{ index !== steps.length - 1 }}"
-        class="van-step__line" style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+        class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
       />
     </view>
   </view>
@@ -44,7 +45,7 @@ function get(index, active) {
     return 'process';
   }
 
-  return '';
+  return 'inactive';
 }
 
 module.exports = get;

dist/tag/index.json

@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
 }

dist/tree-select/index.js

@@ -1,5 +1,4 @@
 import { VantComponent } from '../common/component';
-import { addUnit } from '../common/utils';
 VantComponent({
     classes: [
         'main-item-class',
@@ -22,8 +21,7 @@ VantComponent({
         },
         height: {
             type: [Number, String],
-            value: 300,
+            value: 300
-            observer: 'updateHeight'
         },
         max: {
             type: Number,
@@ -33,9 +31,6 @@ VantComponent({
     data: {
         subItems: []
     },
-    created() {
-        this.updateHeight();
-    },
     methods: {
         // 当一个子项被选择时
         onSelectItem(event) {
@@ -64,11 +59,6 @@ VantComponent({
             const { items, mainActiveIndex } = this.data;
             const { children = [] } = items[mainActiveIndex] || {};
             return this.set({ subItems: children });
-        },
-        updateHeight() {
-            this.setData({
-                innerHeight: addUnit(this.data.height)
-            });
         }
     }
 });

dist/tree-select/index.wxml

@@ -3,7 +3,7 @@
 
 <view
   class="van-tree-select"
-  style="height: {{ innerHeight }}"
+  style="height: {{ utils.addUnit(height) }}"
 >
   <scroll-view scroll-y class="van-tree-select__nav">
     <van-sidebar active-key="{{ mainActiveIndex }}" bind:change="onClickNav" custom-class="van-tree-select__nav__inner">

dist/uploader/index.js

@@ -1,17 +1,14 @@
 import { VantComponent } from '../common/component';
 import { isImageFile } from './utils';
-import { addUnit } from '../common/utils';
 VantComponent({
     props: {
         disabled: Boolean,
         multiple: Boolean,
         uploadText: String,
-        useSlot: Boolean,
         useBeforeRead: Boolean,
         previewSize: {
             type: null,
-            value: 90,
+            value: 90
-            observer: 'setComputedPreviewSize'
         },
         name: {
             type: [Number, String],
@@ -21,6 +18,14 @@ VantComponent({
             type: String,
             value: 'image'
         },
+        sizeType: {
+            type: Array,
+            value: ['original', 'compressed']
+        },
+        capture: {
+            type: Array,
+            value: ['album', 'camera']
+        },
         fileList: {
             type: Array,
             value: [],
@@ -62,15 +67,10 @@ VantComponent({
             const lists = fileList.map(item => (Object.assign(Object.assign({}, item), { isImage: typeof item.isImage === 'undefined' ? isImageFile(item) : item.isImage })));
             this.setData({ lists, isInCount: lists.length < maxCount });
         },
-        setComputedPreviewSize(val) {
-            this.setData({
-                computedPreviewSize: addUnit(val)
-            });
-        },
         startUpload() {
             if (this.data.disabled)
                 return;
-            const { name = '', capture = ['album', 'camera'], maxCount = 100, multiple = false, maxSize, accept, lists, useBeforeRead = false // 是否定义了 beforeRead
+            const { name = '', capture, maxCount, multiple, maxSize, accept, sizeType, lists, useBeforeRead = false // 是否定义了 beforeRead
              } = this.data;
             let chooseFile = null;
             const newMaxCount = maxCount - lists.length;
@@ -80,6 +80,7 @@ VantComponent({
                     wx.chooseImage({
                         count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
                         sourceType: capture,
+                        sizeType,
                         success: resolve,
                         fail: reject
                     });
@@ -95,7 +96,8 @@ VantComponent({
                     });
                 });
             }
-            chooseFile.then((res) => {
+            chooseFile
+                .then((res) => {
                 const file = multiple ? res.tempFiles : res.tempFiles[0];
                 // 检查文件大小
                 if (file instanceof Array) {
@@ -125,6 +127,9 @@ VantComponent({
                 else {
                     this.$emit('after-read', { file, name });
                 }
+            })
+                .catch(error => {
+                this.$emit('error', error);
             });
         },
         deleteItem(event) {

dist/uploader/index.wxml

@@ -15,14 +15,14 @@
         src="{{ item.url || item.path }}"
         alt="{{ item.name || ('图片' + index) }}"
         class="van-uploader__preview-image"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
         data-url="{{ item.url || item.path }}"
         bind:tap="doPreviewImage"
       />
       <view
         wx:else
         class="van-uploader__file"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
       >
         <van-icon name="description" class="van-uploader__file-icon" />
         <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url || item.path }}</view>
@@ -38,15 +38,14 @@
 
     <!-- 上传样式 -->
     <block wx:if="{{ isInCount }}">
-      <view wx:if="{{ useSlot }}" class="van-uploader__slot" bind:tap="startUpload">
+      <view class="van-uploader__slot" bind:tap="startUpload">
         <slot />
       </view>
 
       <!-- 默认上传样式 -->
       <view
-        wx:else
         class="van-uploader__upload"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
         bind:tap="startUpload"
       >
         <van-icon name="plus" class="van-uploader__upload-icon" />

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__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:#fff;border:1px dashed #ebedf0;border-radius:4px}.van-uploader__upload-icon{display:inline-block;width:24px;height:24px;color:#969799;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__preview{position:relative;margin:0 8px 8px 0}.van-uploader__preview-image{display:block;width:80px;height:80px;border-radius:4px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.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;border-radius:4px}.van-uploader__file-icon{display:inline-block;width:20px;height:20px;color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 5px;color:#646566;font-size:12px;text-align:center}
+@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:#fff;border:1px dashed #ebedf0;border-radius:4px}.van-uploader__upload-icon{display:inline-block;width:24px;height:24px;color:#969799;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__preview{position:relative;margin:0 8px 8px 0}.van-uploader__preview-image{display:block;width:80px;height:80px;border-radius:4px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.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;border-radius:4px}.van-uploader__file-icon{display:inline-block;width:20px;height:20px;color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 5px;color:#646566;font-size:12px;text-align:center}

dist/wxs/add-unit.wxs

@@ -0,0 +1,14 @@
+/* eslint-disable */
+var REGEXP = getRegExp('^\d+(\.\d+)?$');
+
+function addUnit(value) {
+  if (value == null) {
+    return undefined;
+  }
+
+  return REGEXP.test('' + value) ? value + 'px' : value;
+}
+
+module.exports = {
+  addUnit: addUnit
+};

dist/wxs/utils.wxs

@@ -1,7 +1,10 @@
+/* eslint-disable */
 var bem = require('./bem.wxs').bem;
 var memoize = require('./memoize.wxs').memoize;
+var addUnit = require('./add-unit.wxs').addUnit;
 
 module.exports = {
   bem: memoize(bem),
-  memoize: memoize
+  memoize: memoize,
+  addUnit: addUnit
 };

lib/checkbox/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 function emit(target, value) {
     target.$emit('input', value);
     target.$emit('change', value);
@@ -32,12 +31,9 @@ component_1.VantComponent({
         },
         iconSize: {
             type: null,
-            observer: 'setSizeWithUnit'
+            value: 20
         }
     },
-    data: {
-        sizeWithUnit: '20px'
-    },
     methods: {
         emitChange: function (value) {
             if (this.parent) {
@@ -79,11 +75,6 @@ component_1.VantComponent({
                     emit(parent, parentValue);
                 }
             }
-        },
+        }
-        setSizeWithUnit: function (size) {
-            this.set({
-                sizeWithUnit: utils_1.addUnit(size)
-            });
-        },
     }
 });

lib/checkbox/index.wxml

@@ -8,7 +8,7 @@
       name="success"
       size="0.8em"
       class="{{ utils.bem('checkbox__icon', [shape, { disabled, checked: value }]) }}"
-      style="font-size: {{ sizeWithUnit }};{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
+      style="font-size: {{ utils.addUnit(iconSize) }};{{ checkedColor && value && !disabled ? 'border-color:' + checkedColor + '; background-color:' + checkedColor : '' }}"
       custom-class="icon-class"
       custom-style="line-height: 1.25em;"
     />

lib/checkbox/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content: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}
+@import '../common/index.wxss';.van-checkbox{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-checkbox__icon-wrap,.van-checkbox__label{line-height:20px;line-height:var(--checkbox-size,20px)}.van-checkbox__icon-wrap{-webkit-flex:none;flex:none}.van-checkbox__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content: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}

lib/dialog/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var button_1 = require("../mixins/button");
 var open_type_1 = require("../mixins/open-type");
-var utils_1 = require("../common/utils");
 var color_1 = require("../common/color");
 component_1.VantComponent({
     mixins: [button_1.button, open_type_1.openType],
@@ -21,10 +20,7 @@ component_1.VantComponent({
         showCancelButton: Boolean,
         closeOnClickOverlay: Boolean,
         confirmButtonOpenType: String,
-        width: {
+        width: null,
-            type: null,
-            observer: 'setWidthWithUnit'
-        },
         zIndex: {
             type: Number,
             value: 2000
@@ -112,11 +108,6 @@ component_1.VantComponent({
             if (callback) {
                 callback(this);
             }
-        },
-        setWidthWithUnit: function (val) {
-            this.setData({
-                widthWithUnit: utils_1.addUnit(val)
-            });
         }
     }
 });

lib/dialog/index.wxml

@@ -1,10 +1,12 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <van-popup
   show="{{ show }}"
   z-index="{{ zIndex }}"
   overlay="{{ overlay }}"
   transition="{{ transition }}"
   custom-class="van-dialog {{ className }}"
-  custom-style="{{ widthWithUnit ? 'width: ' + widthWithUnit + ';' : '' }}{{ customStyle }}"
+  custom-style="width: {{ utils.addUnit(width) }};{{ customStyle }}"
   overlay-style="{{ overlayStyle }}"
   close-on-click-overlay="{{ closeOnClickOverlay }}"
   bind:close="onClickOverlay"

lib/goods-action-button/index.js

@@ -18,6 +18,7 @@ component_1.VantComponent({
         color: String,
         loading: Boolean,
         disabled: Boolean,
+        plain: Boolean,
         type: {
             type: String,
             value: 'danger'
@@ -33,10 +34,16 @@ component_1.VantComponent({
         },
         updateStyle: function () {
             var _a = this.parent.children, children = _a === void 0 ? [] : _a;
+            var length = children.length;
             var index = children.indexOf(this);
+            var rightBorderLess = false;
+            if (length > 1) {
+                rightBorderLess = index !== length - 1;
+            }
             this.setData({
                 isFirst: index === 0,
-                isLast: index === children.length - 1
+                rightBorderLess: rightBorderLess,
+                isLast: index === length - 1
             });
         }
     }

lib/goods-action-button/index.wxml

@@ -5,10 +5,11 @@
   lang="{{ lang }}"
   type="{{ type }}"
   color="{{ color }}"
+  plain="{{ plain }}"
   loading="{{ loading }}"
   disabled="{{ disabled }}"
   open-type="{{ openType }}"
-  custom-class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast }]) }}"
+  custom-class="{{ utils.bem('goods-action-button', [type, { first: isFirst, last: isLast, plain : plain, ordinary: !plain }])}} {{ rightBorderLess ?'van-goods-action-button--no-right-border': ''}}"
   business-id="{{ businessId }}"
   session-from="{{ sessionFrom }}"
   app-parameter="{{ appParameter }}"

lib/goods-action-button/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{border:none!important;height:40px!important;height:var(--goods-action-button-height,40px)!important;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important;line-height:40px!important;line-height:var(--goods-action-button-height,40px)!important}.van-goods-action-button--first{display:block!important;margin-left:5px;border-top-left-radius:20px!important;border-top-left-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-left-radius:20px!important;border-bottom-left-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--last{display:block!important;margin-right:5px;border-top-right-radius:20px!important;border-top-right-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-right-radius:20px!important;border-bottom-right-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--warning{background:linear-gradient(90deg,#ffd01e,#ff8917);background:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917))}.van-goods-action-button--danger{background:linear-gradient(90deg,#ff6034,#ee0a24);background:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24))}@media (max-width:321px){.van-goods-action-button{font-size:13px}}
+@import '../common/index.wxss';:host{-webkit-flex:1;flex:1}.van-goods-action-button{height:40px!important;height:var(--goods-action-button-height,40px)!important;font-weight:500!important;font-weight:var(--font-weight-bold,500)!important;line-height:40px!important;line-height:var(--goods-action-button-height,40px)!important}.van-goods-action-button--first{display:block!important;margin-left:5px;border-top-left-radius:20px!important;border-top-left-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-left-radius:20px!important;border-bottom-left-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--last{display:block!important;margin-right:5px;border-top-right-radius:20px!important;border-top-right-radius:var(--goods-action-button-border-radius,20px)!important;border-bottom-right-radius:20px!important;border-bottom-right-radius:var(--goods-action-button-border-radius,20px)!important}.van-goods-action-button--warning{background:linear-gradient(90deg,#ffd01e,#ff8917);background:var(--goods-action-button-warning-color,linear-gradient(90deg,#ffd01e,#ff8917))}.van-goods-action-button--danger{background:linear-gradient(90deg,#ff6034,#ee0a24);background:var(--goods-action-button-danger-color,linear-gradient(90deg,#ff6034,#ee0a24))}.van-goods-action-button--ordinary{border:none!important}.van-goods-action-button--plain{background:#fff;background:var(--goods-action-button-plain-color,#fff)}.van-goods-action-button--no-right-border{border-right-width:0!important}@media (max-width:321px){.van-goods-action-button{font-size:13px}}

lib/icon/index.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     props: {
         dot: Boolean,
         info: null,
-        size: {
+        size: null,
-            type: null,
-            observer: 'setSizeWithUnit'
-        },
         color: String,
         customStyle: String,
         classPrefix: {
@@ -25,17 +21,9 @@ component_1.VantComponent({
             }
         }
     },
-    data: {
-        sizeWithUnit: null,
-    },
     methods: {
         onClick: function () {
             this.$emit('click');
-        },
-        setSizeWithUnit: function (size) {
-            this.setData({
-                sizeWithUnit: utils_1.addUnit(size)
-            });
         }
     }
 });

lib/icon/index.wxml

@@ -1,6 +1,8 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view
   class="custom-class {{ classPrefix }} {{ isImageName ? 'van-icon--image' : classPrefix + '-' + name }}"
-  style="{{ color ? 'color: ' + color + ';' : '' }}{{ size ? 'font-size: ' + sizeWithUnit + ';' : '' }}{{ customStyle }}"
+  style="color: {{ color }};font-size: {{ utils.addUnit(size) }};{{ customStyle }}"
   bind:tap="onClick"
 >
   <van-info

lib/loading/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     props: {
         color: String,
@@ -10,25 +9,7 @@ component_1.VantComponent({
             type: String,
             value: 'circular'
         },
-        size: {
+        size: String,
-            type: String,
+        textSize: String
-            observer: 'setSizeWithUnit'
-        },
-        textSize: {
-            type: String,
-            observer: 'setTextSizeWithUnit'
-        }
-    },
-    methods: {
-        setSizeWithUnit: function (size) {
-            this.setData({
-                sizeWithUnit: utils_1.addUnit(size)
-            });
-        },
-        setTextSizeWithUnit: function (size) {
-            this.set({
-                textSizeWithUnit: utils_1.addUnit(size)
-            });
-        }
     }
 });

lib/loading/index.wxml

@@ -1,7 +1,9 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
+
 <view class="custom-class van-loading {{ vertical ? 'van-loading--vertical' : '' }}">
   <view
     class="van-loading__spinner van-loading__spinner--{{ type }}"
-    style="color: {{ color }}; width: {{ sizeWithUnit }}; height: {{ sizeWithUnit }}"
+    style="color: {{ color }}; width: {{ utils.addUnit(size) }}; height: {{ utils.addUnit(size) }}"
   >
     <view
       wx:if="{{ type === 'spinner' }}"
@@ -10,7 +12,7 @@
       class="van-loading__dot"
     />
   </view>
-  <view class="van-loading__text" style="font-size: {{ textSizeWithUnit }};">
+  <view class="van-loading__text" style="font-size: {{ utils.addUnit(textSize) }};">
     <slot />
   </view>
 </view>

lib/mixins/observer/behavior.js

@@ -3,15 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.behavior = Behavior({
     methods: {
         set: function (data, callback) {
-            var _this = this;
+            this.setData(data, callback);
-            return new Promise(function (resolve) {
+            return new Promise(function (resolve) { return wx.nextTick(resolve); });
-                _this.setData(data, function () {
-                    if (callback && typeof callback === 'function') {
-                        callback.call(_this);
-                    }
-                    resolve();
-                });
-            });
         }
     }
 });

lib/notice-bar/index.js

@@ -53,6 +53,9 @@ component_1.VantComponent({
     watch: {
         text: function () {
             this.setData({}, this.init);
+        },
+        speed: function () {
+            this.setData({}, this.init);
         }
     },
     created: function () {

lib/notify/index.js

@@ -36,9 +36,8 @@ component_1.VantComponent({
             var _this = this;
             var _a = this.data, duration = _a.duration, onOpened = _a.onOpened;
             clearTimeout(this.timer);
-            this.setData({
+            this.setData({ show: true });
-                show: true
+            wx.nextTick(onOpened);
-            }, onOpened);
             if (duration > 0 && duration !== Infinity) {
                 this.timer = setTimeout(function () {
                     _this.hide();
@@ -48,9 +47,8 @@ component_1.VantComponent({
         hide: function () {
             var onClose = this.data.onClose;
             clearTimeout(this.timer);
-            this.setData({
+            this.setData({ show: false });
-                show: false
+            wx.nextTick(onClose);
-            }, onClose);
         },
         onTap: function (event) {
             var onClick = this.data.onClick;

lib/notify/index.wxml

@@ -9,7 +9,10 @@
     class="van-notify van-notify--{{ type }}"
     style="background:{{ background }};color:{{ color }};"
   >
-    <view wx:if="{{ safeAreaInsetTop }}" class="van-notify__safe-area"></view>
+    <view
+      wx:if="{{ safeAreaInsetTop }}"
+      style="height: {{ statusBarHeight }}px"
+    ></view>
     <text>{{ message }}</text>
   </view>
 </van-transition>

lib/notify/notify.js

@@ -9,6 +9,7 @@ var defaultOptions = {
     duration: 3000,
     zIndex: 110,
     color: color_1.WHITE,
+    safeAreaInsetTop: false,
     onClick: function () { },
     onOpened: function () { },
     onClose: function () { }
@@ -27,7 +28,7 @@ function Notify(options) {
     delete options.context;
     delete options.selector;
     if (notify) {
-        notify.set(options);
+        notify.setData(options);
         notify.show();
         return notify;
     }

lib/progress/index.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var color_1 = require("../common/color");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     props: {
         inactive: Boolean,
@@ -24,17 +23,7 @@ component_1.VantComponent({
         },
         strokeWidth: {
             type: null,
-            observer: 'setStrokeWidthUnit'
+            value: 4
-        }
-    },
-    data: {
-        strokeWidthUnit: '4px'
-    },
-    methods: {
-        setStrokeWidthUnit: function (val) {
-            this.setData({
-                strokeWidthUnit: utils_1.addUnit(val)
-            });
         }
     }
 });

lib/progress/index.wxml

@@ -1,8 +1,9 @@
+<wxs src="../wxs/utils.wxs" module="utils" />
 <wxs src="./index.wxs" module="getters" />
 
 <view
   class="van-progress custom-class"
-  style="height: {{ strokeWidthUnit }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
+  style="height: {{ utils.addUnit(strokeWidth) }}; {{ trackColor ? 'background: ' + trackColor : '' }}"
 >
   <view
     class="van-progress__portion"

lib/radio/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     field: true,
     relation: {
@@ -31,18 +30,10 @@ component_1.VantComponent({
         },
         iconSize: {
             type: null,
-            observer: 'setIconSizeUnit'
+            value: 20
         }
     },
-    data: {
-        iconSizeWithUnit: '20px'
-    },
     methods: {
-        setIconSizeUnit: function (val) {
-            this.setData({
-                iconSizeWithUnit: utils_1.addUnit(val)
-            });
-        },
         emitChange: function (value) {
             var instance = this.parent || this;
             instance.$emit('input', value);

lib/radio/index.wxml

@@ -8,15 +8,15 @@
   >
     <slot />
   </view>
-  <view class="van-radio__icon-wrap" style="font-size: {{ iconSizeWithUnit }};" bindtap="onChange">
+  <view class="van-radio__icon-wrap" style="font-size: {{ utils.addUnit(iconSize) }};" bindtap="onChange">
     <slot wx:if="{{ useIconSlot }}" name="icon" />
     <van-icon
       wx:else
       name="success"
       class="{{ utils.bem('radio__icon', [shape, { disabled, checked: value === name }]) }}"
-      style="{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
+      style="font-size: {{ utils.addUnit(iconSize) }};{{ checkedColor && !disabled && value === name ? 'border-color:' + checkedColor + '; background-color:' + checkedColor + ';' : '' }}"
       custom-class="icon-class"
-      custom-style="line-height: {{ iconSizeWithUnit }};font-size: .8em;display: block;"
+      custom-style="line-height: {{ utils.addUnit(iconSize) }};font-size: .8em;display: block;"
     />
   </view>
   <view

lib/radio/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-radio{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{-webkit-flex:none;flex:none}.van-radio__icon{display:block;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}
+@import '../common/index.wxss';.van-radio{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;overflow:hidden;-webkit-user-select:none;user-select:none}.van-radio__icon-wrap{-webkit-flex:none;flex:none}.van-radio__icon{display:-webkit-flex;display:flex;-webkit-align-items:center;align-items:center;-webkit-justify-content: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}

lib/rate/index.js

@@ -12,19 +12,22 @@ var __assign = (this && this.__assign) || function () {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     field: true,
     classes: ['icon-class'],
     props: {
-        value: Number,
+        value: {
+            type: Number,
+            observer: function (value) {
+                if (value !== this.data.innerValue) {
+                    this.setData({ innerValue: value });
+                }
+            }
+        },
         readonly: Boolean,
         disabled: Boolean,
         allowHalf: Boolean,
-        size: {
+        size: null,
-            type: null,
-            observer: 'setSizeWithUnit'
-        },
         icon: {
             type: String,
             value: 'star'
@@ -49,38 +52,16 @@ component_1.VantComponent({
             type: Number,
             value: 5
         },
-        gutter: {
+        gutter: null,
-            type: null,
-            observer: 'setGutterWithUnit'
-        },
         touchable: {
             type: Boolean,
             value: true
         }
     },
     data: {
-        innerValue: 0,
+        innerValue: 0
-        gutterWithUnit: undefined,
-        sizeWithUnit: null
-    },
-    watch: {
-        value: function (value) {
-            if (value !== this.data.innerValue) {
-                this.setData({ innerValue: value });
-            }
-        }
     },
     methods: {
-        setGutterWithUnit: function (val) {
-            this.setData({
-                gutterWithUnit: utils_1.addUnit(val)
-            });
-        },
-        setSizeWithUnit: function (size) {
-            this.setData({
-                sizeWithUnit: utils_1.addUnit(size)
-            });
-        },
         onSelect: function (event) {
             var data = this.data;
             var score = event.currentTarget.dataset.score;

lib/rate/index.wxml

@@ -8,12 +8,12 @@
     class="van-rate__item"
     wx:for="{{ count }}"
     wx:key="index"
-    style="padding-right: {{ index !== count - 1 ? gutterWithUnit : '' }}"
+    style="padding-right: {{ index !== count - 1 ? utils.addUnit(gutter) : '' }}"
   >
     <van-icon
       name="{{ index + 1 <= innerValue ? icon : voidIcon }}"
       class="van-rate__icon"
-      style="font-size :{{ size? sizeWithUnit : ''}}"
+      style="font-size: {{ utils.addUnit(size) }}"
       custom-class="icon-class"
       data-score="{{ index }}"
       color="{{ disabled ? disabledColor : index + 1 <= innerValue ? color : voidColor }}"
@@ -24,7 +24,7 @@
       wx:if="{{ allowHalf }}"
       name="{{ index + 0.5 <= innerValue ? icon : voidIcon }}"
       class="{{ utils.bem('rate__icon', ['half']) }}"
-      style="font-size :{{ size? sizeWithUnit : ''}}"
+      style="font-size: {{ utils.addUnit(size) }}"
       custom-class="icon-class"
       data-score="{{ index - 0.5 }}"
       color="{{ disabled ? disabledColor : index + 0.5 <= innerValue ? color : voidColor }}"

lib/steps/index.js

@@ -15,6 +15,10 @@ component_1.VantComponent({
             type: String,
             value: color_1.GREEN
         },
+        inactiveColor: {
+            type: String,
+            value: color_1.GRAY_DARK
+        },
         activeIcon: {
             type: String,
             value: 'checked'

lib/steps/index.wxml

@@ -6,6 +6,7 @@
       wx:for="{{ steps }}"
       wx:key="index"
       class="{{ utils.bem('step', [direction, status(index, active)]) }} van-hairline"
+      style="{{ status(index, active) === 'inactive' ? 'color: ' + inactiveColor: '' }}"
     >
       <view class="van-step__title" style="{{ index === active ? 'color: ' + activeColor : '' }}">
         <view>{{ item.text }}</view>
@@ -15,14 +16,14 @@
         <block wx:if="{{ index !== active }}">
           <van-icon
             wx:if="{{ inactiveIcon }}"
-            color="#969799"
+            color="{{ status(index, active) === 'inactive' ? inactiveColor: activeColor }}"
             name="{{ inactiveIcon }}"
             custom-class="van-step__icon"
           />
           <view
             wx:else
             class="van-step__circle"
-            style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+            style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
           />
         </block>
 
@@ -30,7 +31,7 @@
       </view>
       <view
         wx:if="{{ index !== steps.length - 1 }}"
-        class="van-step__line" style="{{ index < active ? 'background-color: ' + activeColor : '' }}"
+        class="van-step__line" style="{{ 'background-color: ' + (index < active ? activeColor : inactiveColor) }}"
       />
     </view>
   </view>
@@ -44,7 +45,7 @@ function get(index, active) {
     return 'process';
   }
 
-  return '';
+  return 'inactive';
 }
 
 module.exports = get;

lib/tag/index.json

@@ -1,3 +1,6 @@
 {
-  "component": true
+  "component": true,
+  "usingComponents": {
+    "van-icon": "../icon/index"
+  }
 }

lib/tree-select/index.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
-var utils_1 = require("../common/utils");
 component_1.VantComponent({
     classes: [
         'main-item-class',
@@ -24,8 +23,7 @@ component_1.VantComponent({
         },
         height: {
             type: [Number, String],
-            value: 300,
+            value: 300
-            observer: 'updateHeight'
         },
         max: {
             type: Number,
@@ -35,9 +33,6 @@ component_1.VantComponent({
     data: {
         subItems: []
     },
-    created: function () {
-        this.updateHeight();
-    },
     methods: {
         // 当一个子项被选择时
         onSelectItem: function (event) {
@@ -66,11 +61,6 @@ component_1.VantComponent({
             var _a = this.data, items = _a.items, mainActiveIndex = _a.mainActiveIndex;
             var _b = (items[mainActiveIndex] || {}).children, children = _b === void 0 ? [] : _b;
             return this.set({ subItems: children });
-        },
-        updateHeight: function () {
-            this.setData({
-                innerHeight: utils_1.addUnit(this.data.height)
-            });
         }
     }
 });

lib/tree-select/index.wxml

@@ -3,7 +3,7 @@
 
 <view
   class="van-tree-select"
-  style="height: {{ innerHeight }}"
+  style="height: {{ utils.addUnit(height) }}"
 >
   <scroll-view scroll-y class="van-tree-select__nav">
     <van-sidebar active-key="{{ mainActiveIndex }}" bind:change="onClickNav" custom-class="van-tree-select__nav__inner">

lib/uploader/index.js

@@ -13,18 +13,15 @@ var __assign = (this && this.__assign) || function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 var component_1 = require("../common/component");
 var utils_1 = require("./utils");
-var utils_2 = require("../common/utils");
 component_1.VantComponent({
     props: {
         disabled: Boolean,
         multiple: Boolean,
         uploadText: String,
-        useSlot: Boolean,
         useBeforeRead: Boolean,
         previewSize: {
             type: null,
-            value: 90,
+            value: 90
-            observer: 'setComputedPreviewSize'
         },
         name: {
             type: [Number, String],
@@ -34,6 +31,14 @@ component_1.VantComponent({
             type: String,
             value: 'image'
         },
+        sizeType: {
+            type: Array,
+            value: ['original', 'compressed']
+        },
+        capture: {
+            type: Array,
+            value: ['album', 'camera']
+        },
         fileList: {
             type: Array,
             value: [],
@@ -75,17 +80,12 @@ component_1.VantComponent({
             var lists = fileList.map(function (item) { return (__assign(__assign({}, item), { isImage: typeof item.isImage === 'undefined' ? utils_1.isImageFile(item) : item.isImage })); });
             this.setData({ lists: lists, isInCount: lists.length < maxCount });
         },
-        setComputedPreviewSize: function (val) {
-            this.setData({
-                computedPreviewSize: utils_2.addUnit(val)
-            });
-        },
         startUpload: function () {
             var _this = this;
             if (this.data.disabled)
                 return;
-            var _a = this.data, _b = _a.name, name = _b === void 0 ? '' : _b, _c = _a.capture, capture = _c === void 0 ? ['album', 'camera'] : _c, _d = _a.maxCount, maxCount = _d === void 0 ? 100 : _d, _e = _a.multiple, multiple = _e === void 0 ? false : _e, maxSize = _a.maxSize, accept = _a.accept, lists = _a.lists, _f = _a.useBeforeRead // 是否定义了 beforeRead
+            var _a = this.data, _b = _a.name, name = _b === void 0 ? '' : _b, capture = _a.capture, maxCount = _a.maxCount, multiple = _a.multiple, maxSize = _a.maxSize, accept = _a.accept, sizeType = _a.sizeType, lists = _a.lists, _c = _a.useBeforeRead // 是否定义了 beforeRead
-            , useBeforeRead = _f === void 0 ? false : _f // 是否定义了 beforeRead
+            , useBeforeRead = _c === void 0 ? false : _c // 是否定义了 beforeRead
             ;
             var chooseFile = null;
             var newMaxCount = maxCount - lists.length;
@@ -95,6 +95,7 @@ component_1.VantComponent({
                     wx.chooseImage({
                         count: multiple ? (newMaxCount > 9 ? 9 : newMaxCount) : 1,
                         sourceType: capture,
+                        sizeType: sizeType,
                         success: resolve,
                         fail: reject
                     });
@@ -110,7 +111,8 @@ component_1.VantComponent({
                     });
                 });
             }
-            chooseFile.then(function (res) {
+            chooseFile
+                .then(function (res) {
                 var file = multiple ? res.tempFiles : res.tempFiles[0];
                 // 检查文件大小
                 if (file instanceof Array) {
@@ -140,6 +142,9 @@ component_1.VantComponent({
                 else {
                     _this.$emit('after-read', { file: file, name: name });
                 }
+            })
+                .catch(function (error) {
+                _this.$emit('error', error);
             });
         },
         deleteItem: function (event) {

lib/uploader/index.wxml

@@ -15,14 +15,14 @@
         src="{{ item.url || item.path }}"
         alt="{{ item.name || ('图片' + index) }}"
         class="van-uploader__preview-image"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
         data-url="{{ item.url || item.path }}"
         bind:tap="doPreviewImage"
       />
       <view
         wx:else
         class="van-uploader__file"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
       >
         <van-icon name="description" class="van-uploader__file-icon" />
         <view class="van-uploader__file-name van-ellipsis">{{ item.name || item.url || item.path }}</view>
@@ -38,15 +38,14 @@
 
     <!-- 上传样式 -->
     <block wx:if="{{ isInCount }}">
-      <view wx:if="{{ useSlot }}" class="van-uploader__slot" bind:tap="startUpload">
+      <view class="van-uploader__slot" bind:tap="startUpload">
         <slot />
       </view>
 
       <!-- 默认上传样式 -->
       <view
-        wx:else
         class="van-uploader__upload"
-        style="width: {{ computedPreviewSize }}; height: {{ computedPreviewSize }};"
+        style="width: {{ utils.addUnit(previewSize) }}; height: {{ utils.addUnit(previewSize) }};"
         bind:tap="startUpload"
       >
         <van-icon name="plus" class="van-uploader__upload-icon" />

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__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:#fff;border:1px dashed #ebedf0;border-radius:4px}.van-uploader__upload-icon{display:inline-block;width:24px;height:24px;color:#969799;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__preview{position:relative;margin:0 8px 8px 0}.van-uploader__preview-image{display:block;width:80px;height:80px;border-radius:4px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.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;border-radius:4px}.van-uploader__file-icon{display:inline-block;width:20px;height:20px;color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 5px;color:#646566;font-size:12px;text-align:center}
+@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:#fff;border:1px dashed #ebedf0;border-radius:4px}.van-uploader__upload-icon{display:inline-block;width:24px;height:24px;color:#969799;font-size:24px}.van-uploader__upload-text{margin-top:8px;color:#969799;font-size:12px}.van-uploader__preview{position:relative;margin:0 8px 8px 0}.van-uploader__preview-image{display:block;width:80px;height:80px;border-radius:4px}.van-uploader__preview-delete{position:absolute;top:-8px;right:-8px;color:#969799;font-size:18px;background-color:#fff;border-radius:100%}.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;border-radius:4px}.van-uploader__file-icon{display:inline-block;width:20px;height:20px;color:#646566;font-size:20px}.van-uploader__file-name{box-sizing:border-box;width:100%;margin-top:8px;padding:0 5px;color:#646566;font-size:12px;text-align:center}

lib/wxs/add-unit.wxs

@@ -0,0 +1,14 @@
+/* eslint-disable */
+var REGEXP = getRegExp('^\d+(\.\d+)?$');
+
+function addUnit(value) {
+  if (value == null) {
+    return undefined;
+  }
+
+  return REGEXP.test('' + value) ? value + 'px' : value;
+}
+
+module.exports = {
+  addUnit: addUnit
+};

lib/wxs/utils.wxs

@@ -1,7 +1,10 @@
+/* eslint-disable */
 var bem = require('./bem.wxs').bem;
 var memoize = require('./memoize.wxs').memoize;
+var addUnit = require('./add-unit.wxs').addUnit;
 
 module.exports = {
   bem: memoize(bem),
-  memoize: memoize
+  memoize: memoize,
+  addUnit: addUnit
 };