From 3a5d6662fbeb80426d9708a5d4684bdd5c1f072f Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Tue, 02 Aug 2022 17:37:00 +0800
Subject: [PATCH] 优化卡片外链,碎碎念标志

---
 src/components/group/articleListScorll.vue |   99 +++++++++++++++++++++----------------------------
 1 files changed, 43 insertions(+), 56 deletions(-)

diff --git a/src/components/group/articleListScorll.vue b/src/components/group/articleListScorll.vue
index 9de3547..d7d4aa5 100644
--- a/src/components/group/articleListScorll.vue
+++ b/src/components/group/articleListScorll.vue
@@ -1,18 +1,24 @@
 <template>
 	<div>
 		<div v-infinite-scroll="loadMore" infinite-scroll-disabled="busy" :infinite-scroll-distance="10">
-			<div v-for="temp in data">
-				<newArticle v-bind="temp"></newArticle>
+			<div class="mySecret" v-if="data.length==0">
+				<p>空空如也..</p>
+			</div>
+
+			<div v-for="(temp,index) in data">
+				<newArticle v-bind="temp" :index="index"></newArticle>
 				<!-- <box5 v-bind="temp"></box5> -->
 			</div>
+
+
 			<div v-if="loading && !busy" class="demo-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" />
+					:defaultPageSize="defaultPageSize" :pageSize="pageSize" :total="total" />
 			</div>
 		</a-row>
 
@@ -28,30 +34,7 @@
 		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: {
@@ -61,33 +44,48 @@
 		directives: {
 			infiniteScroll
 		},
+
 		data() {
 			return {
+				typeId: "",
 				data: [],
 				loading: false,
 				busy: false,
 				size: "small",
 				total: 1,
-				pageSize: 1,
+				pageSize: 6,
 				current: 1,
+				defaultPageSize: 10
 			};
 		},
-		beforeMount() {
-			queryBlogArticleList({
-				pageNo: this.current
-			}).then((res) => {
-				this.total = Number(res.data.total)
-				this.pageSize = Number(res.data.size);
-				this.data = res.data.records;
-				return res
-			})
+		created() {
+			this.typeId = this.$route.query.typeId;
+		},
+		watch: {
+			'$route'(to, from) {
+				if ("articleList" === to.name || "home" === to.name) {
+					this.typeId = this.$route.query.typeId;
+				}
+			},
+			typeId: function(newValue, oldValue) {
+				this.busy = true;
+				this.$message.info('loading', 0.3);
+				this.onChange(1);
+			},
+		},
+		activated() {
+			window.addEventListener('scroll', this);
+		},
+		deactivated() {
+			window.removeEventListener('scroll', this);
 		},
 		methods: {
-
 			onChange(current) {
 				this.current = current;
 				queryBlogArticleList({
-					pageNo: this.current
+					pageNo: current,
+					pageSize: this.pageSize,
+					typeId: this.typeId
 				}).then((res) => {
 					this.busy = false;
 					this.total = Number(res.data.total)
@@ -99,9 +97,11 @@
 			loadMore() {
 				this.loading = true;
 				this.busy = true;
-				
+
 				queryBlogArticleList({
-					pageNo: this.current + 1
+					pageNo: this.current + 1,
+					pageSize: this.pageSize,
+					typeId: this.typeId
 				}).then((res) => {
 
 					this.total = Number(res.data.total)
@@ -109,7 +109,7 @@
 					this.data = this.data.concat(res.data.records);
 					this.busy = false;
 					if (res.data.records.length == 0) {
-						this.$message.warning('没有更多了');
+						//this.$message.warning('别滑了,别滑了,到底了..');
 						this.busy = true;
 						this.loading = false;
 						return;
@@ -130,19 +130,6 @@
 	};
 </script>
 <style>
-	/* .test {
-		overflow: hidden;
-		height: 700px;
-	}
-
-	.infinite-container {
-		overflow: auto;
-	}
-
-	.infinite-container::-webkit-scrollbar {
-		display: none;
-	} */
-
 	.demo-loading-container {
 		position: absolute;
 		bottom: 40px;

--
Gitblit v1.9.1