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

Merge pull request 'gdpao2' (#227) from gyh into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/227
This commit is contained in:
gyh 2020-08-17 20:32:50 +08:00
commit 2a180ba05f
3 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pageB/components/userinfo/index.vue
View File

@ -1,7 +1,7 @@
<template>
<view class="userinfo" @click="stopClick()">
<view class="userhead">
<image class="avatar" :src="item.member_avatar" @click="gotoInfo(item.member_id)"></image>
<image class="avatar" :src="item.member_avatar" @click="gotoInfo(item.role,item.member_id,item.store_id)"></image>
<!-- <text class="follow" @click="following(item.member_id)">{{ is_follow ? "✓" : "+" }}</text> -->
<image class="follow" :src=" !is_follow ? '../../static/image/userinfo/follow.png' : '../../static/image/userinfo/followed.png' " mode="" @click="following(item.member_id)"></image>
</view>
@ -238,11 +238,16 @@
cart: this.is_cart
});
},
gotoInfo(id) {
console.log(id);
uni.navigateTo({
url: "/pageB/details/index?id=" + id
})
gotoInfo(type,id,s_id) {
if (type == 2) {
uni.navigateTo({
url: "/pageC/merchant/index?id=" + s_id
})
} else {
uni.navigateTo({
url: "/pageB/details/index?id=" + id
})
}
},
// 冒泡
stopClick() {

12
pageB/details/index.vue
View File

@ -19,8 +19,8 @@
<view class="box">
<videoItem v-for="item in listInfo" :key="item.article_id" :item="item"
@getArticlelist="getArticlelist"></videoItem>
<view class="no-data" v-show="!listInfo && page">暂无数据</view>
<u-loadmore class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
<view class="no-data" v-if="!listInfo && page">暂无数据</view>
<u-loadmore v-else class="load-size" color="#999999" :status="status" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
</view>
</scroll-view>
</view>
@ -124,16 +124,12 @@ export default {
if (this.page == 1) {
this.listInfo = res.data.list;
this.status = "loadmore";
} else if (res.data.length == 0 && this.page > 1) {
} else if (res.data.length == 0) {
this.status = "nomore";
} else {
this.listInfo = this.listInfo.concat(res.data.list);
console.log(this.listInfo)
}
if (res.data.length == 0 && this.page > 1) {
} else {
this.page++;
}
this.page++;
} else {
console.log(res.message);
}

16
pages/index/index.vue
View File

@ -253,6 +253,7 @@
fansList: [], // 关注的发现列表
status: 'loadmore',
status_1: 'loadmore',
status_live: 'loadmore',
iconType: 'circle',
loadText: {
loadmore: '轻轻上拉',
@ -325,18 +326,18 @@
})
this.$u.api.tabLiveList({page:this.live_page}).then((res) => {
// uni.stopPullDownRefresh();
this.status = "loading";
this.status_live = "loading";
console.log(res)
if (res.errCode == 0) {
uni.hideLoading();
if (this.live_page == 1) {
this.tabLiveLists = res.data.data;
this.status = "loadmore";
this.status_live = "loadmore";
if (res.data.data.length < 4) {
this.status = "nomore";
this.status_live = "nomore";
}
} else if (res.data.data.length == 0 && this.live_page > 1) {
this.status = "nomore";
this.status_live = "nomore";
} else {
this.tabLiveLists = this.tabLiveLists.concat(res.data.data);
console.log(this.tabLiveLists)
@ -346,7 +347,7 @@
this.live_page++;
}
} else {
this.status = "nomore"
this.status_live = "nomore"
}
})
@ -411,11 +412,6 @@
},
// 发现列表
getArticlelist() {
if (this.page > 1) {
uni.showLoading({
title: "loading..."
})
}
this.$u.api.getArticlelist({
page: this.page,
is_video_img: 0, // 查询视频1 图文2 都查0