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

src/pages/course/components/talkingItem.vue

@@ -60,10 +60,10 @@
 				<!-- 试题问题反馈 -->
 				<!-- <RadioSubjectRequest v-if="[8].indexOf(type) >= 0 && dataInfo.qnsTyp !== 'ES'" :item="dataInfo" :mode="mode" @subject_click="subject_click" /> -->
 				<!-- 段落图片视频预览 -->
-				<view v-if="type === 3" style="overflow: hidden">
+				<view v-if="type === 3" style="overflow: hidden;padding-top: 10rpx;">
 					<ImagePreview class="cont-img-box" v-for="item in (dataInfo.imageAddrs || []) "
 						:imgId="item" :previewDetail="false" @click="previewImage(item)"></ImagePreview>
-					<VideoPreview class="cont-img-box" v-if="(dataInfo.vidoAddrs || []).length > 0"
+					<VideoPreview class="cont-img-box cont-video-box" v-if="(dataInfo.vidoAddrs || []).length > 0"
 						:fileId="dataInfo.vidoAddrs[0].vidAddr"
 						:picId="dataInfo.vidoAddrs[0].vidImgAddr"  @click="previewVideo(dataInfo.vidoAddrs[0])">
 					</VideoPreview>
@@ -913,6 +913,8 @@
 				}
 				
 				.file-items{
+					float: left;
+					width: 100%;
 					padding-top: 12rpx;
 					.file-item {
 						line-height: 36rpx;
@@ -921,14 +923,25 @@
 						color: #06f;
 					}
 				}
-
+				
 				.cont-img-box {
-					width: 433rpx;
-					height: 269rpx;
+					float: left;
+					width: calc(33% - 13.34rpx);
+					height: 130rpx;
 					border-radius: 15rpx;
 					overflow: hidden;
 					background-color: #fafafa;
 					margin-bottom: 20rpx;
+					margin-right: 20rpx;
+					
+					&.cont-video-box{
+						width: 433rpx;
+						height: 269rpx;
+						margin-right: 0rpx;
+					}
+					&:nth-child(3n){
+						margin-right: 0;
+					}
 				}
 			}
 

src/pages/sparring/tip.vue

@@ -290,6 +290,7 @@ const showModelComfirm = ref(false)
 const reconcatNum = ref(0)
 const answerText = ref('')
 const touchBtnCallBack = ref(null)
+const stopAnswerCallBack = ref(false)
 let isLeave = false
 const initsocketTask = () => {
   let _src = isPreview.value ? '/trapractice/previewsocket/open' : '/trapractice/partnersocket/open'
@@ -310,7 +311,7 @@ const initsocketTask = () => {
     if (watchFlag.value === 1 || showModelComfirm.value) return
     if (reconcatNum.value === 5) {
       common.msg('系统网络异常，请稍后再试！')
-      common.redirectTo(`/pages/index/dialog`)
+      common.reLaunch(`/pages/index/dialog`)
       return
     }
     showModelComfirm.value = true
@@ -473,6 +474,7 @@ const initsocketTask = () => {
   watchFlag.value += 1
 }
 const goBack = () => {
+	console.log(222,detailInfo.value.traInterTyp === '01')
   if (detailInfo.value.traInterTyp === '01') {
     overTalking()
   } else {
@@ -585,6 +587,7 @@ onMounted(() => {
   // getDetailInfo()
 })
 onBackPress(res => {
+	console.log(1111)
   if (res.from === 'backbutton') {
     goBack()
     return true