diff --git a/packages/address-edit/index.vue b/packages/address-edit/index.vue
index a7146ae85..86ae309cc 100644
--- a/packages/address-edit/index.vue
+++ b/packages/address-edit/index.vue
@@ -263,10 +263,12 @@ export default create({
     setAreaCode(code) {
       this.currentInfo.area_code = code;
       this.$nextTick(() => {
-        const { area } = this.$refs;
-        if (area) {
-          this.assignAreaValues(area.getValues());
-        }
+        this.$nextTick(() => {
+          const { area } = this.$refs;
+          if (area) {
+            this.assignAreaValues(area.getValues());
+          }
+        });
       });
     }
   }
diff --git a/packages/locale/lang/zh-CN.js b/packages/locale/lang/zh-CN.js
index ebd5cf04c..074fa1f3c 100644
--- a/packages/locale/lang/zh-CN.js
+++ b/packages/locale/lang/zh-CN.js
@@ -86,9 +86,9 @@ export default {
       name: '名字',
       tel: '手机或固定电话',
       postal: '邮政编码(选填)',
-      province: '选择省',
-      city: '选择市',
-      county: '选择区'
+      province: '选择省份',
+      city: '选择城市',
+      county: '选择地区'
     }
   },
   vanAddressEditDetail: {
diff --git a/test/unit/specs/address-edit.spec.js b/test/unit/specs/address-edit.spec.js
index 14d9805f8..a7765506d 100644
--- a/test/unit/specs/address-edit.spec.js
+++ b/test/unit/specs/address-edit.spec.js
@@ -17,13 +17,13 @@ describe('AddressEdit', () => {
     expect(wrapper.find('.van-field__control')[2].element.value).to.equal('');
     expect(
       wrapper.find('.van-address-edit__area .van-cell__value span')[0].text()
-    ).to.equal('选择省');
+    ).to.equal('选择省份');
     expect(
       wrapper.find('.van-address-edit__area .van-cell__value span')[1].text()
-    ).to.equal('选择市');
+    ).to.equal('选择城市');
     expect(
       wrapper.find('.van-address-edit__area .van-cell__value span')[2].text()
-    ).to.equal('选择区');
+    ).to.equal('选择地区');
   });
 
   it('create a AddressEdit with props', () => {