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

Merge pull request 'gdpaon' (#226) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/226
This commit is contained in:
gyh 2020-08-17 19:34:48 +08:00
commit fd31d14881
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pageB/video/video.nvue
View File

@ -177,6 +177,9 @@
onReady() { onReady() {
this.videoBox = uni.createVideoContext("videoId", this); this.videoBox = uni.createVideoContext("videoId", this);
}, },
onHide() {
this.videoBox.pause();
},
onBackPress() { onBackPress() {
if (this.cart_type) { if (this.cart_type) {
this.cart_type = !this.cart_type; this.cart_type = !this.cart_type;

19
pages/index/index.vue
View File

@ -332,7 +332,7 @@
if (this.live_page == 1) { if (this.live_page == 1) {
this.tabLiveLists = res.data.data; this.tabLiveLists = res.data.data;
this.status = "loadmore"; this.status = "loadmore";
if (res.data.data.length < 6) { if (res.data.data.length < 4) {
this.status = "nomore"; this.status = "nomore";
} }
} else if (res.data.data.length == 0 && this.live_page > 1) { } else if (res.data.data.length == 0 && this.live_page > 1) {
@ -423,26 +423,17 @@
uni.stopPullDownRefresh(); uni.stopPullDownRefresh();
this.status = "loading"; this.status = "loading";
if (res.errCode == 0) { if (res.errCode == 0) {
uni.hideLoading();
console.log(this.page,res.data.list.length);
if (this.page == 1) { if (this.page == 1) {
this.articleList = res.data.list; this.articleList = res.data.list;
this.status = "loadmore"; if (!res.data.length) {
if (res.data.list.length < 4) {
this.status = "nomore"; this.status = "nomore";
} }
} else if (res.data.length == 0 && this.page > 1) { } else if (res.data.length == 0) {
this.status = "nomore"; this.status = "nomore";
} else { } else {
this.articleList = this.articleList.concat(res.data.list); this.articleList = this.articleList.concat(res.data.list);
} }
if (res.data.length == 0 && this.page > 1) { this.page++;
console.log(111);
} else {
this.page++;
}
} else {
this.status = "nomore"
} }
}) })
}, },