From e380c23b1cb099d8a0d2b94245ada7c0d5ef5c69 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Fri, 3 Jan 2020 18:17:41 +0800
Subject: [PATCH] feat(Image): add loading-icon prop (#5469)

---
 src/image/README.md                           |  1 +
 src/image/README.zh-CN.md                     |  1 +
 src/image/demo/index.vue                      | 62 ++++---------------
 src/image/index.js                            |  6 +-
 .../test/__snapshots__/index.spec.js.snap     |  7 +++
 src/image/test/index.spec.js                  | 10 +++
 6 files changed, 35 insertions(+), 52 deletions(-)

diff --git a/src/image/README.md b/src/image/README.md
index 61a35fcdf..b175729ab 100644
--- a/src/image/README.md
+++ b/src/image/README.md
@@ -78,6 +78,7 @@ Vue.use(Lazyload);
 | lazy-load | Whether to enable lazy load，should register [Lazyload](#/en-US/lazyload) component | *boolean* | `false` | - |
 | show-error | Whether to show error placeholder | *boolean* | `true` | 2.0.9 |
 | show-loading | Whether to show loading placeholder | *boolean* | `true` | 2.0.9 |
+| loading-icon | Loading icon | *string* | `photo-o` | 2.4.2 |
 
 ### fit optional value
 
diff --git a/src/image/README.zh-CN.md b/src/image/README.zh-CN.md
index cfc1f9046..7c45f6cdf 100644
--- a/src/image/README.zh-CN.md
+++ b/src/image/README.zh-CN.md
@@ -104,6 +104,7 @@ Vue.use(Image);
 | lazy-load | 是否开启图片懒加载，须配合 [Lazyload](#/zh-CN/lazyload) 组件使用 | *boolean* | `false` | - |
 | show-error | 是否展示图片加载失败提示 | *boolean* | `true` | 2.0.9 |
 | show-loading | 是否展示图片加载中提示 | *boolean* | `true` | 2.0.9 |
+| loading-icon | 加载时提示的图标名称或图片链接，可选值见 [Icon 组件](#/zh-CN/icon) | *string* | `photo-o` | 2.4.2 |
 
 ### 图片填充模式
 
diff --git a/src/image/demo/index.vue b/src/image/demo/index.vue
index 5a9fccef4..a56fffee7 100644
--- a/src/image/demo/index.vue
+++ b/src/image/demo/index.vue
@@ -2,27 +2,14 @@
   <demo-section>
     <demo-block :title="$t('basicUsage')">
       <van-row>
-        <van-image
-          width="100"
-          height="100"
-          :src="image"
-        />
+        <van-image width="100" height="100" :src="image" />
       </van-row>
     </demo-block>
 
     <demo-block :title="$t('fitMode')">
       <van-row gutter="20">
-        <van-col
-          v-for="fit in fits"
-          span="8"
-          :key="fit"
-        >
-          <van-image
-            :fit="fit"
-            width="100%"
-            height="27vw"
-            :src="image"
-          />
+        <van-col v-for="fit in fits" span="8" :key="fit">
+          <van-image :fit="fit" width="100%" height="27vw" :src="image" />
           <div class="text">{{ fit }}</div>
         </van-col>
       </van-row>
@@ -30,18 +17,8 @@
 
     <demo-block :title="$t('round')">
       <van-row gutter="20">
-        <van-col
-          v-for="fit in fits"
-          span="8"
-          :key="fit"
-        >
-          <van-image
-            round
-            :fit="fit"
-            width="100%"
-            height="27vw"
-            :src="image"
-          />
+        <van-col v-for="fit in fits" span="8" :key="fit">
+          <van-image round :fit="fit" width="100%" height="27vw" :src="image" />
           <div class="text">{{ fit }}</div>
         </van-col>
       </van-row>
@@ -50,23 +27,14 @@
     <demo-block :title="$t('loading')">
       <van-row gutter="20">
         <van-col span="8">
-          <van-image
-            width="100%"
-            height="27vw"
-          />
+          <van-image width="100%" height="27vw" />
           <div class="text">{{ $t('defaultTip') }}</div>
         </van-col>
 
         <van-col span="8">
-          <van-image
-            width="100%"
-            height="27vw"
-          >
+          <van-image width="100%" height="27vw">
             <template #loading>
-              <van-loading
-                type="spinner"
-                size="20"
-              />
+              <van-loading type="spinner" size="20" />
             </template>
           </van-image>
           <div class="text">{{ $t('customTip') }}</div>
@@ -77,20 +45,12 @@
     <demo-block :title="$t('error')">
       <van-row gutter="20">
         <van-col span="8">
-          <van-image
-            width="100%"
-            height="27vw"
-            src="x"
-          />
+          <van-image width="100%" height="27vw" src="x" />
           <div class="text">{{ $t('defaultTip') }}</div>
         </van-col>
 
         <van-col span="8">
-          <van-image
-            width="100%"
-            height="27vw"
-            src="x"
-          >
+          <van-image width="100%" height="27vw" src="x">
             <template #error>{{ $t('loadFail') }}</template>
           </van-image>
           <div class="text">{{ $t('customTip') }}</div>
@@ -133,7 +93,7 @@ export default {
 </script>
 
 <style lang="less">
-@import "../../style/var";
+@import '../../style/var';
 
 .demo-image {
   overflow-x: hidden;
diff --git a/src/image/index.js b/src/image/index.js
index 873b6f29d..90dca3bd5 100644
--- a/src/image/index.js
+++ b/src/image/index.js
@@ -20,6 +20,10 @@ export default createComponent({
     showLoading: {
       type: Boolean,
       default: true
+    },
+    loadingIcon: {
+      type: String,
+      default: 'photo-o'
     }
   },
 
@@ -109,7 +113,7 @@ export default createComponent({
         return (
           <div class={bem('loading')}>
             {this.slots('loading') || (
-              <Icon name="photo-o" class={bem('loading-icon')} />
+              <Icon name={this.loadingIcon} class={bem('loading-icon')} />
             )}
           </div>
         );
diff --git a/src/image/test/__snapshots__/index.spec.js.snap b/src/image/test/__snapshots__/index.spec.js.snap
index 42f8c4acb..f06652b5a 100644
--- a/src/image/test/__snapshots__/index.spec.js.snap
+++ b/src/image/test/__snapshots__/index.spec.js.snap
@@ -25,6 +25,13 @@ exports[`load event 2`] = `
 </div>
 `;
 
+exports[`loading-icon prop 1`] = `
+<div class="van-image"><img class="van-image__img">
+  <div class="van-image__loading"><i class="van-icon van-icon-success van-image__loading-icon">
+      <!----></i></div>
+</div>
+`;
+
 exports[`radius prop 1`] = `
 <div class="van-image" style="overflow: hidden; border-radius: 3px;"><img src="https://img.yzcdn.cn/vant/cat.jpeg" class="van-image__img">
   <div class="van-image__loading"><i class="van-icon van-icon-photo-o van-image__loading-icon">
diff --git a/src/image/test/index.spec.js b/src/image/test/index.spec.js
index a4beca8e9..e60544f6f 100644
--- a/src/image/test/index.spec.js
+++ b/src/image/test/index.spec.js
@@ -125,6 +125,16 @@ test('show-error prop', () => {
   expect(wrapper).toMatchSnapshot();
 });
 
+test('loading-icon prop', () => {
+  const wrapper = mount(Image, {
+    propsData: {
+      loadingIcon: 'success'
+    }
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
 test('radius prop', () => {
   const wrapper = mount(Image, {
     propsData: {