From 054cdefd40ac8963fac897e4fe98ffc1de4e0b69 Mon Sep 17 00:00:00 2001 From: inleft <inleft@qq.com> Date: Wed, 17 Aug 2022 17:30:53 +0800 Subject: [PATCH] 重构消息盒子,优化表情组件 --- src/components/mini/mdDetail.vue | 77 +++++++++++++++++++++++++++++--------- 1 files changed, 59 insertions(+), 18 deletions(-) diff --git a/src/components/mini/mdDetail.vue b/src/components/mini/mdDetail.vue index f22bcdb..c1fea4e 100644 --- a/src/components/mini/mdDetail.vue +++ b/src/components/mini/mdDetail.vue @@ -1,15 +1,22 @@ <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 class="mySecret" v-if="showMsg && !myLock"> - <h1>怎样才能让你看到我呢</h1> - <h1>只要你要,只要我有...</h1> - <span class="myTip">{{errorMsg}}</span> + <div v-if="showMsg && !myLock"> + <div class="mySecretSamll" v-if="articleFileType==myConstant.fileTypeShort"> + <p>碎碎念只有那么一点了</p> + <p>但是下面依旧可以碎碎念</p> + </div> + + <div class="mySecret" v-else> + <h1>怎样才能让你看到我呢</h1> + <h1>只要你要,只要我有...</h1> + <span class="myTip">{{errorMsg}}</span> + </div> </div> <div v-else> @@ -25,13 +32,21 @@ <span class="myTip">{{errorMsg}}</span> </div> + <div class="mySecret" + v-else-if="articleFileType==myConstant.fileTypeVideo + || articleFileType==myConstant.fileTypeMp3 + || articleFileType==myConstant.fileTypeShort"> + <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="smallOption" @click="articleOptionHandle('dislike')"> <a-icon type="dislike" style="margin-top: 2px;" /> </div> @@ -71,6 +86,7 @@ import comment from "../mini/box12-comment.vue" import axios from 'axios' + import myConstant from "../../config/myConstant.js" export default { components: { @@ -79,9 +95,12 @@ }, data() { return { + myConstant: myConstant, articelMeta: "", isAllowedComment: 1, + introduce: "", articleId: "", + articleFileType: myConstant.fileTypeMarkDown, source: "", showMsg: false, myLock: false, @@ -98,11 +117,13 @@ }, created() { this.articleId = this.$route.query.id; + this.articleFileType = this.$route.query.articleFileType; }, watch: { '$route'(to, from) { if ("mdDetail" === to.name) { this.articleId = this.$route.query.id; + this.articleFileType = this.$route.query.articleFileType; } }, articleId: function(newValue, oldValue) { @@ -122,6 +143,12 @@ queryDetail() { this.showMsg = true; this.errorMsg = "加载中.."; + + // if (this.articleFileType == myConstant.fileTypeShort) { + // this.errorMsg = "该类型日志在这里没有更多啦.."; + // return + // } + queryBlogArticleDetail({ id: this.articleId, authWord: this.secret == "" ? null : md5(this.secret) @@ -152,12 +179,19 @@ // this.test = res.data.isAllowedComment == 1 ? true : false; this.isAllowedComment = res.data.isAllowedComment; + this.introduce = res.data.introduce; + 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; @@ -177,9 +211,6 @@ this.search.disabled = false; }) - }, - back: function() { - this.$router.go(-1); } }, @@ -218,7 +249,17 @@ } .mySecret { - height: 715px; + height: 515px; + display: flex; + flex-direction: column; + justify-content: center; + padding-left: auto; + align-items: center; + } + + .mySecretSamll { + padding: 30px 10px 10px; + height: 115px; display: flex; flex-direction: column; justify-content: center; @@ -229,8 +270,8 @@ .markdown-body, .articleComment { - min-height: 750px; - padding: 35px 20px 10px 20px; + min-height: 70%; + padding: 30px 20px 20px 20px; box-shadow: 8px 8px 18px rgba(0, 0, 0, 0.1), -8px -8px 18px #ffffff; } -- Gitblit v1.9.1