diff --git a/components/index/video-item/index.vue b/components/index/video-item/index.vue index bb127bc..dd983a0 100644 --- a/components/index/video-item/index.vue +++ b/components/index/video-item/index.vue @@ -15,7 +15,7 @@ {{ item.member_nickname }} - + @@ -105,6 +105,7 @@ >image{ width: 37rpx; height: 8rpx; + padding: 20rpx; } .action { z-index: 19; diff --git a/pageB/video/video.nvue b/pageB/video/video.nvue index 38b1ffb..7095b60 100644 --- a/pageB/video/video.nvue +++ b/pageB/video/video.nvue @@ -52,7 +52,7 @@ - + {{ item.member_nickname }} {{ item.create_time }} @@ -679,6 +679,10 @@ margin-right: 20rpx; border-radius: 50%; } + + .comment-title-info { + justify-content: space-between; + } .comment-title { font-size: 26rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index c495dba..301738a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -39,7 +39,7 @@ - + @@ -269,9 +269,6 @@ darenItem }, onShow() { - this.page = 1; - if (this.page != 1) { - } console.log(this.imService.status) if(!this.imService.status && this.$store.state.hasLogin){ const user = uni.getStorageSync('user_info'); @@ -416,7 +413,7 @@ dianji(a) { // console.log(a); if (a.type == "change") { - this.num = a.detail.current + this.num = a.detail.current; } else { this.num = a; } @@ -426,16 +423,18 @@ if (this.num == 0) { this.page = 1; this.articleList = []; - this.status = "loadmore"; + this.status = "nomore"; this.getArticlelist(); this.getSwiper(); } else if (this.num == 1) { this.live_page = 1; + this.status_live = "nomore"; this.getZhiBoSwiper(); // 直播轮播 this.tabLiveList(); } else if (this.num == 2) { this.follow_page = 0; this.fansList = []; + this.status_1 = "nomore"; if (this.hasLogin) { this.getFollowList(); // 关注列表 } @@ -462,9 +461,9 @@ } else { this.articleList = this.articleList.concat(res.data.list); } - this.page++; } }) + console.log(this.page); }, // 屏蔽更新列表 updateList() { @@ -475,12 +474,11 @@ }, // 发现下拉加载 swiperBottom(e) { - if(this.num == 0){ - this.getArticlelist(); - }else if(this.num == 1){ - this.tabLiveList(); - } - // console.log(e); + this.page++; + this.getArticlelist(); + }, + swiperBottomLive() { + this.tabLiveList(); }, swiperTop() { // uni.startPullDownRefresh(); diff --git a/static/image/userinfo/dianzan.png b/static/image/userinfo/dianzan.png index ada366b..c490f14 100644 Binary files a/static/image/userinfo/dianzan.png and b/static/image/userinfo/dianzan.png differ diff --git a/static/image/userinfo/dianzan1.png b/static/image/userinfo/dianzan1.png index 3dfd011..407166c 100644 Binary files a/static/image/userinfo/dianzan1.png and b/static/image/userinfo/dianzan1.png differ diff --git a/static/image/userinfo/dianzan2.png b/static/image/userinfo/dianzan2.png deleted file mode 100644 index ff70f83..0000000 Binary files a/static/image/userinfo/dianzan2.png and /dev/null differ diff --git a/static/image/userinfo/gouwuche.png b/static/image/userinfo/gouwuche.png index 2bb2028..687884d 100644 Binary files a/static/image/userinfo/gouwuche.png and b/static/image/userinfo/gouwuche.png differ diff --git a/static/image/userinfo/gouwuche1.png b/static/image/userinfo/gouwuche1.png index 7f4c54e..e1de4f4 100644 Binary files a/static/image/userinfo/gouwuche1.png and b/static/image/userinfo/gouwuche1.png differ diff --git a/static/image/userinfo/gouwuche2.png b/static/image/userinfo/gouwuche2.png deleted file mode 100644 index 3c93715..0000000 Binary files a/static/image/userinfo/gouwuche2.png and /dev/null differ diff --git a/static/image/userinfo/pinglun.png b/static/image/userinfo/pinglun.png index 56cf1d3..66ed98d 100644 Binary files a/static/image/userinfo/pinglun.png and b/static/image/userinfo/pinglun.png differ diff --git a/static/image/userinfo/pinglun1.png b/static/image/userinfo/pinglun1.png index fdc2c77..7e69f8a 100644 Binary files a/static/image/userinfo/pinglun1.png and b/static/image/userinfo/pinglun1.png differ diff --git a/static/image/userinfo/pinglun2.png b/static/image/userinfo/pinglun2.png deleted file mode 100644 index 3a388eb..0000000 Binary files a/static/image/userinfo/pinglun2.png and /dev/null differ diff --git a/static/image/userinfo/shoucang.png b/static/image/userinfo/shoucang.png index 48f8be4..be34e31 100644 Binary files a/static/image/userinfo/shoucang.png and b/static/image/userinfo/shoucang.png differ diff --git a/static/image/userinfo/shoucang1.png b/static/image/userinfo/shoucang1.png index 0fbb397..60b9ad8 100644 Binary files a/static/image/userinfo/shoucang1.png and b/static/image/userinfo/shoucang1.png differ diff --git a/static/image/userinfo/shoucang2.png b/static/image/userinfo/shoucang2.png deleted file mode 100644 index c2d880a..0000000 Binary files a/static/image/userinfo/shoucang2.png and /dev/null differ