From 82b9356315a5cab04e4870003242499d2ede6e41 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 24 Jun 2020 17:55:42 +0800
Subject: [PATCH] fix(Uploader): incorrect default size and loading style
 (#3317)

---
 packages/uploader/index.less | 2 +-
 packages/uploader/index.ts   | 6 ++----
 packages/uploader/index.wxml | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packages/uploader/index.less b/packages/uploader/index.less
index 8c6c3db0..8a5981c1 100644
--- a/packages/uploader/index.less
+++ b/packages/uploader/index.less
@@ -138,6 +138,6 @@
   &__loading {
     width: @uploader-loading-icon-size;
     height: @uploader-loading-icon-size;
-    color: @uploader-loading-icon-color;
+    color: @uploader-loading-icon-color !important;
   }
 }
diff --git a/packages/uploader/index.ts b/packages/uploader/index.ts
index 412c6c62..3de1330d 100644
--- a/packages/uploader/index.ts
+++ b/packages/uploader/index.ts
@@ -12,7 +12,7 @@ VantComponent({
     beforeRead: null,
     previewSize: {
       type: null,
-      value: 90,
+      value: 80,
     },
     name: {
       type: [Number, String],
@@ -78,9 +78,7 @@ VantComponent({
             ? isImageFile(item)
             : item.isImage,
         deletable:
-          typeof item.deletable === 'undefined'
-            ? true
-            : item.deletable,
+          typeof item.deletable === 'undefined' ? true : item.deletable,
       }));
       this.setData({ lists, isInCount: lists.length < maxCount });
     },
diff --git a/packages/uploader/index.wxml b/packages/uploader/index.wxml
index bce0a495..efec32e0 100644
--- a/packages/uploader/index.wxml
+++ b/packages/uploader/index.wxml
@@ -34,8 +34,8 @@
         class="van-uploader__mask"
       >
        <van-icon wx:if="{{ item.status === 'failed' }}" name="warning-o" class="van-uploader__mask-icon" />
-       <van-loading wx:else class="van-uploader__loading" />
-       <text wx:if="{{ item.message }}" class="van-uploader__upload-text">{{ item.message }}</text>
+       <van-loading wx:else custom-class="van-uploader__loading" />
+       <text wx:if="{{ item.message }}" class="van-uploader__mask-message">{{ item.message }}</text>
       </view>
       <view
         wx:if="{{ deletable && item.deletable }}"