Merge pull request 'xbx' (#214) from xbx into master

Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/214
This commit is contained in:
luyuan 2020-08-15 19:07:50 +08:00
commit c13d87a07f
2 changed files with 13 additions and 2 deletions

View File

@ -4,7 +4,7 @@
<view class="info"> <view class="info">
<view class="avatar"> <view class="avatar">
<image :src="item.member_avatar" mode="aspectFill"></image> <image :src="item.member_avatar" mode="aspectFill"></image>
<view class="posi-type"> <view class="posi-type" v-if="item.live_status != 0" @click="tozhibo">
<view> <view>
<u-icon name="play-right-fill" color="#fff" size="20rpx"></u-icon> <u-icon name="play-right-fill" color="#fff" size="20rpx"></u-icon>
</view> </view>
@ -136,6 +136,16 @@ export default {
deep: true deep: true
}, },
methods: { methods: {
tozhibo(){
this.$u.route({
url:"/pages/zhibo/index",
params:{
url:item.url,
id:item.live_id,
rid:item.chatroom_id
}
})
},
// //
openPro() { openPro() {
this.is_open = !this.is_open; this.is_open = !this.is_open;

View File

@ -36,7 +36,7 @@
</scroll-view> </scroll-view>
<scroll-view style="width:100%;padding: 0rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 " :scroll-top="scrollTop" @scroll="scroll"> <scroll-view style="width:100%;padding: 0rpx 30rpx;margin-right:23rpx;" :style="{ height: scrollHeight }" scroll-y="true" @scrolltolower="loadMore" v-if=" current == 1 " :scroll-top="scrollTop" @scroll="scroll">
<view class="list" > <view class="list" >
<darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0px 3rpx 7rpx 0px rgba(153, 153, 153, 0.35);" v-for="item in goodsList" :key="item.id" :info="item" v-on:pChangeType="changeType"></darenItem> <darenItem style="margin-top:20rpx;margin-right:23rpx;box-shadow:0px 3rpx 7rpx 0px rgba(153, 153, 153, 0.35);" v-for="item in goodsList" :key="item.member_id" :info="item" v-on:pChangeType="changeType"></darenItem>
</view> </view>
<u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore> <u-loadmore :status="loadStatus" bgColor="#FFFFFF" margin-top="20" margin-bottom="20" v-if="goodsList.length >= pageSize"></u-loadmore>
<u-empty mode="list" v-if="!goodsList.length"></u-empty> <u-empty mode="list" v-if="!goodsList.length"></u-empty>
@ -173,6 +173,7 @@ export default {
page: this.page page: this.page
}) })
this.timer = true; this.timer = true;
console.log(JSON.stringify(res))
if(res.errCode == 0) { if(res.errCode == 0) {
if(load == 'reload') this.goodsList = res.data.list; if(load == 'reload') this.goodsList = res.data.list;
else if(load == 'loadmore') this.goodsList.push(...res.data.list); else if(load == 'loadmore') this.goodsList.push(...res.data.list);