Merge branch 'task/reservation/video' into 'release'

fix: 问诊列表遗留问题优化

See merge request com.pica.cloud.education.frontend/pica-admin-consultation!290

src/components/editor/upload-img.vue

@@ -52,12 +52,16 @@
         headers: {
           token: localStorage.getItem('token'),
         },
-        accept: '.png,.jpeg',
+        accept: 'image/png,image/jpeg,image/jpg',
       };
     },
     watch: {
       imgList(newv) {
-        this.imgArr = newv;
+        const newImageList = newv?.filter(item => {
+          const videoUrl = item?.url.endsWith('.jpeg') || item?.url.endsWith('.png') || item?.url.endsWith('.jpg');
+          if(videoUrl) return item;
+        });
+        this.imgArr = newImageList;
       },
     },
     created() {

src/components/editor/upload-video.vue

@@ -62,12 +62,15 @@
     },
     watch: {
       imgList(newv) {
-        const newList = newv?.map(item => {
-          const suffixUrl = item?.url.substring(item?.url.lastIndexOf('/') + 1); // 接口不返回name，上传数据列表名称展示为截取url最后“/”后面的内容
-          item.name = suffixUrl;
-          return item;
+        const newVideoList = newv?.filter(item => {
+          const videoUrl = item?.url.endsWith('.mp4');
+          if(videoUrl) {
+            const suffixUrl = item?.url.substring(item?.url.lastIndexOf('/') + 1); // 接口不返回name，上传数据列表名称展示为截取url最后“/”后面的内容
+            item.name = suffixUrl;
+            return item;
+          }
         });
-        this.imgArr = newList;
+        this.imgArr = newVideoList;
       },
     },
     created() {

src/views/IM/diagnosis-admin/diagnosis-editor.vue

@@ -673,11 +673,7 @@
           <upload-img
             ref="imgComponent"
             :is-disable="editorType == 2"
-            :img-list="
-              formData.illnessImageUrls.filter((i) => {
-                return i && isImageUrl(i.url) && !i.url.includes('.pdf');
-              })
-            "
+            :img-list="formData?.illnessImageUrls"
           />
         </el-form-item>
         <el-form-item label="病情视频">
@@ -687,11 +683,7 @@
           <upload-video
             ref="videoComponent"
             :is-disable="editorType == 2"
-            :img-list="
-              formData.illnessImageUrls.filter((i) => {
-                return i && isVideoUrl(i.url) && !i.url.includes('.pdf');
-              })
-            "
+            :img-list="formData?.illnessImageUrls"
           />
         </el-form-item>
         <el-form-item label="检测报告">
@@ -1482,15 +1474,6 @@ export default {
     openPdf(item) {
       window.open(item.url);
     },
-    // 正则匹配图片格式
-    isImageUrl(url) {
-      return /\.(jpg|jpeg|png)$/i.test(url);
-    },
-    // 正则匹配视频格式
-    isVideoUrl(url) {
-      const videoExtensions = /\.(mp4)$/i;
-      return videoExtensions.test(url);
-    },
   },
 };
 </script>