From 93768186ca58acd0fc0b6963d0e017979c087631 Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Tue, 23 Aug 2022 02:09:58 +0800
Subject: [PATCH] 上下篇日志提示加入

---
 src/components/group/articleListScorll.vue |   93 ++++++++++++++--------------------------------
 1 files changed, 29 insertions(+), 64 deletions(-)

diff --git a/src/components/group/articleListScorll.vue b/src/components/group/articleListScorll.vue
index 47e61cb..10a9364 100644
--- a/src/components/group/articleListScorll.vue
+++ b/src/components/group/articleListScorll.vue
@@ -1,22 +1,24 @@
 <template>
-	<div>
+	<div class="fade">
 		<div v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" :infinite-scroll-distance="10">
-			<div v-for="(temp,index) in data">
-				<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">
+
+			<div v-for="(temp,index) in data">
+				<newArticle v-bind="temp" :index="index" :typeId="typeId"></newArticle>
+				<!-- <box5 v-bind="temp"></box5> -->
+			</div>
+
+
+			<div v-if="loading && !busy" class="loading-container">
 				<a-spin />
 			</div>
 		</div>
 		<a-row type="flex" justify="center">
-			<div style="position:fixed;bottom: 10px;" id="dddadf">
+			<div style="position:fixed;bottom: 10px;">
 				<a-pagination @change="onChange" :showQuickJumper="true" :size="size" v-model="current"
-					:defaultPageSize="10" :pageSize="pageSize" :total="total" />
+					:showLessItems="true" :defaultPageSize="defaultPageSize" :pageSize="pageSize" :total="total" />
 			</div>
 		</a-row>
 
@@ -25,37 +27,11 @@
 <script>
 	import infiniteScroll from 'vue-infinite-scroll';
 	import box5 from "../mini/box5-article.vue"
-	import babyActicle from '../../assets/baby.htm'
 	import newArticle from "../mini/box-new-article.vue"
-	import shijie from '../../assets/shijie.htm'
 	import {
 		queryBlogArticleList
 	} from '../../api/blogArticle.js'
 
-	var obj1 = {
-		"source": babyActicle,
-		"title": "陈奕迅-Body Song 歌词",
-		"read": 1101,
-		"like": 233,
-		"folder": "歌词",
-		"publishTime": "2021-05-26",
-	}
-	var obj2 = {
-		"source": shijie,
-		"title": "这世界那么多人-吉他谱",
-		"read": 3101,
-		"like": 113,
-		"folder": "吉他谱",
-		"publishTime": "2020-05-26",
-	}
-	var obj3 = {
-		"source": shijie,
-		"title": "遥远的它-吉他谱",
-		"read": 201,
-		"like": 13,
-		"folder": "吉他谱",
-		"publishTime": "2022-07-26",
-	}
 
 	export default {
 		components: {
@@ -65,6 +41,7 @@
 		directives: {
 			infiniteScroll
 		},
+
 		data() {
 			return {
 				typeId: "",
@@ -73,45 +50,45 @@
 				busy: false,
 				size: "small",
 				total: 1,
-				pageSize: 1,
+				pageSize: 6,
 				current: 1,
+				defaultPageSize: 10,
 			};
+		},
+		created() {
+			this.typeId = this.$route.query.typeId;
 		},
 		watch: {
 			'$route'(to, from) {
-				if ("articleList" === to.name) {
+				if ("articleList" === to.name || "home" === to.name) {
 					this.typeId = this.$route.query.typeId;
 				}
 			},
 			typeId: function(newValue, oldValue) {
+				//有条件不刷新
+				// if (newValue == undefined || oldValue == "") {
+				// 	return
+				// }
+
 				this.busy = true;
 				this.$message.info('loading', 0.3);
 				this.onChange(1);
-			}
-
+			},
 		},
 		activated() {
+			this.busy = false;
 			window.addEventListener('scroll', this);
 		},
 		deactivated() {
+			this.busy = true;
 			window.removeEventListener('scroll', this);
-		},
-		beforeMount() {
-			queryBlogArticleList({
-				pageNo: this.current,
-				typeId: this.typeId
-			}).then((res) => {
-				this.total = Number(res.data.total)
-				this.pageSize = Number(res.data.size);
-				this.data = res.data.records;
-				return res
-			})
 		},
 		methods: {
 			onChange(current) {
 				this.current = current;
 				queryBlogArticleList({
 					pageNo: current,
+					pageSize: this.pageSize,
 					typeId: this.typeId
 				}).then((res) => {
 					this.busy = false;
@@ -127,6 +104,7 @@
 
 				queryBlogArticleList({
 					pageNo: this.current + 1,
+					pageSize: this.pageSize,
 					typeId: this.typeId
 				}).then((res) => {
 
@@ -156,20 +134,7 @@
 	};
 </script>
 <style>
-	/* .test {
-		overflow: hidden;
-		height: 700px;
-	}
-
-	.infinite-container {
-		overflow: auto;
-	}
-
-	.infinite-container::-webkit-scrollbar {
-		display: none;
-	} */
-
-	.demo-loading-container {
+	.loading-container {
 		position: absolute;
 		bottom: 40px;
 		width: 100%;

--
Gitblit v1.9.1