Merge branch 'dev' of http://face3d.4dage.com:7005/zhangyupeng/zfb_mp into dev

src/components/Cropper/src/CopperModal.vue

@@ -161,18 +161,19 @@
 
       // Block upload
       function handleBeforeUpload(file: File) {
-        const { size } = file;
-        const { maxSize } = props;
-        if (maxSize && size / 1024 / 1024 >= maxSize) {
-          createMessage.error(t('component.upload.maxSizeMultiple', [maxSize]));
-          return false;
-        }
         const accept = ['image/jpg', 'image/jpeg', 'image/gif', 'image/png'];
         const isAccept = accept.find((i) => String(file.type) === i);
         if (!isAccept) {
           createMessage.error(t('component.upload.illegalFile'));
           return false;
         }
+        const { size } = file;
+        const { maxSize } = props;
+        if (maxSize && size / 1024 / 1024 >= maxSize) {
+          createMessage.error(t('component.upload.maxSizeMultiple', [maxSize]));
+          return false;
+        }
+
         console.log('file.type', isAccept, file.type);
 
         const reader = new FileReader();