|
@@ -95,7 +95,7 @@
|
|
showLoading: false,
|
|
showLoading: false,
|
|
loadingNow: true,
|
|
loadingNow: true,
|
|
loadingText: '上拉加载更多',
|
|
loadingText: '上拉加载更多',
|
|
- pageSize: 10,
|
|
|
|
|
|
+ pageSize: 20,
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
totalPage: 1,
|
|
totalPage: 1,
|
|
pullFlag: true,
|
|
pullFlag: true,
|
|
@@ -110,14 +110,14 @@
|
|
this.clubStatus = resolve.clubStatus
|
|
this.clubStatus = resolve.clubStatus
|
|
this.userID = resolve.userID ? resolve.userID : '';
|
|
this.userID = resolve.userID ? resolve.userID : '';
|
|
this.userIdentity = resolve.userIdentity
|
|
this.userIdentity = resolve.userIdentity
|
|
- if(this.userIdentity = 1){
|
|
|
|
|
|
+ if(this.userIdentity == 1){
|
|
this.identity = 1
|
|
this.identity = 1
|
|
}else{
|
|
}else{
|
|
this.identity = 2
|
|
this.identity = 2
|
|
}
|
|
}
|
|
this.getListFromServer();
|
|
this.getListFromServer();
|
|
}).catch(error =>{
|
|
}).catch(error =>{
|
|
- console.log(error)
|
|
|
|
|
|
+ this.getListFromServer();
|
|
})
|
|
})
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -125,7 +125,7 @@
|
|
},
|
|
},
|
|
methods:{
|
|
methods:{
|
|
toLower() {
|
|
toLower() {
|
|
- if(this.totalPage>this.pageNum && this.pullFlag) {
|
|
|
|
|
|
+ if(this.totalPage>this.listData.length && this.pullFlag) {
|
|
this.getListFromServer(true);
|
|
this.getListFromServer(true);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
@@ -165,11 +165,12 @@
|
|
this.setProductPrice()
|
|
this.setProductPrice()
|
|
this.showSkeleton = false
|
|
this.showSkeleton = false
|
|
}
|
|
}
|
|
|
|
+ console.log(this.listData)
|
|
// 防上拉暴滑
|
|
// 防上拉暴滑
|
|
this.pullFlag = false;
|
|
this.pullFlag = false;
|
|
setTimeout(()=>{ this.pullFlag = true; },500)
|
|
setTimeout(()=>{ this.pullFlag = true; },500)
|
|
// 底部提示文案
|
|
// 底部提示文案
|
|
- if(this.totalPage>this.pageNum) {
|
|
|
|
|
|
+ if(this.totalPage>this.listData.length) {
|
|
this.loadingText = '上拉加载更多';
|
|
this.loadingText = '上拉加载更多';
|
|
} else {
|
|
} else {
|
|
this.showLoading = true;
|
|
this.showLoading = true;
|
|
@@ -178,6 +179,7 @@
|
|
} else {
|
|
} else {
|
|
if(!loadMore) { this.showEmpty = true; }
|
|
if(!loadMore) { this.showEmpty = true; }
|
|
}
|
|
}
|
|
|
|
+
|
|
}).catch(error =>{
|
|
}).catch(error =>{
|
|
this.$util.msg(error.msg,2000);
|
|
this.$util.msg(error.msg,2000);
|
|
})
|
|
})
|