diff --git a/src/components/image-preview/preview-detail.vue b/src/components/image-preview/preview-detail.vue index c854bf0d..720121c9 100644 --- a/src/components/image-preview/preview-detail.vue +++ b/src/components/image-preview/preview-detail.vue @@ -322,7 +322,10 @@ movable-view image { width: 100%; } - + .detail-img { + width: calc(100% - 40rpx); + height: calc(100% - 100rpx); + } // .detail-img { // position: absolute; // left: 50%; diff --git a/src/pages/courseRecord/components/esQuestion.vue b/src/pages/courseRecord/components/esQuestion.vue index e684cd29..f3d11383 100644 --- a/src/pages/courseRecord/components/esQuestion.vue +++ b/src/pages/courseRecord/components/esQuestion.vue @@ -6,6 +6,7 @@ 你的答案: + @@ -55,7 +56,6 @@ }); const emit = defineEmits(['changePlay', 'buutton_click']); const changePlay = (val) => { - console.log('esq') emit('changePlay', val) } watch( diff --git a/src/pages/courseRecord/components/esQuestionAnswer.vue b/src/pages/courseRecord/components/esQuestionAnswer.vue index ddb0f118..355c199b 100644 --- a/src/pages/courseRecord/components/esQuestionAnswer.vue +++ b/src/pages/courseRecord/components/esQuestionAnswer.vue @@ -49,7 +49,9 @@ import { onUnload } from '@dcloudio/uni-app'; - import { getToken } from '@/common/common.js' + import { + getToken + } from '@/common/common.js' const props = defineProps({ dataInfo: { default: () => ({ @@ -143,15 +145,16 @@ // emit('changePlay', ''); }; const playVoice = () => { - emit('changePlay', unref(dataInfo)?.ossAddr); + // emit('changePlay', unref(dataInfo)?.ossAddr); if (talkVoiceObj.value && talkVoiceObj.value.src) { talkVoiceObj.value.play(); + isPlaying.value = true; return; } else { - talkVoiceObj.value.src = ''; + // talkVoiceObj.value.src = ''; if (unref(dataInfo).ossAddr) { setTimeout(() => { - talkVoiceObj.value.src = unref(dataInfo).ossAddr + '?tk=' + getToken(); + talkVoiceObj.value.src = unref(dataInfo).ossAddr + '?tk=' + getToken(); talkVoiceObj.value.play(); isPlaying.value = true; }, 100); @@ -162,24 +165,24 @@ talkVoiceObj.value = uni.createInnerAudioContext(); let prevTime = -1; talkVoiceObj.value.onEnded(() => { - console.log('onEnded') + console.log('onEnded') emit('changePlay', ''); prevTime = -1; talkVoiceObj.value.src = ''; }); talkVoiceObj.value.onStop(() => { - console.log('onEnded') + console.log('onStop') emit('changePlay', ''); prevTime = -1; talkVoiceObj.value.src = ''; }); talkVoiceObj.value.onPause(() => { - console.log('onEnded') + console.log('onPause') prevTime = talkVoiceObj.value.currentTime; emit('changePlay', ''); }); talkVoiceObj.value.onError(() => { - console.log('onError') + console.log('onError') // prevTime = -1; // emit('changePlay', ''); }); @@ -200,12 +203,8 @@ }, 500); } }); - if (unref(dataInfo).intrctWay === '02') { - itemVoice.value = unref(dataInfo).ossAddr + '?tk=' + getToken(); - talkVoiceObj.value.src = itemVoice.value; - setTimeout(() => { - setVoiceTime(0); - }, 100); + if (unref(dataInfo).ossKey) { + talkVoiceObj.value.src = unref(dataInfo).ossAddr + '?tk=' + getToken(); } }; const setVoiceTime = (sum) => {