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++;
}

50
pages/mine/index.vue
View File

@@ -47,7 +47,7 @@
<view class="title-text">我的订单</view>
<view class="more" @click="toOtherPage('/order/Index')">
<view class="title-text-more">查看全部订单</view>
<image src="/static/image/mine/21.png"></image>
<u-icon name="arrow-right" color="#999" size="22"></u-icon>
</view>
</view>
<view class="content">
@@ -180,7 +180,7 @@ export default {
.mine-top {
// width: 100%;
height: 272rpx;
background: #FF780F;
background-color: #F0AD4E;
.top {
padding: 40rpx 0 0 30rpx;
display: flex;
@@ -242,13 +242,11 @@ export default {
}
}
.bottom {
box-sizing: border-box;
padding: 0 30rpx;
display: flex;
// justify-content: space-between;
justify-content: flex-start;
justify-content: space-around;
padding: 0 10rpx;
box-sizing: border-box;
> view {
margin-right: 80rpx;
text-align: center;
font-size: 26rpx;
font-weight: 500;
@@ -268,35 +266,35 @@ export default {
}
@mixin common-mine($content-padding-top, $content-padding-bottom, $image-width, $image-height) {
box-sizing: border-box;
width: 690rpx;
width: 750rpx;
background: rgba(255,255,255,1);
border-radius: 10rpx;
margin: 30rpx auto 0;
padding: 0 20rpx;
// border-radius: 10rpx;
margin: 20rpx auto 0;
.title {
height: 76rpx;
font-size: 28rpx;
color: #666;
position: relative;
display: flex;
align-items: center;
&::after {
content: "";
position: absolute;
width: 650rpx;
height: 1rpx;
background: rgba(234,234,234,1);
bottom: 0;
left: 50%;
transform: translate(-50%,0);
}
height: 76rpx;
padding: 0 20rpx;
font-size: 28rpx;
color: #666;
border-bottom: 1px solid #ececec;
// &::after {
// content: "";
// position: absolute;
// width: 650rpx;
// height: 1rpx;
// background: rgba(234,234,234,1);
// bottom: 0;
// left: 50%;
// transform: translate(-50%,0);
// }
}
.title-text-more {
font-size: 24rpx;
color: #999;
}
.content {
padding: $content-padding-top 0 $content-padding-bottom;
padding: $content-padding-top 20rpx $content-padding-bottom;
display: flex;
> view {
text-align: center;

6
pages/zhibo/index.nvue
View File

@@ -510,7 +510,11 @@ export default {
},
success(res){
console.log(res)
that.info = res.data.data
that.info = res.data.data;
uni.showToast({
title: res.data.message,
icon: "none"
})
// that.list= res.data.data
}
})