From ffd72e5442c8bb8680cabac412a3dc5e6971c453 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 16 Mar 2018 17:10:46 +0800
Subject: [PATCH] [Improvement] extract component common part (#703)

---
 build/bin/build-style-entry.js             |  9 ++--
 packages/actionsheet/index.vue             |  2 +-
 packages/address-edit/Detail.vue           |  8 +---
 packages/address-edit/index.vue            | 50 +++++++++-----------
 packages/address-list/index.vue            |  6 +--
 packages/area/index.vue                    |  2 +-
 packages/badge-group/index.vue             |  2 +-
 packages/badge/index.vue                   |  2 +-
 packages/button/index.vue                  |  2 +-
 packages/card/index.vue                    |  2 +-
 packages/cell-group/index.vue              | 10 ++--
 packages/cell-swipe/index.vue              |  2 +-
 packages/cell/index.vue                    | 15 ++++--
 packages/checkbox-group/index.vue          |  2 +-
 packages/checkbox/index.vue                |  2 +-
 packages/circle/index.vue                  |  2 +-
 packages/col/index.vue                     |  2 +-
 packages/collapse-item/index.vue           |  7 +--
 packages/collapse/index.vue                |  2 +-
 packages/contact-card/index.vue            |  2 +-
 packages/contact-edit/index.vue            | 20 ++++----
 packages/contact-list/index.vue            |  6 +--
 packages/coupon-cell/index.vue             |  9 +---
 packages/coupon-list/Item.vue              |  2 +-
 packages/coupon-list/index.vue             |  6 +--
 packages/datetime-picker/index.vue         |  2 +-
 packages/dialog/dialog.vue                 |  2 +-
 packages/field/index.vue                   |  7 +--
 packages/goods-action-big-btn/index.vue    |  2 +-
 packages/goods-action-mini-btn/index.vue   |  2 +-
 packages/goods-action/index.vue            |  2 +-
 packages/icon/index.vue                    |  2 +-
 packages/image-preview/image-preview.vue   |  2 +-
 packages/list/index.vue                    |  2 +-
 packages/loading/index.vue                 |  2 +-
 packages/mixins/popup/Modal.vue            |  2 +-
 packages/nav-bar/index.vue                 |  2 +-
 packages/notice-bar/index.vue              |  2 +-
 packages/number-keyboard/index.vue         |  2 +-
 packages/pagination/index.vue              |  2 +-
 packages/panel/index.vue                   |  2 +-
 packages/password-input/index.vue          |  2 +-
 packages/picker/PickerColumn.vue           |  2 +-
 packages/picker/index.vue                  |  2 +-
 packages/popup/index.vue                   |  2 +-
 packages/progress/index.vue                |  2 +-
 packages/pull-refresh/index.vue            |  2 +-
 packages/radio-group/index.vue             |  2 +-
 packages/radio/index.vue                   |  2 +-
 packages/row/index.vue                     |  2 +-
 packages/search/index.vue                  |  2 +-
 packages/sku/Sku.vue                       |  2 +-
 packages/sku/components/SkuActions.vue     |  2 +-
 packages/sku/components/SkuHeader.vue      |  2 +-
 packages/sku/components/SkuImgUploader.vue |  2 +-
 packages/sku/components/SkuMessages.vue    |  8 +---
 packages/sku/components/SkuRow.vue         |  2 +-
 packages/sku/components/SkuRowItem.vue     |  2 +-
 packages/sku/components/SkuStepper.vue     |  2 +-
 packages/step/index.vue                    |  2 +-
 packages/stepper/index.vue                 |  2 +-
 packages/steps/index.vue                   |  2 +-
 packages/submit-bar/index.vue              |  2 +-
 packages/swipe-item/index.vue              |  2 +-
 packages/swipe/index.vue                   |  2 +-
 packages/switch-cell/index.vue             |  4 +-
 packages/switch/index.vue                  |  2 +-
 packages/tab/index.vue                     |  2 +-
 packages/tabbar-item/index.vue             |  2 +-
 packages/tabbar/index.vue                  |  2 +-
 packages/tabs/index.vue                    |  2 +-
 packages/tag/index.vue                     |  2 +-
 packages/toast/toast.vue                   |  2 +-
 packages/tree-select/index.vue             |  2 +-
 packages/uploader/index.vue                |  2 +-
 packages/utils/create.js                   | 14 ++++--
 packages/utils/validate/mobile.js          |  4 +-
 packages/vant-css/src/base.css             |  4 ++
 packages/vant-css/src/index.css            |  4 --
 test/specs/address-edit.spec.js            | 54 +++++++++++-----------
 test/specs/contact.spec.js                 | 14 +++---
 81 files changed, 174 insertions(+), 207 deletions(-)

diff --git a/build/bin/build-style-entry.js b/build/bin/build-style-entry.js
index 6d7779a2a..cc8c72c18 100644
--- a/build/bin/build-style-entry.js
+++ b/build/bin/build-style-entry.js
@@ -17,19 +17,20 @@ components.forEach(componentName => {
 // Analyze component dependencies
 function analyzeDependencies(componentName, libDir) {
   const checkList = ['base'];
+  const whiteList = ['icon', 'loading', 'cell', 'button'];
   search(dependencyTree({
     directory: libDir,
     filename: path.resolve(libDir, componentName, 'index.js'),
     filter: path => path.indexOf(`vant${SEP}lib${SEP}`) !== -1
-  }), checkList);
+  }), checkList, whiteList);
   return checkList.filter(component => checkComponentHasStyle(component));
 }
 
