Merge branch 'master' of http://124.70.43.205:3000/GYEE_R.D/exam

exam-06173-vue/src/components/Tinymce/components/EditorImage.vue

@@ -11,7 +11,7 @@
       width="500px"
     >
     <!-- accept=".png, .jpeg, .gif, .jpg" -->
-      <file-upload v-model="fileUrl" class="editor-slide-upload" accept=".docx, .pdf" />
+      <file-upload v-model="fileUrl" class="editor-slide-upload" accept=".docx, .pdf, .png, .jpeg, .gif, .jpg" />
 
       <div slot="footer">
         <el-button @click="dialogVisible = false">

exam-06173-vue/src/components/Tinymce/index.vue

@@ -157,7 +157,7 @@ export default {
     imageSuccessCBK(arr) {
       const that = this
       arr.forEach(v => {
-        const isImg = v.url.indexOf('jpg') !== -1 || v.url.indexOf('png') !== -1
+        const isImg = v.url.indexOf('jpg') !== -1 || v.url.indexOf('png') !== -1 || v.url.indexOf('jpeg') !== -1 || v.url.indexOf('gif') !== -1
         const isPdf = v.url.indexOf('pdf') !== -1
         const isDocx = v.url.indexOf('docx') !== -1
         let isDownload = false