Merge branch 'dev' into 'master'

Dev

See merge request motive-power/yxl/yxl-web-admin-frontend!15

src/components/Upload.vue

@@ -7,13 +7,14 @@
       :headers="myHeaders"
       list-type="picture-card"
       :multiple="false"
-      :limit="limit"
-      :file-list="imgList"
       :on-success="handleAvatarSuccess"
       :on-error="handleError"
       :on-progress="onProgress"
       :before-upload="handleBeforeUpload"
       :disabled="limit <= value.length"
+      accept="image/*"
+      :file-list="imgList"
+      :limit="limit"
     >
       <i slot="default" class="el-icon-plus" />
       <div slot="file" slot-scope="{ file }">
@@ -51,8 +52,7 @@
         </template> -->
 
     <template v-if="limit">
-      最多上传 <b style="color: #f56c6c">{{ limit }}</b
-      >张
+      最多上传 <b style="color: #f56c6c">{{ limit }}</b>张
     </template>
 
     <el-dialog :visible.sync="dialogVisible" :modal="false">
@@ -193,7 +193,12 @@ export default {
       this.dialogImageUrl = file.url;
       this.dialogVisible = true;
     },
-    handleBeforeUpload() {
+    handleBeforeUpload(file) {
+      const isLt100M = file.size / 1024 / 1024 < 5;
+      if (!isLt100M) {
+        this.$message.error("上传照片大小要在5MB以内哦!");
+        return false;
+      }
       this.loading = this.$loading({
         lock: true,
         text: 'Loading',

src/views/photographerManagement/photoVerify/modal/ali-oss-multi.vue

@@ -76,7 +76,7 @@ export default {
   props: {
     limit: {
       type: Number,
-      default: 100
+      default: 200
     }
   },
   data() {