From b3b46cde45f885b746a2a633e5fc0e87e1881abe Mon Sep 17 00:00:00 2001
From: chenjiahan <chenjiahan@youzan.com>
Date: Sat, 29 Feb 2020 11:36:33 +0800
Subject: [PATCH] feat(Uploader): add upload-icon prop

---
 src/uploader/README.md                             |  1 +
 src/uploader/README.zh-CN.md                       |  1 +
 src/uploader/index.js                              |  6 +++++-
 src/uploader/test/__snapshots__/index.spec.js.snap |  9 +++++++++
 src/uploader/test/index.spec.js                    | 10 ++++++++++
 5 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/uploader/README.md b/src/uploader/README.md
index 3517323d1..6be99dc0b 100644
--- a/src/uploader/README.md
+++ b/src/uploader/README.md
@@ -171,6 +171,7 @@ export default {
 | result-type `v2.2.7` | Type of file read result, can be set to `file` `text` | *string* | `dataUrl` |
 | upload-text | Upload text | *string* | - |
 | image-fit `v2.1.5` | Preview image fit mode | *string* | `cover` |
+| upload-icon `v2.5.4` | Upload icon | *string* | `photograph` |
 
 ### Events
 
diff --git a/src/uploader/README.zh-CN.md b/src/uploader/README.zh-CN.md
index 5b4a838db..ec7efc127 100644
--- a/src/uploader/README.zh-CN.md
+++ b/src/uploader/README.zh-CN.md
@@ -192,6 +192,7 @@ export default {
 | result-type `v2.2.7` | 文件读取结果类型，可选值为`file` `text` | *string* | `dataUrl` |
 | upload-text | 上传区域文字提示 | *string* | - |
 | image-fit `v2.1.5` | 预览图裁剪模式，可选值见 [Image](#/zh-CN/image) 组件 | *string* | `cover` |
+| upload-icon `v2.5.4` | 上传区域[图标名称](#/zh-CN/icon)或图片链接 | *string* | `photograph` |
 
 ### Events
 
diff --git a/src/uploader/index.js b/src/uploader/index.js
index 65c5f5ca6..596e2e097 100644
--- a/src/uploader/index.js
+++ b/src/uploader/index.js
@@ -69,6 +69,10 @@ export default createComponent({
       type: String,
       default: 'dataUrl',
     },
+    uploadIcon: {
+      type: String,
+      default: 'photograph',
+    },
   },
 
   computed: {
@@ -356,7 +360,7 @@ export default createComponent({
 
       return (
         <div class={bem('upload')} style={style}>
-          <Icon name="photograph" class={bem('upload-icon')} />
+          <Icon name={this.uploadIcon} class={bem('upload-icon')} />
           {this.uploadText && (
             <span class={bem('upload-text')}>{this.uploadText}</span>
           )}
diff --git a/src/uploader/test/__snapshots__/index.spec.js.snap b/src/uploader/test/__snapshots__/index.spec.js.snap
index 33e44b8e3..c14e92c84 100644
--- a/src/uploader/test/__snapshots__/index.spec.js.snap
+++ b/src/uploader/test/__snapshots__/index.spec.js.snap
@@ -109,3 +109,12 @@ exports[`render upload-text 1`] = `
   </div>
 </div>
 `;
+
+exports[`upload-icon prop 1`] = `
+<div class="van-uploader">
+  <div class="van-uploader__wrapper">
+    <div class="van-uploader__upload"><i class="van-icon van-icon-add van-uploader__upload-icon">
+        <!----></i><input type="file" accept="image/*" class="van-uploader__input"></div>
+  </div>
+</div>
+`;
diff --git a/src/uploader/test/index.spec.js b/src/uploader/test/index.spec.js
index d91a47a3d..ca5a3b2c1 100644
--- a/src/uploader/test/index.spec.js
+++ b/src/uploader/test/index.spec.js
@@ -213,6 +213,16 @@ it('image-fit prop', () => {
   expect(wrapper).toMatchSnapshot();
 });
 
+it('upload-icon prop', () => {
+  const wrapper = mount(Uploader, {
+    propsData: {
+      uploadIcon: 'add',
+    },
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
 it('disable preview image', async () => {
   const wrapper = mount(Uploader, {
     propsData: {