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

src/pages/course/components/touchBtn.vue

@@ -99,11 +99,11 @@ const initRecord = () => {
 	unref(recordObjCom)?.onStop((res, duration)=>{
 		audioPath.value = res.tempFilePath
 		showTalkingModel.value = false
-		if(startFlag.value !== 2){
-			common.msg('说话时间太短，没有听清！')
-			return
-		}
 		if(!isOut.value){
+			if(startFlag.value !== 2){
+				common.msg('说话时间太短，没有听清！')
+				return
+			}
 			emit('uploadVoice', audioPath.value)
 		}
 	})
@@ -127,7 +127,13 @@ const startRecord = () => {
 
 const stopRecord = () => {
 	if(unref(recordObjCom).stop){
-		unref(recordObjCom)?.stop?.()
+		try{
+			unref(recordObjCom)?.stop()
+		}catch{
+			showTalkingModel.value = false
+		}
+	}else{
+		showTalkingModel.value = false
 	}
 }
 // #endif

src/pages/index/components/talking-item.vue

@@ -46,9 +46,10 @@
 	}
 </script>
 
-<style >
+<style scoped lang="scss">
 	.talking-item{
 		overflow: hidden;
+		margin-top: 30rpx;
 		&+.talking-item{
 			margin-top: 30rpx;
 		}