From bc95187efc506413cf85749fe36fe748cf75fed5 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Wed, 17 Aug 2022 18:43:04 +0800
Subject: [PATCH] 重新界定碎念类型入口

---
 src/components/mini/mdDetail.vue |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/components/mini/mdDetail.vue b/src/components/mini/mdDetail.vue
index 93149d1..18f43f8 100644
--- a/src/components/mini/mdDetail.vue
+++ b/src/components/mini/mdDetail.vue
@@ -1,15 +1,17 @@
 <template>
 	<div class="article-meta">
 		<div>
-			<a-button @click="back" style="position: absolute;">
+			<a-button @click="()=>this.$router.back(-1)" style="position: absolute;">
 				<a-icon type="left" />
 			</a-button>
 		</div>
 
 		<div v-if="showMsg && !myLock">
 			<div class="mySecretSamll" v-if="articleFileType==myConstant.fileTypeShort">
-					<p>碎碎念只有那么一点了,但是下面依旧可以碎碎念</p>
+				<p>碎碎念只有那么一点了</p>
+				<p>但是下面依旧可以碎碎念</p>
 			</div>
+
 			<div class="mySecret" v-else>
 				<h1>怎样才能让你看到我呢</h1>
 				<h1>只要你要,只要我有...</h1>
@@ -30,11 +32,25 @@
 				<span class="myTip">{{errorMsg}}</span>
 			</div>
 
+			<div class="mySecret" v-else-if="articleFileType==myConstant.fileTypeVideo
+				|| articleFileType==myConstant.fileTypeMp3
+				|| articleFileType==myConstant.fileTypeShort">
+
+				<div class="mySecretSamll" v-if="introduce.length==0">
+					<p>碎碎念只有那么一点了</p>
+					<p>但是下面依旧可以碎碎念</p>
+				</div>
+				<pre style="white-space: pre-line;">
+				{{introduce}}
+				</pre>
+			</div>
+
 			<div class="markdown-body article-detail" v-else>
 				<vue-markdown :source="source"></vue-markdown>
 			</div>
 		</div>
-		<div class="articleInfoMiniData" >
+
+		<div class="articleInfoMiniData">
 			<div class="smallOption" @click="articleOptionHandle('dislike')">
 				<a-icon type="dislike" style="margin-top: 2px;" />
 			</div>
@@ -75,7 +91,7 @@
 
 	import axios from 'axios'
 	import myConstant from "../../config/myConstant.js"
-	
+
 	export default {
 		components: {
 			VueMarkdown,
@@ -83,9 +99,10 @@
 		},
 		data() {
 			return {
-				myConstant:myConstant,
+				myConstant: myConstant,
 				articelMeta: "",
 				isAllowedComment: 1,
+				introduce: "",
 				articleId: "",
 				articleFileType: myConstant.fileTypeMarkDown,
 				source: "",
@@ -131,10 +148,10 @@
 				this.showMsg = true;
 				this.errorMsg = "加载中..";
 
-				if (this.articleFileType == myConstant.fileTypeShort) {
-					this.errorMsg = "没有更多啦..";
-					return
-				}
+				// if (this.articleFileType == myConstant.fileTypeShort) {
+				// 	this.errorMsg = "该类型日志在这里没有更多啦..";
+				// 	return
+				// }
 
 				queryBlogArticleDetail({
 					id: this.articleId,
@@ -166,12 +183,20 @@
 					// this.test = res.data.isAllowedComment == 1 ? true : false;
 
 					this.isAllowedComment = res.data.isAllowedComment;
+					this.introduce = res.data.introduce;
+					this.articleFileType = res.data.articleFileType;
+
 					this.articelMeta = res.data;
-					this.$axios
-						.get(res.data.articleFileURL)
-						.then((res) => {
-							this.source = res.data;
-						})
+
+					if (res.data.articleFileType == myConstant.fileTypeMarkDown ||
+						res.data.articleFileType == myConstant.fileTypeHtml) {
+
+						this.$axios
+							.get(res.data.articleFileURL)
+							.then((res) => {
+								this.source = res.data;
+							})
+					}
 
 					//获取日志资源文件
 					this.showMsg = false;
@@ -191,9 +216,6 @@
 						this.search.disabled = false;
 					})
 
-			},
-			back: function() {
-				this.$router.go(-1);
 			}
 		},
 
@@ -232,7 +254,7 @@
 	}
 
 	.mySecret {
-		height: 715px;
+		height: 515px;
 		display: flex;
 		flex-direction: column;
 		justify-content: center;
@@ -241,6 +263,7 @@
 	}
 
 	.mySecretSamll {
+		padding: 30px 10px 10px;
 		height: 115px;
 		display: flex;
 		flex-direction: column;
@@ -253,7 +276,7 @@
 	.markdown-body,
 	.articleComment {
 		min-height: 70%;
-		padding: 35px 20px 30px 20px;
+		padding: 30px 20px 20px 20px;
 		box-shadow: 8px 8px 18px rgba(0, 0, 0, 0.1),
 			-8px -8px 18px #ffffff;
 	}

--
Gitblit v1.9.1