diff --git a/docs/demos/views/steps.vue b/docs/demos/views/steps.vue
index c5ec848e8..7dbcf45bd 100644
--- a/docs/demos/views/steps.vue
+++ b/docs/demos/views/steps.vue
@@ -54,7 +54,7 @@ export default {
       step2: '商家接单',
       step3: '买家提货',
       step4: '交易完成',
-      title2: '物流描述',
+      title2: '描述信息',
       title3: '竖向步骤条',
       status1: '【城市】物流状态1',
       status2: '【城市】物流状态',
diff --git a/docs/demos/views/tab.vue b/docs/demos/views/tab.vue
index 743e892bc..76aa8895f 100644
--- a/docs/demos/views/tab.vue
+++ b/docs/demos/views/tab.vue
@@ -116,7 +116,7 @@ export default {
 
 <style lang="postcss">
 .demo-tab {
-  margin-bottom: 500px;
+  margin-bottom: 300px;
 
   .van-tab .van-icon {
     margin-right: 5px;
diff --git a/docs/markdown/zh-CN/badge.md b/docs/markdown/zh-CN/badge.md
index be0a85512..22312c79e 100644
--- a/docs/markdown/zh-CN/badge.md
+++ b/docs/markdown/zh-CN/badge.md
@@ -15,10 +15,10 @@ Vue.use(Badge);
 
 ```html
 <van-badge-group :active-key="activeKey">
-  <van-badge title="热销榜" @click="onClick" />
-  <van-badge title="花式寿司" @click="onClick" info="8" />
-  <van-badge title="火炽寿司" @click="onClick" info="99" />
-  <van-badge title="手握寿司" @click="onClick" info="199" />
+  <van-badge title="标签名称" @click="onClick" />
+  <van-badge title="标签名称" @click="onClick" info="8" />
+  <van-badge title="标签名称" @click="onClick" info="99" />
+  <van-badge title="标签名称" @click="onClick" info="199" />
 </van-badge-group>
 ```
 
diff --git a/docs/markdown/zh-CN/field.md b/docs/markdown/zh-CN/field.md
index 53c76f52b..2257df11b 100644
--- a/docs/markdown/zh-CN/field.md
+++ b/docs/markdown/zh-CN/field.md
@@ -86,7 +86,7 @@ Vue.use(Field);
     placeholder="请输入留言"
     rows="1"
     autosize
-/>
+  />
 </van-cell-group>
 ```
 
diff --git a/docs/markdown/zh-CN/steps.md b/docs/markdown/zh-CN/steps.md
index fb9a3b3f0..47b4c3467 100644
--- a/docs/markdown/zh-CN/steps.md
+++ b/docs/markdown/zh-CN/steps.md
@@ -30,9 +30,9 @@ export default {
 }
 ```
 
-#### 物流描述
+#### 描述信息
 
-通过`title`和`description`属性来定义物流描述信息
+通过`title`和`description`属性来定义描述信息信息
 
 ```html
 <van-steps
diff --git a/package.json b/package.json
index 2c8a2637d..f332e331c 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   ],
   "scripts": {
     "bootstrap": "yarn || npm i && cd ./packages/vant-css/ && yarn || npm i && cd ../../",
-    "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js --content-base ./",
+    "dev": "npm run build:file && webpack-dev-server --inline --config build/webpack.config.dev.js",
     "build:file": "node build/bin/build-entry.js",
     "build:components": "node build/bin/build-components.js --color",
     "build:vant-css": "gulp build --gulpfile packages/vant-css/gulpfile.js --color",
diff --git a/packages/tabs/index.vue b/packages/tabs/index.vue
index 1d495814b..34b3bb60c 100644
--- a/packages/tabs/index.vue
+++ b/packages/tabs/index.vue
@@ -151,6 +151,7 @@ export default create({
       (init ? on : off)(swipeableEl, 'touchstart', this.onTouchStart, false);
       (init ? on : off)(swipeableEl, 'touchmove', this.onTouchMove, false);
       (init ? on : off)(swipeableEl, 'touchend', this.onTouchEnd, false);
+      (init ? on : off)(swipeableEl, 'touchcancel', this.onTouchEnd, false);
     },
 
     // record swipe touch start position