Merge branch 'dev-0120' of http://25.13.9.101:9000/K17_AITS/tra-app into dev-0120

src/pages/course/components/touchBtn.vue

@@ -16,7 +16,7 @@
 			<image class="talk-btn-icon" v-show="keyboardIsShow && !answerValue" src="/src/static/images/course/record.png"
 				mode="" @click="changeBtn"></image>
 			<image class="talk-btn-icon" v-show="keyboardIsShow && !!answerValue" src="/src/static/images/course/send.png"
-				mode="" @click.stop="showKeyboard"></image>
+				mode="" @click.stop="showKeyboard()"></image>
 		</view>
 		<!--  @click="showTalkingModel = false" -->
 		<!-- <uv-popup ref="talkModelRef" mode="bottom" overlay-style="#000000" overlay-opacity="0.9"

src/pages/index/components/question.vue

@@ -126,18 +126,27 @@ import { onUnload } from '@dcloudio/uni-app';
 		}
 	}
 	const setVoiceTime = (sum) => {
-		sum += 1
+		plus.io.getAudioInfo({
-		if(Math.ceil(talkVoiceObj.value.duration)>0){
+			filePath: unref(dataInfo).talkingVoice,
-			voiceTime.value = (Math.ceil(talkVoiceObj.value.duration) || 1 ) + 's'
+			success:(res)=>{
-		}else{
+				voiceTime.value =  (Math.floor(res.duration) || 1) + 's'
-			if(sum === 20) {
+			},
-				voiceTime.value =  (unref(dataInfo).voiceTime || 0) + 's';
+			fail:(res)=>{
-				return
+				voiceTime.value =  (unref(dataInfo).voiceTime || 1) + 's'
 			}
-			setTimeout(()=>{
+		})
-				setVoiceTime(sum)
+		// sum += 1
-			},200)
+		// if(Math.ceil(talkVoiceObj.value.duration)>0){
-		}
+		// 	voiceTime.value = (Math.ceil(talkVoiceObj.value.duration) || 1 ) + 's' 
+		// }else{
+		// 	if(sum === 20) {
+		// 		voiceTime.value =  (unref(dataInfo).voiceTime || 0) + 's';
+		// 		return
+		// 	}
+		// 	setTimeout(()=>{
+		// 		setVoiceTime(sum)
+		// 	},200)
+		// }
 	}
 </script>