From 81c155e7e00b83f06e6486a8d904428a44b8b275 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Wed, 23 Feb 2022 16:47:10 +0800
Subject: [PATCH] 评论页添加,修改站点默认logo

---
 src/components/mini/box12-comment.vue      |  116 +++++++++++++++++++++++
 src/components/mini/mdDetail.vue           |    5 
 src/mock/index.js                          |    2 
 public/index.html                          |    5 
 src/components/fixed/header.vue            |    5 
 src/components/mini/box-new-article.vue    |    9 +
 src/components/mini/box2-class.vue         |    5 
 src/components/mini/tagTime.vue            |    8 +
 src/config/router.config.js                |   14 ++
 src/components/group/articleListScorll.vue |    6 +
 src/components/mini/tagInfo.vue            |   99 ++++++++++++++-----
 11 files changed, 230 insertions(+), 44 deletions(-)

diff --git a/public/index.html b/public/index.html
index 72cdfd6..78dbf7c 100644
--- a/public/index.html
+++ b/public/index.html
@@ -4,8 +4,9 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>default</title>
+    <!-- <link rel="icon" href="<%= BASE_URL %>favicon.ico"> -->
+	 <link rel="shortcut icon" type="image/x-icon" href="http://t.inleft.com/share/icon/favicon.ico">
+    <title>在你左边,听风及雨</title>
   </head>
   <body>
     <noscript>
diff --git a/src/components/fixed/header.vue b/src/components/fixed/header.vue
index 0fb4947..87ce56c 100644
--- a/src/components/fixed/header.vue
+++ b/src/components/fixed/header.vue
@@ -7,12 +7,13 @@
 				<router-link to="/main3">我的网盘</router-link>
 				<router-link to="/main4">友人帐</router-link>
 				<router-link to="/login">登录</router-link>
+				<!-- <router-link to="/comment">测试页</router-link> -->
 			</div>
 		</a-col>
 		<a-col v-bind="showMain">
 			<a-auto-complete v-model="search.value" :data-source="search.dataSource" ref="mySearch" v-bind="search"
 				@select="onSelect" @search="onSearch" @change="onChange">
-				<a-input @keydown.enter="onSelect">
+				<a-input>
 					<a-icon slot="suffix" type="search" class="certain-category-icon" />
 				</a-input>
 			</a-auto-complete>
@@ -116,6 +117,7 @@
 			},
 			onSelect(value) {
 				console.log('回车', value);
+				this.$message.info("更多功能..敬请期待")
 				this.$message.info("回车,内容为" + value)
 			},
 			onChange(value) {
@@ -135,6 +137,7 @@
 		-ms-user-select: none;
 		-khtml-user-select: none;
 		user-select: none;
+
 		a {
 			margin-left: 10px;
 		}
diff --git a/src/components/group/articleListScorll.vue b/src/components/group/articleListScorll.vue
index 99f4a78..47e61cb 100644
--- a/src/components/group/articleListScorll.vue
+++ b/src/components/group/articleListScorll.vue
@@ -5,6 +5,10 @@
 				<newArticle v-bind="temp" :index="index"></newArticle>
 				<!-- <box5 v-bind="temp"></box5> -->
 			</div>
+			<div class="mySecret" v-if="data.length==0">
+				<p>空空如也..</p>
+			</div>
+			
 			<div v-if="loading && !busy" class="demo-loading-container">
 				<a-spin />
 			</div>
@@ -81,7 +85,7 @@
 			},
 			typeId: function(newValue, oldValue) {
 				this.busy = true;
-				this.$message.info('loading',0.3);
+				this.$message.info('loading', 0.3);
 				this.onChange(1);
 			}
 
diff --git a/src/components/mini/box-new-article.vue b/src/components/mini/box-new-article.vue
index ebf3225..9dc0443 100644
--- a/src/components/mini/box-new-article.vue
+++ b/src/components/mini/box-new-article.vue
@@ -35,7 +35,8 @@
 						<span class="article-meta__separator" style="margin: 0px 3px ;"> | </span>
 						<span class="article-meta">
 							<a-icon type="book" />
-							<router-link :to="{path:'/mdDetail',query:{id:id}}" class="article-meta__categories">
+							<router-link :to="{path:'/articleList',query:{typeId:articleTypeId}}"
+								class="article-meta__categories">
 								{{articleTypeName}}
 							</router-link>
 							<!-- <a class="article-meta__categories" href="#"> {{tag}}</a> -->
