Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop
This commit is contained in:
@@ -81,9 +81,9 @@
|
||||
import { computed, unref, ref, toRefs, watch, onMounted, nextTick } from 'vue';
|
||||
import { onUnload } from '@dcloudio/uni-app';
|
||||
// import { useinnerAudio, useAudioFun } from '@/store/innerAudio';
|
||||
|
||||
|
||||
import { useAudio } from './useAudio.js';
|
||||
import {downloadFile} from '@/api/common.js'
|
||||
import { downloadFile } from '@/api/common.js';
|
||||
const props = defineProps({
|
||||
dataInfo: {
|
||||
default: () => ({}),
|
||||
@@ -128,7 +128,7 @@
|
||||
});
|
||||
|
||||
const innerAudio = useAudio();
|
||||
|
||||
|
||||
const status = computed(() => props.status);
|
||||
watch(
|
||||
() => props.status,
|
||||
@@ -157,6 +157,9 @@
|
||||
nextTick(() => {
|
||||
textShow.value = true;
|
||||
});
|
||||
setTimeout(() => {
|
||||
voiceTime.value = '';
|
||||
}, 0);
|
||||
}
|
||||
emit('buutton_click', type, props.dataInfo);
|
||||
};
|
||||
@@ -173,7 +176,7 @@
|
||||
textShow.value = false;
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
const playVoice = () => {
|
||||
// isPlaying.value = true;
|
||||
console.log('点击播放');
|
||||
@@ -210,15 +213,18 @@
|
||||
watch(
|
||||
() => props.dataInfo.voicePath,
|
||||
(newVal) => {
|
||||
console.log('newVal', newVal);
|
||||
if(newVal === '' && props.dataInfo.ossKey) { // 去下载oss内容
|
||||
|
||||
if (newVal === '' && props.dataInfo.ossKey) {
|
||||
// 去下载oss内容
|
||||
console.log('去下载oss内容');
|
||||
downloadFile(props.dataInfo.ossKey).then(res => {
|
||||
downloadFile(props.dataInfo.ossKey).then((res) => {
|
||||
voiceTime.value = '';
|
||||
innerAudio.setAudioSrc(res.tempFilePath);
|
||||
})
|
||||
} else if(newVal === undefined){
|
||||
});
|
||||
} else if (newVal === undefined) {
|
||||
innerAudio.stopAudio();
|
||||
} else {
|
||||
voiceTime.value = '';
|
||||
innerAudio.setAudioSrc(newVal);
|
||||
}
|
||||
},
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user