Merge branch '2.x' into dev

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: {