diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index 175d00245..04f206ba2 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -28,8 +28,8 @@
 
 <script>
 import Popup from '../mixins/popup';
-import VanIcon from '../icon';
-import VanLoading from '../loading';
+import Icon from '../icon';
+import Loading from '../loading';
 
 export default {
   name: 'van-actionsheet',
@@ -37,8 +37,8 @@ export default {
   mixins: [Popup],
 
   components: {
-    [VanIcon.name]: VanIcon,
-    [VanLoading.name]: VanLoading
+    [Icon.name]: Icon,
+    [Loading.name]: Loading
   },
 
   props: {
diff --git a/packages/badge-group/index.vue b/packages/badge-group/index.vue
index dc1009994..1fc386423 100644
--- a/packages/badge-group/index.vue
+++ b/packages/badge-group/index.vue
@@ -5,21 +5,21 @@
 </template>
 
 <script>
-  export default {
-    name: 'van-badge-group',
+export default {
+  name: 'van-badge-group',
 
-    props: {
-      // 当前激活 tab 面板的 key
-      activeKey: {
-        type: [Number, String],
-        default: 0
-      }
-    },
-
-    data() {
-      return {
-        badges: []
-      };
+  props: {
+    // 当前激活 tab 面板的 key
+    activeKey: {
+      type: [Number, String],
+      default: 0
     }
-  };
+  },
+
+  data() {
+    return {
+      badges: []
+    };
+  }
+};
 </script>
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index 7c1b87dde..7ab4ce705 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -51,7 +51,7 @@ export default {
     wrapperStyle() {
       return {
         transform: `translate3d(${this.offset}px, 0, 0)`
-      }
+      };
     }
   },
 
@@ -72,9 +72,8 @@ export default {
       if (direction > 0 && -offset > rightWidth * 0.4 && rightWidth > 0) {
         this.swipeMove(-rightWidth);
         this.resetSwipeStatus();
-      }
       // left
-      else if (direction < 0 && offset >leftWidth * 0.4 && leftWidth > 0) {
+      } else if (direction < 0 && offset > leftWidth * 0.4 && leftWidth > 0) {
         this.swipeMove(leftWidth);
         this.resetSwipeStatus();
       } else {
@@ -114,7 +113,7 @@ export default {
 
     endDrag() {
       if (this.swiping) {
-        this.swipeLeaveTransition(this.offset > 0 ? -1 : 1);        
+        this.swipeLeaveTransition(this.offset > 0 ? -1 : 1);
       };
     }
   }
diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index 75d521a17..c89cc77ff 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -19,7 +19,7 @@ export default {
   name: 'van-datetime-picker',
 
   components: {
-    'van-picker': Picker
+    [Picker.name]: Picker
   },
 
   props: {
diff --git a/packages/field/index.vue b/packages/field/index.vue
index 2f86df5b1..67145aa67 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -48,15 +48,15 @@
 
 <script>
 const VALID_TYPES = ['text', 'number', 'email', 'url', 'tel', 'date', 'time', 'datetime', 'password', 'textarea'];
-import vanCell from '../cell';
-import vanIcon from '../icon';
+import Cell from '../cell';
+import Icon from '../icon';
 
 export default {
   name: 'van-field',
 
   components: {
-    vanCell,
-    vanIcon
+    [Cell.name]: Cell,
+    [Icon.name]: Icon
   },
 
   props: {
diff --git a/packages/image-preview/image-preview.vue b/packages/image-preview/image-preview.vue
index 1ff21be7b..7b6cc3245 100644
--- a/packages/image-preview/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -13,8 +13,8 @@
 <script>
 import Vue from 'vue';
 import Popup from '../mixins/popup';
-import VanSwipe from '../swipe';
-import VanSwipeItem from '../swipe-item';
+import Swipe from '../swipe';
+import SwipeItem from '../swipe-item';
 
 export default {
   name: 'van-image-preview',
@@ -22,8 +22,8 @@ export default {
   mixins: [Popup],
 
   components: {
-    VanSwipe,
-    VanSwipeItem
+    [Swipe.name]: Swipe,
+    [SwipeItem.name]: SwipeItem
   },
 
   props: {
diff --git a/packages/loading/index.vue b/packages/loading/index.vue
index 64fb16f73..75e8f7b33 100644
--- a/packages/loading/index.vue
+++ b/packages/loading/index.vue
@@ -1,12 +1,13 @@
 <template>
-  <div class="van-loading" :class="['van-loading--' + type]">
-    <span class="van-loading__spinner" :class="['van-loading__spinner--' + type, 'van-loading__spinner--' + color]"></span>
+  <div :class="['van-loading', 'van-loading--' + type]">
+    <span :class="['van-loading__spinner', 'van-loading__spinner--' + type, 'van-loading__spinner--' + color]"></span>
   </div>
 </template>
 
 <script>
 const VALID_TYPES = ['gradient-circle', 'circle'];
 const VALID_COLORS = ['black', 'white'];
+
 export default {
   name: 'van-loading',
 
@@ -14,16 +15,12 @@ export default {
     type: {
       type: String,
       default: 'gradient-circle',
-      validator(value) {
-        return VALID_TYPES.indexOf(value) > -1;
-      }
+      validator: value => VALID_TYPES.indexOf(value) > -1
     },
     color: {
       type: String,
       default: 'black',
-      validator(value) {
-        return VALID_COLORS.indexOf(value) > -1;
-      }
+      validator: value => VALID_COLORS.indexOf(value) > -1
     }
   }
 };
diff --git a/packages/mixins/popup/index.js b/packages/mixins/popup/index.js
index b4b8fa227..cb98e2638 100644
--- a/packages/mixins/popup/index.js
+++ b/packages/mixins/popup/index.js
@@ -138,7 +138,7 @@ export default {
 
       if (this.preventScroll) {
         document.addEventListener('touchstart', this.recordPosition, false);
-        document.addEventListener('touchmove', this.watchTouchMove, false);        
+        document.addEventListener('touchmove', this.watchTouchMove, false);
       }
     },
 
diff --git a/packages/mixins/popup/popup-manager.js b/packages/mixins/popup/popup-manager.js
index c422b537f..4c71dfc99 100644
--- a/packages/mixins/popup/popup-manager.js
+++ b/packages/mixins/popup/popup-manager.js
@@ -82,7 +82,7 @@ const PopupManager = {
 
     let domParentNode;
     if (dom && dom.parentNode && dom.parentNode.nodeType !== 11) {
-      domParentNode = dom.parentNode
+      domParentNode = dom.parentNode;
     } else {
       domParentNode = document.body;
     }
diff --git a/packages/picker/index.vue b/packages/picker/index.vue
index cf2851cda..5468a326d 100644
--- a/packages/picker/index.vue
+++ b/packages/picker/index.vue
@@ -8,7 +8,7 @@
       </slot>
     </div>
     <div class="van-picker__columns" :class="['van-picker__columns--' + columns.length]">
-      <picker-column
+      <van-picker-column
         v-for="(item, index) in columns"
         :key="index"
         v-model="values[index]"
@@ -17,8 +17,8 @@
         :itemHeight="itemHeight"
         :visible-item-count="visibileColumnCount"
         :value-key="valueKey"
-        @columnChange="columnValueChange(index)">
-      </picker-column>
+        @columnChange="columnValueChange(index)"
+      />
       <div class="van-picker-center-highlight" :style="{ height: itemHeight + 'px', marginTop: -itemHeight / 2 + 'px' }"></div>
     </div>
   </div>
@@ -33,7 +33,7 @@ export default {
   name: 'van-picker',
 
   components: {
-    PickerColumn
+    [PickerColumn.name]: PickerColumn
   },
 
   props: {
diff --git a/packages/search/index.vue b/packages/search/index.vue
index 85fe31b38..8e4b2df90 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -20,14 +20,14 @@
 </template>
 
 <script>
-import VanIcon from '../icon';
+import Icon from '../icon';
 import Clickoutside from '../utils/clickoutside';
 
 export default {
   name: 'van-search',
 
   components: {
-    VanIcon
+    [Icon.name]: Icon
   },
 
   props: {
diff --git a/packages/steps/index.vue b/packages/steps/index.vue
index 91adf1efd..c246f91d3 100644
--- a/packages/steps/index.vue
+++ b/packages/steps/index.vue
@@ -30,7 +30,7 @@ export default {
   name: 'van-steps',
 
   components: {
-    'van-icon': Icon
+    [Icon.name]: Icon
   },
 
   props: {
diff --git a/packages/swipe-item/index.vue b/packages/swipe-item/index.vue
index dafed2fd2..36979841e 100644
--- a/packages/swipe-item/index.vue
+++ b/packages/swipe-item/index.vue
@@ -13,9 +13,9 @@ export default {
   },
 
   destroyed() {
-    const index = this.$parent.swipes.indexOf(this)
+    const index = this.$parent.swipes.indexOf(this);
     if (index > -1) {
-      this.$parent.swipes.splice(index, 1)
+      this.$parent.swipes.splice(index, 1);
     }
   }
 };
diff --git a/packages/swipe/index.vue b/packages/swipe/index.vue
index 4b6d818b6..6d2e642e0 100644
--- a/packages/swipe/index.vue
+++ b/packages/swipe/index.vue
@@ -61,27 +61,27 @@ export default {
     }).on('autoPlay', function(dist, isEnd) {
       scroll.movePage(dist.x, isEnd);
     });
-    this.dummy = dummy
+    this.dummy = dummy;
   },
 
   watch: {
     swipes(value) {
       if (this.autoPlay && value.length > 1) {
-        this.dummy.initMove()
+        this.dummy.initMove();
       } else {
-        this.dummy.clearMove()
+        this.dummy.clearMove();
       }
       this.scroll.update();
-      return value
+      return value;
     },
 
     autoPlay(value) {
       if (value && this.swipes.length > 1) {
-        this.dummy.initMove()
+        this.dummy.initMove();
       } else {
-        this.dummy.clearMove()
+        this.dummy.clearMove();
       }
-      return value
+      return value;
     }
   },
 
diff --git a/packages/switch/index.vue b/packages/switch/index.vue
index 3dde8ea05..e8f175984 100644
--- a/packages/switch/index.vue
+++ b/packages/switch/index.vue
@@ -8,22 +8,12 @@
 </template>
 
 <script>
-import VanLoading from '../loading';
-/**
- * van-switch
- * @module components/switch
- * @desc 开关
- * @param {boolean} [value=false] - 开关状态
- * @param {boolean} [disabled=false] - 禁用
- * @param {boolean} [loading=false] - loading状态
- *
- * @example
- * <van-switch :checked="true" :disabled="false"></van-switch>
- */
+import Loading from '../loading';
+
 export default {
   name: 'van-switch',
   components: {
-    'van-loading': VanLoading
+    [Loading.name]: Loading
   },
   props: {
     value: Boolean,
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 0da594a6e..5a9cac1e2 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -192,7 +192,7 @@
             const translate = swipeState.startTranslateLeft + deltaX;
 
             /* istanbul ignore else */
-            if (translate > 0 || (translate * -1) > this.maxTranslate ) return;
+            if (translate > 0 || (translate * -1) > this.maxTranslate) return;
 
             translateUtil.translateElement(el, translate, null);
           },
@@ -200,7 +200,7 @@
           end: () => {
             this.isSwiping = false;
           }
-        })
+        });
       },
 
       doOnValueChange() {
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index 4463165e0..e24bf0990 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -12,9 +12,7 @@
     props: {
       type: {
         type: String,
-        validator: function (val) {
-          return ~ALLOW_TYPE.indexOf(val);
-        }
+        validator: val => ~ALLOW_TYPE.indexOf(val)
       },
       mark: Boolean,
       plain: Boolean
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index a147dd8a4..8bb168e49 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -20,8 +20,8 @@
 </template>
 
 <script>
-import vanLoading from '../loading';
-import vanIcon from '../icon';
+import Icon from '../icon';
+import Loading from '../loading';
 
 const TOAST_TYPES = ['text', 'html', 'loading', 'success', 'fail'];
 const DEFAULT_STYLE_LIST = ['success', 'fail'];
@@ -37,8 +37,8 @@ export default {
   name: 'van-toast',
 
   components: {
-    'van-loading': vanLoading,
-    'van-icon': vanIcon
+    [Icon.name]: Icon,
+    [Loading.name]: Loading
   },
   props: {
     type: {