From e0cbe958a3dfd67bf1f8fc3f75e9df6fef2d5354 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=98=89=E6=B6=B5?= <chenjiahan@youzan.com>
Date: Wed, 29 Jan 2020 15:54:54 +0800
Subject: [PATCH] feat(PullRefresh): some props can be string

---
 src/pull-refresh/README.md       |  6 +++---
 src/pull-refresh/README.zh-CN.md |  6 +++---
 src/pull-refresh/demo/index.vue  |  2 +-
 src/pull-refresh/index.js        | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/pull-refresh/README.md b/src/pull-refresh/README.md
index 46f435bf6..a8450be95 100644
--- a/src/pull-refresh/README.md
+++ b/src/pull-refresh/README.md
@@ -104,9 +104,9 @@ Use slots to custom tips
 | loosing-text | Text to show when loosing | *string* | `Loose to refresh...` |
 | loading-text | Text to show when loading | *string* | `Loading...` |
 | success-text | Text to show when loading success | *string* | - |
-| success-duration | Success text display duration(ms) | *number* | `500` |
-| animation-duration | Animation duration | *number* | `300` |
-| head-height `v2.4.2` | Height of head | *number* | `50` |
+| success-duration | Success text display duration(ms) | *number \| string* | `500` |
+| animation-duration | Animation duration | *number \| string* | `300` |
+| head-height `v2.4.2` | Height of head | *number \| string* | `50` |
 | disabled | Whether to disable pull refresh | *boolean* | `false` |
 
 ### Events
diff --git a/src/pull-refresh/README.zh-CN.md b/src/pull-refresh/README.zh-CN.md
index 1f794e40d..7c8878415 100644
--- a/src/pull-refresh/README.zh-CN.md
+++ b/src/pull-refresh/README.zh-CN.md
@@ -107,9 +107,9 @@ export default {
 | loosing-text | 释放过程提示文案 | *string* | `释放即可刷新...` |
 | loading-text | 加载过程提示文案 | *string* | `加载中...` |
 | success-text | 刷新成功提示文案 | *string* | - |
-| success-duration | 刷新成功提示展示时长(ms) | *number* | `500` |
-| animation-duration | 动画时长 | *number* | `300` |
-| head-height `v2.4.2` | 顶部内容高度 | *number* | `50` |
+| success-duration | 刷新成功提示展示时长(ms) | *number \| string* | `500` |
+| animation-duration | 动画时长 | *number \| string* | `300` |
+| head-height `v2.4.2` | 顶部内容高度 | *number \| string* | `50` |
 | disabled | 是否禁用下拉刷新 | *boolean* | `false` |
 
 ### Events
diff --git a/src/pull-refresh/demo/index.vue b/src/pull-refresh/demo/index.vue
index ea936b586..c7f2a6da7 100644
--- a/src/pull-refresh/demo/index.vue
+++ b/src/pull-refresh/demo/index.vue
@@ -20,7 +20,7 @@
       <van-tab :title="$t('customTips')">
         <van-pull-refresh
           v-model="isLoading"
-          :head-height="80"
+          head-height="80"
           @refresh="onRefresh(true)"
         >
           <template #pulling="{ distance }">
diff --git a/src/pull-refresh/index.js b/src/pull-refresh/index.js
index 5719dfc0c..cdb9ce606 100644
--- a/src/pull-refresh/index.js
+++ b/src/pull-refresh/index.js
@@ -28,15 +28,15 @@ export default createComponent({
       required: true,
     },
     successDuration: {
-      type: Number,
+      type: [Number, String],
       default: 500,
     },
     animationDuration: {
-      type: Number,
+      type: [Number, String],
       default: 300,
     },
     headHeight: {
-      type: Number,
+      type: [Number, String],
       default: DEFAULT_HEAD_HEIGHT,
     },
   },
@@ -70,7 +70,7 @@ export default createComponent({
       this.duration = this.animationDuration;
 
       if (loading) {
-        this.setStatus(this.headHeight, true);
+        this.setStatus(+this.headHeight, true);
       } else if (this.slots('success') || this.successText) {
         this.showSuccessTip();
       } else {
@@ -122,7 +122,7 @@ export default createComponent({
         this.duration = this.animationDuration;
 
         if (this.status === 'loosing') {
-          this.setStatus(this.headHeight, true);
+          this.setStatus(+this.headHeight, true);
           this.$emit('input', true);
 
           // ensure value change can be watched
@@ -136,7 +136,7 @@ export default createComponent({
     },
 
     ease(distance) {
-      const { headHeight } = this;
+      const headHeight = +this.headHeight;
 
       if (distance > headHeight) {
         if (distance < headHeight * 2) {