From 80476fae71f08bf4408c7509eff254031a4eeac6 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Wed, 24 Aug 2022 18:47:09 +0800
Subject: [PATCH] 路由修正,常量提取
---
src/components/mini/mdDetail.vue | 323 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 180 insertions(+), 143 deletions(-)
diff --git a/src/components/mini/mdDetail.vue b/src/components/mini/mdDetail.vue
index a55f3d5..7c8734a 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-icon type="left" />
- </a-button>
+
+ <div class="headertop filter-dot headertop-bar " v-if="coverURL.length>0">
+ <figure class="centerbg" v-bind:style="{'background-image':'url('+this.coverURL+')'}">
+ </figure>
</div>
<div v-if="showMsg && !myLock">
- <div class="mySecretSamll" v-if="articleFileType==myConstant.fileTypeShort">
- <p>碎碎念只有那么一点了,但是下面依旧可以碎碎念</p>
+ <div class="mySecretSamll" v-if="articleFileType==fileType.fileTypeTalking_9">
+ <p>碎碎念只有那么一点了</p>
+ <p>但是下面依旧可以碎碎念</p>
</div>
+
<div class="mySecret" v-else>
<h1>怎样才能让你看到我呢</h1>
<h1>只要你要,只要我有...</h1>
@@ -30,11 +32,30 @@
<span class="myTip">{{errorMsg}}</span>
</div>
- <div class="markdown-body article-detail" v-else>
+ <div class="mySecret" v-else-if="articleFileType==fileType.fileTypeVideo_3
+ || articleFileType==fileType.fileTypeVideo_3
+ || articleFileType==fileType.fileTypeTalking_9">
+
+ <div class="mySecretSamll" v-if="introduce.length==0">
+ <p>碎碎念只有那么一点了22</p>
+ <p>但是下面依旧可以碎碎念</p>
+ </div>
+ <pre style="white-space: pre-line;padding: 10px;max-width: 100%;">
+ {{introduce}}
+ </pre>
+ </div>
+ <div v-viewer.static class="markdown-body article-detail" v-else>
+ <div class="articleTitle">
+ <h4>{{articelMeta.title}}</h4>
+ </div>
<vue-markdown :source="source"></vue-markdown>
</div>
</div>
- <div class="articleInfoMiniData">
+ <!-- <div class="articleInfoMiniData">
+ <div>
+ <a-icon type="calendar" class="samllPadding" />
+ <span>{{articelMeta.publishDate==null?'--':articelMeta.publishDate}}</span>
+ </div>
<div class="smallOption" @click="articleOptionHandle('dislike')">
<a-icon type="dislike" style="margin-top: 2px;" />
</div>
@@ -47,21 +68,46 @@
<span>{{articelMeta.likeCount==null?'0':articelMeta.likeCount}}</span>
</div>
<div>
- <!-- <a-icon type="folder-open" class="samllPadding" /> -->
<a-icon type="book" class="samllPadding" />
<span>{{articelMeta.articleTypeName==null?'--':articelMeta.articleTypeName}}</span>
</div>
- <div>
- <a-icon type="calendar" class="samllPadding" />
- <span>{{articelMeta.publishDate==null?'--':articelMeta.publishDate}}</span>
+ <a-icon type="folder-open" class="samllPadding" />
+ </div> -->
+
+ <div class="articleInfoMiniData">
+ <div class="myTitleDeal">
+ <a-icon type="left" />
+ <a-tooltip placement="bottomLeft" :title="'上一篇: '+articelMeta.previousRecord.title"
+ v-if="articelMeta.previousRecord !=null">
+ <router-link
+ :to="{path:'/mdDetail',query:{id:articelMeta.previousRecord.id,articleFileType:articleFileType,typeId:typeId}}"
+ class="article-title">
+ {{articelMeta.previousRecord.title}}
+ </router-link>
+ </a-tooltip>
+ <span v-else class="myTip">到顶啦..</span>
+ </div>
+ <div style="display: -webkit-box;">
+ <div class="myTitleDeal">
+ <a-tooltip placement="bottomLeft" :title="'下一篇: '+articelMeta.nextRecord.title"
+ v-if="articelMeta.nextRecord !=null">
+ <router-link
+ :to="{path:'/mdDetail',query:{id:articelMeta.nextRecord.id,articleFileType:articleFileType,typeId:typeId}}"
+ class="article-title">
+ {{articelMeta.nextRecord.title}}
+ </router-link>
+ </a-tooltip>
+ <span v-else class="myTip">到底啦..</span>
+ </div>
+ <a-icon type="right" />
</div>
</div>
+
<div class="articleComment">
<comment ref="myComment" :articleId="articleId" :isAllowedComment="isAllowedComment" />
</div>
</div>
-
</template>
<script>
@@ -71,6 +117,7 @@
import {
queryBlogArticleDetail
} from '../../api/blogArticle.js'
+
import comment from "../mini/box12-comment.vue"
import axios from 'axios'
@@ -83,11 +130,13 @@
},
data() {
return {
- myConstant: myConstant,
- articelMeta: "",
+ fileType: myConstant.fileType,
+ articelMeta: '',
isAllowedComment: 1,
+ introduce: "",
articleId: "",
- articleFileType: myConstant.fileTypeMarkDown,
+ articleFileType: myConstant.fileType.fileTypeMarkDown_1,
+ typeId: null,
source: "",
showMsg: false,
myLock: false,
@@ -100,17 +149,22 @@
value: '',
disabled: false
},
+ coverURL: ""
}
},
created() {
+ console.log(111);
+ console.log(this.$route.params);
this.articleId = this.$route.query.id;
this.articleFileType = this.$route.query.articleFileType;
+ this.typeId = this.$route.query.typeId;
},
watch: {
'$route'(to, from) {
if ("mdDetail" === to.name) {
this.articleId = this.$route.query.id;
this.articleFileType = this.$route.query.articleFileType;
+ this.typeId = this.$route.query.typeId;
}
},
articleId: function(newValue, oldValue) {
@@ -131,16 +185,11 @@
this.showMsg = true;
this.errorMsg = "加载中..";
- if (this.articleFileType == myConstant.fileTypeShort ||
- this.articleFileType == myConstant.fileTypeVideo ||
- this.articleFileType == myConstant.fileTypeMp3) {
- this.errorMsg = "该类型日志在这里没有更多啦..";
- return
- }
-
queryBlogArticleDetail({
id: this.articleId,
- authWord: this.secret == "" ? null : md5(this.secret)
+ authWord: this.secret == "" ? null : md5(this.secret),
+ typeId: this.typeId,
+ fileType: this.articleFileType
}).then((res) => {
this.showMsg = true;
this.myLock = false;
@@ -168,12 +217,28 @@
// this.test = res.data.isAllowedComment == 1 ? true : false;
this.isAllowedComment = res.data.isAllowedComment;
+ this.introduce = res.data.introduce;
+ this.articleFileType = res.data.articleFileType;
+ if (res.data.coverFileURL != null && res.data.coverFileURL != '') {
+ this.coverURL = res.data.coverFileURL;
+ } else {
+ this.coverURL = "http://t.inleft.com/share/media_photo/background.jpg";
+ }
+
this.articelMeta = res.data;
- this.$axios
- .get(res.data.articleFileURL)
- .then((res) => {
- this.source = res.data;
- })
+
+ if (res.data.articleFileType == this.fileType.fileTypeMarkDown_1 ||
+ res.data.articleFileType == this.fileType.fileTypeHtml_2) {
+ if (res.data.articleFileURL != null && res.data.articleFileURL != '') {
+ this.$axios
+ .get(res.data.articleFileURL)
+ .then((res) => {
+ this.source = res.data;
+ }).catch(() => [
+ this.$message.error("获取文件好像失败了..", 3)
+ ])
+ }
+ }
//获取日志资源文件
this.showMsg = false;
@@ -193,9 +258,6 @@
this.search.disabled = false;
})
- },
- back: function() {
- this.$router.back(-1);
}
},
@@ -205,6 +267,65 @@
<style lang="less">
@import '../../assets/md.less';
+ .articleTitle {
+ h4 {
+ margin: 0px 0px 20px 0px;
+ -webkit-line-clamp: 1;
+ }
+
+ text-align: center;
+ width: 100%;
+
+ }
+
+ .headertop {
+ position: relative;
+ overflow: hidden;
+ border-radius: 14px;
+ }
+
+ .centerbg {
+ width: 100%;
+ margin: 0;
+ padding: 0;
+ background-repeat: no-repeat;
+ // background-attachment: fixed;
+ background-size: cover;
+ z-index: -1;
+ // background-image: url("http://t.inleft.com/blog//cover/这世界那么多人.jpg");
+ height: 222px;
+ background-size: 100% auto;
+ background-position: center;
+ }
+
+
+ .headertop::before {
+ content: '';
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ z-index: 3;
+ background-attachment: fixed;
+ }
+
+ .headertop.filter-dot::before {
+ // background-image: url("https://blog-img-1258635493.cos.ap-chengdu.myqcloud.com/cdn/img/other/dot.gif");
+ // background-image: url("http://blog.inleft.com/photo/dot.gif");
+ }
+
+ // .headertop-bar::after {
+ // content: '';
+ // width: 150%;
+ // height: 4.375rem;
+ // background: linear-gradient(0deg, #fff, 84%, #ffffff4f);
+ // left: -25%;
+ // bottom: -2.875rem;
+ // border-radius: 100%;
+ // position: absolute;
+ // z-index: 4;
+ // }
.smallOption {
transition-function: ease-out;
@@ -227,14 +348,30 @@
.articleInfoMiniData {
user-select: none;
box-shadow: 8px 8px 18px rgba(0, 0, 0, 0.1), -8px -8px 18px #ffffff;
- padding: 10px 50px;
+ padding: 10px 23px;
+ margin: 20px 0px;
display: flex;
justify-content: space-between;
flex-wrap: wrap;
+
+
+ a {
+ color: black;
+ }
+
+ .myTitleDeal {
+ max-width: 300px;
+ -webkit-line-clamp: 1;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ word-wrap: break-word;
+ white-space: nowrap;
+ word-break: break-all;
+ }
}
.mySecret {
- height: 715px;
+ height: 515px;
display: flex;
flex-direction: column;
justify-content: center;
@@ -243,6 +380,7 @@
}
.mySecretSamll {
+ padding: 30px 10px 10px;
height: 115px;
display: flex;
flex-direction: column;
@@ -255,118 +393,17 @@
.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;
}
- /* #test{
- padding-left: 25%;
- padding-right: 25%;
- } */
- /* h3 {
- margin: 40px 0 0;
+
+ @media screen and (max-width:768px) {
+ .articleInfoMiniData {
+ .myTitleDeal {
+ max-width: 120px;
+ }
+ }
}
-
- ul {
- list-style-type: none;
- padding: 0;
- }
-
- li {
- display: inline-block;
- margin: 0 10px;
- }
-
- a {
- color: #42b983;
- }
-
- */
-
-
- /* 自己也可以再调整调整 (贡献一版 我们调整的一版样式) */
- /* .markdown-body {
- padding: 20px;
- min-width: 200px;
- max-width: 900px;
- font-size: 12px;
-
- h2 {
- font-size: 18px;
- margin: 1em 0 15px;
- padding-top: 0.8em;
- padding-bottom: 0.8em;
- }
-
- h3 {
- font-size: 14px;
- margin: 22px 0 16px;
- }
-
- h4 {
- font-size: 13px;
- margin: 20px 0 16px;
- }
-
- h5 {
- font-size: 12px;
- margin: 16px 0 16px;
- font-weight: 700;
- }
-
- p {
- font-size: 12px;
- line-height: 24px;
- color: #666666;
- margin-top: 0px;
- margin: 8px 0;
- margin: 14px 0 14px;
- }
-
- pre {
- background-color: #eee;
- margin-bottom: 8px;
- margin-top: 8px;
- margin: 12px 0 12px;
- }
-
- blockquote {
- margin-bottom: 8px;
- margin-top: 8px;
- margin: 14px 0 14px;
- background-color: #eee;
- padding: 16px 16px;
- }
-
- tr {
- background-color: #f5f5f5;
- }
-
- code {
- background-color: #eee;
- }
-
- ul,
- ol,
- li {
- list-style: unset;
- font-size: 12px;
- line-height: 20px;
- color: #666666;
- margin-top: 0px;
- margin: 8px 0;
- }
-
- blockquote {
- border-color: #48b6e2;
- }
-
- table {
- display: table;
- width: 100%;
- max-width: 100%;
- margin-bottom: 20px;
- }
- } */
</style>
--
Gitblit v1.9.1