Merge branch 'ch/ht_3.0' of eta_mini/eta_mini_crm_front into debug_ht

src/views/media/components/MediaUpload.vue

@@ -42,14 +42,14 @@ const dialogTitle = computed(()=>{
     return {'add':'上传','edit':'编辑',}[props.modifyType]+mediaName.value
 })
 const uploadAccept = computed(()=>{
-    return props.mediaType==='audio'?'.mp3':'.mp4'
+    return props.mediaType==='audio'?'.mp3,.m4a':'.mp4'
 })
 const uploadType = computed(()=>{
     return props.mediaType==='audio'?'audio/mpeg':'video/mp4'
 })
-// const uploadAudioType = computed(()=>{
-//     return props.mediaType==='audio'?'audio/mpeg':'video/mp4'
-// })
+const uploadAudioType = computed(()=>{
+    return props.mediaType==='audio'?'audio/x-m4a':'video/mp4'
+})
 const mediaData = reactive({
     fileUrl:'',
     mediaName:'',
@@ -110,7 +110,7 @@ function handleUpload(){
 async function handleUploadMedia(file){
     uploadLoading.value = true
     const {type} = file.file
-    if(type!==uploadType.value){
+    if(type!==uploadType.value && type!==uploadAudioType.value){
         ElMessage.warning(`仅支持${uploadAccept.value}格式的文件`)
         uploadLoading.value = false
         return 
@@ -210,7 +210,7 @@ function handleUploadImg(file){
         <div class="content-wrap">
             <el-form label-width="95px" label-position="left" :model="mediaData" :rules="rules" ref="formRef">
                 <el-form-item prop="fileUrl" class="upload-form-item">
-                    <el-input :placeholder="props.mediaType==='audio'?'音频格式限制mp3':'视频格式限制mp4，编码器为H.264'" v-model="mediaData.fileUrl" disabled>
+                    <el-input :placeholder="props.mediaType==='audio'?'音频格式限制mp3、m4a':'视频格式限制mp4，编码器为H.264'" v-model="mediaData.fileUrl" disabled>
                         <template #append>
                             <el-button 
                                 :loading="uploadLoading"