From 8e9e7080f06f8883ce21f412c2723634ae928af3 Mon Sep 17 00:00:00 2001
From: zhaofang <752743406@qq.com>
Date: Wed, 16 Nov 2022 16:20:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json          |  8 ++++----
 pages/my/follow.vue | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pages.json b/pages.json
index 5d2dd94..5fee363 100644
--- a/pages.json
+++ b/pages.json
@@ -27,7 +27,7 @@
 		{"path" : "pages/study/courseAssess","style" : {"navigationBarTitleText": "课程评估","enablePullDownRefresh": false}},
 		{"path" : "pages/study/loaddetail","style" : {"navigationBarTitleText": "学习任务详细信息","enablePullDownRefresh": false}},
 		{"path" : "pages/study/studydetail","style" : {"navigationBarTitleText": "自主学习详细信息","enablePullDownRefresh": false}},
-		{"path" : "pages/news/index","style" : {"navigationBarTitleText": "消息","enablePullDownRefresh": true}},
+		{"path" : "pages/news/index","style" : {"navigationBarTitleText": "消息","enablePullDownRefresh": false}},
 		{"path" : "pages/my/index","style" : {"navigationBarTitleText": "我的","enablePullDownRefresh": false}},
 		{"path" : "pages/my/myub","style" : {"navigationBarTitleText": "我的u币","enablePullDownRefresh": false}},
 		{"path" : "pages/my/myubrules","style" : {"navigationBarTitleText": "u币规则","enablePullDownRefresh": false}},
@@ -45,9 +45,9 @@
 		{"path" : "pages/my/headimg","style" : {"navigationBarTitleText": "修改头像","enablePullDownRefresh": false}},
 		{"path" : "pages/my/uCurrencyRules","style" : {"navigationBarTitleText": "U币规则","enablePullDownRefresh": false}},
 		{"path" : "pages/my/rankingList","style" : {"navigationBarTitleText": "排行榜","enablePullDownRefresh": false}},
-		{"path" : "pages/my/follow","style" : {"navigationBarTitleText": "关注列表","enablePullDownRefresh": true}},
-		{"path" : "pages/my/myQa","style" : {"navigationBarTitleText": "我的问答","enablePullDownRefresh": true}},
-		{"path" : "pages/my/myMedal","style" : {"navigationBarTitleText": "我的勋章","enablePullDownRefresh": true}},
+		{"path" : "pages/my/follow","style" : {"navigationBarTitleText": "关注列表","enablePullDownRefresh": false}},
+		{"path" : "pages/my/myQa","style" : {"navigationBarTitleText": "我的问答","enablePullDownRefresh": false}},
+		{"path" : "pages/my/myMedal","style" : {"navigationBarTitleText": "我的勋章","enablePullDownRefresh": false}},
 		{"path" : "pages/login/login","style" : { "navigationBarTitleText": "","enablePullDownRefresh": false}},
 		{"path" : "pages/login/loading","style" : { "navigationBarTitleText": "正在加载","enablePullDownRefresh": false}},
 		{"path" : "pages/plus/index","style" : {"navigationBarTitleText": "发布内容"}},
diff --git a/pages/my/follow.vue b/pages/my/follow.vue
index c024b09..8af0974 100644
--- a/pages/my/follow.vue
+++ b/pages/my/follow.vue
@@ -91,12 +91,14 @@
 					pageIndex:1,
 					pageSize:10,
 					list:[],
+					count:0
 				},
 				follow:{
 					aid:'',
 					pageIndex:1,
 					pageSize:10,
 					list:[],
+					count:0
 				}
 				
 			}
@@ -105,10 +107,10 @@
 		   this.onReachBottom();
 		},
 		onReachBottom() {
-			if(this.tab == 1) {//关注我的
+			if(this.tab == 1 && this.followMe.list.length<this.followMe.count) {//关注我的
 				this.followMe.pageIndex ++;
 				this.getMyPage();
-			} else {//我关注的
+			} else if(this.tab == 2 && this.follow.list.length<this.follow.count){//我关注的
 				this.follow.pageIndex ++;
 				this.getPage();
 			}
@@ -159,8 +161,10 @@
 			      apiFollow.save(item.userFollow.aid).then(res=>{
 			        if(res.status == 200) {
 					  $this.followMe.list[index].has = true;
+					  // 手动把关注成功的数据push进我关注的列表
+					 
 			        } else {
-			          this.$message.error(res.message);
+			          // this.$message.error(res.message);
 			        }
 			      })
 			},
@@ -174,9 +178,7 @@
 			    apiFollow.mypage(this.followMe).then(res=>{
 					setTimeout(function(){ uni.hideLoading() },100);
 			        if(res.status== 200) {
-			           if($this.followMe.pageIndex>=res.result.totalPages){
-						   $this.loadStatus='noMore';
-					   }
+						this.followMe.count = res.result.count;
 			           res.result.list.forEach(item=>{
 			              item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
 			           })
@@ -194,9 +196,7 @@
 			    apiFollow.page(this.follow).then(res=>{
 					setTimeout(function(){ uni.hideLoading() },100);
 			      if(res.status== 200) {
-			         if($this.follow.pageIndex>=res.result.totalPages){
-			         	 $this.loadStatus='noMore';
-			         }
+					  this.follow.count = res.result.count;
 			         res.result.list.forEach(item=>{
 			            item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''}
 			         })