theluyuan/deming
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'gdpao' (#223) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/223
This commit was merged in pull request #223.
This commit is contained in:
gyh
2020-08-17 16:58:52 +08:00
parent c14b4338e9 b1a705e0f8
commit f77b4ebc02
8 changed files with 95 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
pages/index/index.vue
View File

@@ -240,6 +240,7 @@
num: 0,
page: 1, // 0即第一页
follow_page: 0, //
live_page: 1, //
articleList: [],
recommendList: [], // 推荐达人
indexImageSwiper: [],
@@ -318,24 +319,27 @@
uni.showLoading({
title: "loading..."
})
this.$u.api.tabLiveList({page:this.page}).then((res) => {
this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
// uni.stopPullDownRefresh();
this.status = "loading";
console.log(res)
if (res.errCode == 0) {
uni.hideLoading();
if (this.page == 1) {
if (this.live_page == 1) {
this.tabLiveLists = res.data.data;
this.status = "loadmore";
} else if (res.data.data.length == 0 && this.page > 1) {
if (res.data.data.length < 6) {
this.status = "nomore";
}
} else if (res.data.data.length == 0 && this.live_page > 1) {
this.status = "nomore";
} else {
this.tabLiveLists = this.tabLiveLists.concat(res.data.data);
console.log(this.tabLiveLists)
}
if (res.data.data.length == 0 && this.page > 1) {
if (res.data.data.length == 0 && this.live_page > 1) {
} else {
this.page++;
this.live_page++;
}
} else {
this.status = "nomore"
@@ -388,7 +392,7 @@
this.getArticlelist();
this.getSwiper();
} else if (this.num == 1) {
this.page = 1;
this.live_page = 1;
this.getZhiBoSwiper(); // 直播轮播
this.tabLiveList();
} else if (this.num == 2) {
@@ -416,15 +420,20 @@
this.status = "loading";
if (res.errCode == 0) {
uni.hideLoading();
console.log(this.page,res.data.list.length);
if (this.page == 1) {
this.articleList = res.data.list;
this.status = "loadmore";
if (res.data.list.length < 4) {
this.status = "nomore";
}
} else if (res.data.length == 0 && this.page > 1) {
this.status = "nomore";
} else {
this.articleList = this.articleList.concat(res.data.list);
}
if (res.data.length == 0 && this.page > 1) {
console.log(111);
} else {
this.page++;
}
@@ -436,17 +445,16 @@
// 屏蔽更新列表
updateList() {
this.page = 1;
this.articleList = [];
this.getArticlelist();
this.tabLiveList()
this.tabLiveList();
},
// 发现下拉加载
swiperBottom(e) {
if(this.num == 0 ){
if(this.num == 0){
this.getArticlelist();
}else if(this.num == 1){
console.log(123)
this.tabLiveList()
this.tabLiveList();
}
// console.log(e);
},