Merge remote-tracking branch 'origin/base-modify' into base-modify-hf

src/views/summit/model/reviewPopup.vue

@@ -68,7 +68,7 @@
 							v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag"
 							:src="form.videoPath"
 							style="width:300px;max-height:300px;"
-						/> -->
+						/>-->
 						<!-- <i
               v-else-if="!imgFlag"
               class="el-icon-plus avatar-uploader-icon"
@@ -168,11 +168,14 @@ export default {
 			}
 		},
 		beforeAvatarUpload(file) {
-			const zip = file.type === 'application/zip'
-			if (!zip) {
+			var index = file.name.lastIndexOf('.')
+			var ext = file.name.substr(index + 1)
+			console.log(ext)
+			if (ext != 'zip') {
 				this.$message.error('上传压缩包只能是 zip 格式!')
+				return false
 			}
-			return zip
+			return true
 		},
 		videoUpload(file) {
 			const isJPG = file.type === 'video/mp4'