From 5048d4fbacd90392729daad9ac23b956f944f643 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 10 Nov 2017 05:59:15 -0600
Subject: [PATCH] [new feature] progress add showPivot prop (#300)

* fix: Tabbar icon line-height

* [new feature] progress add showPivot prop
---
 docs/examples-docs/en-US/progress.md |  1 +
 docs/examples-docs/zh-CN/progress.md |  1 +
 packages/progress/index.vue          | 18 +++++++++---------
 packages/vant-css/src/tabbar.css     |  6 ++++++
 4 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/docs/examples-docs/en-US/progress.md b/docs/examples-docs/en-US/progress.md
index 7cc0948a8..f0a6a4fe2 100644
--- a/docs/examples-docs/en-US/progress.md
+++ b/docs/examples-docs/en-US/progress.md
@@ -49,6 +49,7 @@ Use `pivot-text` to custom text，use `color` to custom bar color
 |-----------|-----------|-----------|-------------|-------------|
 | inactive | Whether to be gray | `Boolean` | `false` | - |
 | percentage | Percentage | `Number` | `false` | `0-100` |
+| showPivot | Whether to show text | `Boolean` | `true` | - |
 | pivotText | Text | `String` | percentage | - |
 | color | Color | `String` | `#38f` | hexvalue |
 | textColor | Text color | `String` | `#fff` | hexvalue |
diff --git a/docs/examples-docs/zh-CN/progress.md b/docs/examples-docs/zh-CN/progress.md
index 66dde381e..1f7a0314c 100644
--- a/docs/examples-docs/zh-CN/progress.md
+++ b/docs/examples-docs/zh-CN/progress.md
@@ -59,6 +59,7 @@ Vue.component(Progress.name, Progress);
 |-----------|-----------|-----------|-------------|-------------|
 | inactive | 是否置灰 | `Boolean` | `false` | - |
 | percentage | 进度百分比 | `Number` | `false` | `0-100` |
+| showPivot | 是否显示进度文字 | `Boolean` | `true` | - |
 | pivotText | 文字显示 | `String` | 百分比文字 | - |
 | color | 进度条颜色 | `String` | `#38f` | hexvalue |
 | textColor | 进度条文字颜色 | `String` | `#fff` | hexvalue |
diff --git a/packages/progress/index.vue b/packages/progress/index.vue
index 685a46135..3c8464fbf 100644
--- a/packages/progress/index.vue
+++ b/packages/progress/index.vue
@@ -1,25 +1,25 @@
 <template>
   <div class="van-progress">
     <span class="van-progress__portion" :style="portionStyle"></span>
-    <span class="van-progress__pivot" :style="pivotStyle">{{ pivotText }}</span>
+    <span class="van-progress__pivot" v-show="showPivot" :style="pivotStyle">{{ pivotText }}</span>
   </div>
 </template>
 
 <script>
-const DEFAULT_COLOR = '#38f';
-const DEFAULT_TEXT_COLOR = '#fff';
-const INACTIVE_COLOR = '#cacaca';
-
 export default {
   name: 'van-progress',
 
   props: {
+    inactive: Boolean,
     percentage: {
       type: Number,
       required: true,
       validator: value => value >= 0 && value <= 100
     },
-    inactive: Boolean,
+    showPivot: {
+      type: Boolean,
+      default: true
+    },
     pivotText: {
       type: String,
       default() {
@@ -28,17 +28,17 @@ export default {
     },
     color: {
       type: String,
-      default: DEFAULT_COLOR
+      default: '#38f'
     },
     textColor: {
       type: String,
-      default: DEFAULT_TEXT_COLOR
+      default: '#fff'
     }
   },
 
   computed: {
     componentColor() {
-      return this.inactive ? INACTIVE_COLOR : this.color;
+      return this.inactive ? '#cacaca' : this.color;
     },
     pivotStyle() {
       const { percentage } = this;
diff --git a/packages/vant-css/src/tabbar.css b/packages/vant-css/src/tabbar.css
index 15dc13bc8..f8c0a952f 100644
--- a/packages/vant-css/src/tabbar.css
+++ b/packages/vant-css/src/tabbar.css
@@ -27,8 +27,14 @@
       margin-bottom: 5px;
       position: relative;
 
+      .van-icon {
+        display: block;
+      }
+
       &-dot {
         &::after {
+          top: 0;
+          right: -8px;
           width: 8px;
           height: 8px;
           content: ' ';