Merge branch 'develop' into 'sit'

Develop

See merge request K17_AITS/tra-app!206

src/components/image-preview/image-preview.vue

@@ -3,7 +3,7 @@
 		<image :src="imgUrlShow" :mode="mode" @click="showDetail" style="width: 100%; height: 100%"></image>
 		<uni-popup ref="PopupRef" class="popup" mask-background-color="rgba(0,0,0,.2)" background-color="rgba(0,0,0,.2)" @change="changeShow">
 			<view class="overlay-box" @click="closePopup"  @touchmove.stop>
-				<image class="detail-img" :src="imgUrlShow" :mode="mode"></image>
+				<image class="detail-img" :src="imgUrlShow" mode="aspectFit"></image>
 			</view>
 		</uni-popup>
 	</view>

src/components/image-preview/preview-detail.vue

@@ -12,7 +12,7 @@
 				 object-fit="contain"></video>
 		</view>
 		<view class="overlay-box" @click="playEnded"  @touchmove.stop v-if="fileType === 'image'">
-			<image class="detail-img" :src="fileUrlShow" mode="aspectFill"></image>
+			<image class="detail-img" :src="fileUrlShow" mode="aspectFit"></image>
 		</view>
 	</uni-popup>
 </template>
@@ -233,6 +233,9 @@
 		mounted() {
 			this.watching = true
 		},
+		beforeUnmount() {
+			this.playEnded()
+		}
 	}
 </script>
 
@@ -285,8 +288,8 @@
 				position: absolute;
 				left: 50%;
 				top: 50%;
-				width: 100vw;
-				max-height: 100%;
+				width: calc(100% - 40rpx);
+				height: calc(100% - 100rpx);
 				transform: translate(-50%, -50%);
 			}
 		}

src/pages/course/study.vue

@@ -321,7 +321,6 @@
 	}
 	// 关闭播放状态
 	const changePlayItemId = (id = '') => {
-		console.log(id, 'id')
 		activeVoiceTalkingItemId.value = id
 		// if(activeVoiceTalkingItemId.value === id){
 		// 	activeVoiceTalkingItemId.value = ''