Merge branch '2.x' into dev

src/image/README.md

@@ -79,6 +79,7 @@ app.use(Lazyload);
 | show-loading | Whether to show loading placeholder | _boolean_ | `true` |
 | error-icon `v2.4.2` | Error icon | _string_ | `photo-fail` |
 | loading-icon `v2.4.2` | Loading icon | _string_ | `photo` |
+| icon-prefix `v2.10.12` | Icon className prefix | _string_ | `van-icon` |
 
 ### fit optional value
 

src/image/README.zh-CN.md

@@ -111,6 +111,7 @@ app.use(Lazyload);
 | show-loading | 是否展示图片加载中提示 | _boolean_ | `true` |
 | error-icon `v2.4.2` | 失败时提示的[图标名称](#/zh-CN/icon)或图片链接 | _string_ | `photo-fail` |
 | loading-icon `v2.4.2` | 加载时提示的[图标名称](#/zh-CN/icon)或图片链接 | _string_ | `photo` |
+| icon-prefix `v2.10.12` | 图标类名前缀，同 Icon 组件的 [class-prefix 属性](#/zh-CN/icon#props) | _string_ | `van-icon` |
 
 ### 图片填充模式 
 

src/image/index.tsx

@@ -16,6 +16,7 @@ export default createComponent({
     height: [Number, String],
     radius: [Number, String],
     lazyLoad: Boolean,
+    iconPrefix: String,
     showError: {
       type: Boolean,
       default: true,
@@ -84,7 +85,13 @@ export default createComponent({
         return slots.loading();
       }
 
-      return <Icon name={props.loadingIcon} class={bem('loading-icon')} />;
+      return (
+        <Icon
+          name={props.loadingIcon}
+          class={bem('loading-icon')}
+          classPrefix={props.iconPrefix}
+        />
+      );
     };
 
     const renderErrorIcon = () => {
@@ -92,7 +99,13 @@ export default createComponent({
         return slots.error();
       }
 
-      return <Icon name={props.errorIcon} class={bem('error-icon')} />;
+      return (
+        <Icon
+          name={props.errorIcon}
+          class={bem('error-icon')}
+          classPrefix={props.iconPrefix}
+        />
+      );
     };
 
     const renderPlaceholder = () => {

src/image/test/__snapshots__/index.legacy.js.snap

@@ -1,5 +1,19 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`apply icon-prefix prop to error-icon 1`] = `
+<div class="van-image">
+  <div class="van-image__error"><i class="my-icon my-icon-error van-image__error-icon">
+      <!----></i></div>
+</div>
+`;
+
+exports[`apply icon-prefix prop to loading-icon 1`] = `
+<div class="van-image"><img class="van-image__img">
+  <div class="van-image__loading"><i class="my-icon my-icon-success van-image__loading-icon">
+      <!----></i></div>
+</div>
+`;
+
 exports[`default slot 1`] = `
 <div class="van-image"><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 van-image__loading-icon">

src/image/test/index.legacy.js

@@ -147,6 +147,31 @@ test('loading-icon prop', () => {
   expect(wrapper).toMatchSnapshot();
 });
 
+test('apply icon-prefix prop to error-icon', () => {
+  const wrapper = mount(VanImage, {
+    propsData: {
+      errorIcon: 'error',
+      iconPrefix: 'my-icon',
+      src: 'https://img.yzcdn.cn/vant/cat.jpeg',
+    },
+  });
+
+  wrapper.find('img').trigger('error');
+
+  expect(wrapper).toMatchSnapshot();
+});
+
+test('apply icon-prefix prop to loading-icon', () => {
+  const wrapper = mount(VanImage, {
+    propsData: {
+      loadingIcon: 'success',
+      iconPrefix: 'my-icon',
+    },
+  });
+
+  expect(wrapper).toMatchSnapshot();
+});
+
 test('radius prop', () => {
   const wrapper = mount(VanImage, {
     propsData: {