-function search(tree, checkList) {
+function search(tree, checkList, whiteList) {
   tree && Object.keys(tree).forEach(key => {
-    search(tree[key], checkList);
+    search(tree[key], checkList, whiteList);
     const component = key.split(`${SEP}vant${SEP}lib${SEP}`)[1].replace(`${SEP}index.js`, '').replace(`mixins${SEP}`, '');
-    if (checkList.indexOf(component) === -1) {
+    if (checkList.indexOf(component) === -1 && whiteList.indexOf(component) === -1) {
       checkList.push(component);
     }
   });
diff --git a/packages/actionsheet/index.vue b/packages/actionsheet/index.vue
index 4c2b3ca8a..9b3e6dc38 100644
--- a/packages/actionsheet/index.vue
+++ b/packages/actionsheet/index.vue
@@ -38,7 +38,7 @@ import { create } from '../utils';
 import Popup from '../mixins/popup';
 
 export default create({
-  name: 'van-actionsheet',
+  name: 'actionsheet',
 
   mixins: [Popup],
 
diff --git a/packages/address-edit/Detail.vue b/packages/address-edit/Detail.vue
index 30cd52609..7d6b73e17 100644
--- a/packages/address-edit/Detail.vue
+++ b/packages/address-edit/Detail.vue
@@ -41,17 +41,13 @@
 <script>
 import { create } from '../utils';
 import Field from '../field';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import { isAndroid } from '../utils';
 
 export default create({
-  name: 'van-address-edit-detail',
+  name: 'address-edit-detail',
 
   components: {
-    Field,
-    Cell,
-    CellGroup
+    Field
   },
 
   props: {
diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index cc7aecb06..e72a38a78 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -5,7 +5,7 @@
         maxlength="15"
         :placeholder="$t('name')"
         :label="$t('label.name', computedAddressText)"
-        v-model="currentInfo.name"
+        v-model="data.name"
         :error="errorInfo.name"
         @focus="onFocus('name')"
       />
@@ -13,7 +13,7 @@
         type="tel"
         :label="$t('tel')"
         :placeholder="$t('telPlaceholder')"
-        v-model="currentInfo.tel"
+        v-model="data.tel"
         :error="errorInfo.tel"
         @focus="onFocus('tel')"
       />
@@ -23,17 +23,17 @@
         :title="$t('area')"
         @click="showArea = true"
       >
-        <span>{{ currentInfo.province || $t('province') }}</span>
-        <span>{{ currentInfo.city || $t('city') }}</span>
-        <span>{{ currentInfo.county || $t('county') }}</span>
+        <span>{{ data.province || $t('province') }}</span>
+        <span>{{ data.city || $t('city') }}</span>
+        <span>{{ data.county || $t('county') }}</span>
       </cell>
       <address-edit-detail
-        :value="currentInfo.address_detail"
+        :value="data.address_detail"
         :is-error="errorInfo.address_detail"
         :show-search-result="showSearchResult"
         :search-result="searchResult"
         @focus="onFocus('address_detail')"
-        @blur="onDetailBlur"
+        @blur="detailFocused = false"
         @input="onChangeDetail"
         @select-search="$emit('select-search', $event)"
       />
@@ -43,7 +43,7 @@
         type="tel"
         :label="$t('label.postal')"
         :placeholder="$t('placeholder.postal')"
-        v-model="currentInfo.postal_code"
+        v-model="data.postal_code"
         maxlength="6"
         class="van-hairline--top"
         :error="errorInfo.postal_code"
@@ -53,7 +53,7 @@
       <switch-cell
         v-if="showSetDefault"
         v-show="!hideBottomFields"
-        v-model="currentInfo.is_default"
+        v-model="data.is_default"
         :title="$t('defaultAddress', computedAddressText)"
       />
     </cell-group>
@@ -69,7 +69,7 @@
       <van-area
         ref="area"
         :loading="!areaListLoaded"
-        :value="currentInfo.area_code"
+        :value="data.area_code"
         :area-list="areaList"
         @confirm="onAreaConfirm"
         @cancel="showArea = false"
@@ -82,8 +82,6 @@
 /* eslint-disable camelcase */
 import { create, isObj } from '../utils';
 import Field from '../field';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import VanButton from '../button';
 import Popup from '../popup';
 import Toast from '../toast';
@@ -106,12 +104,10 @@ const defaultAddress = {
 };
 
 export default create({
-  name: 'van-address-edit',
+  name: 'address-edit',
 
   components: {
     Field,
-    Cell,
-    CellGroup,
     SwitchCell,
     VanButton,
     Popup,
@@ -144,7 +140,7 @@ export default create({
   data() {
     return {
       showArea: false,
-      currentInfo: {
+      data: {
         ...defaultAddress,
         ...this.addressInfo
       },
@@ -162,7 +158,7 @@ export default create({
   watch: {
     addressInfo: {
       handler(val) {
-        this.currentInfo = {
+        this.data = {
           ...defaultAddress,
           ...val
         };
@@ -176,8 +172,8 @@ export default create({
     },
 
     areaList() {
-      if (this.currentInfo.area_code) {
-        this.setAreaCode(this.currentInfo.area_code);
+      if (this.data.area_code) {
+        this.setAreaCode(this.data.area_code);
       }
     }
   },
@@ -204,12 +200,8 @@ export default create({
       this.$emit('focus', key);
     },
 
-    onDetailBlur() {
-      this.detailFocused = false;
-    },
-
     onChangeDetail(val) {
-      this.currentInfo.address_detail = val;
+      this.data.address_detail = val;
       this.$emit('change-detail', val);
     },
 
@@ -223,7 +215,7 @@ export default create({
     },
 
     assignAreaValues(values) {
-      Object.assign(this.currentInfo, {
+      Object.assign(this.data, {
         province: values[0].name,
         city: values[1].name,
         county: values[2].name,
@@ -253,12 +245,12 @@ export default create({
       });
 
       if (isValid && !this.isSaving) {
-        this.$emit('save', this.currentInfo);
+        this.$emit('save', this.data);
       }
     },
 
     getErrorMessageByKey(key) {
-      const value = this.currentInfo[key];
+      const value = this.data[key];
       const { $t } = this;
 
       switch (key) {
@@ -283,7 +275,7 @@ export default create({
       Dialog.confirm({
         message: this.$t('confirmDelete', this.computedAddressText)
       }).then(() => {
-        this.$emit('delete', this.currentInfo);
+        this.$emit('delete', this.data);
       });
     },
 
@@ -295,7 +287,7 @@ export default create({
 
     // set area code to area component
     setAreaCode(code) {
-      this.currentInfo.area_code = code;
+      this.data.area_code = code;
       this.$nextTick(() => {
         this.$nextTick(() => {
           const { area } = this.$refs;
diff --git a/packages/address-list/index.vue b/packages/address-list/index.vue
index 1374030b0..1505d1ffa 100644
--- a/packages/address-list/index.vue
+++ b/packages/address-list/index.vue
@@ -23,18 +23,14 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import Radio from '../radio';
 import RadioGroup from '../radio-group';
 
 export default create({
-  name: 'van-address-list',
+  name: 'address-list',
 
   components: {
-    Cell,
     Radio,
-    CellGroup,
     RadioGroup
   },
 
diff --git a/packages/area/index.vue b/packages/area/index.vue
index 4e95ce41c..2dc84b086 100644
--- a/packages/area/index.vue
+++ b/packages/area/index.vue
@@ -20,7 +20,7 @@ import { create, isObj } from '../utils';
 import Picker from '../picker';
 
 export default create({
-  name: 'van-area',
+  name: 'area',
 
   components: {
     Picker
diff --git a/packages/badge-group/index.vue b/packages/badge-group/index.vue
index 1224759cf..12b2982fc 100644
--- a/packages/badge-group/index.vue
+++ b/packages/badge-group/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-badge-group',
+  name: 'badge-group',
 
   props: {
     activeKey: {
diff --git a/packages/badge/index.vue b/packages/badge/index.vue
index bc920b28e..e30d3cde6 100644
--- a/packages/badge/index.vue
+++ b/packages/badge/index.vue
@@ -9,7 +9,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-badge',
+  name: 'badge',
 
   props: {
     url: String,
diff --git a/packages/button/index.vue b/packages/button/index.vue
index 8e9df67d0..7bffa42c8 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -27,7 +27,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-button',
+  name: 'button',
 
   props: {
     text: String,
diff --git a/packages/card/index.vue b/packages/card/index.vue
index 0de4037a3..e046dd612 100644
--- a/packages/card/index.vue
+++ b/packages/card/index.vue
@@ -30,7 +30,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-card',
+  name: 'card',
 
   props: {
     thumb: String,
diff --git a/packages/cell-group/index.vue b/packages/cell-group/index.vue
index c0e22cedb..59fd60221 100644
--- a/packages/cell-group/index.vue
+++ b/packages/cell-group/index.vue
@@ -5,10 +5,12 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import install from '../utils/install';
 
-export default create({
-  name: 'van-cell-group',
+export default {
+  install,
+
+  name: 'cell-group',
 
   props: {
     border: {
@@ -16,5 +18,5 @@ export default create({
       default: true
     }
   }
-});
+};
 </script>
diff --git a/packages/cell-swipe/index.vue b/packages/cell-swipe/index.vue
index bb9b23e8f..144f38eb7 100644
--- a/packages/cell-swipe/index.vue
+++ b/packages/cell-swipe/index.vue
@@ -27,7 +27,7 @@ import Clickoutside from '../utils/clickoutside';
 const THRESHOLD = 0.15;
 
 export default create({
-  name: 'van-cell-swipe',
+  name: 'cell-swipe',
 
   props: {
     onClose: Function,
diff --git a/packages/cell/index.vue b/packages/cell/index.vue
index 592fa9490..7fe972fc1 100644
--- a/packages/cell/index.vue
+++ b/packages/cell/index.vue
@@ -37,11 +37,18 @@
 </template>
 
 <script>
-import { create } from '../utils';
+import Icon from '../icon';
+import install from '../utils/install';
 import RouterLink from '../mixins/router-link';
 
-export default create({
-  name: 'van-cell',
+export default {
+  install,
+
+  name: 'cell',
+
+  components: {
+    Icon
+  },
 
   mixins: [RouterLink],
 
@@ -65,5 +72,5 @@ export default create({
       this.routerLink();
     }
   }
-});
+};
 </script>
diff --git a/packages/checkbox-group/index.vue b/packages/checkbox-group/index.vue
index 9c00e3d78..576b25254 100644
--- a/packages/checkbox-group/index.vue
+++ b/packages/checkbox-group/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-checkbox-group',
+  name: 'checkbox-group',
 
   props: {
     value: {},
diff --git a/packages/checkbox/index.vue b/packages/checkbox/index.vue
index 08154cd18..712f3d63b 100644
--- a/packages/checkbox/index.vue
+++ b/packages/checkbox/index.vue
@@ -21,7 +21,7 @@ import { create, isDef } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
-  name: 'van-checkbox',
+  name: 'checkbox',
 
   mixins: [findParent],
 
diff --git a/packages/circle/index.vue b/packages/circle/index.vue
index 6bd78cc92..4939fddef 100644
--- a/packages/circle/index.vue
+++ b/packages/circle/index.vue
@@ -15,7 +15,7 @@ import { create } from '../utils';
 import { raf, cancel } from '../utils/raf';
 
 export default create({
-  name: 'van-circle',
+  name: 'circle',
 
   props: {
     text: String,
diff --git a/packages/col/index.vue b/packages/col/index.vue
index 8b8db3f16..c33fe1ee0 100644
--- a/packages/col/index.vue
+++ b/packages/col/index.vue
@@ -12,7 +12,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-col',
+  name: 'col',
 
   props: {
     span: [Number, String],
diff --git a/packages/collapse-item/index.vue b/packages/collapse-item/index.vue
index 50cc6cf61..af3abf161 100644
--- a/packages/collapse-item/index.vue
+++ b/packages/collapse-item/index.vue
@@ -16,19 +16,14 @@
 </template>
 
 <script>
-import Cell from '../cell';
 import findParent from '../mixins/find-parent';
 import { create, isDef } from '../utils';
 
 export default create({
-  name: 'van-collapse-item',
+  name: 'collapse-item',
 
   mixins: [findParent],
 
-  components: {
-    Cell
-  },
-
   props: {
     name: [String, Number],
     title: String
diff --git a/packages/collapse/index.vue b/packages/collapse/index.vue
index 7d526bbe4..d67c514a5 100644
--- a/packages/collapse/index.vue
+++ b/packages/collapse/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-collapse',
+  name: 'collapse',
 
   model: {
     prop: 'activeNames'
diff --git a/packages/contact-card/index.vue b/packages/contact-card/index.vue
index 0dcc3d876..8dce72eb2 100644
--- a/packages/contact-card/index.vue
+++ b/packages/contact-card/index.vue
@@ -21,7 +21,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-contact-card',
+  name: 'contact-card',
 
   props: {
     tel: String,
diff --git a/packages/contact-edit/index.vue b/packages/contact-edit/index.vue
index 9c548222d..9bcce2fc2 100644
--- a/packages/contact-edit/index.vue
+++ b/packages/contact-edit/index.vue
@@ -2,7 +2,7 @@
   <div class="van-contact-edit">
     <cell-group>
       <field
-        v-model="currentInfo.name"
+        v-model="data.name"
         maxlength="30"
         :label="$t('contact')"
         :placeholder="$t('name')"
@@ -10,7 +10,7 @@
         @focus="onFocus('name')"
       />
       <field
-        v-model="currentInfo.tel"
+        v-model="data.tel"
         type="tel"
         :label="$t('tel')"
         :placeholder="$t('telPlaceholder')"
@@ -28,19 +28,17 @@
 <script>
 import Field from '../field';
 import VanButton from '../button';
-import CellGroup from '../cell-group';
 import Dialog from '../dialog';
 import Toast from '../toast';
 import validateMobile from '../utils/validate/mobile';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-contact-edit',
+  name: 'contact-edit',
 
   components: {
     Field,
-    VanButton,
-    CellGroup
+    VanButton
   },
 
   props: {
@@ -63,7 +61,7 @@ export default create({
 
   data() {
     return {
-      currentInfo: this.contactInfo,
+      data: this.contactInfo,
       errorInfo: {
         name: false,
         tel: false
@@ -73,7 +71,7 @@ export default create({
 
   watch: {
     contactInfo(val) {
-      this.currentInfo = val;
+      this.data = val;
     }
   },
 
@@ -83,7 +81,7 @@ export default create({
     },
 
     getErrorMessageByKey(key) {
-      const value = this.currentInfo[key];
+      const value = this.data[key];
       switch (key) {
         case 'name':
           return value ? value.length <= 15 ? '' : this.$t('nameOverlimit') : this.$t('nameEmpty');
@@ -108,7 +106,7 @@ export default create({
       });
 
       if (isValid && !this.isSaving) {
-        this.$emit('save', this.currentInfo);
+        this.$emit('save', this.data);
       }
     },
 
@@ -120,7 +118,7 @@ export default create({
       Dialog.confirm({
         message: this.$t('confirmDelete')
       }).then(() => {
-        this.$emit('delete', this.currentInfo);
+        this.$emit('delete', this.data);
       });
     }
   }
diff --git a/packages/contact-list/index.vue b/packages/contact-list/index.vue
index 508cef9d6..154886745 100644
--- a/packages/contact-list/index.vue
+++ b/packages/contact-list/index.vue
@@ -22,19 +22,15 @@
 </template>
 
 <script>
-import Cell from '../cell';
 import Radio from '../radio';
-import CellGroup from '../cell-group';
 import RadioGroup from '../radio-group';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-contact-list',
+  name: 'contact-list',
 
   components: {
-    Cell,
     Radio,
-    CellGroup,
     RadioGroup
   },
 
diff --git a/packages/coupon-cell/index.vue b/packages/coupon-cell/index.vue
index f2408be11..7b272638d 100644
--- a/packages/coupon-cell/index.vue
+++ b/packages/coupon-cell/index.vue
@@ -6,16 +6,9 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 
 export default create({
-  name: 'van-coupon-cell',
-
-  components: {
-    Cell,
-    CellGroup
-  },
+  name: 'coupon-cell',
 
   model: {
     prop: 'chosenCoupon'
diff --git a/packages/coupon-list/Item.vue b/packages/coupon-list/Item.vue
index 9052ffd42..7addf28cf 100644
--- a/packages/coupon-list/Item.vue
+++ b/packages/coupon-list/Item.vue
@@ -22,7 +22,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-coupon-item',
+  name: 'coupon-item',
 
   props: {
     data: Object,
diff --git a/packages/coupon-list/index.vue b/packages/coupon-list/index.vue
index 6d32e172c..455ac20de 100644
--- a/packages/coupon-list/index.vue
+++ b/packages/coupon-list/index.vue
@@ -49,19 +49,15 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
-import CellGroup from '../cell-group';
 import CouponItem from './Item';
 import Field from '../field';
 import VanButton from '../button';
 
 export default create({
-  name: 'van-coupon-list',
+  name: 'coupon-list',
 
   components: {
     VanButton,
-    Cell,
-    CellGroup,
     Field,
     CouponItem
   },
diff --git a/packages/datetime-picker/index.vue b/packages/datetime-picker/index.vue
index abcd369ac..970a00391 100644
--- a/packages/datetime-picker/index.vue
+++ b/packages/datetime-picker/index.vue
@@ -17,7 +17,7 @@ import Picker from '../picker';
 const isValidDate = date => Object.prototype.toString.call(date) === '[object Date]' && !isNaN(date.getTime());
 
 export default create({
-  name: 'van-datetime-picker',
+  name: 'datetime-picker',
 
   components: {
     Picker
diff --git a/packages/dialog/dialog.vue b/packages/dialog/dialog.vue
index 2de2eb787..c8351936a 100644
--- a/packages/dialog/dialog.vue
+++ b/packages/dialog/dialog.vue
@@ -36,7 +36,7 @@ import VanButton from '../button';
 import Popup from '../mixins/popup';
 
 export default create({
-  name: 'van-dialog',
+  name: 'dialog',
 
   components: {
     VanButton
diff --git a/packages/field/index.vue b/packages/field/index.vue
index ee454b65f..5fa330b62 100644
--- a/packages/field/index.vue
+++ b/packages/field/index.vue
@@ -50,17 +50,12 @@
 
 <script>
 import { create } from '../utils';
-import Cell from '../cell';
 
 export default create({
-  name: 'van-field',
+  name: 'field',
 
   inheritAttrs: false,
 
-  components: {
-    Cell
-  },
-
   props: {
     type: {
       type: String,
diff --git a/packages/goods-action-big-btn/index.vue b/packages/goods-action-big-btn/index.vue
index bece91fbb..e2c53d687 100644
--- a/packages/goods-action-big-btn/index.vue
+++ b/packages/goods-action-big-btn/index.vue
@@ -17,7 +17,7 @@ import VanButton from '../button';
 import RouterLink from '../mixins/router-link';
 
 export default create({
-  name: 'van-goods-action-big-btn',
+  name: 'goods-action-big-btn',
 
   mixins: [RouterLink],
 
diff --git a/packages/goods-action-mini-btn/index.vue b/packages/goods-action-mini-btn/index.vue
index 88db1a951..5fc63aac1 100644
--- a/packages/goods-action-mini-btn/index.vue
+++ b/packages/goods-action-mini-btn/index.vue
@@ -10,7 +10,7 @@ import { create } from '../utils';
 import RouterLink from '../mixins/router-link';
 
 export default create({
-  name: 'van-goods-action-mini-btn',
+  name: 'goods-action-mini-btn',
 
   mixins: [RouterLink],
 
diff --git a/packages/goods-action/index.vue b/packages/goods-action/index.vue
index 9d74a1bda..a01f4b2ff 100644
--- a/packages/goods-action/index.vue
+++ b/packages/goods-action/index.vue
@@ -8,6 +8,6 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-goods-action'
+  name: 'goods-action'
 });
 </script>
diff --git a/packages/icon/index.vue b/packages/icon/index.vue
index 36d4d9589..62c122341 100644
--- a/packages/icon/index.vue
+++ b/packages/icon/index.vue
@@ -11,7 +11,7 @@ import install from '../utils/install';
 export default {
   install,
 
-  name: 'van-icon',
+  name: 'icon',
 
   props: {
     name: String,
diff --git a/packages/image-preview/image-preview.vue b/packages/image-preview/image-preview.vue
index a98259508..4defc2dc8 100644
--- a/packages/image-preview/image-preview.vue
+++ b/packages/image-preview/image-preview.vue
@@ -22,7 +22,7 @@ import Swipe from '../swipe';
 import SwipeItem from '../swipe-item';
 
 export default create({
-  name: 'van-image-preview',
+  name: 'image-preview',
 
   mixins: [Popup],
 
diff --git a/packages/list/index.vue b/packages/list/index.vue
index 8b3d085b1..223ea2e46 100644
--- a/packages/list/index.vue
+++ b/packages/list/index.vue
@@ -16,7 +16,7 @@ import utils from '../utils/scroll';
 import { on, off } from '../utils/event';
 
 export default create({
-  name: 'van-list',
+  name: 'list',
 
   model: {
     prop: 'loading'
diff --git a/packages/loading/index.vue b/packages/loading/index.vue
index 897ac305e..931799100 100644
--- a/packages/loading/index.vue
+++ b/packages/loading/index.vue
@@ -15,7 +15,7 @@ import install from '../utils/install';
 export default {
   install,
 
-  name: 'van-loading',
+  name: 'loading',
 
   props: {
     size: String,
diff --git a/packages/mixins/popup/Modal.vue b/packages/mixins/popup/Modal.vue
index e76440d8f..654a1193e 100644
--- a/packages/mixins/popup/Modal.vue
+++ b/packages/mixins/popup/Modal.vue
@@ -13,7 +13,7 @@
 
 <script>
 export default {
-  name: 'van-modal',
+  name: 'modal',
 
   props: {
     visible: Boolean,
diff --git a/packages/nav-bar/index.vue b/packages/nav-bar/index.vue
index 3bf32636d..be6dd90a2 100644
--- a/packages/nav-bar/index.vue
+++ b/packages/nav-bar/index.vue
@@ -25,7 +25,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-nav-bar',
+  name: 'nav-bar',
 
   props: {
     title: String,
diff --git a/packages/notice-bar/index.vue b/packages/notice-bar/index.vue
index 1c8d333de..03600602d 100644
--- a/packages/notice-bar/index.vue
+++ b/packages/notice-bar/index.vue
@@ -29,7 +29,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-notice-bar',
+  name: 'notice-bar',
 
   props: {
     text: String,
diff --git a/packages/number-keyboard/index.vue b/packages/number-keyboard/index.vue
index 3d004ac74..7a88907ba 100644
--- a/packages/number-keyboard/index.vue
+++ b/packages/number-keyboard/index.vue
@@ -39,7 +39,7 @@ import { create } from '../utils';
 import Key from './Key';
 
 export default create({
-  name: 'van-number-keyboard',
+  name: 'number-keyboard',
 
   components: { Key },
 
diff --git a/packages/pagination/index.vue b/packages/pagination/index.vue
index 92f68d27e..740654b94 100644
--- a/packages/pagination/index.vue
+++ b/packages/pagination/index.vue
@@ -34,7 +34,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-pagination',
+  name: 'pagination',
 
   props: {
     value: Number,
diff --git a/packages/panel/index.vue b/packages/panel/index.vue
index d175dc9cf..f40b50a17 100644
--- a/packages/panel/index.vue
+++ b/packages/panel/index.vue
@@ -20,7 +20,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-panel',
+  name: 'panel',
   props: {
     desc: String,
     title: String,
diff --git a/packages/password-input/index.vue b/packages/password-input/index.vue
index 8bf8faf00..b02b866e6 100644
--- a/packages/password-input/index.vue
+++ b/packages/password-input/index.vue
@@ -17,7 +17,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-password-input',
+  name: 'password-input',
 
   props: {
     info: String,
diff --git a/packages/picker/PickerColumn.vue b/packages/picker/PickerColumn.vue
index 5ddae8406..3ca032d41 100644
--- a/packages/picker/PickerColumn.vue
+++ b/packages/picker/PickerColumn.vue
@@ -31,7 +31,7 @@ const DEFAULT_DURATION = 200;
 const range = (num, arr) => Math.min(Math.max(num, arr[0]), arr[1]);
 
 export default create({
-  name: 'van-picker-column',
+  name: 'picker-column',
 
   props: {
     valueKey: String,
diff --git a/packages/picker/index.vue b/packages/picker/index.vue
index 843e74091..19a67a1c2 100644
--- a/packages/picker/index.vue
+++ b/packages/picker/index.vue
@@ -33,7 +33,7 @@ import PickerColumn from './PickerColumn';
 import deepClone from '../utils/deep-clone';
 
 export default create({
-  name: 'van-picker',
+  name: 'picker',
 
   components: {
     PickerColumn
diff --git a/packages/popup/index.vue b/packages/popup/index.vue
index 8fa9ed4a6..2824581c2 100644
--- a/packages/popup/index.vue
+++ b/packages/popup/index.vue
@@ -11,7 +11,7 @@ import { create } from '../utils';
 import Popup from '../mixins/popup';
 
 export default create({
-  name: 'van-popup',
+  name: 'popup',
 
   mixins: [Popup],
 
diff --git a/packages/progress/index.vue b/packages/progress/index.vue
index d086b54aa..26c4cd4b3 100644
--- a/packages/progress/index.vue
+++ b/packages/progress/index.vue
@@ -9,7 +9,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-progress',
+  name: 'progress',
 
   props: {
     inactive: Boolean,
diff --git a/packages/pull-refresh/index.vue b/packages/pull-refresh/index.vue
index 528700fc4..15555ccda 100644
--- a/packages/pull-refresh/index.vue
+++ b/packages/pull-refresh/index.vue
@@ -33,7 +33,7 @@ import { create } from '../utils';
 import scrollUtils from '../utils/scroll';
 
 export default create({
-  name: 'van-pull-refresh',
+  name: 'pull-refresh',
 
   props: {
     pullingText: String,
diff --git a/packages/radio-group/index.vue b/packages/radio-group/index.vue
index 884ea789c..cbfcd55dc 100644
--- a/packages/radio-group/index.vue
+++ b/packages/radio-group/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-radio-group',
+  name: 'radio-group',
 
   props: {
     value: {},
diff --git a/packages/radio/index.vue b/packages/radio/index.vue
index 6ac2e43c4..1e93359e0 100644
--- a/packages/radio/index.vue
+++ b/packages/radio/index.vue
@@ -25,7 +25,7 @@ import { create } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
-  name: 'van-radio',
+  name: 'radio',
 
   mixins: [findParent],
 
diff --git a/packages/row/index.vue b/packages/row/index.vue
index 8334a5642..08aed5efe 100644
--- a/packages/row/index.vue
+++ b/packages/row/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-row',
+  name: 'row',
 
   props: {
     gutter: {
diff --git a/packages/search/index.vue b/packages/search/index.vue
index 12d9fa5e5..4ed535591 100644
--- a/packages/search/index.vue
+++ b/packages/search/index.vue
@@ -28,7 +28,7 @@ import { create } from '../utils';
 import Clickoutside from '../utils/clickoutside';
 
 export default create({
-  name: 'van-search',
+  name: 'search',
 
   inheritAttrs: false,
 
diff --git a/packages/sku/Sku.vue b/packages/sku/Sku.vue
index 2f7c1dcb0..fe80a267c 100644
--- a/packages/sku/Sku.vue
+++ b/packages/sku/Sku.vue
@@ -120,7 +120,7 @@ import { create } from '../utils';
 const { QUOTA_LIMIT } = LIMIT_TYPE;
 
 export default create({
-  name: 'van-sku',
+  name: 'sku',
 
   components: {
     Popup,
diff --git a/packages/sku/components/SkuActions.vue b/packages/sku/components/SkuActions.vue
index 1654c7b29..ae986ece8 100644
--- a/packages/sku/components/SkuActions.vue
+++ b/packages/sku/components/SkuActions.vue
@@ -20,7 +20,7 @@ import VanButton from '../../button';
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-actions',
+  name: 'sku-actions',
 
   components: {
     VanButton
diff --git a/packages/sku/components/SkuHeader.vue b/packages/sku/components/SkuHeader.vue
index 0303121d5..9c5c9ca72 100644
--- a/packages/sku/components/SkuHeader.vue
+++ b/packages/sku/components/SkuHeader.vue
@@ -15,7 +15,7 @@
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-header',
+  name: 'sku-header',
 
   props: {
     skuEventBus: Object,
diff --git a/packages/sku/components/SkuImgUploader.vue b/packages/sku/components/SkuImgUploader.vue
index e2bc4d06b..4f8785eca 100644
--- a/packages/sku/components/SkuImgUploader.vue
+++ b/packages/sku/components/SkuImgUploader.vue
@@ -46,7 +46,7 @@ import Loading from '../../loading';
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-img-uploader',
+  name: 'sku-img-uploader',
 
   components: {
     'van-uploader': Uploader,
diff --git a/packages/sku/components/SkuMessages.vue b/packages/sku/components/SkuMessages.vue
index 720b9a96c..7cc65321b 100644
--- a/packages/sku/components/SkuMessages.vue
+++ b/packages/sku/components/SkuMessages.vue
@@ -30,20 +30,16 @@
 <script>
 import { create } from '../../utils';
 import Field from '../../field';
-import CellGroup from '../../cell-group';
-import Cell from '../../cell';
 import validateEmail from '../../utils/validate/email';
 import validateNumber from '../../utils/validate/number';
 import SkuImgUploader from './SkuImgUploader';
 
 export default create({
-  name: 'van-sku-messages',
+  name: 'sku-messages',
 
   components: {
     SkuImgUploader,
-    Field,
-    Cell,
-    CellGroup
+    Field
   },
 
   props: {
diff --git a/packages/sku/components/SkuRow.vue b/packages/sku/components/SkuRow.vue
index 0325e1bad..77d1f82b3 100644
--- a/packages/sku/components/SkuRow.vue
+++ b/packages/sku/components/SkuRow.vue
@@ -9,7 +9,7 @@
 
 <script>
 export default {
-  name: 'van-sku-row',
+  name: 'sku-row',
 
   props: {
     skuRow: Object
diff --git a/packages/sku/components/SkuRowItem.vue b/packages/sku/components/SkuRowItem.vue
index 7bcfa42bb..7c716af2c 100644
--- a/packages/sku/components/SkuRowItem.vue
+++ b/packages/sku/components/SkuRowItem.vue
@@ -15,7 +15,7 @@
 import { create } from '../../utils';
 
 export default create({
-  name: 'van-sku-row-item',
+  name: 'sku-row-item',
 
   props: {
     skuEventBus: Object,
diff --git a/packages/sku/components/SkuStepper.vue b/packages/sku/components/SkuStepper.vue
index d1f496706..49180d74f 100644
--- a/packages/sku/components/SkuStepper.vue
+++ b/packages/sku/components/SkuStepper.vue
@@ -25,7 +25,7 @@ import { LIMIT_TYPE } from '../constants';
 const { QUOTA_LIMIT, STOCK_LIMIT } = LIMIT_TYPE;
 
 export default create({
-  name: 'van-sku-stepper',
+  name: 'sku-stepper',
 
   components: {
     Stepper
diff --git a/packages/step/index.vue b/packages/step/index.vue
index ab3718d27..774247dc4 100644
--- a/packages/step/index.vue
+++ b/packages/step/index.vue
@@ -15,7 +15,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-step',
+  name: 'step',
 
   beforeCreate() {
     this.$parent.steps.push(this);
diff --git a/packages/stepper/index.vue b/packages/stepper/index.vue
index 4ab313c3c..2870ef930 100644
--- a/packages/stepper/index.vue
+++ b/packages/stepper/index.vue
@@ -24,7 +24,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-stepper',
+  name: 'stepper',
 
   props: {
     value: {},
diff --git a/packages/steps/index.vue b/packages/steps/index.vue
index 2e3a5aae2..9fa3212b4 100644
--- a/packages/steps/index.vue
+++ b/packages/steps/index.vue
@@ -22,7 +22,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-steps',
+  name: 'steps',
 
   props: {
     icon: String,
diff --git a/packages/submit-bar/index.vue b/packages/submit-bar/index.vue
index d52d7f6e4..57dc7e99d 100644
--- a/packages/submit-bar/index.vue
+++ b/packages/submit-bar/index.vue
@@ -24,7 +24,7 @@ import VanButton from '../button';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-submit-bar',
+  name: 'submit-bar',
 
   components: {
     VanButton
diff --git a/packages/swipe-item/index.vue b/packages/swipe-item/index.vue
index 97a757998..9e2d4b835 100644
--- a/packages/swipe-item/index.vue
+++ b/packages/swipe-item/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-swipe-item',
+  name: 'swipe-item',
 
   data() {
     return {
diff --git a/packages/swipe/index.vue b/packages/swipe/index.vue
index 777ec1950..9085a873b 100644
--- a/packages/swipe/index.vue
+++ b/packages/swipe/index.vue
@@ -25,7 +25,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-swipe',
+  name: 'swipe',
 
   props: {
     autoplay: Number,
diff --git a/packages/switch-cell/index.vue b/packages/switch-cell/index.vue
index b896bddeb..2f5b345ff 100644
--- a/packages/switch-cell/index.vue
+++ b/packages/switch-cell/index.vue
@@ -5,15 +5,13 @@
 </template>
 
 <script>
-import Cell from '../cell';
 import VanSwitch from '../switch';
 import { create } from '../utils';
 
 export default create({
-  name: 'van-switch-cell',
+  name: 'switch-cell',
 
   components: {
-    Cell,
     VanSwitch
   },
 
diff --git a/packages/switch/index.vue b/packages/switch/index.vue
index d59908f86..19a1fabf5 100644
--- a/packages/switch/index.vue
+++ b/packages/switch/index.vue
@@ -11,7 +11,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-switch',
+  name: 'switch',
 
   props: {
     value: Boolean,
diff --git a/packages/tab/index.vue b/packages/tab/index.vue
index 0902398d7..13ab4bd18 100644
--- a/packages/tab/index.vue
+++ b/packages/tab/index.vue
@@ -9,7 +9,7 @@ import { create } from '../utils';
 import findParent from '../mixins/find-parent';
 
 export default create({
-  name: 'van-tab',
+  name: 'tab',
 
   mixins: [findParent],
 
diff --git a/packages/tabbar-item/index.vue b/packages/tabbar-item/index.vue
index 9940c2415..7124c1afb 100644
--- a/packages/tabbar-item/index.vue
+++ b/packages/tabbar-item/index.vue
@@ -17,7 +17,7 @@ import { create } from '../utils';
 import RouterLink from '../mixins/router-link';
 
 export default create({
-  name: 'van-tabbar-item',
+  name: 'tabbar-item',
 
   mixins: [RouterLink],
 
diff --git a/packages/tabbar/index.vue b/packages/tabbar/index.vue
index dc38d7b35..9ce4ccbaf 100644
--- a/packages/tabbar/index.vue
+++ b/packages/tabbar/index.vue
@@ -8,7 +8,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-tabbar',
+  name: 'tabbar',
 
   data() {
     return {
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 34b3bb60c..5f342da20 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -40,7 +40,7 @@ import VanNode from '../utils/node';
 import scrollUtils from '../utils/scroll';
 
 export default create({
-  name: 'van-tabs',
+  name: 'tabs',
 
   components: {
     VanNode
diff --git a/packages/tag/index.vue b/packages/tag/index.vue
index e069c2111..866c3c1b5 100644
--- a/packages/tag/index.vue
+++ b/packages/tag/index.vue
@@ -15,7 +15,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-tag',
+  name: 'tag',
   props: {
     type: String,
     mark: Boolean,
diff --git a/packages/toast/toast.vue b/packages/toast/toast.vue
index 3e5d60526..c9d5f43d7 100644
--- a/packages/toast/toast.vue
+++ b/packages/toast/toast.vue
@@ -24,7 +24,7 @@ import { create } from '../utils';
 const STYLE_LIST = ['success', 'fail', 'loading'];
 
 export default create({
-  name: 'van-toast',
+  name: 'toast',
 
   props: {
     mask: Boolean,
diff --git a/packages/tree-select/index.vue b/packages/tree-select/index.vue
index bdb8bb8eb..b9be749b9 100644
--- a/packages/tree-select/index.vue
+++ b/packages/tree-select/index.vue
@@ -31,7 +31,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-tree-select',
+  name: 'tree-select',
 
   props: {
     items: {
diff --git a/packages/uploader/index.vue b/packages/uploader/index.vue
index 78530c31d..6e37c56ef 100644
--- a/packages/uploader/index.vue
+++ b/packages/uploader/index.vue
@@ -16,7 +16,7 @@
 import { create } from '../utils';
 
 export default create({
-  name: 'van-uploader',
+  name: 'uploader',
 
   inheritAttrs: false,
 
diff --git a/packages/utils/create.js b/packages/utils/create.js
index 983e1b073..68b66929f 100644
--- a/packages/utils/create.js
+++ b/packages/utils/create.js
@@ -2,18 +2,24 @@
  * Create a component with common options
  */
 import '../locale';
-import Icon from '../icon';
 import i18n from '../mixins/i18n';
 import install from './install';
+import Icon from '../icon';
 import Loading from '../loading';
+import Cell from '../cell';
+import CellGroup from '../cell-group';
 
 export default function(sfc) {
+  sfc.name = 'van-' + sfc.name;
   sfc.install = sfc.install || install;
   sfc.mixins = sfc.mixins || [];
   sfc.mixins.push(i18n);
-  sfc.components = sfc.components || {};
-  sfc.components.icon = Icon;
-  sfc.components.loading = Loading;
+  sfc.components = Object.assign(sfc.components || {}, {
+    Icon,
+    Loading,
+    Cell,
+    CellGroup
+  });
 
   return sfc;
 };
diff --git a/packages/utils/validate/mobile.js b/packages/utils/validate/mobile.js
index d2d31045a..da6f67c9c 100644
--- a/packages/utils/validate/mobile.js
+++ b/packages/utils/validate/mobile.js
@@ -1,4 +1,4 @@
 export default function mobile(value) {
-  return /^((\+86)|(86))?(1)\d{10}$/.test(value) ||
-  /^\+?(9[976]\d|8[987530]\d|6[987]\d|5[90]\d|42\d|3[875]\d|2[98654321]\d|9[8543210]|8[6421]|6[6543210]|5[87654321]|4[987654310]|3[9643210]|2[70]|7|1|)-?\d{1,14}$/.test(String(value));
+  value = value.replace(/[^-|\d]/g, '');
+  return /^((\+86)|(86))?(1)\d{10}$/.test(value) || /^0[0-9\-]{10,13}$/.test(value);
 }
diff --git a/packages/vant-css/src/base.css b/packages/vant-css/src/base.css
index a5086616b..e07c9f4bd 100644
--- a/packages/vant-css/src/base.css
+++ b/packages/vant-css/src/base.css
@@ -7,3 +7,7 @@
 @import "./common/ellipsis.css";
 @import "./common/hairline.css";
 @import "./common/animation.css";
+@import './icon.css';
+@import './loading.css';
+@import './button.css';
+@import './cell.css';
diff --git a/packages/vant-css/src/index.css b/packages/vant-css/src/index.css
index 6cd288e97..15c427c70 100644
--- a/packages/vant-css/src/index.css
+++ b/packages/vant-css/src/index.css
@@ -4,10 +4,6 @@
 
 /* base */
 @import './base.css';
-@import './icon.css';
-@import './loading.css';
-@import './button.css';
-@import './cell.css';
 
 /* common components */
 @import './col.css';
diff --git a/test/specs/address-edit.spec.js b/test/specs/address-edit.spec.js
index d52098aa3..c0b849832 100644
--- a/test/specs/address-edit.spec.js
+++ b/test/specs/address-edit.spec.js
@@ -99,42 +99,42 @@ describe('AddressEdit', () => {
     const saveButton = wrapper.find('.van-button')[0];
 
     // name empty
-    wrapper.vm.currentInfo.name = '';
+    wrapper.vm.data.name = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // name too long
-    wrapper.vm.currentInfo.name = '111111111111111111111111111';
+    wrapper.vm.data.name = '111111111111111111111111111';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // tel empty
-    wrapper.vm.currentInfo.name = '123';
-    wrapper.vm.currentInfo.tel = '';
+    wrapper.vm.data.name = '123';
+    wrapper.vm.data.tel = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // area_code empty
-    wrapper.vm.currentInfo.tel = '13000000000';
-    wrapper.vm.currentInfo.area_code = '';
+    wrapper.vm.data.tel = '13000000000';
+    wrapper.vm.data.area_code = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['area_code']).to.be.true;
 
     // area_code invalid
-    wrapper.vm.currentInfo.tel = '13000000000';
-    wrapper.vm.currentInfo.area_code = '-1';
+    wrapper.vm.data.tel = '13000000000';
+    wrapper.vm.data.area_code = '-1';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['area_code']).to.be.true;
 
     // address_detail empty
-    wrapper.vm.currentInfo.area_code = '100000';
-    wrapper.vm.currentInfo.address_detail = '';
+    wrapper.vm.data.area_code = '100000';
+    wrapper.vm.data.address_detail = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.true;
     wrapper.find('.van-field__control')[2].trigger('focus');
@@ -145,26 +145,26 @@ describe('AddressEdit', () => {
     for (let i = 0; i < 300; i++) {
       longAddress += '1';
     }
-    wrapper.vm.currentInfo.address_detail = longAddress;
+    wrapper.vm.data.address_detail = longAddress;
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.true;
     wrapper.find('.van-field__control')[2].trigger('focus');
     expect(wrapper.vm.errorInfo['address_detail']).to.be.false;
 
     // postal_code invalid
-    wrapper.vm.currentInfo.address_detail = '123';
-    wrapper.vm.currentInfo.postal_code = '123';
+    wrapper.vm.data.address_detail = '123';
+    wrapper.vm.data.postal_code = '123';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.true;
     wrapper.find('.van-field__control')[3].trigger('focus');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.false;
 
     // valid result
-    wrapper.vm.currentInfo.postal_code = '123456';
+    wrapper.vm.data.postal_code = '123456';
     saveButton.trigger('click');
 
     // not show postal_code
-    wrapper.vm.currentInfo.postal_code = '156';
+    wrapper.vm.data.postal_code = '156';
     wrapper.vm.showPostal = false;
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['postal_code']).to.be.false;
@@ -235,17 +235,17 @@ describe('AddressEdit', () => {
     wrapper.vm.onAreaConfirm([{ code: -1 }]);
     wrapper.vm.onAreaConfirm([{ code: 1 }, { code: -1 }]);
     wrapper.vm.onAreaConfirm([{ code: 1 }, { code: 1 }, { code: -1 }]);
-    expect(wrapper.vm.currentInfo['area_code']).to.equal('');
+    expect(wrapper.vm.data['area_code']).to.equal('');
 
     wrapper.vm.onAreaConfirm([
       { name: '浙江省' },
       { name: '杭州市' },
       { name: '西湖区', code: '123456' }
     ]);
-    expect(wrapper.vm.currentInfo['province']).to.equal('浙江省');
-    expect(wrapper.vm.currentInfo['city']).to.equal('杭州市');
-    expect(wrapper.vm.currentInfo['county']).to.equal('西湖区');
-    expect(wrapper.vm.currentInfo['area_code']).to.equal('123456');
+    expect(wrapper.vm.data['province']).to.equal('浙江省');
+    expect(wrapper.vm.data['city']).to.equal('杭州市');
+    expect(wrapper.vm.data['county']).to.equal('西湖区');
+    expect(wrapper.vm.data['area_code']).to.equal('123456');
   });
 
   it('delete address', done => {
@@ -308,7 +308,7 @@ describe('AddressEdit', () => {
     wrapper.vm.$nextTick(() => {
       wrapper.find('.van-field__icon')[0].trigger('touchstart');
       wrapper.vm.$nextTick(() => {
-        expect(wrapper.vm.currentInfo.address_detail).to.equal('');
+        expect(wrapper.vm.data.address_detail).to.equal('');
         done();
       });
     });
@@ -352,7 +352,7 @@ describe('AddressEdit', () => {
 
     wrapper.setProps({ addressInfo });
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.vm.currentInfo.name).to.equal('123');
+      expect(wrapper.vm.data.name).to.equal('123');
       done();
     });
   });
@@ -375,7 +375,7 @@ describe('AddressEdit', () => {
 
     wrapper.vm.setAreaCode('110101');
     setTimeout(() => {
-      expect(wrapper.vm.currentInfo.area_code).to.eql('110101');
+      expect(wrapper.vm.data.area_code).to.eql('110101');
       expect(wrapper.vm.getArea()).to.eql([
         { code: '110000', name: '北京市' },
         { code: '110100', name: '北京市' },
@@ -399,22 +399,22 @@ describe('AddressEdit', () => {
       }
     });
 
-    expect(wrapper.vm.currentInfo.city).to.equal('');
+    expect(wrapper.vm.data.city).to.equal('');
     wrapper.vm.areaList = areaList;
 
     setTimeout(() => {
-      expect(wrapper.vm.currentInfo.city).to.equal('温州市');
+      expect(wrapper.vm.data.city).to.equal('温州市');
 
       wrapper.vm.addressInfo = { area_code: '' };
       wrapper.vm.areaList = {};
 
       setTimeout(() => {
-        expect(wrapper.vm.currentInfo.city).to.equal('');
+        expect(wrapper.vm.data.city).to.equal('');
         wrapper.vm.areaList = areaList;
         wrapper.vm.addressInfo = { area_code: '330304' };
 
         setTimeout(() => {
-          expect(wrapper.vm.currentInfo.city).to.equal('温州市');
+          expect(wrapper.vm.data.city).to.equal('温州市');
           done();
         }, 50);
       });
diff --git a/test/specs/contact.spec.js b/test/specs/contact.spec.js
index 362f565c9..7e8cc20d0 100644
--- a/test/specs/contact.spec.js
+++ b/test/specs/contact.spec.js
@@ -179,36 +179,36 @@ describe('ContactEdit', () => {
     const saveButton = wrapper.find('.van-button')[0];
 
     // name empty
-    wrapper.vm.contactInfo.name = '';
+    wrapper.vm.data.name = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // name too long
-    wrapper.vm.contactInfo.name = '111111111111111111111111111';
+    wrapper.vm.data.name = '111111111111111111111111111';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['name']).to.be.true;
     wrapper.find('.van-field__control')[0].trigger('focus');
     expect(wrapper.vm.errorInfo['name']).to.be.false;
 
     // tel empty
-    wrapper.vm.contactInfo.name = '123';
-    wrapper.vm.contactInfo.tel = '';
+    wrapper.vm.data.name = '123';
+    wrapper.vm.data.tel = '';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // tel invalid
-    wrapper.vm.contactInfo.tel = 'abc';
+    wrapper.vm.data.tel = 'abc';
     saveButton.trigger('click');
     expect(wrapper.vm.errorInfo['tel']).to.be.true;
     wrapper.find('.van-field__control')[1].trigger('focus');
     expect(wrapper.vm.errorInfo['tel']).to.be.false;
 
     // saving
-    wrapper.vm.contactInfo.tel = '13000000000';
+    wrapper.vm.data.tel = '13000000000';
     saveButton.trigger('click');
     wrapper.vm.isSaving = true;
     saveButton.trigger('click');
@@ -260,7 +260,7 @@ describe('ContactEdit', () => {
 
     wrapper.setProps({ contactInfo });
     wrapper.vm.$nextTick(() => {
-      expect(wrapper.vm.currentInfo.name).to.equal('123');
+      expect(wrapper.vm.data.name).to.equal('123');
       done();
     });
   });