@@ -55,9 +56,13 @@
 		props: {
 			"index": {
 				default: 0,
-			},"id": {
+			},
+			"id": {
 				default: 0,
 			},
+			"articleTypeId": {
+				default: null
+			},
 			"isTop": {
 				default: 0,
 			},
diff --git a/src/components/mini/box12-comment.vue b/src/components/mini/box12-comment.vue
new file mode 100644
index 0000000..fc1468c
--- /dev/null
+++ b/src/components/mini/box12-comment.vue
@@ -0,0 +1,116 @@
+<template>
+	<div class="myFriend">
+		<a-form-model ref="myForm"  :model="form" :label-col="labelCol" :wrapper-col="wrapperCol">
+			<div style="display: flex;justify-content: center;	">
+				<a-form-model-item label="昵称">
+					<a-input v-model="form.secret" autocomplete='new-password' type="password" placeholder="昵称">
+					</a-input>
+				</a-form-model-item>
+				<a-form-model-item label="邮箱">
+					<a-input v-model="form.secret" autocomplete='new-password' type="password" placeholder="邮箱">
+					</a-input>
+				</a-form-model-item>
+				<a-form-model-item label="主页">
+					<a-input v-model="form.secret" autocomplete='new-password' type="password" placeholder="主页">
+					</a-input>
+				</a-form-model-item>
+			</div>
+		</a-form-model>
+
+
+		<a-comment>
+			<!-- <a-avatar slot="avatar" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+				alt="Han Solo" /> -->
+			<div slot="content">
+				<a-form-item>
+					<a-textarea :rows="4" :value="value" @change="handleChange" />
+				</a-form-item>
+				<a-form-item>
+					<a-button html-type="submit" :loading="submitting" type="primary" @click="handleSubmit">
+						高低整两句
+					</a-button>
+				</a-form-item>
+			</div>
+		</a-comment>
+
+		<a-comment>
+			<span slot="actions" key="comment-nested-reply-to">Reply to</span>
+			<a slot="author">Han Solo</a>
+			<a-avatar slot="avatar" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+				alt="Han Solo" />
+			<p slot="content">
+				We supply a series of design principles, practical patterns and high quality design resources
+				(Sketch and Axure).
+			</p>
+			<a-collapse v-model="activeKey">
+				<a-collapse-panel key="1" header="展开">
+					<a-comment>
+						<span slot="actions">Reply to</span>
+						<a slot="author">Han Solo</a>
+						<a-avatar slot="avatar" src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png"
+							alt="Han Solo" />
+						<p slot="content">
+							We supply a series of design principles, practical patterns and high quality design
+							resources (Sketch and Axure).
+						</p>
+						<a-comment>
+							<span slot="actions">Reply to</span>
+							<a slot="author">Han Solo</a>
+							<a-avatar slot="avatar"
+								src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo" />
+							<p slot="content">
+								We supply a series of design principles, practical patterns and high quality design
+								resources (Sketch and Axure).
+							</p>
+						</a-comment>
+						<a-comment>
+							<span slot="actions">Reply to</span>
+							<a slot="author">Han Solo</a>
+							<a-avatar slot="avatar"
+								src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo" />
+							<p slot="content">
+								We supply a series of design principles, practical patterns and high quality design
+								resources (Sketch and Axure).
+							</p>
+						</a-comment>
+					</a-comment>
+				</a-collapse-panel>
+			</a-collapse>
+		</a-comment>
+		<a-comment>
+				<span slot="actions">Reply to</span>
+				<a slot="author">Han Solo</a>
+				<a-avatar slot="avatar"
+					src="https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png" alt="Han Solo" />
+				<p slot="content">
+					We supply a series of design principles, practical patterns and high quality design
+					resources (Sketch and Axure).
+				</p>
+			</a-comment>
+		</a-comment>
+	</div>
+</template>
+
+
+<script>
+	export default {
+		data() {
+			return {
+				labelCol: {
+					span: 5,
+					offset: 0,
+				},
+				wrapperCol: {
+					span: 15,
+					offset: 0
+				},
+				form: {
+					secret: ""
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/src/components/mini/box2-class.vue b/src/components/mini/box2-class.vue
index a26cd6d..2426d1f 100644
--- a/src/components/mini/box2-class.vue
+++ b/src/components/mini/box2-class.vue
@@ -35,10 +35,11 @@
 	} from '../../api/blogArticleType.js'
 	export default {
 		beforeMount() {
-			this.$message.info('loading',0.3);
+			this.$message.info('loading', 0.3);
 			queryBlogArticleType({}).then((res) => {
 				this.list1 = res.data.slice(0, 3)
-				this.list2 = res.data.slice(3)
+				if (res.data.length >= 3)
+					this.list2 = res.data.slice(3)
 			})
 		},
 		data() {
diff --git a/src/components/mini/mdDetail.vue b/src/components/mini/mdDetail.vue
index 632ffe8..d6e38b0 100644
--- a/src/components/mini/mdDetail.vue
+++ b/src/components/mini/mdDetail.vue
@@ -32,8 +32,6 @@
 				<vue-markdown :source="source"></vue-markdown>
 			</div>
 		</div>
-
-
 	</div>
 
 </template>
@@ -169,7 +167,8 @@
 	}
 
 	.markdown-body {
-		padding: 10px 20px 10px 20px;
+		min-height: 750px;
+		padding: 35px 20px 10px 20px;
 		box-shadow: 8px 8px 18px rgba(0, 0, 0, 0.1),
 			-8px -8px 18px #ffffff;
 	}
diff --git a/src/components/mini/tagInfo.vue b/src/components/mini/tagInfo.vue
index a959eb1..dab1557 100644
--- a/src/components/mini/tagInfo.vue
+++ b/src/components/mini/tagInfo.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="swichTag ">
 		<a-page-header title="关于我的一些..小故事" style="padding: 10px 0px 20px 0px;" @back="() => this.$router.go(-1)" />
-		
+		<h3 class="layui-timeline-title">捏脸</h3>
 		<a-timeline pending="...">
 			<p slot="pendingDot" style="font-size: 18px;" />
 			<a-timeline-item color="">
@@ -26,39 +26,84 @@
 							style="width: 50px;border-radius: 30px" />
 						<span style="font-size: 10px;color: #999">(小乖)</span>
 					</li>
+					<br>
+					<li> touch: inleft@qq.com</li>
 				</ul>
 				</p>
+
+			</a-timeline-item>
+			<h3 class="layui-timeline-title">那些对我而言,有意义的时刻..</h3>
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2022-02-22</h3>
+				<span style="text-decoration:line-through" >全新的</span><span>vue系列+spring全家桶搭建的blog部署上线</span>
+				<p class="myTip">(终于是赶在这个全是2的日子前把旧站有用的数据迁移了过来)</p>
+			</a-timeline-item>
+			
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2022-01-11</h3>
+				<p>3号机计划开始,新的blog代码提交的第一行</p>
 			</a-timeline-item>
 
 			<a-timeline-item color="">
 				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
-				<h4 class="layui-timeline-title">202108</h4>
-				<p>到我提笔准备写下篇类日记的时候,时间已经来到了16号,
-					<br>此刻的心情,也是平静了许多,想来,这周算是近年来比较忙的周末了吧,从周五凌晨1点就开始马不停蹄..
-				</p>
-				<br>然后,从哪里说起好呢,似乎从哪里起头都是一笔坏账啊..
-				<br>临上车前,我靠在车站的栏杆上,她拿着个电动小风扇,倒是自己不吹,直愣愣对着我,在我旁边吱吱说话,不过此刻我早就不记得她说过了什么,
-				<br>那时,我满脑子都是在想:说吧,说吧,你再不说,以后可能就没机会了
-				<br>没等我脑子缓过神来,我把目光从直视栏杆的方向就自然扭回到了她的方向,话题一转:你觉得,我是在用什么心情在看你呢
-				<br>
-				<br>她啊了一下,似乎也没停顿,这个比较直的女孩就接过我的话:应该是.....她自顾说了几个她觉得的我对她的印象
-				<br>但我的眼里,彼时彼刻已全是她的身影..
-				<br>几分神,我顿了顿,遥遥头:不是,我是说...我对你的...一时语塞
-				<br>我的双手在胸前不停打转,很想通过肢体的语言给她传递我心里的感受,有那么一会,我实在是不知道怎么说下去了..
-				<br>
-				<br>客车要发动了,我停下双手,想起也是同样的在5年前的一个场景
-				<br>我眼神示意了下车子,我要走了..客流开始向车的入口靠过去,我正要提步
-				<br>却踏不起我迟疑的步伐..
-				<br>"哎..给我一个拥抱吧"..我试探下张了双臂,她稍微停了下,还是靠了过来..
-				<br>
-				<br>只须臾片刻,便消千万年间
-				<br>离开她的怀抱后,我比了比个手势:"其实,六年前,到现在为止"..趁机,我在她耳边,轻轻地道:"***,***"
-				<br>
-				<br>end..希望我们的故事还没有终点..
-				
+				<h3 class="layui-timeline-title">2022-01-06</h3>
+				<p>迁移1号机上的svn,启用3号机下的gitblit</p>
 			</a-timeline-item>
 
 			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2022-01-04</h3>
+				<p>迁移1号机的文件仓库到3号机</p>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2021-11-23</h3>
+				<p>完成技术选型,抛弃笨重的jeecg,就决定是你了<a href="https://xiaonuo.vip" target="_blank">xiaonuo.vip</a></p>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2021-11-11</h3>
+				<p>被告知腾讯双11活动背刺,3号机计划启动</p>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2021-10-13</h3>
+				<p>layui官网正式关闭..</p>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2021-07-30</h3>
+				<p>腾讯2号机续费,暂时旅居在typecho下</p>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2020-05-27</h3>
+				<span>扬帆,起航,layui第一版blog单页 面世</span>
+				<span class="myTip">(咕了,没有后文..)</span>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2019-01-02</h3>
+				<span>域名备案完成</span>
+			</a-timeline-item>
+
+			<a-timeline-item color="">
+				<a-icon slot="dot" type="clock-circle-o" style="font-size: 18px;" />
+				<h3 class="layui-timeline-title">2018-12-21</h3>
+				<span>拿下域名:inleft.com</span>
+				<p>阿里云1号机 尝鲜</p>
+			</a-timeline-item>
+
+
+			<!-- <a-timeline-item color="">
 				<a-icon slot="dot" type="align-left" style="font-size: 18px;" />
 
 				<br><em>爱她所爱,思她所思,为她承担伤痛</em>
@@ -66,7 +111,7 @@
 				<br>无论身处乱世还是神所不顾 我都愿为她拔剑而战
 				<br>为她收起翅膀
 				<br>不离不弃,直至永远
-			</a-timeline-item>
+			</a-timeline-item> -->
 		</a-timeline>
 
 	</div>
@@ -76,5 +121,5 @@
 </script>
 
 <style lang="less">
-	
+
 </style>
diff --git a/src/components/mini/tagTime.vue b/src/components/mini/tagTime.vue
index e1f669e..b3b9503 100644
--- a/src/components/mini/tagTime.vue
+++ b/src/components/mini/tagTime.vue
@@ -45,13 +45,19 @@
 		created() {
 			this.year = this.$route.query.year;
 			this.month = this.$route.query.month;
+			archiveGroup({
+				year: this.year,
+				month: this.month
+			}).then((res) => {
+				this.list = res.data;
+			})
 		},
 		watch: {
 			'$route'(to, from) {
 				if ("tagTime" === to.name) {
 					this.year = this.$route.query.year;
 					this.month = this.$route.query.month;
-					this.$message.info('loading',0.3);
+					this.$message.info('loading', 0.3);
 					archiveGroup({
 						year: this.year,
 						month: this.month
diff --git a/src/config/router.config.js b/src/config/router.config.js
index bd96ebc..cbeb488 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -9,6 +9,7 @@
 import login from '../components/swichLabel/main5-show.vue'
 
 import box1 from '../components/mini/box1-info.vue'
+import comment from '../components/mini/box12-comment.vue'
 import tagTime from '../components/mini/tagTime.vue'
 import tagInfo from '../components/mini/tagInfo.vue'
 import boxFriend from '../components/mini/box-friend.vue'
@@ -29,7 +30,7 @@
 				component: main1,
 				children: [{
 						path: '/',
-						name:"articleList",
+						name: "articleList",
 						component: articleList,
 						props: true
 					},
@@ -38,16 +39,21 @@
 						component: box1,
 					},
 					{
-						name:"tagTime",
+						name: "tagTime",
 						path: '/tagTime',
 						component: tagTime,
+					},
+					{
+						name: "comment",
+						path: '/comment',
+						component: comment,
 					},
 					{
 						path: '/tagInfo',
 						component: tagInfo,
 					},
 					{
-						name:"mdDetail",
+						name: "mdDetail",
 						path: '/mdDetail',
 						component: mdDetail,
 					}, {
@@ -61,7 +67,7 @@
 				component: main1,
 				children: [{
 					path: '/',
-					name:"articleList",
+					name: "articleList",
 					component: articleList,
 				}]
 			},
diff --git a/src/mock/index.js b/src/mock/index.js
index 125db81..f9a9c8a 100644
--- a/src/mock/index.js
+++ b/src/mock/index.js
@@ -19,7 +19,7 @@
 	// require('./services/manage')
 	// require('./services/other')
 	// require('./services/tagCloud')
-	require('./test/article.js')
+	// require('./test/article.js')
 
 	Mock.setup({
 		timeout: 800 // setter delay time

--
Gitblit v1.9.1