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

Merge branch 'master' of http://git.luyuan.tk/luyuan/deming into xbx

Browse Source
This commit is contained in:
luyuan
2020-08-13 10:09:49 +08:00
parent e55aa62bcc f9a2ada1d3
commit eb886368e9
17 changed files with 280 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pages/index/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<view>
<view class="status_bar"></view>
<view class="index" @touchmove.stop.prevent="moveHandle">
<view class="index">
<view class="top">
<view class="sosuo" @click="goSearch">
<u-icon name="search" color="#555" size="34rpx"></u-icon>
@@ -18,7 +18,7 @@
</view>
<view class="sosuo"></view>
</view>
<swiper class="card" @change="dianji" :current="num">
<swiper class="card" @change="dianji" :current="num" @touchmove.stop.prevent="moveHandle">
<swiper-item>
<scroll-view style="width:100%;height:100%" scroll-y="true" lower-threshold="200" upper-threshold="100" @scrolltolower="swiperBottom" @scrolltoupper="swiperTop">
<view class="box">
@@ -45,11 +45,11 @@
<view class="list">
<view>
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => !(index&1))" :zid="item.live_id" :rid="item.chatroom_id"
:key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
:key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
</view>
<view style="margin-left:20rpx">
<zhiboItem v-for="item in tabLiveLists.filter((_, index) => index&1)" :zid="item.live_id" :rid="item.chatroom_id"
:key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
:key="item.live_id" :name="item.store_name" :image="item.cover_img" :url="item.url" :item="item" @updateList="updateList"></zhiboItem>
</view>
</view>
</view>
@@ -79,7 +79,7 @@
<videoItem isguanzhu="true" v-for="(item,id) in fansList" :key="id" :item="item"></videoItem>
</view>
<view class="no-data" v-if="!fansList.length">您还没有关注哦，赶紧去点点关注！</view>
<u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" margin-bottom="50" :load-text="loadText" />
<u-loadmore class="load-size" v-else :status="status_1" icon-type="iconType" margin-top="50" :load-text="loadText" />
</view>
</view>
</view>
@@ -98,11 +98,6 @@
width: 750rpx;
display: flex;
flex-direction: column;
height: 100vh;
/* #ifdef APP-PLUS */
padding-bottom: 88rpx;
/* #endif */
overflow: hidden;
.top {
z-index: 10000;
@@ -135,29 +130,31 @@
.card {
width: 100%;
height: 100%;
margin-top: 88rpx;
// pointer-events: none;
height: calc(100vh - 150rpx);
margin-top: 100rpx;
// padding-top: 100rpx;
.box {
width: 100%;
height: 100%;
padding: 0 30rpx;
padding: 0 30rpx 0;
// margin-top: 30rpx;
}
.list {
display: flex;
padding-bottom: 50rpx;
margin-bottom: 50rpx;
// height: 100vh;
// padding-bottom: 100rpx;
// margin-bottom: 50rpx;
}
}
.tuijian {
width: 750rpx;
padding: 30rpx;
margin-left: -30rpx;
height: 400rpx;
background-color: #ececec;
padding: 30rpx;
.title {
width: 100%;
@@ -389,7 +386,6 @@
this.articleList = this.articleList.concat(res.data.list);
}
if (res.data.length == 0 && this.page > 1) {
console.log(111);
} else {
this.page++;
}