From c6793e5475b607e83cbb55b7d0ddfb9b81bd7774 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Thu, 25 Aug 2022 04:09:06 +0800
Subject: [PATCH] 日志内容详情页多媒体适配 markdown 内图片增加viewer相应

---
 src/components/mini/box16-videoDetail.vue |   76 ++++++++++++++++++-------------------
 1 files changed, 37 insertions(+), 39 deletions(-)

diff --git a/src/components/mini/box16-videoDetail.vue b/src/components/mini/box16-videoDetail.vue
index 804dd89..c900020 100644
--- a/src/components/mini/box16-videoDetail.vue
+++ b/src/components/mini/box16-videoDetail.vue
@@ -9,7 +9,7 @@
 			<div class="playBox" v-bind:class="{ fadeInLeft: this.$attrs.showFade,fade: !this.$attrs.showFade }">
 				<videoPlayBox ref="videoPlayBox" @swichPlay="swichPlay"></videoPlayBox>
 			</div>
-			<div 
+			<div
 				v-bind:class="{ showButtonMargin:( showBackButton ) ,fadeInRight: this.$attrs.showFade,fade: !this.$attrs.showFade }">
 				<div class="introduce myShadow" v-if="introduce!=''">
 					<pre style="white-space: pre-line;">{{introduce}}</pre>
@@ -86,6 +86,7 @@
 		},
 		data() {
 			return {
+				loadFinish: false,
 				showBackButton: false,
 				articleId: "",
 				lastArticleId: "",
@@ -163,23 +164,22 @@
 						return
 					}
 
+					if (res.data.videoUrlList == null || res.data.videoUrlList.length < 1) {
+						this.$notification.error({
+							message: '该日志还没有上传视频资源..',
+							placement: 'bottomRight'
+						});
+					}
+
 					this.isAllowedComment = res.data.isAllowedComment;
 					this.introduce = res.data.introduce;
 
-					this.videoData.url = res.data.articleFileURL;
+					this.videoData.url = res.data.videoUrlList[0];
+
 					this.videoData.img = res.data.coverFileURL;
 					this.videoData.title = res.data.title;
 					this.videoData.introduce = res.data.introduce;
 					this.videoData.id = res.data.id;
-
-
-					if (res.data.articleFileURL != null &&
-						res.data.articleFileURL != "" &&
-						res.data.articleFileURL.endsWith("m3u8")) {
-						this.videoData.type = "customHls";
-					} else {
-						this.videoData.type = "normal";
-					}
 
 					this.myLock = !this.myLock;
 					if (this.lastArticleId != this.articleId) {
@@ -192,15 +192,7 @@
 		},
 	}
 </script>
-<style scoped>
-	a {
-		color: black;
-	}
-
-	pre {
-		font-family: 'HYTangMeiRen';
-		src: url("http://t.inleft.com/share/z%E5%AD%97%E4%BD%93%E5%BA%93/hytmr55%E6%B1%89%E4%BB%AA%E5%94%90%E7%BE%8E%E4%BA%BA%E5%AD%97%E4%BD%93.woff") format("truetype");
-	}
+<style lang="less">
 
 	.boxMain {
 		user-select: none;
@@ -209,28 +201,34 @@
 		clear: both;
 		grid-row-gap: 2rem;
 		max-height: 100%;
+
+		a {
+			color: black;
+		}
+
+		.playBox {
+			display: flex;
+			justify-content: center;
+			padding: 35px 0px;
+		}
+
+		.showButtonMargin {
+			margin: 75px 0px 0px 0px;
+		}
+
+		.myShadow {
+
+			box-shadow: 8px 8px 18px rgba(0, 0, 0, 0.1),
+				-8px -8px 18px #ffffff;
+		}
+
+		.introduce {
+			padding: 20px 20px 5px;
+			margin-bottom: 20px;
+		}
 	}
 
-	.playBox {
-		display: flex;
-		justify-content: center;
-		padding: 35px 0px;
-	}
 
-	.showButtonMargin {
-		margin: 75px 0px 0px 0px;
-	}
-
-	.myShadow {
-
-		box-shadow: 8px 8px 18px rgba(0, 0, 0, 0.1),
-			-8px -8px 18px #ffffff;
-	}
-
-	.introduce {
-		padding: 20px 20px 5px;
-		margin-bottom: 20px;
-	}
 
 	@media screen and (max-width: 1023px) {
 		.boxMain {

--
Gitblit v1.9.1