diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue
index 6f4c26ef..35a773ec 100644
--- a/src/views/homepage/page.vue
+++ b/src/views/homepage/page.vue
@@ -6,7 +6,7 @@
-->
-
+
动态
@@ -20,6 +20,18 @@
还没有动态
+
课程
@@ -28,6 +40,18 @@
还没有课程
+
案例
@@ -36,6 +60,18 @@
还没有案例
+
笔记
@@ -44,6 +80,18 @@
还没有笔记
+
提问
@@ -52,6 +100,18 @@
还没有提问
+
回答
@@ -60,6 +120,18 @@
还没有回答
+
文章
@@ -68,6 +140,18 @@
还没有文章
+
关注
@@ -78,18 +162,6 @@
-->
-
-
-
-
@@ -125,6 +197,7 @@
},
data(){
return{
+ pageId:'',
loading:false,
loading1:false,
loading2:false,
@@ -133,22 +206,30 @@
loading5:false,
loading6:false,
intTabIndex:-1,//初始化显示哪个tab,71我关注的人,72关注我的人
- page:{
- pageIndex:1,
- pageSize:10,
- count:0
- },
input:'',
- activeName:'',
- pageId:'',
+ activeName:'0',
// pageList:[],
casePageList:[],
+ casePage:{count:0,pageSize:10, pageIndex:1},
+
notePageList:[],
+ notePage:{count:0,pageSize:10,pageIndex:1},
+
articlePageList:[],
+ articlePage:{count:0,pageSize:10,pageIndex:1},
+
qaPageList:[],
+ qaPage:{count:0,pageSize:10,pageIndex:1},
+
answerPageList:[],
+ answerPage:{count:0,pageSize:10,pageIndex:1},
+
cousrePageList:[],
+ cousrePage:{count:0,pageSize:10,pageIndex:1},
+
allPageList:[],
+ allPage:{count:0,pageSize:10,pageIndex:1},
+
personal:false,
orgData:[],
Profess:[]
@@ -211,19 +292,40 @@
loadMajorType:'majorType/loadMajorTypes',
loadOrgDomain:'orgDomain/loadOrgDomains'
}),
+ getPagerData(){
+ if(this.activeName == '0') {
+ return this.allPage;
+ } else if(this.activeName == '1') {
+ return this.cousrePage;
+ } else if(this.activeName == '2') {
+ return this.articlePage;
+ } else if(this.activeName == '3') {
+ return this.casePage;
+ } else if(this.activeName == '4') {
+ return this.qaPage;
+ } else if(this.activeName == '5') {
+ return this.answerPage;
+ } else if(this.activeName == '6') {
+ return this.notePage;
+ }
+ return null;
+ },
handleSizeChange(val) {
- this.page.pageSize = val;
- this.page.pageIndex = 1;
+ let curPageData=this.getPagerData();
+ curPageData.pageIndex=1;
+ curPageData.pageSize=val;
this.getList();
},
handleCurrentChange(val) {
- this.page.pageIndex = val;
+ let curPageData=this.getPagerData();
+ curPageData.pageIndex=val;
this.getList();
},
getList() {
+ let curPageData=this.getPagerData();
let data = {
- pageIndex:this.page.pageIndex,
- pageSize:this.page.pageSize,
+ pageIndex:curPageData.pageIndex,
+ pageSize:curPageData.pageSize,
contentType:this.activeName == 0? '':this.activeName,//内容类型
aid:this.pageId, //指定用户的动态,
hidden:this.pageId == this.userInfo.aid?'':false,//是否隐藏,不指定,查询全部
@@ -253,7 +355,7 @@
this.loading5 = false;
this.loading6 = false;
if(res.status == 200) {
- this.page.count = res.result.count;
+ curPageData.count = res.result.count;
let ids = res.result.list.map(item=>item.contentId);
const noReapetIds = [...new Set(ids)];
res.result.list.forEach(item=>{
@@ -542,17 +644,43 @@
})
},
handleClick() {
- if(this.activeName == '7') {
- //单独的分页,所以这里不与当前页面的分页共用
- this.$refs.followList.resetActive();
- this.$refs.followList.getPage();
- return
+
+ if(this.activeName == '0') {
+ if(this.allPageList.length>0){
+ return;
}
- this.page.count = 0
+ } else if(this.activeName == '1') {
+ if(this.cousrePageList.length>0){
+ return;
+ }
+ } else if(this.activeName == '2') {
+ if(this.articlePageList.length>0){
+ return;
+ }
+ } else if(this.activeName == '3') {
+ if(this.casePageList.length>0){
+ return;
+ }
+ } else if(this.activeName == '4') {
+ if(this.qaPageList.length>0){
+ return;
+ }
+ } else if(this.activeName == '5') {
+ if(this.answerPageList.length>0){
+ return;
+ }
+ } else if(this.activeName == '6') {
+ if(this.notePageList.length>0){
+ return;
+ }
+ }else if(this.activeName == '7'){
+ //单独的分页,所以这里不与当前页面的分页共用
+ this.$refs.followList.resetActive();
+ this.$refs.followList.getPage();
+ return
+ }
if(this.activeName == '8') {
- this.page.count = 0;
- // console.log(this.$refs.followList,'this.$refs.followList');
- // this.$refs.followList.getPage();
+ // 书箱没有了
return
}
this.getList();
@@ -562,6 +690,10 @@