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

Merge pull request 'gdpaoup' (#145) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/145
This commit was merged in pull request #145.
This commit is contained in:
gyh
2020-08-10 19:08:19 +08:00
parent 33b0137c06 74fcc50696
commit 52bce327cc
4 changed files with 245 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
pages/index/index.vue
View File

@@ -14,7 +14,7 @@
inactive-color="#333" :active-item-style="{
'color':'#333'
}" :bold="false"
@change="dianji"></u-tabs>
@change="dianji($event)"></u-tabs>
</view>
<view class="sosuo"></view>
</view>
@@ -120,7 +120,8 @@
.tabs {
width: 334rpx;
// pointer-events: none;
/deep/ .u-tab-item {
font-weight: bold;
}
@@ -130,6 +131,7 @@
.card {
height: 100%;
width: 100%;
// pointer-events: none;
.box {
width: 100%;
@@ -342,7 +344,6 @@
this.$u.api.attentionMember({
member_id: member_id
}).then((res) => {
console.log(res);
this.follow_page = 0;
this.getRecommendList(); // 关注列表
this.getFollowList(); // 刷新发现的列表
@@ -357,28 +358,31 @@
},
// 切换导航
dianji(a) {
// console.log(a);
if (typeof a == "object") {
this.num = a.detail.current
} else {
this.num = a
}
// console.log(a);
if (a.type == "change") {
this.num = a.detail.current
} else {
this.num = a;
}
// console.log(this.num);
// 状态请求
if (this.num == 0) {
this.page = 0;
this.status = "loadmore";
this.getArticlelist();
this.getSwiper();
} else if (this.num == 1) {
this.getZhiBoSwiper(); // 直播轮播
this.tabLiveList();
} else if (this.num == 2) {
this.follow_page = 0;
this.status = "loadmore";
if (this.hasLogin) {
this.getFollowList(); // 关注列表
if (a.type == "change") { // 强制请求一次
if (this.num == 0) {
this.page = 0;
this.status = "loadmore";
this.getArticlelist();
this.getSwiper();
} else if (this.num == 1) {
this.getZhiBoSwiper(); // 直播轮播
this.tabLiveList();
} else if (this.num == 2) {
this.follow_page = 0;
this.fansList = [];
if (this.hasLogin) {
this.getFollowList(); // 关注列表
}
this.getRecommendList(); // 推荐达人
}
this.getRecommendList(); // 推荐达人
}
},
// 发现别表
@@ -430,11 +434,14 @@
}).then(res => {
this.status_1 = "loading";
if (res.errCode == 0) {
if (this.fansList.length < 4) {
this.status_1 = "nomore";
}
// uni.stopPullDownRefresh();
// console.log('37647744ghj', res)
if (this.follow_page == 0) {
this.fansList = res.data.list;
this.status_1 = "loadmore";
// this.status_1 = "loadmore";
} else if (res.data.list.length == 0 && this.follow_page > 0) {
this.status_1 = "nomore";
} else {