From 1e836bf461281dd058d559c299c58950dfe022be Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 22 Nov 2019 15:19:27 +0800
Subject: [PATCH 01/18] docs: remove vant-demo pages (#5084)

---
 docs/markdown/quickstart.zh-CN.md  |  11 +++
 docs/site/components/DemoPages.vue | 136 -----------------------------
 docs/site/doc.config.js            |   4 -
 docs/site/router.js                |   5 +-
 4 files changed, 12 insertions(+), 144 deletions(-)
 delete mode 100644 docs/site/components/DemoPages.vue

diff --git a/docs/markdown/quickstart.zh-CN.md b/docs/markdown/quickstart.zh-CN.md
index 224cbb6e6..f7b91e797 100644
--- a/docs/markdown/quickstart.zh-CN.md
+++ b/docs/markdown/quickstart.zh-CN.md
@@ -29,6 +29,17 @@ npm i vant -S
 yarn add vant
 ```
 
+### 示例工程
+
+我们提供了一个基于 Vue Cli 的[示例工程](https://github.com/youzan/vant-demo)，示例工程会帮助你了解如下内容：
+
+- 基于 Vant 搭建单页面应用，配置按需引入组件
+- 配置基于 Rem 的适配方案
+- 配置基于 Viewport 的适配方案
+- 配置基于 TypeScript 的工程
+- 配置自定义主题色方案
+
+
 ## 引入组件
 
 ### 方式一. 自动按需引入组件 (推荐)
diff --git a/docs/site/components/DemoPages.vue b/docs/site/components/DemoPages.vue
deleted file mode 100644
index 218de7a87..000000000
--- a/docs/site/components/DemoPages.vue
+++ /dev/null
@@ -1,136 +0,0 @@
-<template>
-  <section class="van-doc-demo-pages">
-    <h1>示例工程</h1>
-
-    <div class="card">
-      <h3>介绍</h3>
-      <p>
-        我们提供了一个基于 Vue Cli 3 的示例工程，仓库地址为
-        <a
-          href="https://github.com/youzan/vant-demo"
-          target="_blank"
-        >Vant Demo</a>，示例工程会帮助你了解如下内容：
-      </p>
-      <ul>
-        <li>基于 Vant 搭建单页面应用，配置按需引入组件</li>
-        <li>配置基于 rem 的适配方案</li>
-        <li>配置基于 viewport 的适配方案</li>
-        <li>配置基于 TypeScript 的工程</li>
-        <li>配置自定义主题色方案</li>
-      </ul>
-    </div>
-
-    <div class="card">
-      <h3>示例页面</h3>
-      <p>下面是一些使用 Vant 搭建的示例页面，点击图片切换至对应示例。</p>
-      <div class="van-doc-demo-pages__gallery">
-        <div
-          :class="['van-doc-demo-pages__item', { 'van-doc-demo-pages__item--active': index === currentDemo }]"
-          v-for="(demo, index) in demos"
-        >
-          <h4>{{ demo.title }}</h4>
-          <a :href="demo.source" target="_blank">源代码</a>
-          <img :src="demo.preview" @click="onChangeDemo(demo, index)">
-        </div>
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-export default {
-  name: 'van-doc-demo-pages',
-
-  data() {
-    return {
-      currentDemo: 0
-    };
-  },
-
-  computed: {
-    demos() {
-      return [
-        {
-          title: '商品详情',
-          preview:
-            'https://img.yzcdn.cn/public_files/2017/10/24/7070a8d1d6504b864c605114d32f2aae.png',
-          url: '/vant-demo/#/goods',
-          source:
-            'https://github.com/youzan/vant-demo/blob/master/base/src/view/goods/index.vue'
-        },
-        {
-          title: '用户中心',
-          preview:
-            'https://img.yzcdn.cn/public_files/2017/10/23/e1d70757e3ab88d39a360b704be8f43f.png',
-          url: '/vant-demo/#/user',
-          source:
-            'https://github.com/youzan/vant-demo/blob/master/base/src/view/user/index.vue'
-        },
-        {
-          title: '购物车',
-          preview:
-            'https://img.yzcdn.cn/public_files/2017/10/24/06b8b5ed3692314d434db7f6854dcdbe.png',
-          url: '/vant-demo/#/cart',
-          source:
-            'https://github.com/youzan/vant-demo/blob/master/base/src/view/cart/index.vue'
-        }
-      ];
-    }
-  },
-
-  beforeMount() {
-    this.$emit('changeDemoURL', this.demos[0].url);
-  },
-
-  methods: {
-    onChangeDemo(demo, index) {
-      this.currentDemo = index;
-      this.$emit('changeDemoURL', demo.url);
-    }
-  }
-};
-</script>
-
-<style lang="less">
-.van-doc-demo-pages {
-  &__gallery {
-    margin-top: 30px;
-  }
-
-  &__item {
-    display: inline-block;
-    width: 28%;
-    margin-bottom: 40px;
-    text-align: center;
-
-    &:nth-child(3n + 1),
-    &:nth-child(3n + 2) {
-      margin-right: 4%;
-    }
-
-    h4 {
-      margin-top: 0;
-    }
-
-    img {
-      width: 100%;
-      background-color: #f8f8f8;
-      border-radius: 3px;
-      box-shadow: 0 2px 3px rgba(10, 10, 10, 0.1), 0 0 0 1px rgba(10, 10, 10, 0.1);
-      cursor: pointer;
-    }
-
-    a {
-      display: inline-block;
-      margin: 4px 0 7px;
-      font-size: 12px;
-    }
-
-    &--active {
-      img {
-        box-shadow: 0 1px 4px rgba(51, 136, 255, 0.4), 0 0 0 1px rgba(51, 136, 255, 0.4);
-      }
-    }
-  }
-}
-</style>
diff --git a/docs/site/doc.config.js b/docs/site/doc.config.js
index 5ac86cacb..40044c6d7 100644
--- a/docs/site/doc.config.js
+++ b/docs/site/doc.config.js
@@ -75,10 +75,6 @@ export default {
                 path: '/style-guide',
                 title: '风格指南'
               },
-              {
-                path: '/demo',
-                title: '示例工程'
-              },
               {
                 path: '/locale',
                 title: '国际化'
diff --git a/docs/site/router.js b/docs/site/router.js
index 1c8ee0456..223b5ff01 100644
--- a/docs/site/router.js
+++ b/docs/site/router.js
@@ -1,7 +1,6 @@
 import Vue from 'vue';
 import docConfig from './doc.config';
 import DemoList from './components/DemoList';
-import DemoPages from './components/DemoPages';
 import { demoWrapper } from './mobile/demo-common';
 import { initIframeRouter } from './utils/iframe-router';
 
@@ -35,9 +34,7 @@ const registerRoute = ({ mobile, componentMap }) => {
         path = path.replace('/', '');
 
         let component;
-        if (path === 'demo') {
-          component = DemoPages;
-        } else if (mobile) {
+        if (mobile) {
           const module = componentMap[`./${path}/demo/index.vue`];
 
           if (module) {

From 23c419973a0198a43e3cb99a952eeae6d59cf8b8 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Fri, 22 Nov 2019 17:14:11 +0800
Subject: [PATCH 02/18] feat(ContactCard): refactor style & add new prop
 show-set-default (#5083)

---
 src/contact-card/README.md                    |  2 +
 src/contact-card/README.zh-CN.md              |  2 +
 src/contact-card/demo/index.vue               |  8 ++-
 .../test/__snapshots__/demo.spec.js.snap      | 26 +++++---
 src/contact-edit/index.js                     | 66 +++++++++++++------
 src/contact-edit/index.less                   | 32 +++++++--
 src/style/var.less                            |  5 +-
 7 files changed, 107 insertions(+), 34 deletions(-)

diff --git a/src/contact-card/README.md b/src/contact-card/README.md
index fc82742af..7c4f95b5b 100644
--- a/src/contact-card/README.md
+++ b/src/contact-card/README.md
@@ -173,6 +173,8 @@ export default {
 | is-saving | Whether to show save button loading status | *boolean* | `false` | - |
 | is-deleting | Whether to show delete button loading status | *boolean* | `false` | - |
 | tel-validator | The method to validate tel | *(tel: string) => boolean* | - | - |
+| show-set-default | Whether to show default contact switch | *boolean* | `false` | - |
+| set-default-label | default contact switch label | *string* | - | - |
 
 ### ContactEdit Events
 
diff --git a/src/contact-card/README.zh-CN.md b/src/contact-card/README.zh-CN.md
index 218ce4137..8ddb795be 100644
--- a/src/contact-card/README.zh-CN.md
+++ b/src/contact-card/README.zh-CN.md
@@ -177,6 +177,8 @@ export default {
 | is-saving | 是否显示保存按钮加载动画 | *boolean* | `false` | - |
 | is-deleting | 是否显示删除按钮加载动画 | *boolean* | `false` | - |
 | tel-validator | 手机号格式校验函数 | *(tel: string) => boolean* | - | - |
+| show-set-default | 是否显示默认联系人栏 | *boolean* | `false` | - |
+| set-default-label | 默认联系人栏文案 | *string* | - | - |
 
 ### ContactEdit Events
 
diff --git a/src/contact-card/demo/index.vue b/src/contact-card/demo/index.vue
index fe2d7800a..cef09488e 100644
--- a/src/contact-card/demo/index.vue
+++ b/src/contact-card/demo/index.vue
@@ -28,6 +28,8 @@
         :lazy-render="false"
       >
         <van-contact-edit
+          show-set-default
+          :set-default-label="$t('defaultLabel')"
           :contact-info="editingContact"
           :is-edit="isEdit"
           @save="onSave"
@@ -51,10 +53,12 @@
 export default {
   i18n: {
     'zh-CN': {
-      name: '张三'
+      name: '张三',
+      defaultLabel: '设为默认联系人'
     },
     'en-US': {
-      name: 'John Snow'
+      name: 'John Snow',
+      defaultLabel: 'Set as the default contact'
     }
   },
 
diff --git a/src/contact-card/test/__snapshots__/demo.spec.js.snap b/src/contact-card/test/__snapshots__/demo.spec.js.snap
index dbe3cb2f5..42f46ad66 100644
--- a/src/contact-card/test/__snapshots__/demo.spec.js.snap
+++ b/src/contact-card/test/__snapshots__/demo.spec.js.snap
@@ -25,19 +25,29 @@ exports[`renders demo correctly 1`] = `
     </div>
     <div class="van-popup van-popup--bottom" style="display: none;" name="van-popup-slide-bottom">
       <div class="van-contact-edit">
-        <div class="van-cell van-field">
-          <div class="van-cell__title van-field__label"><span>张三</span></div>
-          <div class="van-cell__value">
-            <div class="van-field__body"><input type="text" placeholder="请填写姓名" class="van-field__control"></div>
+        <div class="van-contact-edit__fields">
+          <div class="van-cell van-field">
+            <div class="van-cell__title van-field__label"><span>张三</span></div>
+            <div class="van-cell__value">
+              <div class="van-field__body"><input type="text" placeholder="请填写姓名" class="van-field__control"></div>
+            </div>
+          </div>
+          <div class="van-cell van-field">
+            <div class="van-cell__title van-field__label"><span>电话</span></div>
+            <div class="van-cell__value">
+              <div class="van-field__body"><input type="tel" placeholder="请填写电话" class="van-field__control"></div>
+            </div>
           </div>
         </div>
-        <div class="van-cell van-field">
-          <div class="van-cell__title van-field__label"><span>电话</span></div>
+        <div class="van-cell van-cell--borderless van-contact-edit__switch-cell">
+          <div class="van-cell__title"><span>设为默认联系人</span></div>
           <div class="van-cell__value">
-            <div class="van-field__body"><input type="tel" placeholder="请填写电话" class="van-field__control"></div>
+            <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
+              <div class="van-switch__node"></div>
+            </div>
           </div>
         </div>
-        <div class="van-contact-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+        <div class="van-contact-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
       </div>
     </div>
   </div>
diff --git a/src/contact-edit/index.js b/src/contact-edit/index.js
index 9b3f50480..26c8f760e 100644
--- a/src/contact-edit/index.js
+++ b/src/contact-edit/index.js
@@ -3,6 +3,8 @@ import Button from '../button';
 import Field from '../field';
 import Toast from '../toast';
 import Dialog from '../dialog';
+import Switch from '../switch';
+import Cell from '../cell';
 import { isMobile } from '../utils/validate/mobile';
 
 const [createComponent, bem, t] = createNamespace('contact-edit');
@@ -17,6 +19,8 @@ export default createComponent({
     isEdit: Boolean,
     isSaving: Boolean,
     isDeleting: Boolean,
+    showSetDefault: Boolean,
+    setDefaultLabel: String,
     contactInfo: {
       type: Object,
       default: () => ({ ...defaultContact })
@@ -94,34 +98,58 @@ export default createComponent({
 
     return (
       <div class={bem()}>
-        <Field
-          vModel={data.name}
-          clearable
-          maxlength="30"
-          label={t('name')}
-          placeholder={t('nameEmpty')}
-          error={errorInfo.name}
-          onFocus={onFocus('name')}
-        />
-        <Field
-          vModel={data.tel}
-          clearable
-          type="tel"
-          label={t('tel')}
-          placeholder={t('telEmpty')}
-          error={errorInfo.tel}
-          onFocus={onFocus('tel')}
-        />
+        <div class={bem('fields')}>
+          <Field
+            vModel={data.name}
+            clearable
+            maxlength="30"
+            label={t('name')}
+            placeholder={t('nameEmpty')}
+            error={errorInfo.name}
+            onFocus={onFocus('name')}
+          />
+          <Field
+            vModel={data.tel}
+            clearable
+            type="tel"
+            label={t('tel')}
+            placeholder={t('telEmpty')}
+            error={errorInfo.tel}
+            onFocus={onFocus('tel')}
+          />
+        </div>
+        {this.showSetDefault && (
+          <Cell
+            title={this.setDefaultLabel}
+            class={bem('switch-cell')}
+            border={false}
+          >
+            <Switch
+              vModel={data.isDefault}
+              size={24}
+              onChange={event => {
+                this.$emit('change-default', event);
+              }}
+            />
+          </Cell>
+        )}
         <div class={bem('buttons')}>
           <Button
             block
+            round
             type="danger"
             text={t('save')}
             loading={this.isSaving}
             onClick={this.onSave}
           />
           {this.isEdit && (
-            <Button block text={t('delete')} loading={this.isDeleting} onClick={this.onDelete} />
+            <Button
+              block
+              round
+              text={t('delete')}
+              loading={this.isDeleting}
+              onClick={this.onDelete}
+            />
           )}
         </div>
       </div>
diff --git a/src/contact-edit/index.less b/src/contact-edit/index.less
index cbb322745..cec00b8de 100644
--- a/src/contact-edit/index.less
+++ b/src/contact-edit/index.less
@@ -1,15 +1,39 @@
 @import '../style/var';
 
 .van-contact-edit {
+  padding: @contact-edit-padding;
+
+  &__fields {
+    overflow: hidden;
+    border-radius: @contact-edit-fields-radius;
+
+    .van-cell__title {
+      max-width: @contact-edit-field-label-width;
+    }
+  }
+
+  &__switch-cell {
+    margin-top: 10px;
+    padding-top: 9px;
+    padding-bottom: 9px;
+    overflow: hidden;
+    border-radius: @contact-edit-fields-radius;
+
+    .van-cell__value {
+      flex: none;
+    }
+
+    .van-switch {
+      vertical-align: top;
+    }
+  }
+
   &__buttons {
     padding: @contact-edit-buttons-padding;
   }
 
-  .van-cell__title {
-    max-width: @contact-edit-field-label-width;
-  }
-
   .van-button {
     margin-bottom: @contact-edit-button-margin-bottom;
+    font-size: @contact-edit-button-font-size;
   }
 }
diff --git a/src/style/var.less b/src/style/var.less
index dec245472..10e91b82b 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -199,8 +199,11 @@
 @contact-card-value-line-height: 20px;
 
 // ContactEdit
-@contact-edit-buttons-padding: @padding-xl @padding-md;
+@contact-edit-padding: @padding-md;
+@contact-edit-fields-radius: @border-radius-md;
+@contact-edit-buttons-padding: @padding-xl 0;
 @contact-edit-button-margin-bottom: @padding-sm;
+@contact-edit-button-font-size: 16px;
 @contact-edit-field-label-width: 65px;
 
 // ContactList

From dfd45e9299bf0376aad911e2dc340bbffdac450e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Sat, 23 Nov 2019 09:49:59 +0800
Subject: [PATCH 03/18] feat(Toast): improve type definitions (#5086)

---
 types/toast.d.ts | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/types/toast.d.ts b/types/toast.d.ts
index 73517265c..5bf8b9c0d 100644
--- a/types/toast.d.ts
+++ b/types/toast.d.ts
@@ -2,20 +2,23 @@ import Vue from 'vue';
 import { VanPopupMixin } from './mixins/popup';
 
 type ToastMessage = string | number;
+type ToastType = 'text' | 'loading' | 'success' | 'fail' | 'html';
+type ToastPosition = 'top' | 'middle' | 'bottom';
+type ToastLoadingType = 'circular' | 'spinner';
 
 export type ToastOptions = {
   icon?: string;
-  type?: string;
+  type?: ToastType;
   mask?: boolean;
   message?: ToastMessage;
   onClose?: () => void;
   onOpened?: () => void;
   overlay?: boolean;
   duration?: number;
-  position?: string;
+  position?: ToastPosition;
   className?: any;
   transition?: string;
-  loadingType?: string;
+  loadingType?: ToastLoadingType;
   forbidClick?: boolean;
   closeOnClick?: boolean;
   closeOnClickOverlay?: boolean;
@@ -23,9 +26,9 @@ export type ToastOptions = {
 };
 
 export interface VanToast extends Vue, VanPopupMixin {
-  type: string;
-  position: string;
-  loadingType: string;
+  type: ToastType;
+  position: ToastPosition;
+  loadingType: ToastLoadingType;
   forbidClick: boolean;
   message: ToastMessage;
   clear(): void;
@@ -38,8 +41,8 @@ export interface Toast {
   fail(options?: ToastOptions | ToastMessage): VanToast;
   clear(all?: boolean): void;
   install(): void;
-  setDefaultOptions(options: ToastOptions): void;
-  resetDefaultOptions(): void;
+  setDefaultOptions(options: string | ToastOptions): void;
+  resetDefaultOptions(options?: string): void;
   allowMultiple(allow: boolean): void;
 }
 

From 4c1e77cc37c000706ddc4c2d40aff0584d55dc1f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Mon, 25 Nov 2019 08:27:00 +0800
Subject: [PATCH 04/18] feat(Circle): add stroke-linecap prop (#5087)

* feat(Circle): add stroke-linecap prop

* docs: butt
---
 src/circle/README.md                             |  3 ++-
 src/circle/README.zh-CN.md                       |  1 +
 src/circle/index.js                              | 12 +++++++++---
 src/circle/test/__snapshots__/index.spec.js.snap |  7 +++++++
 src/circle/test/index.spec.js                    | 10 ++++++++++
 5 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/circle/README.md b/src/circle/README.md
index 39b5a102f..3b721baa8 100644
--- a/src/circle/README.md
+++ b/src/circle/README.md
@@ -121,7 +121,8 @@ export default {
 | speed | Animate speed（rate/s）| *number* | `0` | - |
 | text | Text | *string* | - | - |
 | stroke-width | Stroke width | *number* | `40` | - |
-| clockwise | Is clockwise | *boolean* | `true` | - |
+| stroke-linecap | Stroke linecap，can be set to `sqaure` `butt` | *string* | `round` | 2.2.15 |
+| clockwise | Whether to be clockwise | *boolean* | `true` | - |
 
 ### Slots
 
diff --git a/src/circle/README.zh-CN.md b/src/circle/README.zh-CN.md
index 60be6f55a..351e66d94 100644
--- a/src/circle/README.zh-CN.md
+++ b/src/circle/README.zh-CN.md
@@ -133,6 +133,7 @@ export default {
 | speed | 动画速度（单位为 rate/s）| *number* | `0` | - |
 | text | 文字 | *string* | - | - |
 | stroke-width | 进度条宽度 | *number* | `40` | - |
+| stroke-linecap | 进度条端点的形状，可选值为`sqaure` `butt` | *string* | `round` | 2.2.15 |
 | clockwise | 是否顺时针增加 | *boolean* | `true` | - |
 
 ### Slots
diff --git a/src/circle/index.js b/src/circle/index.js
index 8c470a112..4a481b871 100644
--- a/src/circle/index.js
+++ b/src/circle/index.js
@@ -14,12 +14,14 @@ function format(rate) {
 
 function getPath(clockwise, viewBoxSize) {
   const sweepFlag = clockwise ? 1 : 0;
-  return `M ${viewBoxSize / 2} ${viewBoxSize / 2} m 0, -500 a 500, 500 0 1, ${sweepFlag} 0, 1000 a 500, 500 0 1, ${sweepFlag} 0, -1000`;
+  return `M ${viewBoxSize / 2} ${viewBoxSize /
+    2} m 0, -500 a 500, 500 0 1, ${sweepFlag} 0, 1000 a 500, 500 0 1, ${sweepFlag} 0, -1000`;
 }
 
 export default createComponent({
   props: {
     text: String,
+    strokeLinecap: String,
     value: {
       type: Number,
       default: 0
@@ -85,6 +87,7 @@ export default createComponent({
       return {
         stroke: `${this.color}`,
         strokeWidth: `${this.strokeWidth + 1}px`,
+        strokeLinecap: this.strokeLinecap,
         strokeDasharray: `${offset}px ${PERIMETER}px`
       };
     },
@@ -129,7 +132,9 @@ export default createComponent({
         this.startRate = this.value;
         this.endRate = format(this.rate);
         this.increase = this.endRate > this.startRate;
-        this.duration = Math.abs(((this.startRate - this.endRate) * 1000) / this.speed);
+        this.duration = Math.abs(
+          ((this.startRate - this.endRate) * 1000) / this.speed
+        );
 
         if (this.speed) {
           cancelRaf(this.rafId);
@@ -168,7 +173,8 @@ export default createComponent({
             stroke={this.gradient ? `url(#${this.uid})` : this.color}
           />
         </svg>
-        {this.slots() || (this.text && <div class={bem('text')}>{this.text}</div>)}
+        {this.slots() ||
+          (this.text && <div class={bem('text')}>{this.text}</div>)}
       </div>
     );
   }
diff --git a/src/circle/test/__snapshots__/index.spec.js.snap b/src/circle/test/__snapshots__/index.spec.js.snap
index 97dbfb718..8749d4958 100644
--- a/src/circle/test/__snapshots__/index.spec.js.snap
+++ b/src/circle/test/__snapshots__/index.spec.js.snap
@@ -13,3 +13,10 @@ exports[`speed is 0 1`] = `
     <path d="M 520 520 m 0, -500 a 500, 500 0 1, 1 0, 1000 a 500, 500 0 1, 1 0, -1000" stroke="#1989fa" class="van-circle__layer" style="stroke: #1989fa; stroke-width: 41px; stroke-dasharray: 1570px 3140px;"></path>
   </svg></div>
 `;
+
+exports[`stroke-linecap prop 1`] = `
+<div class="van-circle" style="width: 100px; height: 100px;"><svg viewBox="0 0 1040 1040">
+    <path d="M 520 520 m 0, -500 a 500, 500 0 1, 1 0, 1000 a 500, 500 0 1, 1 0, -1000" class="van-circle__hover" style="fill: none; stroke: #fff; stroke-width: 40px;"></path>
+    <path d="M 520 520 m 0, -500 a 500, 500 0 1, 1 0, 1000 a 500, 500 0 1, 1 0, -1000" stroke="#1989fa" class="van-circle__layer" style="stroke: #1989fa; stroke-width: 41px; stroke-linecap: square; stroke-dasharray: 0px 3140px;"></path>
+  </svg></div>
+`;
diff --git a/src/circle/test/index.spec.js b/src/circle/test/index.spec.js
index 2d37e250f..17349e8db 100644
--- a/src/circle/test/index.spec.js
+++ b/src/circle/test/index.spec.js
@@ -47,3 +47,13 @@ test('size prop', () => {
 
   expect(wrapper).toMatchSnapshot();
 });
+
+test('stroke-linecap prop', () => {
+  const wrapper = mount(Circle, {
+    propsData: {
+      strokeLinecap: 'square'
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});

From 9b01cac23fddfc06063f5cf7057014cf0df49aa2 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Mon, 25 Nov 2019 08:27:40 +0800
Subject: [PATCH 05/18] docs(Swipe): add api version tip (#5091)

---
 src/swipe/README.md       | 30 +++++++++++++++---------------
 src/swipe/README.zh-CN.md | 28 ++++++++++++++--------------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/swipe/README.md b/src/swipe/README.md
index 1b67035aa..c9b572a6a 100644
--- a/src/swipe/README.md
+++ b/src/swipe/README.md
@@ -144,34 +144,34 @@ export default {
 
 ### Swipe Events
 
-| Event | Description | Arguments |
-|------|------|------|
-| change | Triggered when current swipe change | index: index of current swipe |
+| Event | Description | Arguments | Version |
+|------|------|------|------|
+| change | Triggered when current swipe change | index: index of current swipe | - |
 
 ### SwipeItem Events
 
-| Event | Description | Arguments |
-|------|------|------|
-| click | Triggered when clicked | event: Event |
+| Event | Description | Arguments | Version |
+|------|------|------|------|
+| click | Triggered when clicked | event: Event | - |
 
 ### Swipe Methods
 
 Use [ref](https://vuejs.org/v2/api/#ref) to get Swipe instance and call instance methods
 
-| Name | Description | Attribute | Return value |
-|------|------|------|------|
-| swipeTo | Swipe to target index | index: target index, options: Options | void |
-| resize | Resize Swipe when container element resized | - | void |
+| Name | Description | Attribute | Return value | Version |
+|------|------|------|------|------|
+| swipeTo | Swipe to target index | index: target index, options: Options | void | - |
+| resize | Resize Swipe when container element resized | - | void | 2.2.14 |
 
 ### swipeTo Options
 
 | Name | Description | Type |
-|------|------|------|
+|------|------|------|------|
 | immediate | Whether to skip animation | *boolean* |
 
 ### Swipe Slots
 
-| Name | Description |
-|------|------|
-| default | Content |
-| indicator | Custom indicator |
+| Name | Description | Version |
+|------|------|------|
+| default | Content | - |
+| indicator | Custom indicator | - |
diff --git a/src/swipe/README.zh-CN.md b/src/swipe/README.zh-CN.md
index 541414496..27721b226 100644
--- a/src/swipe/README.zh-CN.md
+++ b/src/swipe/README.zh-CN.md
@@ -150,24 +150,24 @@ export default {
 
 ### Swipe Events
 
-| 事件名 | 说明 | 回调参数 |
-|------|------|------|
-| change | 每一页轮播结束后触发 | index, 当前页的索引 |
+| 事件名 | 说明 | 回调参数 | 版本 |
+|------|------|------|------|
+| change | 每一页轮播结束后触发 | index, 当前页的索引 | - |
 
 ### SwipeItem Events
 
-| 事件名 | 说明 | 回调参数 |
-|------|------|------|
-| click | 点击时触发 | event: Event |
+| 事件名 | 说明 | 回调参数 | 版本 |
+|------|------|------|------|
+| click | 点击时触发 | event: Event | - |
 
 ### Swipe 方法
 
 通过 [ref](https://cn.vuejs.org/v2/api/#ref) 可以获取到 Swipe 实例并调用实例方法
 
-| 方法名 | 说明 | 参数 | 返回值 |
-|------|------|------|------|
-| swipeTo | 滚动到目标位置 | index: number, options: Options | void |
-| resize | 外层元素大小变化后，可以调用此方法来触发重绘 | - | void |
+| 方法名 | 说明 | 参数 | 返回值 | 版本 |
+|------|------|------|------|------|
+| swipeTo | 滚动到目标位置 | index: number, options: Options | void | - |
+| resize | 外层元素大小变化后，可以调用此方法来触发重绘 | - | void | 2.2.14 |
 
 ### swipeTo Options 格式
 
@@ -177,7 +177,7 @@ export default {
 
 ### Swipe Slots
 
-| 名称 | 说明 |
-|------|------|
-| default | 轮播内容 |
-| indicator | 自定义指示器 |
+| 名称 | 说明 | 版本 |
+|------|------|------|
+| default | 轮播内容 | - |
+| indicator | 自定义指示器 | - |

From a6a431e8c76bc85ec5deb87aa755b19cd205332f Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 26 Nov 2019 11:57:26 +0800
Subject: [PATCH 06/18] feat(AddressList): refactor style & add new prop
 default-tag-text (#5106)

---
 src/address-list/Item.tsx                     | 16 ++++++-
 src/address-list/README.md                    |  2 +
 src/address-list/README.zh-CN.md              |  2 +
 src/address-list/demo/index.vue               | 13 +++--
 src/address-list/index.less                   | 48 +++++++++++++++----
 src/address-list/index.tsx                    | 27 ++++++-----
 .../test/__snapshots__/demo.spec.js.snap      | 45 +++++++++--------
 .../test/__snapshots__/index.spec.js.snap     | 11 +++--
 src/style/var.less                            | 18 +++----
 9 files changed, 123 insertions(+), 59 deletions(-)

diff --git a/src/address-list/Item.tsx b/src/address-list/Item.tsx
index c5792e6c6..1ac884c32 100644
--- a/src/address-list/Item.tsx
+++ b/src/address-list/Item.tsx
@@ -3,6 +3,7 @@ import { emit, inherit } from '../utils/functional';
 import Icon from '../icon';
 import Cell from '../cell';
 import Radio from '../radio';
+import Tag from '../tag';
 
 // Types
 import { CreateElement, RenderContext } from 'vue/types';
@@ -13,12 +14,14 @@ export type AddressItemData = {
   tel: string | number;
   name: string;
   address: string;
+  isDefault: boolean;
 };
 
 export type AddressItemProps = {
   data: AddressItemData;
   disabled?: boolean;
   switchable?: boolean;
+  defaultTagText?: string;
 };
 
 export type AddressItemEvents = {
@@ -60,7 +63,14 @@ function AddressItem(
   const genContent = () => {
     const { data } = props;
     const Info = [
-      <div class={bem('name')}>{`${data.name}，${data.tel}`}</div>,
+      <div class={bem('name')}>
+        {`${data.name} ${data.tel}`}
+        {data.isDefault && props.defaultTagText && (
+          <Tag type="danger" round class={bem('tag')}>
+            {props.defaultTagText}
+          </Tag>
+        )}
+      </div>,
       <div class={bem('address')}>{data.address}</div>
     ];
 
@@ -77,6 +87,7 @@ function AddressItem(
     <Cell
       class={bem({ disabled })}
       valueClass={bem('value')}
+      border={false}
       clickable={switchable && !disabled}
       scopedSlots={{
         default: genContent,
@@ -91,7 +102,8 @@ function AddressItem(
 AddressItem.props = {
   data: Object,
   disabled: Boolean,
-  switchable: Boolean
+  switchable: Boolean,
+  defaultTagText: String
 };
 
 export default createComponent<AddressItemProps, AddressItemEvents>(AddressItem);
diff --git a/src/address-list/README.md b/src/address-list/README.md
index 95bb6a10b..7187257af 100644
--- a/src/address-list/README.md
+++ b/src/address-list/README.md
@@ -77,6 +77,7 @@ export default {
 | disabled-text | Disabled text | *string* | - | - |
 | switchable | Whether to allow switch address | *boolean* | `true` | - |
 | add-button-text | Add button text | *string* | `Add new address` | - |
+| default-tag-text | Default tag text | *string* | - | - |
 
 ### Events
 
@@ -97,6 +98,7 @@ export default {
 | name | Name | *string* |
 | tel | Phone | *string \| number* |
 | address | Address | *string* |
+| isDefault | Is default address | *boolean* |
 
 ### Slots
 
diff --git a/src/address-list/README.zh-CN.md b/src/address-list/README.zh-CN.md
index f1e0e9a18..1bdc323bb 100644
--- a/src/address-list/README.zh-CN.md
+++ b/src/address-list/README.zh-CN.md
@@ -78,6 +78,7 @@ export default {
 | disabled-text | 不可配送提示文案 | *string* | - | - |
 | switchable | 是否允许切换地址 | *boolean* | `true` | - |
 | add-button-text | 底部按钮文字 | *string* | `新增地址` | - |
+| default-tag-text | 默认地址标签文字 | *string* | - | - |
 
 ### Events
 
@@ -98,6 +99,7 @@ export default {
 | name | 收货人姓名 | *string* |
 | tel | 收货人手机号 | *string \| number* |
 | address | 收货地址 | *string* |
+| isDefault | 是否为默认地址 | *boolean* |
 
 ### Slots
 
diff --git a/src/address-list/demo/index.vue b/src/address-list/demo/index.vue
index 662900167..d1982cba2 100644
--- a/src/address-list/demo/index.vue
+++ b/src/address-list/demo/index.vue
@@ -3,6 +3,7 @@
     <demo-block :title="$t('basicUsage')">
       <van-address-list
         v-model="chosenAddressId"
+        :default-tag-text="$t('defaultTagText')"
         :list="$t('list')"
         :disabled-list="$t('disabledList')"
         :disabled-text="$t('disabledText')"
@@ -22,7 +23,8 @@ export default {
           id: '1',
           name: '张三',
           tel: '13000000000',
-          address: '浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室'
+          address: '浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室',
+          isDefault: true
         },
         {
           id: '2',
@@ -41,7 +43,8 @@ export default {
       ],
       add: '新增地址',
       edit: '编辑地址',
-      disabledText: '以下地址超出配送范围'
+      disabledText: '以下地址超出配送范围',
+      defaultTagText: '默认'
     },
     'en-US': {
       list: [
@@ -49,7 +52,8 @@ export default {
           id: '1',
           name: 'John Snow',
           tel: '13000000000',
-          address: 'Somewhere'
+          address: 'Somewhere',
+          isDefault: true
         },
         {
           id: '2',
@@ -68,7 +72,8 @@ export default {
       ],
       add: 'Add',
       edit: 'Edit',
-      disabledText: 'The following address is out of range'
+      disabledText: 'The following address is out of range',
+      defaultTagText: 'Default'
     }
   },
 
diff --git a/src/address-list/index.less b/src/address-list/index.less
index 17a438586..7531910d5 100644
--- a/src/address-list/index.less
+++ b/src/address-list/index.less
@@ -3,17 +3,26 @@
 .van-address-list {
   box-sizing: border-box;
   height: 100%;
-  padding-bottom: 100px;
+  padding: @address-list-padding;
 
-  &__add {
+  &__bottom {
     position: fixed;
     bottom: 0;
     left: 0;
     z-index: @address-list-add-button-z-index;
+    box-sizing: border-box;
+    width: 100%;
+    padding: 5px @padding-md;
+    background-color: @white;
+  }
+
+  &__add {
+    height: 40px;
+    line-height: 38px;
   }
 
   &__disabled-text {
-    padding: 0 @padding-md;
+    padding: @address-list-disabled-text-padding;
     color: @address-list-disabled-text-color;
     font-size: @address-list-disabled-text-font-size;
     line-height: @address-list-disabled-text-line-height;
@@ -22,16 +31,30 @@
 
 .van-address-item {
   padding: @address-list-item-padding;
+  border-radius: @border-radius-md;
+
+  &:not(:last-child) {
+    margin-bottom: @padding-sm;
+  }
 
   &__value {
-    padding-right: @padding-xl;
+    padding-right: 44px;
   }
 
   &__name {
-    margin-bottom: @padding-base;
-    font-weight: @font-weight-bold;
-    font-size: @font-size-md;
-    line-height: 20px;
+    display: flex;
+    align-items: center;
+    margin-bottom: @padding-xs;
+    font-size: @font-size-lg;
+    line-height: 22px;
+  }
+
+  &__tag {
+    flex: none;
+    margin-left: @padding-xs;
+    padding-top: 0;
+    padding-bottom: 0;
+    line-height: 1.4em;
   }
 
   &__address {
@@ -51,12 +74,21 @@
     position: absolute;
     top: 50%;
     right: @padding-md;
+    color: @gray-dark;
     font-size: @address-list-edit-icon-size;
     transform: translate(0, -50%);
   }
 
+  .van-radio__label {
+    margin-left: @padding-sm;
+  }
+
   .van-radio__icon--checked .van-icon {
     background-color: @address-list-item-radio-icon-color;
     border-color: @address-list-item-radio-icon-color;
   }
+
+  .van-radio__icon:not(.van-radio__icon--checked) {
+    visibility: hidden;
+  }
 }
diff --git a/src/address-list/index.tsx b/src/address-list/index.tsx
index 5217ac5d2..e13bb2710 100644
--- a/src/address-list/index.tsx
+++ b/src/address-list/index.tsx
@@ -15,6 +15,7 @@ export type AddressListProps = {
   addButtonText?: string;
   list?: AddressItemData[];
   disabledList?: AddressItemData[];
+  defaultTagText?: string;
 };
 
 export type AddressListSlots = DefaultSlots & {
@@ -40,6 +41,7 @@ function AddressList(
         key={item.id}
         disabled={disabled}
         switchable={props.switchable}
+        defaultTagText={props.defaultTagText}
         onSelect={() => {
           emit(ctx, disabled ? 'select-disabled' : 'select', item, index);
 
@@ -67,16 +69,18 @@ function AddressList(
       {props.disabledText && <div class={bem('disabled-text')}>{props.disabledText}</div>}
       {DisabledList}
       {slots.default && slots.default()}
-      <Button
-        square
-        size="large"
-        type="danger"
-        class={bem('add')}
-        text={props.addButtonText || t('add')}
-        onClick={() => {
-          emit(ctx, 'add');
-        }}
-      />
+      <div class={bem('bottom')}>
+        <Button
+          round
+          block
+          type="danger"
+          class={bem('add')}
+          text={props.addButtonText || t('add')}
+          onClick={() => {
+            emit(ctx, 'add');
+          }}
+        />
+      </div>
     </div>
   );
 }
@@ -90,7 +94,8 @@ AddressList.props = {
   switchable: {
     type: Boolean,
     default: true
-  }
+  },
+  defaultTagText: String
 };
 
 export default createComponent<AddressListProps>(AddressList);
diff --git a/src/address-list/test/__snapshots__/demo.spec.js.snap b/src/address-list/test/__snapshots__/demo.spec.js.snap
index bd2ed0002..6bf8e5fa2 100644
--- a/src/address-list/test/__snapshots__/demo.spec.js.snap
+++ b/src/address-list/test/__snapshots__/demo.spec.js.snap
@@ -5,34 +5,37 @@ exports[`renders demo correctly 1`] = `
   <div>
     <div class="van-address-list">
       <div role="radiogroup" class="van-radio-group">
-        <div role="button" tabindex="0" class="van-cell van-cell--clickable van-address-item">
+        <div role="button" tabindex="0" class="van-cell van-cell--clickable van-cell--borderless van-address-item">
           <div class="van-cell__value van-cell__value--alone van-address-item__value">
             <div role="radio" tabindex="0" aria-checked="true" class="van-radio">
               <div class="van-radio__icon van-radio__icon--round van-radio__icon--checked" style="font-size: 16px;"><i class="van-icon van-icon-success">
-                  <!----></i></div><span class="van-radio__label"><div class="van-address-item__name">张三，13000000000</div><div class="van-address-item__address">浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div></span>
+                  <!----></i></div><span class="van-radio__label"><div class="van-address-item__name">张三 13000000000<span class="van-tag van-tag--round van-tag--danger van-address-item__tag">默认</span>
             </div>
-          </div><i class="van-icon van-icon-edit van-address-item__edit">
-            <!----></i>
-        </div>
-        <div role="button" tabindex="0" class="van-cell van-cell--clickable van-address-item">
-          <div class="van-cell__value van-cell__value--alone van-address-item__value">
-            <div role="radio" tabindex="-1" aria-checked="false" class="van-radio">
-              <div class="van-radio__icon van-radio__icon--round" style="font-size: 16px;"><i class="van-icon van-icon-success">
-                  <!----></i></div><span class="van-radio__label"><div class="van-address-item__name">李四，1310000000</div><div class="van-address-item__address">浙江省杭州市拱墅区莫干山路 50 号</div></span>
-            </div>
-          </div><i class="van-icon van-icon-edit van-address-item__edit">
-            <!----></i>
-        </div>
-      </div>
-      <div class="van-address-list__disabled-text">以下地址超出配送范围</div>
-      <div class="van-cell van-address-item van-address-item--disabled">
-        <div class="van-cell__value van-cell__value--alone van-address-item__value">
-          <div class="van-address-item__name">王五，1320000000</div>
-          <div class="van-address-item__address">浙江省杭州市滨江区江南大道 15 号</div>
+            <div class="van-address-item__address">浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div></span>
+          </div>
         </div><i class="van-icon van-icon-edit van-address-item__edit">
           <!----></i>
-      </div><button class="van-button van-button--danger van-button--large van-button--square van-address-list__add"><span class="van-button__text">新增地址</span></button>
+      </div>
+      <div role="button" tabindex="0" class="van-cell van-cell--clickable van-cell--borderless van-address-item">
+        <div class="van-cell__value van-cell__value--alone van-address-item__value">
+          <div role="radio" tabindex="-1" aria-checked="false" class="van-radio">
+            <div class="van-radio__icon van-radio__icon--round" style="font-size: 16px;"><i class="van-icon van-icon-success">
+                <!----></i></div><span class="van-radio__label"><div class="van-address-item__name">李四 1310000000</div><div class="van-address-item__address">浙江省杭州市拱墅区莫干山路 50 号</div></span>
+          </div>
+        </div><i class="van-icon van-icon-edit van-address-item__edit">
+          <!----></i>
+      </div>
     </div>
+    <div class="van-address-list__disabled-text">以下地址超出配送范围</div>
+    <div class="van-cell van-cell--borderless van-address-item van-address-item--disabled">
+      <div class="van-cell__value van-cell__value--alone van-address-item__value">
+        <div class="van-address-item__name">王五 1320000000</div>
+        <div class="van-address-item__address">浙江省杭州市滨江区江南大道 15 号</div>
+      </div><i class="van-icon van-icon-edit van-address-item__edit">
+        <!----></i>
+    </div>
+    <div class="van-address-list__bottom"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round van-address-list__add"><span class="van-button__text">新增地址</span></button></div>
   </div>
 </div>
+</div>
 `;
diff --git a/src/address-list/test/__snapshots__/index.spec.js.snap b/src/address-list/test/__snapshots__/index.spec.js.snap
index e11f36c3a..867138aca 100644
--- a/src/address-list/test/__snapshots__/index.spec.js.snap
+++ b/src/address-list/test/__snapshots__/index.spec.js.snap
@@ -3,20 +3,21 @@
 exports[`unswitchable 1`] = `
 <div class="van-address-list">
   <div role="radiogroup" class="van-radio-group">
-    <div class="van-cell van-address-item">
+    <div class="van-cell van-cell--borderless van-address-item">
       <div class="van-cell__value van-cell__value--alone van-address-item__value">
-        <div class="van-address-item__name">张三，13000000000</div>
+        <div class="van-address-item__name">张三 13000000000</div>
         <div class="van-address-item__address">浙江省杭州市西湖区文三路 138 号东方通信大厦 7 楼 501 室</div>
       </div><i class="van-icon van-icon-edit van-address-item__edit">
         <!----></i>
     </div>
-    <div class="van-cell van-address-item">
+    <div class="van-cell van-cell--borderless van-address-item">
       <div class="van-cell__value van-cell__value--alone van-address-item__value">
-        <div class="van-address-item__name">李四，1310000000</div>
+        <div class="van-address-item__name">李四 1310000000</div>
         <div class="van-address-item__address">浙江省杭州市拱墅区莫干山路 50 号</div>
       </div><i class="van-icon van-icon-edit van-address-item__edit">
         <!----></i>
     </div>
-  </div><button class="van-button van-button--danger van-button--large van-button--square van-address-list__add"><span class="van-button__text">新增地址</span></button>
+  </div>
+  <div class="van-address-list__bottom"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round van-address-list__add"><span class="van-button__text">新增地址</span></button></div>
 </div>
 `;
diff --git a/src/style/var.less b/src/style/var.less
index 10e91b82b..4197e5a9d 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -77,17 +77,19 @@
 @address-edit-detail-finish-font-size: @font-size-sm;
 
 // AddressList
+@address-list-padding: 12px 7px 100px 17px;
 @address-list-disabled-text-color: @gray-dark;
-@address-list-disabled-text-font-size: @font-size-sm;
-@address-list-disabled-text-line-height: 30px;
+@address-list-disabled-text-padding: @padding-base * 5 0 @padding-md;
+@address-list-disabled-text-font-size: @font-size-md;
+@address-list-disabled-text-line-height: 20px;
 @address-list-add-button-z-index: 999;
-@address-list-item-padding: @padding-md;
-@address-list-item-text-color: @gray-darker;
-@address-list-item-disabled-text-color: @gray-dark;
-@address-list-item-font-size: @font-size-sm;
-@address-list-item-line-height: 16px;
+@address-list-item-padding: @padding-sm;
+@address-list-item-text-color: @text-color;
+@address-list-item-disabled-text-color: @gray;
+@address-list-item-font-size: 13px;
+@address-list-item-line-height: 18px;
 @address-list-item-radio-icon-color: @red;
-@address-list-edit-icon-size: 16px;
+@address-list-edit-icon-size: 18px;
 
 // Button
 @button-mini-height: 22px;

From a6490ed7f527527bd39c9fd944e777a4cd17c64e Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 17:05:14 +0800
Subject: [PATCH 07/18] docs: add desc of autofocus prop (#5111)

---
 src/field/README.md        | 1 +
 src/field/README.zh-CN.md  | 1 +
 src/search/README.md       | 1 +
 src/search/README.zh-CN.md | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/field/README.md b/src/field/README.md
index 88d198148..c9f694505 100644
--- a/src/field/README.md
+++ b/src/field/README.md
@@ -152,6 +152,7 @@ Textarea Field can be auto resize when has `autosize` prop
 | clearable | Whether to be clearable | *boolean* | `false` | - |
 | clickable | Whether to show click feedback when clicked | *boolean* | `false` | - |
 | is-link | Whether to show link icon | *boolean* | `false` | - |
+| autofocus | Whether to auto focus, unsupported in iOS | *boolean* | `false` | - |
 | show-word-limit | Whether to show word limit, need to set the `maxlength` prop | *boolean* | `false` | 2.2.8 |
 | error | Whether to show error info | *boolean* | `false` | - |
 | arrow-direction | Can be set to `left` `up` `down` | *string* | - | 2.0.4 |
diff --git a/src/field/README.zh-CN.md b/src/field/README.zh-CN.md
index e608206ce..54c81d89a 100644
--- a/src/field/README.zh-CN.md
+++ b/src/field/README.zh-CN.md
@@ -158,6 +158,7 @@ Vue.use(Field);
 | clearable | 是否启用清除控件 | *boolean* | `false` | - |
 | clickable | 是否开启点击反馈 | *boolean* | `false` | - |
 | is-link | 是否展示右侧箭头并开启点击反馈 | *boolean* | `false` | - |
+| autofocus | 是否自动聚焦，iOS 系统不支持该属性 | *boolean* | `false` | - |
 | show-word-limit | 是否显示字数统计，需要设置`maxlength`属性 | *boolean* | `false` | 2.2.8 |
 | error | 是否将输入内容标红 | *boolean* | `false` | - |
 | arrow-direction | 箭头方向，可选值为 `left` `up` `down` | *string* | - | 2.0.4 |
diff --git a/src/search/README.md b/src/search/README.md
index 4216b5066..924c1086a 100644
--- a/src/search/README.md
+++ b/src/search/README.md
@@ -70,6 +70,7 @@ Use `action` slot to custom right button, `cancel` event will no longer be trigg
 | maxlength | Max length of value | *string \| number* | - | - |
 | placeholder | Placeholder | *string* | - | - |
 | clearable | Whether to be clearable | *boolean* | `true` | - |
+| autofocus | Whether to auto focus, unsupported in iOS | *boolean* | `false` | - |
 | show-action | Whether to show right action button | *boolean* | `false` | - |
 | action-text | Text of action button | *boolean* | `Cancel` | 2.2.2 |
 | disabled | Whether to disable field | *boolean* | `false` | - |
diff --git a/src/search/README.zh-CN.md b/src/search/README.zh-CN.md
index 02f3c4f1e..6d84c66c1 100644
--- a/src/search/README.zh-CN.md
+++ b/src/search/README.zh-CN.md
@@ -65,6 +65,7 @@ Search 组件提供了`search`和`cancel`事件，`search`事件在点击键盘
 | maxlength | 输入的最大字符数 | *string \| number* | - | - |
 | placeholder | 占位提示文字 | *string* | - | - |
 | clearable | 是否启用清除控件 | *boolean* | `true` | - |
+| autofocus | 是否自动聚焦，iOS 系统不支持该属性 | *boolean* | `false` | - |
 | show-action | 是否在搜索框右侧显示取消按钮 | *boolean* | `false` | - |
 | action-text | 取消按钮文字 | *boolean* | `取消` | 2.2.2 |
 | disabled | 是否禁用输入框 | *boolean* | `false` | - |

From f525abbf11d33c6ebb18d648b5731caca1c9ac7c Mon Sep 17 00:00:00 2001
From: NoahSun <934937054@qq.com>
Date: Tue, 26 Nov 2019 17:55:16 +0800
Subject: [PATCH 08/18] fix(NumberKeyboard):  shouldn't trigger blur event when
 hidden (#5110)

---
 src/number-keyboard/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/number-keyboard/index.js b/src/number-keyboard/index.js
index 851280672..408d5fe69 100644
--- a/src/number-keyboard/index.js
+++ b/src/number-keyboard/index.js
@@ -105,7 +105,7 @@ export default createComponent({
 
   methods: {
     onBlur() {
-      this.$emit('blur');
+      this.show && this.$emit('blur');
     },
 
     onClose() {

From ab3ccbed8f60b66286ab43299b808d41d2ccaa03 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 17:55:45 +0800
Subject: [PATCH 09/18] feat(style): add background-color var (#5112)

---
 docs/markdown/theme.en-US.md | 2 +-
 docs/markdown/theme.zh-CN.md | 2 +-
 docs/site/mobile/App.vue     | 2 +-
 src/style/var.less           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/markdown/theme.en-US.md b/docs/markdown/theme.en-US.md
index dfeeae732..d1e7e72e0 100644
--- a/docs/markdown/theme.en-US.md
+++ b/docs/markdown/theme.en-US.md
@@ -15,7 +15,7 @@ There are some basic variables below, all available variables could be found in
 @text-color: #323233;
 @border-color: #ebedf0;
 @active-color: #f2f3f5;
-@background-color: #f8f8f8;
+@background-color: #f7f8fa;
 @background-color-light: #fafafa;
 ```
 
diff --git a/docs/markdown/theme.zh-CN.md b/docs/markdown/theme.zh-CN.md
index 0cf53fd5a..b9f96e1fd 100644
--- a/docs/markdown/theme.zh-CN.md
+++ b/docs/markdown/theme.zh-CN.md
@@ -19,7 +19,7 @@ Vant 使用了 [Less](http://lesscss.org/) 对样式进行预处理，并内置
 @text-color: #323233;
 @border-color: #ebedf0;
 @active-color: #f2f3f5;
-@background-color: #f8f8f8;
+@background-color: #f7f8fa;
 @background-color-light: #fafafa;
 ```
 
diff --git a/docs/site/mobile/App.vue b/docs/site/mobile/App.vue
index 3a0d2915b..2b360fa7a 100644
--- a/docs/site/mobile/App.vue
+++ b/docs/site/mobile/App.vue
@@ -70,7 +70,7 @@ body {
   color: @text-color;
   font-family: 'PingFang SC', Helvetica, 'STHeiti STXihei', 'Microsoft YaHei', Tohoma, Arial, sans-serif;
   line-height: 1;
-  background-color: #f8f8f8;
+  background-color: #f7f8fa;
   -webkit-font-smoothing: antialiased;
 }
 
diff --git a/src/style/var.less b/src/style/var.less
index 4197e5a9d..4a887851a 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -21,7 +21,7 @@
 @active-color: #f2f3f5;
 @active-opacity: .7;
 @disabled-opacity: .5;
-@background-color: #f8f8f8;
+@background-color: #f7f8fa;
 @background-color-light: #fafafa;
 
 // Padding

From e36561457bf8be5593b411e4849facd8fd6736be Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 17:59:26 +0800
Subject: [PATCH 10/18] fix(ActionSheet): reset button padding (#5113)

---
 src/action-sheet/index.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/action-sheet/index.less b/src/action-sheet/index.less
index a2d3637c2..6e54ae3aa 100644
--- a/src/action-sheet/index.less
+++ b/src/action-sheet/index.less
@@ -8,6 +8,7 @@
   &__cancel {
     display: block;
     width: 100%;
+    padding: 0;
     font-size: @action-sheet-item-font-size;
     line-height: @action-sheet-item-height;
     text-align: center;

From f59beb9787616ca2ce4de558c9dfbb129858dfcf Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 19:19:41 +0800
Subject: [PATCH 11/18] feat(Card): allow use bottom slot without price or num
 (#5116)

---
 src/card/index.tsx                             | 2 +-
 src/card/test/__snapshots__/index.spec.js.snap | 4 +---
 src/card/test/index.spec.js                    | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/card/index.tsx b/src/card/index.tsx
index c671dcfce..17e981e0d 100644
--- a/src/card/index.tsx
+++ b/src/card/index.tsx
@@ -51,7 +51,7 @@ function Card(
   const showNum = slots.num || isDef(props.num);
   const showPrice = slots.price || isDef(props.price);
   const showOriginPrice = slots['origin-price'] || isDef(props.originPrice);
-  const showBottom = showNum || showPrice || showOriginPrice;
+  const showBottom = showNum || showPrice || showOriginPrice || slots.bottom;
 
   function onThumbClick(event: MouseEvent) {
     emit(ctx, 'click-thumb', event);
diff --git a/src/card/test/__snapshots__/index.spec.js.snap b/src/card/test/__snapshots__/index.spec.js.snap
index 091a7af08..d4de2d22d 100644
--- a/src/card/test/__snapshots__/index.spec.js.snap
+++ b/src/card/test/__snapshots__/index.spec.js.snap
@@ -4,9 +4,7 @@ exports[`render bottom slot 1`] = `
 <div class="van-card">
   <div class="van-card__header">
     <div class="van-card__content">
-      <div class="van-card__bottom">
-        <div class="van-card__price">¥ 100</div>Custom Bottom
-      </div>
+      <div class="van-card__bottom">Custom Bottom</div>
     </div>
   </div>
 </div>
diff --git a/src/card/test/index.spec.js b/src/card/test/index.spec.js
index bbcea88cb..fcef9663e 100644
--- a/src/card/test/index.spec.js
+++ b/src/card/test/index.spec.js
@@ -65,9 +65,6 @@ test('render origin-price slot', () => {
 
 test('render bottom slot', () => {
   const wrapper = mount(Card, {
-    propsData: {
-      price: 100
-    },
     scopedSlots: {
       bottom: () => 'Custom Bottom'
     }

From b2c53396efbf5d2caa649b43c942f013b4ff21be Mon Sep 17 00:00:00 2001
From: iam2r <bestwishtous@gmail.com>
Date: Tue, 26 Nov 2019 20:24:55 +0800
Subject: [PATCH 12/18] fix(touch-emulator): incorrect function (#5118)

---
 packages/vant-touch-emulator/index.js | 33 ++++++++++++---------------
 1 file changed, 14 insertions(+), 19 deletions(-)

diff --git a/packages/vant-touch-emulator/index.js b/packages/vant-touch-emulator/index.js
index e35532983..b1f754978 100644
--- a/packages/vant-touch-emulator/index.js
+++ b/packages/vant-touch-emulator/index.js
@@ -78,36 +78,33 @@ function TouchList() {
   return touchList;
 }
 
-/**
- * Simple trick to fake touch event support
- * this is enough for most libraries like Modernizr and Hammer
- */
-function fakeTouchSupport() {
-  var objs = [window, document.documentElement];
-  var props = ['ontouchstart', 'ontouchmove', 'ontouchcancel', 'ontouchend'];
 
-  for (var o = 0; o < objs.length; o++) {
-    for (var p = 0; p < props.length; p++) {
-      if (objs[o] && objs[o][props[p]] === undefined) {
-        objs[o][props[p]] = null;
-      }
-    }
-  }
-}
 
 /**
  * only trigger touches when the left mousebutton has been pressed
  * @param touchType
  * @returns {Function}
  */
+
+ 
+var initiated = false;
 function onMouse(touchType) {
   return function(ev) {
     // prevent mouse events
 
-    if (ev.which !== 1) {
-      return;
+    if (ev.type === 'mousedown') {
+      initiated = true;
     }
 
+    if (ev.type === 'mouseup') {
+      initiated = false;
+    }
+
+    if (ev.type === 'mousemove' && !initiated) {
+      return
+    }
+
+
     // The EventTarget on which the touch point started when it was first placed on the surface,
     // even if the touch point has since moved outside the interactive area of that element.
     // also, when the target doesnt exist anymore, we update it
@@ -173,8 +170,6 @@ function getActiveTouches(mouseEv) {
  * TouchEmulator initializer
  */
 function TouchEmulator() {
-  fakeTouchSupport();
-
   window.addEventListener('mousedown', onMouse('touchstart'), true);
   window.addEventListener('mousemove', onMouse('touchmove'), true);
   window.addEventListener('mouseup', onMouse('touchend'), true);

From fe0e930ed07370d330629984fcfc269e34f4abf7 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 20:26:07 +0800
Subject: [PATCH 13/18] feat: add color paletee of neutral color (#5119)

---
 docs/site/mobile/App.vue    |   2 +-
 src/address-list/index.less |   2 +-
 src/coupon/index.less       |   2 +-
 src/icon/demo/index.vue     |   2 +-
 src/image/demo/index.vue    |   2 +-
 src/list/demo/index.vue     |   4 +-
 src/sidebar/demo/index.vue  |   2 +-
 src/sku/index.less          |  10 +--
 src/style/var.less          | 150 ++++++++++++++++++------------------
 src/switch/index.tsx        |   4 +-
 src/utils/constant.ts       |   2 -
 11 files changed, 92 insertions(+), 90 deletions(-)

diff --git a/docs/site/mobile/App.vue b/docs/site/mobile/App.vue
index 2b360fa7a..33a0fc5d6 100644
--- a/docs/site/mobile/App.vue
+++ b/docs/site/mobile/App.vue
@@ -89,7 +89,7 @@ body {
   }
 
   .van-icon {
-    color: @gray-dark;
+    color: @gray-6;
     font-size: 24px;
     cursor: pointer;
   }
diff --git a/src/address-list/index.less b/src/address-list/index.less
index 7531910d5..1b839f909 100644
--- a/src/address-list/index.less
+++ b/src/address-list/index.less
@@ -74,7 +74,7 @@
     position: absolute;
     top: 50%;
     right: @padding-md;
-    color: @gray-dark;
+    color: @gray-6;
     font-size: @address-list-edit-icon-size;
     transform: translate(0, -50%);
   }
diff --git a/src/coupon/index.less b/src/coupon/index.less
index 620a748a3..63441440b 100644
--- a/src/coupon/index.less
+++ b/src/coupon/index.less
@@ -33,7 +33,7 @@
   }
 
   p {
-    color: @gray-dark;
+    color: @gray-6;
     font-size: @font-size-sm;
     line-height: 16px;
   }
diff --git a/src/icon/demo/index.vue b/src/icon/demo/index.vue
index 33ff94594..846d1d9c4 100644
--- a/src/icon/demo/index.vue
+++ b/src/icon/demo/index.vue
@@ -123,7 +123,7 @@ export default {
     span {
       display: block;
       padding: 0 5px;
-      color: @gray-darker;
+      color: @gray-7;
       font-size: 12px;
       line-height: 18px;
     }
diff --git a/src/image/demo/index.vue b/src/image/demo/index.vue
index 91e69828f..5a9fccef4 100644
--- a/src/image/demo/index.vue
+++ b/src/image/demo/index.vue
@@ -149,7 +149,7 @@ export default {
 
   .text {
     margin-top: 5px;
-    color: @gray-darker;
+    color: @gray-7;
     font-size: 14px;
     text-align: center;
   }
diff --git a/src/list/demo/index.vue b/src/list/demo/index.vue
index a7fd5482f..c21d77acd 100644
--- a/src/list/demo/index.vue
+++ b/src/list/demo/index.vue
@@ -130,7 +130,7 @@ export default {
   .page-desc {
     margin: 0;
     padding: 5px 0;
-    color: @gray-darker;
+    color: @gray-7;
     font-size: 14px;
     text-align: center;
 
@@ -144,7 +144,7 @@ export default {
   }
 
   .van-checkbox__label {
-    color: @gray-darker;
+    color: @gray-7;
   }
 }
 </style>
diff --git a/src/sidebar/demo/index.vue b/src/sidebar/demo/index.vue
index b0f3ece59..e69e78ed6 100644
--- a/src/sidebar/demo/index.vue
+++ b/src/sidebar/demo/index.vue
@@ -67,7 +67,7 @@ export default {
 
   &-title {
     margin-bottom: 16px;
-    color: @gray-dark;
+    color: @gray-6;
     font-weight: normal;
     font-size: 14px;
   }
diff --git a/src/sku/index.less b/src/sku/index.less
index 181838505..3ea21726d 100644
--- a/src/sku/index.less
+++ b/src/sku/index.less
@@ -62,7 +62,7 @@
 
   &-header-item {
     margin-top: @padding-xs;
-    color: @gray-dark;
+    color: @gray-6;
     font-size: @font-size-sm;
     line-height: 16px;
   }
@@ -178,7 +178,7 @@
       }
 
       &--disabled {
-        color: @gray;
+        color: @gray-5;
         background: @active-color;
 
         .van-sku-row__item-img {
@@ -213,7 +213,7 @@
   &__stock {
     display: inline-block;
     margin-right: @padding-xs;
-    color: @gray-dark;
+    color: @gray-6;
     font-size: @font-size-sm;
 
     &-num--highlight {
@@ -334,11 +334,11 @@
       }
 
       &--warning {
-        background: linear-gradient(to right, #ffd01e, #ff8917);
+        background: @gradient-orange;
       }
 
       &--danger {
-        background: linear-gradient(to right, #ff6034, #ee0a24);
+        background: @gradient-red;
       }
     }
   }
diff --git a/src/style/var.less b/src/style/var.less
index 4a887851a..b339968d1 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -1,27 +1,31 @@
-// Basic Colors
+// Color Palette
 @black: #000;
 @white: #fff;
+@gray-1: #f7f8fa;
+@gray-2: #f2f3f5;
+@gray-3: #ebedf0;
+@gray-4: #dcdee0;
+@gray-5: #c8c9cc;
+@gray-6: #969799;
+@gray-7: #646566;
+@gray-8: #323233;
 @red: #ee0a24;
 @blue: #1989fa;
 @orange: #ff976a;
 @orange-dark: #ed6a0c;
 @orange-light: #fffbe8;
 @green: #07c160;
-@gray: #c8c9cc;
-@gray-light: #e5e5e5;
-@gray-darker: #7d7e80;
-@gray-dark: #969799;
 
 // Gradient Colors
 @gradient-red: linear-gradient(to right, #ff6034, #ee0a24);
 @gradient-orange: linear-gradient(to right, #ffd01e, #ff8917);
 
 // Component Colors
-@text-color: #323233;
-@active-color: #f2f3f5;
+@text-color: @gray-8;
+@active-color: @gray-2;
 @active-opacity: .7;
 @disabled-opacity: .5;
-@background-color: #f7f8fa;
+@background-color: @gray-1;
 @background-color-light: #fafafa;
 
 // Padding
@@ -44,7 +48,7 @@
 @animation-duration-fast: .2s;
 
 // Border
-@border-color: #ebedf0;
+@border-color: @gray-3;
 @border-width-base: 1px;
 @border-radius-sm: 2px;
 @border-radius-md: 4px;
@@ -54,18 +58,18 @@
 @action-sheet-max-height: 90%;
 @action-sheet-header-height: 44px;
 @action-sheet-header-font-size: @font-size-lg;
-@action-sheet-description-color: @gray-darker;
+@action-sheet-description-color: @gray-7;
 @action-sheet-description-font-size: @font-size-md;
 @action-sheet-description-line-height: 20px;
 @action-sheet-item-height: 50px;
 @action-sheet-item-background: @white;
 @action-sheet-item-font-size: @font-size-lg;
 @action-sheet-item-text-color: @text-color;
-@action-sheet-item-disabled-text-color: @gray;
-@action-sheet-subname-color: @gray-darker;
+@action-sheet-item-disabled-text-color: @gray-5;
+@action-sheet-subname-color: @gray-7;
 @action-sheet-subname-font-size: @font-size-sm;
 @action-sheet-close-icon-size: 18px;
-@action-sheet-close-icon-color: @gray-dark;
+@action-sheet-close-icon-color: @gray-6;
 @action-sheet-close-icon-padding: 0 @padding-sm;
 @action-sheet-cancel-padding-top: @padding-xs;
 @action-sheet-cancel-padding-color: @background-color;
@@ -78,14 +82,14 @@
 
 // AddressList
 @address-list-padding: 12px 7px 100px 17px;
-@address-list-disabled-text-color: @gray-dark;
+@address-list-disabled-text-color: @gray-6;
 @address-list-disabled-text-padding: @padding-base * 5 0 @padding-md;
 @address-list-disabled-text-font-size: @font-size-md;
 @address-list-disabled-text-line-height: 20px;
 @address-list-add-button-z-index: 999;
 @address-list-item-padding: @padding-sm;
 @address-list-item-text-color: @text-color;
-@address-list-item-disabled-text-color: @gray;
+@address-list-item-disabled-text-color: @gray-5;
 @address-list-item-font-size: 13px;
 @address-list-item-line-height: 18px;
 @address-list-item-radio-icon-color: @red;
@@ -134,10 +138,10 @@
 @card-background-color: @background-color-light;
 @card-thumb-size: 90px;
 @card-title-line-height: 16px;
-@card-desc-color: @gray-darker;
+@card-desc-color: @gray-7;
 @card-desc-line-height: 20px;
 @card-price-color: @red;
-@card-origin-price-color: @gray-darker;
+@card-origin-price-color: @gray-7;
 @card-origin-price-font-size: @font-size-xs;
 
 // Cell
@@ -150,33 +154,33 @@
 @cell-border-color: @border-color;
 @cell-active-color: @active-color;
 @cell-required-color: @red;
-@cell-label-color: @gray-dark;
+@cell-label-color: @gray-6;
 @cell-label-font-size: @font-size-sm;
 @cell-label-line-height: 18px;
 @cell-label-margin-top: 3px;
-@cell-value-color: @gray-dark;
+@cell-value-color: @gray-6;
 @cell-icon-size: 16px;
-@cell-right-icon-color: @gray-dark;
+@cell-right-icon-color: @gray-6;
 @cell-large-vertical-padding: @padding-sm;
 @cell-large-title-font-size: @font-size-lg;
 @cell-large-label-font-size: @font-size-md;
 
 // CellGroup
 @cell-group-background-color: @white;
-@cell-group-title-color: @gray-dark;
+@cell-group-title-color: @gray-6;
 @cell-group-title-padding: @padding-md @padding-md @padding-xs;
 @cell-group-title-font-size: @font-size-md;
 @cell-group-title-line-height: 16px;
 
 // Checkbox
 @checkbox-size: 20px;
-@checkbox-border-color: @gray-light;
+@checkbox-border-color: @gray-5;
 @checkbox-transition-duration: @animation-duration-fast;
 @checkbox-label-margin: @padding-xs;
 @checkbox-label-color: @text-color;
 @checkbox-checked-icon-color: @blue;
-@checkbox-disabled-icon-color: @gray;
-@checkbox-disabled-label-color: @gray;
+@checkbox-disabled-icon-color: @gray-5;
+@checkbox-disabled-label-color: @gray-5;
 @checkbox-disabled-background-color: @border-color;
 
 // Circle
@@ -190,9 +194,9 @@
 @collapse-item-content-padding: @padding-md;
 @collapse-item-content-font-size: 13px;
 @collapse-item-content-line-height: 1.5;
-@collapse-item-content-text-color: @gray-dark;
+@collapse-item-content-text-color: @gray-6;
 @collapse-item-content-background-color: @white;
-@collapse-item-title-disabled-color: @gray;
+@collapse-item-title-disabled-color: @gray-5;
 
 // ContactCard
 @contact-card-padding: @padding-md;
@@ -231,7 +235,7 @@
 @coupon-amount-font-size: 24px;
 @coupon-currency-font-size: 50%;
 @coupon-name-font-size: @font-size-lg;
-@coupon-disabled-text-color: @gray-dark;
+@coupon-disabled-text-color: @gray-6;
 @coupon-description-padding: @padding-xs @padding-md;
 @coupon-description-background-color: @background-color-light;
 @coupon-description-border-color: @border-color;
@@ -244,7 +248,7 @@
 @coupon-list-field-padding: @padding-xs @padding-md;
 @coupon-list-exchange-button-height: 32px;
 @coupon-list-empty-image-size: 200px;
-@coupon-list-empty-tip-color: @gray-dark;
+@coupon-list-empty-tip-color: @gray-6;
 @coupon-list-empty-tip-font-size: @font-size-md;
 @coupon-list-empty-tip-line-height: 20px;
 
@@ -263,13 +267,13 @@
 @dialog-message-font-size: @font-size-md;
 @dialog-message-line-height: 20px;
 @dialog-message-max-height: 60vh;
-@dialog-has-title-message-text-color: @gray-darker;
+@dialog-has-title-message-text-color: @gray-7;
 @dialog-has-title-message-padding-top: @padding-sm;
 @dialog-confirm-button-text-color: @blue;
 
 // Divider
 @divider-margin: @padding-md 0;
-@divider-text-color: @gray-dark;
+@divider-text-color: @gray-6;
 @divider-font-size: @font-size-md;
 @divider-line-height: 24px;
 @divider-border-color: @border-color;
@@ -283,7 +287,7 @@
 @dropdown-menu-title-font-size: 15px;
 @dropdown-menu-title-text-color: @text-color;
 @dropdown-menu-title-active-text-color: @blue;
-@dropdown-menu-title-disabled-text-color: @gray-dark;
+@dropdown-menu-title-disabled-text-color: @gray-6;
 @dropdown-menu-title-padding: 0 @padding-xs;
 @dropdown-menu-title-line-height: 18px;
 @dropdown-menu-option-active-color: @blue;
@@ -293,16 +297,16 @@
 @field-label-width: 90px;
 @field-input-text-color: @text-color;
 @field-input-error-text-color: @red;
-@field-input-disabled-text-color: @gray-dark;
-@field-placeholder-text-color: @gray-dark;
+@field-input-disabled-text-color: @gray-6;
+@field-placeholder-text-color: @gray-6;
 @field-icon-size: 16px;
 @field-clear-icon-size: 16px;
-@field-clear-icon-color: @gray;
-@field-right-icon-color: @gray-dark;
+@field-clear-icon-color: @gray-5;
+@field-right-icon-color: @gray-6;
 @field-error-message-color: @red;
 @field-error-message-text-color: 12px;
 @field-text-area-min-height: 60px;
-@field-word-limit-color: @gray-darker;
+@field-word-limit-color: @gray-7;
 @field-word-limit-font-size: @font-size-sm;
 @field-word-limit-line-height: 16px;
 
@@ -311,7 +315,7 @@
 @grid-item-content-background-color: @white;
 @grid-item-content-active-color: @active-color;
 @grid-item-icon-size: 28px;
-@grid-item-text-color: @gray-darker;
+@grid-item-text-color: @gray-7;
 @grid-item-text-font-size: @font-size-sm;
 
 // GoodsAction
@@ -322,7 +326,7 @@
 @goods-action-icon-size: 18px;
 @goods-action-icon-font-size: @font-size-xs;
 @goods-action-icon-active-color: @active-color;
-@goods-action-icon-text-color: @gray-darker;
+@goods-action-icon-text-color: @gray-7;
 @goods-action-button-height: 40px;
 @goods-action-button-warning-color: @gradient-orange;
 @goods-action-button-danger-color: @gradient-red;
@@ -353,7 +357,7 @@
 @info-font-family: PingFang SC, Helvetica Neue, Arial, sans-serif;
 
 // Image
-@image-placeholder-text-color: @gray-dark;
+@image-placeholder-text-color: @gray-6;
 @image-placeholder-font-size: @font-size-md;
 @image-placeholder-background-color: @background-color;
 
@@ -364,14 +368,14 @@
 
 // List
 @list-icon-margin-right: 5px;
-@list-text-color: @gray-dark;
+@list-text-color: @gray-6;
 @list-text-font-size: @font-size-md;
 @list-text-line-height: 50px;
 
 // Loading
-@loading-text-color: @gray-dark;
+@loading-text-color: @gray-6;
 @loading-text-font-size: @font-size-md;
-@loading-spinner-color: @gray;
+@loading-spinner-color: @gray-5;
 @loading-spinner-size: 30px;
 @loading-spinner-animation-duration: .8s;
 
@@ -407,11 +411,11 @@
 // NumberKeyboard
 @number-keyboard-background-color: @white;
 @number-keyboard-key-height: 54px;
-@number-keyboard-key-background: #ebedf0;
+@number-keyboard-key-background: @gray-3;
 @number-keyboard-key-font-size: 24px;
 @number-keyboard-key-active-color: @active-color;
 @number-keyboard-delete-font-size: @font-size-lg;
-@number-keyboard-title-color: @gray-darker;
+@number-keyboard-title-color: @gray-7;
 @number-keyboard-title-height: 30px;
 @number-keyboard-title-font-size: @font-size-md;
 @number-keyboard-close-padding: 0 @padding-md;
@@ -432,10 +436,10 @@
 @pagination-font-size: @font-size-md;
 @pagination-item-width: 36px;
 @pagination-item-default-color: @blue;
-@pagination-item-disabled-color: @gray-darker;
+@pagination-item-disabled-color: @gray-7;
 @pagination-item-disabled-background-color: @background-color;
 @pagination-background-color: @white;
-@pagination-desc-color: @gray-darker;
+@pagination-desc-color: @gray-7;
 @pagination-disabled-opacity: @disabled-opacity;
 
 // Panel
@@ -449,7 +453,7 @@
 @password-input-font-size: 20px;
 @password-input-border-radius: 6px;
 @password-input-background-color: @white;
-@password-input-info-color: @gray-dark;
+@password-input-info-color: @gray-6;
 @password-input-info-font-size: @font-size-md;
 @password-input-error-info-color: @red;
 @password-input-dot-size: 10px;
@@ -474,14 +478,14 @@
 @popup-transition: transform @animation-duration-base ease-out;
 @popup-round-border-radius: 20px;
 @popup-close-icon-size: 18px;
-@popup-close-icon-color: @gray-dark;
+@popup-close-icon-color: @gray-6;
 @popup-close-icon-margin: 16px;
 @popup-close-icon-z-index: 1;
 
 // Progress
 @progress-height: 4px;
 @progress-color: @blue;
-@progress-background-color: @gray-light;
+@progress-background-color: @gray-3;
 @progress-pivot-padding: 0 5px;
 @progress-pivot-text-color: @white;
 @progress-pivot-font-size: @font-size-xs;
@@ -491,17 +495,17 @@
 // PullRefresh
 @pull-refresh-head-height: 50px;
 @pull-refresh-head-font-size: @font-size-md;
-@pull-refresh-head-text-color: @gray-dark;
+@pull-refresh-head-text-color: @gray-6;
 
 // Radio
 @radio-size: 20px;
-@radio-border-color: @gray-light;
+@radio-border-color: @gray-5;
 @radio-transition-duration: @animation-duration-fast;
 @radio-label-margin: @padding-xs;
 @radio-label-color: @text-color;
 @radio-checked-icon-color: @blue;
-@radio-disabled-icon-color: @gray;
-@radio-disabled-label-color: @gray;
+@radio-disabled-icon-color: @gray-5;
+@radio-disabled-label-color: @gray-5;
 @radio-disabled-background-color: @border-color;
 
 // Rate
@@ -515,7 +519,7 @@
 @search-label-padding: 0 5px;
 @search-label-color: @text-color;
 @search-label-font-size: @font-size-md;
-@search-left-icon-color: @gray-dark;
+@search-left-icon-color: @gray-6;
 @search-action-padding: 0 @padding-xs;
 @search-action-text-color: @text-color;
 @search-action-font-size: @font-size-md;
@@ -527,7 +531,7 @@
 @sidebar-font-size: @font-size-md;
 @sidebar-line-height: 20px;
 @sidebar-text-color: @text-color;
-@sidebar-disabled-text-color: @gray;
+@sidebar-disabled-text-color: @gray-5;
 @sidebar-padding: 20px @padding-sm 20px @padding-xs;
 @sidebar-active-color: @active-color;
 @sidebar-background-color: @background-color-light;
@@ -545,7 +549,7 @@
 
 // Slider
 @slider-active-background-color: @blue;
-@slider-inactive-background-color: @gray-light;
+@slider-inactive-background-color: @gray-3;
 @slider-disabled-opacity: @disabled-opacity;
 @slider-button-width: 24px;
 @slider-button-height: 24px;
@@ -554,7 +558,7 @@
 @slider-button-box-shadow: 0 1px 2px rgba(0, 0, 0, .5);
 
 // Step
-@step-text-color: @gray-dark;
+@step-text-color: @gray-6;
 @step-process-text-color: @text-color;
 @step-font-size: @font-size-md;
 @step-line-color: @border-color;
@@ -562,7 +566,7 @@
 @step-finish-text-color: @text-color;
 @step-icon-size: 12px;
 @step-circle-size: 5px;
-@step-circle-color: @gray-dark;
+@step-circle-color: @gray-6;
 @step-horizontal-title-font-size: @font-size-sm;
 
 // Steps
@@ -575,13 +579,13 @@
 @stepper-active-color: #e8e8e8;
 @stepper-background-color: @active-color;
 @stepper-button-icon-color: @text-color;
-@stepper-button-disabled-color: #f7f8fa;
-@stepper-button-disabled-icon-color: @gray;
+@stepper-button-disabled-color: @background-color;
+@stepper-button-disabled-icon-color: @gray-5;
 @stepper-input-width: 32px;
 @stepper-input-height: 28px;
 @stepper-input-font-size: @font-size-md;
 @stepper-input-text-color: @text-color;
-@stepper-input-disabled-text-color: @gray;
+@stepper-input-disabled-text-color: @gray-5;
 @stepper-input-disabled-background-color: @active-color;
 @stepper-border-radius: @border-radius-md;
 
@@ -636,16 +640,16 @@
 
 // TabbarItem
 @tabbar-item-font-size: @font-size-sm;
-@tabbar-item-text-color: @gray-darker;
+@tabbar-item-text-color: @gray-7;
 @tabbar-item-active-color: @blue;
 @tabbar-item-line-height: 1;
 @tabbar-item-icon-size: 18px;
 @tabbar-item-margin-bottom: 5px;
 
 // Tab
-@tab-text-color: @gray-darker;
+@tab-text-color: @gray-7;
 @tab-active-text-color: @text-color;
-@tab-disabled-text-color: @gray;
+@tab-disabled-text-color: @gray-5;
 @tab-font-size: @font-size-md;
 
 // Tabs
@@ -668,7 +672,7 @@
 @tag-primary-color: @blue;
 @tag-success-color: @green;
 @tag-warning-color: @orange;
-@tag-default-color: @gray-dark;
+@tag-default-color: @gray-6;
 @tag-plain-background-color: @white;
 
 // Toast
@@ -695,29 +699,29 @@
 @tree-select-nav-item-padding: @padding-sm @padding-xs @padding-sm @padding-sm;
 @tree-select-item-height: 44px;
 @tree-select-item-active-color: @red;
-@tree-select-item-disabled-color: @gray;
+@tree-select-item-disabled-color: @gray-5;
 
 // Uploader
 @uploader-size: 80px;
 @uploader-icon-size: 24px;
-@uploader-icon-color: @gray-dark;
-@uploader-text-color: @gray-dark;
+@uploader-icon-color: @gray-6;
+@uploader-text-color: @gray-6;
 @uploader-text-font-size: @font-size-sm;
-@uploader-upload-border-color: @gray-light;
+@uploader-upload-border-color: @gray-3;
 @uploader-upload-border-radius: 4px;
 @uploader-upload-background-color: @white;
-@uploader-delete-color: @gray-dark;
+@uploader-delete-color: @gray-6;
 @uploader-delete-icon-size: 18px;
 @uploader-delete-background-color: @white;
 @uploader-file-background-color: @background-color;
 @uploader-file-icon-size: 20px;
-@uploader-file-icon-color: @gray-darker;
+@uploader-file-icon-color: @gray-7;
 @uploader-file-name-padding: 0 @padding-base;
 @uploader-file-name-margin-top: @padding-xs;
 @uploader-file-name-font-size: @font-size-sm;
-@uploader-file-name-text-color: @gray-darker;
+@uploader-file-name-text-color: @gray-7;
 
 // Sku
-@sku-item-background-color: #f7f8fa;
+@sku-item-background-color: @background-color;
 @sku-icon-gray-color: #dcdde0;
 @sku-upload-mask-color: rgba(50, 50, 51, .8);
diff --git a/src/switch/index.tsx b/src/switch/index.tsx
index 66c163b92..ac1ddc894 100644
--- a/src/switch/index.tsx
+++ b/src/switch/index.tsx
@@ -1,5 +1,5 @@
 import { createNamespace, addUnit } from '../utils';
-import { BLUE, GRAY_DARK } from '../utils/constant';
+import { BLUE } from '../utils/constant';
 import { switchProps, SharedSwitchProps } from './shared';
 import { emit, inherit } from '../utils/functional';
 import Loading from '../loading';
@@ -38,7 +38,7 @@ function Switch(
     backgroundColor: checked ? activeColor : inactiveColor
   };
 
-  const loadingColor = checked ? activeColor || BLUE : inactiveColor || GRAY_DARK;
+  const loadingColor = checked ? activeColor || BLUE : inactiveColor || '';
 
   function onClick(event: PointerEvent) {
     emit(ctx, 'click', event);
diff --git a/src/utils/constant.ts b/src/utils/constant.ts
index 43bf62eb9..165806dd4 100644
--- a/src/utils/constant.ts
+++ b/src/utils/constant.ts
@@ -3,8 +3,6 @@ export const RED = '#ee0a24';
 export const BLUE = '#1989fa';
 export const GREEN = '#07c160';
 export const WHITE = '#fff';
-export const GRAY = '#c9c9c9';
-export const GRAY_DARK = '#969799';
 
 // border
 export const BORDER = 'van-hairline';

From a08d7357f31b633dd1f2eeeb63becc5292dcb5a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 20:29:45 +0800
Subject: [PATCH 14/18] chore(touch-emulator): release 1.2.0

---
 packages/vant-touch-emulator/index.js     | 1 -
 packages/vant-touch-emulator/package.json | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/vant-touch-emulator/index.js b/packages/vant-touch-emulator/index.js
index b1f754978..92674603c 100644
--- a/packages/vant-touch-emulator/index.js
+++ b/packages/vant-touch-emulator/index.js
@@ -104,7 +104,6 @@ function onMouse(touchType) {
       return
     }
 
-
     // The EventTarget on which the touch point started when it was first placed on the surface,
     // even if the touch point has since moved outside the interactive area of that element.
     // also, when the target doesnt exist anymore, we update it
diff --git a/packages/vant-touch-emulator/package.json b/packages/vant-touch-emulator/package.json
index cd89a4e20..5a0e56734 100644
--- a/packages/vant-touch-emulator/package.json
+++ b/packages/vant-touch-emulator/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vant/touch-emulator",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "description": "Vant touch emulator",
   "main": "index.js",
   "publishConfig": {

From 68fef3d72a1f2a7d6a2f2103ba0047667d7b7b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 20:39:31 +0800
Subject: [PATCH 15/18] docs(touch-emulator): add changelog

---
 packages/vant-touch-emulator/changelog.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 packages/vant-touch-emulator/changelog.md

diff --git a/packages/vant-touch-emulator/changelog.md b/packages/vant-touch-emulator/changelog.md
new file mode 100644
index 000000000..6434ef05a
--- /dev/null
+++ b/packages/vant-touch-emulator/changelog.md
@@ -0,0 +1,16 @@
+# Changelog
+
+### [v1.2.0]
+`2019-11-22`
+
+- fix incorrect touchmove behaviour in Firefox [\#5118](https://github.com/youzan/vant/pull/5118)
+
+### [v1.1.0]
+`2019-06-03`
+
+- skip emulator when browser support touch event
+
+### [v1.0.0]
+`2019-05-28`
+
+- initial release

From c58f8e54baa64769bd7ce881e2bd803dd512391a Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 26 Nov 2019 20:44:15 +0800
Subject: [PATCH 16/18] feat(AddressEdit): refactor style (#5117)

---
 src/address-edit/Detail.js                    |  26 +-
 src/address-edit/index.js                     | 114 +++---
 src/address-edit/index.less                   |  21 ++
 .../test/__snapshots__/demo.spec.js.snap      |  63 ++--
 .../test/__snapshots__/index.spec.js.snap     | 350 ++++++++++--------
 src/style/var.less                            |   3 +-
 6 files changed, 329 insertions(+), 248 deletions(-)

diff --git a/src/address-edit/Detail.js b/src/address-edit/Detail.js
index 8d8485682..f2c10d4ba 100644
--- a/src/address-edit/Detail.js
+++ b/src/address-edit/Detail.js
@@ -17,6 +17,12 @@ export default createComponent({
     showSearchResult: Boolean
   },
 
+  computed: {
+    shouldShowSearchResult() {
+      return this.focused && this.searchResult && this.showSearchResult;
+    }
+  },
+
   methods: {
     onSelect(express) {
       this.$emit('select-search', express);
@@ -42,19 +48,30 @@ export default createComponent({
     },
 
     genSearchResult() {
-      const { searchResult } = this;
-      const show = this.focused && searchResult && this.showSearchResult;
-      if (show) {
+      const { value, shouldShowSearchResult, searchResult } = this;
+      if (shouldShowSearchResult) {
         return searchResult.map(express => (
           <Cell
             key={express.name + express.address}
-            title={express.name}
+            class={bem('search-item')}
             label={express.address}
+            border={false}
             icon="location-o"
             clickable
             onClick={() => {
               this.onSelect(express);
             }}
+            scopedSlots={{
+              title: () =>
+                express.name && (
+                  <div
+                    domPropsInnerHTML={express.name.replace(
+                      value,
+                      `<span class=${bem('keyword')}>${value}</span>`
+                    )}
+                  />
+                )
+            }}
           />
         ));
       }
@@ -72,6 +89,7 @@ export default createComponent({
           type="textarea"
           value={this.value}
           error={this.error}
+          border={!this.shouldShowSearchResult}
           label={t('label')}
           maxlength={this.detailMaxlength}
           placeholder={t('placeholder')}
diff --git a/src/address-edit/index.js b/src/address-edit/index.js
index 55d35a196..2d85422fc 100644
--- a/src/address-edit/index.js
+++ b/src/address-edit/index.js
@@ -251,64 +251,68 @@ export default createComponent({
 
     return (
       <div class={bem()}>
-        <Field
-          vModel={data.name}
-          clearable
-          label={t('name')}
-          placeholder={t('namePlaceholder')}
-          error={errorInfo.name}
-          onFocus={onFocus('name')}
-        />
-        <Field
-          vModel={data.tel}
-          clearable
-          type="tel"
-          label={t('tel')}
-          placeholder={t('telPlaceholder')}
-          error={errorInfo.tel}
-          onFocus={onFocus('tel')}
-        />
-        <Field
-          vShow={this.showArea}
-          readonly
-          label={t('area')}
-          placeholder={t('areaPlaceholder')}
-          value={this.areaText}
-          onClick={() => {
-            this.showAreaPopup = true;
-          }}
-        />
-        <Detail
-          vShow={this.showDetail}
-          focused={this.detailFocused}
-          value={data.addressDetail}
-          error={errorInfo.addressDetail}
-          detailRows={this.detailRows}
-          detailMaxlength={this.detailMaxlength}
-          searchResult={this.searchResult}
-          showSearchResult={this.showSearchResult}
-          onFocus={onFocus('addressDetail')}
-          onBlur={this.onDetailBlur}
-          onInput={this.onChangeDetail}
-          onSelect-search={event => {
-            this.$emit('select-search', event);
-          }}
-        />
-        {this.showPostal && (
+        <div class={bem('fields')}>
           <Field
-            vShow={!hideBottomFields}
-            vModel={data.postalCode}
-            type="tel"
-            maxlength="6"
-            label={t('postal')}
-            placeholder={t('postal')}
-            error={errorInfo.postalCode}
-            onFocus={onFocus('postalCode')}
+            vModel={data.name}
+            clearable
+            label={t('name')}
+            placeholder={t('namePlaceholder')}
+            error={errorInfo.name}
+            onFocus={onFocus('name')}
           />
-        )}
-        {this.slots()}
+          <Field
+            vModel={data.tel}
+            clearable
+            type="tel"
+            label={t('tel')}
+            placeholder={t('telPlaceholder')}
+            error={errorInfo.tel}
+            onFocus={onFocus('tel')}
+          />
+          <Field
+            vShow={this.showArea}
+            readonly
+            label={t('area')}
+            placeholder={t('areaPlaceholder')}
+            rightIcon="arrow"
+            value={this.areaText}
+            onClick={() => {
+              this.showAreaPopup = true;
+            }}
+          />
+          <Detail
+            vShow={this.showDetail}
+            focused={this.detailFocused}
+            value={data.addressDetail}
+            error={errorInfo.addressDetail}
+            detailRows={this.detailRows}
+            detailMaxlength={this.detailMaxlength}
+            searchResult={this.searchResult}
+            showSearchResult={this.showSearchResult}
+            onFocus={onFocus('addressDetail')}
+            onBlur={this.onDetailBlur}
+            onInput={this.onChangeDetail}
+            onSelect-search={event => {
+              this.$emit('select-search', event);
+            }}
+          />
+          {this.showPostal && (
+            <Field
+              vShow={!hideBottomFields}
+              vModel={data.postalCode}
+              type="tel"
+              maxlength="6"
+              label={t('postal')}
+              placeholder={t('postal')}
+              error={errorInfo.postalCode}
+              onFocus={onFocus('postalCode')}
+            />
+          )}
+          {this.slots()}
+        </div>
         {this.showSetDefault && (
           <SwitchCell
+            class={bem('default')}
             vModel={data.isDefault}
             vShow={!hideBottomFields}
             title={t('defaultAddress')}
@@ -320,6 +324,7 @@ export default createComponent({
         <div vShow={!hideBottomFields} class={bem('buttons')}>
           <Button
             block
+            round
             loading={this.isSaving}
             type="danger"
             text={this.saveButtonText || t('save')}
@@ -328,6 +333,7 @@ export default createComponent({
           {this.showDelete && (
             <Button
               block
+              round
               loading={this.isDeleting}
               text={this.deleteButtonText || t('delete')}
               onClick={this.onDelete}
diff --git a/src/address-edit/index.less b/src/address-edit/index.less
index 736d48232..feca9d61f 100644
--- a/src/address-edit/index.less
+++ b/src/address-edit/index.less
@@ -1,6 +1,19 @@
 @import '../style/var';
 
 .van-address-edit {
+  padding: @address-edit-padding;
+
+  &__fields {
+    overflow: hidden;
+    border-radius: @padding-xs;
+  }
+
+  &__default {
+    margin-top: @padding-sm;
+    overflow: hidden;
+    border-radius: @padding-xs;
+  }
+
   &__buttons {
     padding: @address-edit-buttons-padding;
 
@@ -12,6 +25,14 @@
   &-detail {
     padding: 0;
 
+    &__search-item {
+      background-color: #f2f3f5;
+    }
+
+    &__keyword {
+      color: @red;
+    }
+
     &__finish {
       color: @address-edit-detail-finish-color;
       font-size: @address-edit-detail-finish-font-size;
diff --git a/src/address-edit/test/__snapshots__/demo.spec.js.snap b/src/address-edit/test/__snapshots__/demo.spec.js.snap
index bebae6adc..5006885a2 100644
--- a/src/address-edit/test/__snapshots__/demo.spec.js.snap
+++ b/src/address-edit/test/__snapshots__/demo.spec.js.snap
@@ -4,41 +4,46 @@ exports[`renders demo correctly 1`] = `
 <div>
   <div>
     <div class="van-address-edit">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>姓名</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      <div class="van-address-edit__fields">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>姓名</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+          </div>
         </div>
-      </div>
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>电话</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>电话</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+          </div>
         </div>
-      </div>
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>地区</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
-        </div>
-      </div>
-      <div class="van-cell van-address-edit-detail">
-        <div class="van-cell__value van-cell__value--alone">
-          <div class="van-cell van-field">
-            <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-            <div class="van-cell__value">
-              <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>地区</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+              <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+                  <!----></i></div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+        <div class="van-cell van-address-edit-detail">
+          <div class="van-cell__value van-cell__value--alone">
+            <div class="van-cell van-field">
+              <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+              <div class="van-cell__value">
+                <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+          </div>
         </div>
       </div>
-      <div class="van-cell van-cell--center van-switch-cell">
+      <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
         <div class="van-cell__title"><span>设为默认收货地址</span></div>
         <div class="van-cell__value">
           <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
@@ -46,7 +51,7 @@ exports[`renders demo correctly 1`] = `
           </div>
         </div>
       </div>
-      <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button><button class="van-button van-button--default van-button--normal van-button--block"><span class="van-button__text">删除</span></button></div>
+      <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button><button class="van-button van-button--default van-button--normal van-button--block van-button--round"><span class="van-button__text">删除</span></button></div>
     </div>
   </div>
 </div>
diff --git a/src/address-edit/test/__snapshots__/index.spec.js.snap b/src/address-edit/test/__snapshots__/index.spec.js.snap
index 4d3906873..462c99692 100644
--- a/src/address-edit/test/__snapshots__/index.spec.js.snap
+++ b/src/address-edit/test/__snapshots__/index.spec.js.snap
@@ -2,75 +2,85 @@
 
 exports[`create a AddressEdit 1`] = `
 <div class="van-address-edit">
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>姓名</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+  <div class="van-address-edit__fields">
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>姓名</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>电话</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>电话</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>地区</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>地区</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+          <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+              <!----></i></div>
+        </div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-address-edit-detail">
-    <div class="van-cell__value van-cell__value--alone">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea></div>
+    <div class="van-cell van-address-edit-detail">
+      <div class="van-cell__value van-cell__value--alone">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea></div>
+          </div>
         </div>
       </div>
     </div>
   </div>
-  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
 </div>
 `;
 
 exports[`create a AddressEdit with props 1`] = `
 <div class="van-address-edit">
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>姓名</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+  <div class="van-address-edit__fields">
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>姓名</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>电话</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>电话</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>地区</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
-    </div>
-  </div>
-  <div class="van-cell van-address-edit-detail">
-    <div class="van-cell__value van-cell__value--alone">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>地区</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+          <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+              <!----></i></div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+    <div class="van-cell van-address-edit-detail">
+      <div class="van-cell__value van-cell__value--alone">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+      </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell">
+  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
     <div class="van-cell__value">
       <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
@@ -78,47 +88,52 @@ exports[`create a AddressEdit with props 1`] = `
       </div>
     </div>
   </div>
-  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
 </div>
 `;
 
 exports[`set-default 1`] = `
 <div class="van-address-edit">
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>姓名</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+  <div class="van-address-edit__fields">
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>姓名</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>电话</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>电话</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>地区</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
-    </div>
-  </div>
-  <div class="van-cell van-address-edit-detail">
-    <div class="van-cell__value van-cell__value--alone">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>地区</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+          <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+              <!----></i></div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+    <div class="van-cell van-address-edit-detail">
+      <div class="van-cell__value van-cell__value--alone">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control"></textarea></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+      </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell">
+  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
     <div class="van-cell__value">
       <div role="switch" aria-checked="false" class="van-switch" style="font-size: 24px;">
@@ -126,47 +141,52 @@ exports[`set-default 1`] = `
       </div>
     </div>
   </div>
-  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
 </div>
 `;
 
 exports[`show area component 1`] = `
 <div class="van-address-edit">
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>姓名</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+  <div class="van-address-edit__fields">
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>姓名</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>电话</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>电话</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>地区</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
-    </div>
-  </div>
-  <div class="van-cell van-address-edit-detail">
-    <div class="van-cell__value van-cell__value--alone">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>地区</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+          <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+              <!----></i></div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+    <div class="van-cell van-address-edit-detail">
+      <div class="van-cell__value van-cell__value--alone">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+      </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell">
+  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
     <div class="van-cell__value">
       <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
@@ -174,47 +194,52 @@ exports[`show area component 1`] = `
       </div>
     </div>
   </div>
-  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
 </div>
 `;
 
 exports[`show area component 2`] = `
 <div class="van-address-edit">
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>姓名</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+  <div class="van-address-edit__fields">
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>姓名</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>电话</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>电话</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>地区</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
-    </div>
-  </div>
-  <div class="van-cell van-address-edit-detail">
-    <div class="van-cell__value van-cell__value--alone">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>地区</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+          <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+              <!----></i></div>
         </div>
       </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+    <div class="van-cell van-address-edit-detail">
+      <div class="van-cell__value van-cell__value--alone">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>邮政编码</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="邮政编码" class="van-field__control"></div>
+      </div>
     </div>
   </div>
-  <div class="van-cell van-cell--center van-switch-cell">
+  <div class="van-cell van-cell--center van-switch-cell van-address-edit__default">
     <div class="van-cell__title"><span>设为默认收货地址</span></div>
     <div class="van-cell__value">
       <div role="switch" aria-checked="true" class="van-switch van-switch--on" style="font-size: 24px;">
@@ -222,40 +247,45 @@ exports[`show area component 2`] = `
       </div>
     </div>
   </div>
-  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
 </div>
 `;
 
 exports[`valid area placeholder confirm 1`] = `
 <div class="van-address-edit">
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>姓名</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+  <div class="van-address-edit__fields">
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>姓名</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="收货人姓名" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>电话</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>电话</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-field">
-    <div class="van-cell__title van-field__label"><span>地区</span></div>
-    <div class="van-cell__value">
-      <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control"></div>
+    <div class="van-cell van-field">
+      <div class="van-cell__title van-field__label"><span>地区</span></div>
+      <div class="van-cell__value">
+        <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
+          <div class="van-field__right-icon"><i class="van-icon van-icon-arrow">
+              <!----></i></div>
+        </div>
+      </div>
     </div>
-  </div>
-  <div class="van-cell van-address-edit-detail">
-    <div class="van-cell__value van-cell__value--alone">
-      <div class="van-cell van-field">
-        <div class="van-cell__title van-field__label"><span>详细地址</span></div>
-        <div class="van-cell__value">
-          <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+    <div class="van-cell van-address-edit-detail">
+      <div class="van-cell__value van-cell__value--alone">
+        <div class="van-cell van-field">
+          <div class="van-cell__title van-field__label"><span>详细地址</span></div>
+          <div class="van-cell__value">
+            <div class="van-field__body"><textarea rows="1" placeholder="街道门牌、楼层房间号等信息" class="van-field__control" style="height: auto;"></textarea></div>
+          </div>
         </div>
       </div>
     </div>
   </div>
-  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block"><span class="van-button__text">保存</span></button></div>
+  <div class="van-address-edit__buttons"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round"><span class="van-button__text">保存</span></button></div>
 </div>
 `;
diff --git a/src/style/var.less b/src/style/var.less
index b339968d1..94d63ba5f 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -75,7 +75,8 @@
 @action-sheet-cancel-padding-color: @background-color;
 
 // AddressEdit
-@address-edit-buttons-padding: @padding-xl @padding-md;
+@address-edit-padding: @padding-sm;
+@address-edit-buttons-padding: @padding-xl @padding-base;
 @address-edit-button-margin-bottom: @padding-sm;
 @address-edit-detail-finish-color: @blue;
 @address-edit-detail-finish-font-size: @font-size-sm;

From 592bcafda04e56f10c922be5dc902de54ee2cd65 Mon Sep 17 00:00:00 2001
From: rex <rexkaneki@gmail.com>
Date: Tue, 26 Nov 2019 20:44:35 +0800
Subject: [PATCH 17/18] feat(ContactList): refactor style & add new prop
 defaultTagText (#5089)

---
 src/contact-card/README.md                    |  3 +
 src/contact-card/README.zh-CN.md              |  2 +
 src/contact-card/demo/index.vue               | 10 +++-
 .../test/__snapshots__/demo.spec.js.snap      | 16 +++---
 .../test/__snapshots__/index.spec.js.snap     | 16 +++---
 src/contact-list/index.less                   | 31 ++++++----
 src/contact-list/index.tsx                    | 57 +++++++++++++------
 7 files changed, 88 insertions(+), 47 deletions(-)

diff --git a/src/contact-card/README.md b/src/contact-card/README.md
index 7c4f95b5b..e1e2d3e1e 100644
--- a/src/contact-card/README.md
+++ b/src/contact-card/README.md
@@ -155,6 +155,7 @@ export default {
 | v-model | Id of chosen contact | *string \| number* | - | - |
 | list | Contact list | *Contact[]* | `[]` | - |
 | add-text | Add button text | *string* | `Add new contact` | - |
+| default-tag-text | Default tag text | *string* | - | - |
 
 ### ContactList Events
 
@@ -164,6 +165,7 @@ export default {
 | edit | Triggered when click edit button | item: contact object，index |
 | select | Triggered when select contact | item: contact object |
 
+
 ### ContactEdit Props
 
 | Attribute | Description | Type | Default | Version |
@@ -190,3 +192,4 @@ export default {
 | id | ID | *string \| number* |
 | name | Name | *string* |
 | tel | Phone | *string* |
+| isDefault | Is default contact | *boolean* |
diff --git a/src/contact-card/README.zh-CN.md b/src/contact-card/README.zh-CN.md
index 8ddb795be..c5883b390 100644
--- a/src/contact-card/README.zh-CN.md
+++ b/src/contact-card/README.zh-CN.md
@@ -159,6 +159,7 @@ export default {
 | v-model | 当前选中联系人的 id | *string \| number* | - | - |
 | list | 联系人列表 | *Contact[]* | `[]` | - |
 | add-text | 新建按钮文案 | *string* | `新建联系人` | - |
+| default-tag-text | 默认联系人标签文案 | *string* | - | - |
 
 ### ContactList Events
 
@@ -194,3 +195,4 @@ export default {
 | id | 每位联系人的唯一标识 | *string \| number* |
 | name | 联系人姓名 | *string* |
 | tel | 联系人手机号 | *string \| number* |
+| isDefault | 是否为默认联系人 | *boolean* |
diff --git a/src/contact-card/demo/index.vue b/src/contact-card/demo/index.vue
index cef09488e..98a912098 100644
--- a/src/contact-card/demo/index.vue
+++ b/src/contact-card/demo/index.vue
@@ -16,6 +16,7 @@
         <van-contact-list
           v-model="chosenContactId"
           :list="list"
+          :default-tag-text="$t('defaultTagText')"
           @add="onAdd"
           @edit="onEdit"
           @select="onSelect"
@@ -54,11 +55,13 @@ export default {
   i18n: {
     'zh-CN': {
       name: '张三',
-      defaultLabel: '设为默认联系人'
+      defaultLabel: '设为默认联系人',
+      defaultTagText: '默认'
     },
     'en-US': {
       name: 'John Snow',
-      defaultLabel: 'Set as the default contact'
+      defaultLabel: 'Set as the default contact',
+      defaultTagText: 'default'
     }
   },
 
@@ -78,7 +81,8 @@ export default {
       return {
         name: this.$t('name'),
         tel: '13000000000',
-        id: 0
+        id: 0,
+        isDefault: 1
       };
     },
 
diff --git a/src/contact-card/test/__snapshots__/demo.spec.js.snap b/src/contact-card/test/__snapshots__/demo.spec.js.snap
index 42f46ad66..8c2b45d4a 100644
--- a/src/contact-card/test/__snapshots__/demo.spec.js.snap
+++ b/src/contact-card/test/__snapshots__/demo.spec.js.snap
@@ -11,16 +11,16 @@ exports[`renders demo correctly 1`] = `
     <div class="van-popup van-popup--bottom" style="display: none;" name="van-popup-slide-bottom">
       <div class="van-contact-list">
         <div role="radiogroup" class="van-radio-group van-contact-list__group">
-          <div role="button" tabindex="0" class="van-cell van-cell--clickable van-contact-list__item">
-            <div class="van-cell__value van-cell__value--alone van-contact-list__item-value">
-              <div role="radio" tabindex="-1" aria-checked="false" class="van-radio">
-                <div class="van-radio__icon van-radio__icon--round" style="font-size: 16px;"><i class="van-icon van-icon-success">
-                    <!----></i></div><span class="van-radio__label"><div class="van-contact-list__name">张三，13000000000</div></span>
-              </div>
-            </div><i class="van-icon van-icon-edit van-contact-list__edit">
+          <div role="button" tabindex="0" class="van-cell van-cell--clickable van-cell--center van-contact-list__item"><i class="van-icon van-icon-edit van-contact-list__edit">
               <!----></i>
+            <div class="van-cell__value van-cell__value--alone van-contact-list__item-value">张三，13000000000<span class="van-tag van-tag--round van-tag--danger van-contact-list__item-tag">默认</span></div>
+            <div role="radio" tabindex="-1" aria-checked="false" class="van-radio">
+              <div class="van-radio__icon van-radio__icon--round" style="font-size: 16px;"><i class="van-icon van-icon-success">
+                  <!----></i></div>
+            </div>
           </div>
-        </div><button class="van-button van-button--danger van-button--large van-button--square van-contact-list__add"><span class="van-button__text">新建联系人</span></button>
+        </div>
+        <div class="van-contact-list__bottom"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round van-contact-list__add"><span class="van-button__text">新建联系人</span></button></div>
       </div>
     </div>
     <div class="van-popup van-popup--bottom" style="display: none;" name="van-popup-slide-bottom">
diff --git a/src/contact-card/test/__snapshots__/index.spec.js.snap b/src/contact-card/test/__snapshots__/index.spec.js.snap
index 2f7b2323e..4425c0489 100644
--- a/src/contact-card/test/__snapshots__/index.spec.js.snap
+++ b/src/contact-card/test/__snapshots__/index.spec.js.snap
@@ -3,15 +3,15 @@
 exports[`ContactList render 1`] = `
 <div class="van-contact-list">
   <div role="radiogroup" class="van-radio-group van-contact-list__group">
-    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-contact-list__item">
-      <div class="van-cell__value van-cell__value--alone van-contact-list__item-value">
-        <div role="radio" tabindex="0" aria-checked="true" class="van-radio">
-          <div class="van-radio__icon van-radio__icon--round van-radio__icon--checked" style="font-size: 16px;"><i class="van-icon van-icon-success" style="border-color: #ee0a24; background-color: rgb(238, 10, 36);">
-              <!----></i></div><span class="van-radio__label"><div class="van-contact-list__name">test，123123213</div></span>
-        </div>
-      </div><i class="van-icon van-icon-edit van-contact-list__edit">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-cell--center van-contact-list__item"><i class="van-icon van-icon-edit van-contact-list__edit">
         <!----></i>
+      <div class="van-cell__value van-cell__value--alone van-contact-list__item-value">test，123123213</div>
+      <div role="radio" tabindex="0" aria-checked="true" class="van-radio">
+        <div class="van-radio__icon van-radio__icon--round van-radio__icon--checked" style="font-size: 16px;"><i class="van-icon van-icon-success" style="border-color: #ee0a24; background-color: rgb(238, 10, 36);">
+            <!----></i></div>
+      </div>
     </div>
-  </div><button class="van-button van-button--danger van-button--large van-button--square van-contact-list__add"><span class="van-button__text">新建联系人</span></button>
+  </div>
+  <div class="van-contact-list__bottom"><button class="van-button van-button--danger van-button--normal van-button--block van-button--round van-contact-list__add"><span class="van-button__text">新建联系人</span></button></div>
 </div>
 `;
diff --git a/src/contact-list/index.less b/src/contact-list/index.less
index 887df3b75..ddaa26716 100644
--- a/src/contact-list/index.less
+++ b/src/contact-list/index.less
@@ -10,7 +10,18 @@
   }
 
   &__item-value {
+    display: flex;
+    align-items: center;
     padding-right: @padding-xl;
+    padding-left: @padding-xs;
+  }
+
+  &__item-tag {
+    flex: none;
+    margin-left: @padding-xs;
+    padding-top: 0;
+    padding-bottom: 0;
+    line-height: 1.4em;
   }
 
   &__group {
@@ -20,24 +31,22 @@
     -webkit-overflow-scrolling: touch;
   }
 
-  &__name {
-    font-weight: @font-weight-bold;
-    font-size: @font-size-md;
-    line-height: 20px;
-  }
-
   &__edit {
-    position: absolute;
-    top: 50%;
-    right: @padding-md;
     font-size: @contact-list-edit-icon-size;
-    transform: translate(0, -50%);
   }
 
-  &__add {
+  &__bottom {
     position: fixed;
+    right: 0;
     bottom: 0;
     left: 0;
     z-index: @contact-list-add-button-z-index;
+    padding: 5px 16px;
+    background-color: #fff;
+  }
+
+  &__add {
+    height: 40px;
+    line-height: 38px;
   }
 }
diff --git a/src/contact-list/index.tsx b/src/contact-list/index.tsx
index f2ad9cd0a..4d8066856 100644
--- a/src/contact-list/index.tsx
+++ b/src/contact-list/index.tsx
@@ -3,6 +3,7 @@ import { RED } from '../utils/constant';
 import { emit, inherit } from '../utils/functional';
 import Icon from '../icon';
 import Cell from '../cell';
+import Tag from '../tag';
 import Button from '../button';
 import Radio from '../radio';
 import RadioGroup from '../radio-group';
@@ -15,12 +16,14 @@ export type ContactListItem = {
   id: string | number;
   tel: string | number;
   name: string;
+  isDefault: boolean;
 };
 
 export type ContactListProps = {
   value?: any;
   list?: ContactListItem[];
   addText?: string;
+  defaultTagText?: string;
 };
 
 const [createComponent, bem, t] = createNamespace('contact-list');
@@ -39,15 +42,18 @@ function ContactList(
         emit(ctx, 'select', item, index);
       }
 
-      function Content() {
+      function RightIcon() {
         return (
-          <Radio name={item.id} iconSize={16} checkedColor={RED} onClick={onClick}>
-            <div class={bem('name')}>{`${item.name}，${item.tel}`}</div>
-          </Radio>
+          <Radio
+            name={item.id}
+            iconSize={16}
+            checkedColor={RED}
+            onClick={onClick}
+          />
         );
       }
 
-      function RightIcon() {
+      function LeftIcon() {
         return (
           <Icon
             name="edit"
@@ -60,15 +66,29 @@ function ContactList(
         );
       }
 
+      function Content() {
+        return [
+          `${item.name}，${item.tel}`,
+          item.isDefault && props.defaultTagText && (
+            <Tag type="danger" round class={bem('item-tag')}>
+              {props.defaultTagText}
+            </Tag>
+          )
+        ];
+      }
+
       return (
         <Cell
           key={item.id}
           isLink
+          center
           class={bem('item')}
           valueClass={bem('item-value')}
+          // @ts-ignore
           scopedSlots={{
             default: Content,
-            'right-icon': RightIcon
+            'right-icon': RightIcon,
+            icon: LeftIcon
           }}
           onClick={onClick}
         />
@@ -80,16 +100,18 @@ function ContactList(
       <RadioGroup value={props.value} class={bem('group')}>
         {List}
       </RadioGroup>
-      <Button
-        square
-        size="large"
-        type="danger"
-        class={bem('add')}
-        text={props.addText || t('addText')}
-        onClick={() => {
-          emit(ctx, 'add');
-        }}
-      />
+      <div class={bem('bottom')}>
+        <Button
+          round
+          block
+          type="danger"
+          class={bem('add')}
+          text={props.addText || t('addText')}
+          onClick={() => {
+            emit(ctx, 'add');
+          }}
+        />
+      </div>
     </div>
   );
 }
@@ -97,7 +119,8 @@ function ContactList(
 ContactList.props = {
   value: null as any,
   list: Array,
-  addText: String
+  addText: String,
+  defaultTagText: String
 };
 
 export default createComponent(ContactList);

From d8e30bdcacb1553ebfcf64f8423a64d65e1eb8c3 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Tue, 26 Nov 2019 20:59:47 +0800
Subject: [PATCH 18/18] feat(AddressEdit): add click feedback of area cell
 (#5120)

---
 src/address-edit/Detail.js                    | 25 ++++++++++---------
 src/address-edit/index.js                     |  1 +
 src/address-edit/index.less                   |  2 +-
 .../test/__snapshots__/demo.spec.js.snap      |  2 +-
 .../test/__snapshots__/index.spec.js.snap     | 12 ++++-----
 src/contact-list/index.less                   |  2 +-
 src/contact-list/index.tsx                    | 18 +++++++------
 7 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/src/address-edit/Detail.js b/src/address-edit/Detail.js
index f2c10d4ba..0ecf36720 100644
--- a/src/address-edit/Detail.js
+++ b/src/address-edit/Detail.js
@@ -53,24 +53,25 @@ export default createComponent({
         return searchResult.map(express => (
           <Cell
             key={express.name + express.address}
-            class={bem('search-item')}
-            label={express.address}
+            clickable
             border={false}
             icon="location-o"
-            clickable
+            label={express.address}
+            class={bem('search-item')}
             onClick={() => {
               this.onSelect(express);
             }}
             scopedSlots={{
-              title: () =>
-                express.name && (
-                  <div
-                    domPropsInnerHTML={express.name.replace(
-                      value,
-                      `<span class=${bem('keyword')}>${value}</span>`
-                    )}
-                  />
-                )
+              title: () => {
+                if (express.name) {
+                  const text = express.name.replace(
+                    value,
+                    `<span class=${bem('keyword')}>${value}</span>`
+                  );
+
+                  return <div domPropsInnerHTML={text} />;
+                }
+              }
             }}
           />
         ));
diff --git a/src/address-edit/index.js b/src/address-edit/index.js
index 2d85422fc..f26643071 100644
--- a/src/address-edit/index.js
+++ b/src/address-edit/index.js
@@ -272,6 +272,7 @@ export default createComponent({
           <Field
             vShow={this.showArea}
             readonly
+            clickable
             label={t('area')}
             placeholder={t('areaPlaceholder')}
             rightIcon="arrow"
diff --git a/src/address-edit/index.less b/src/address-edit/index.less
index feca9d61f..4dec6ca3e 100644
--- a/src/address-edit/index.less
+++ b/src/address-edit/index.less
@@ -26,7 +26,7 @@
     padding: 0;
 
     &__search-item {
-      background-color: #f2f3f5;
+      background-color: @gray-2;
     }
 
     &__keyword {
diff --git a/src/address-edit/test/__snapshots__/demo.spec.js.snap b/src/address-edit/test/__snapshots__/demo.spec.js.snap
index 5006885a2..100c392e3 100644
--- a/src/address-edit/test/__snapshots__/demo.spec.js.snap
+++ b/src/address-edit/test/__snapshots__/demo.spec.js.snap
@@ -17,7 +17,7 @@ exports[`renders demo correctly 1`] = `
             <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
           </div>
         </div>
-        <div class="van-cell van-field">
+        <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
           <div class="van-cell__title van-field__label"><span>地区</span></div>
           <div class="van-cell__value">
             <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
diff --git a/src/address-edit/test/__snapshots__/index.spec.js.snap b/src/address-edit/test/__snapshots__/index.spec.js.snap
index 462c99692..1e0659574 100644
--- a/src/address-edit/test/__snapshots__/index.spec.js.snap
+++ b/src/address-edit/test/__snapshots__/index.spec.js.snap
@@ -15,7 +15,7 @@ exports[`create a AddressEdit 1`] = `
         <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
       </div>
     </div>
-    <div class="van-cell van-field">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
       <div class="van-cell__title van-field__label"><span>地区</span></div>
       <div class="van-cell__value">
         <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
@@ -54,7 +54,7 @@ exports[`create a AddressEdit with props 1`] = `
         <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
       </div>
     </div>
-    <div class="van-cell van-field">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
       <div class="van-cell__title van-field__label"><span>地区</span></div>
       <div class="van-cell__value">
         <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
@@ -107,7 +107,7 @@ exports[`set-default 1`] = `
         <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
       </div>
     </div>
-    <div class="van-cell van-field">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
       <div class="van-cell__title van-field__label"><span>地区</span></div>
       <div class="van-cell__value">
         <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
@@ -160,7 +160,7 @@ exports[`show area component 1`] = `
         <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
       </div>
     </div>
-    <div class="van-cell van-field">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
       <div class="van-cell__title van-field__label"><span>地区</span></div>
       <div class="van-cell__value">
         <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
@@ -213,7 +213,7 @@ exports[`show area component 2`] = `
         <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
       </div>
     </div>
-    <div class="van-cell van-field">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
       <div class="van-cell__title van-field__label"><span>地区</span></div>
       <div class="van-cell__value">
         <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
@@ -266,7 +266,7 @@ exports[`valid area placeholder confirm 1`] = `
         <div class="van-field__body"><input type="tel" placeholder="收货人手机号" class="van-field__control"></div>
       </div>
     </div>
-    <div class="van-cell van-field">
+    <div role="button" tabindex="0" class="van-cell van-cell--clickable van-field">
       <div class="van-cell__title van-field__label"><span>地区</span></div>
       <div class="van-cell__value">
         <div class="van-field__body"><input type="text" placeholder="选择省 / 市 / 区" readonly="readonly" class="van-field__control">
diff --git a/src/contact-list/index.less b/src/contact-list/index.less
index ddaa26716..2a6058c0c 100644
--- a/src/contact-list/index.less
+++ b/src/contact-list/index.less
@@ -42,7 +42,7 @@
     left: 0;
     z-index: @contact-list-add-button-z-index;
     padding: 5px 16px;
-    background-color: #fff;
+    background-color: @white;
   }
 
   &__add {
diff --git a/src/contact-list/index.tsx b/src/contact-list/index.tsx
index 4d8066856..9027d47bc 100644
--- a/src/contact-list/index.tsx
+++ b/src/contact-list/index.tsx
@@ -9,7 +9,7 @@ import Radio from '../radio';
 import RadioGroup from '../radio-group';
 
 // Types
-import { CreateElement, RenderContext } from 'vue/types';
+import { CreateElement, RenderContext, VNode } from 'vue/types';
 import { DefaultSlots } from '../utils/types';
 
 export type ContactListItem = {
@@ -67,14 +67,17 @@ function ContactList(
       }
 
       function Content() {
-        return [
-          `${item.name}，${item.tel}`,
-          item.isDefault && props.defaultTagText && (
+        const nodes = ([`${item.name}，${item.tel}`] as unknown[]) as VNode[];
+
+        if (item.isDefault && props.defaultTagText) {
+          nodes.push(
             <Tag type="danger" round class={bem('item-tag')}>
               {props.defaultTagText}
             </Tag>
-          )
-        ];
+          );
+        }
+
+        return nodes;
       }
 
       return (
@@ -84,11 +87,10 @@ function ContactList(
           center
           class={bem('item')}
           valueClass={bem('item-value')}
-          // @ts-ignore
           scopedSlots={{
+            icon: LeftIcon,
             default: Content,
             'right-icon': RightIcon,
-            icon: LeftIcon
           }}
           onClick={onClick}
         />