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

upgrade 8.4

Browse Source
This commit is contained in:
ghusermoon 2020-08-04 21:13:47 +08:00
parent fe9a54987e
commit 5343196342
5 changed files with 185 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/shop/list/index.vue
View File

@ -93,8 +93,8 @@ export default {
}, },
setSwiperHeight() { setSwiperHeight() {
// height: 230px, margin-bottom: 13 // height: 230px, margin-bottom: 13
const height = Math.ceil(this.goodsList.length / 2) * (230 + 13); const height = Math.ceil(this.goodsList.length / 2) * (510 + 26);
this.swiperHeight = height == 0 ? '230px' : height + 'px'; this.swiperHeight = height == 0 ? '230rpx' : height + 'rpx';
}, },
// tabs通知swiper切换 // tabs通知swiper切换
tabsChange(index) { tabsChange(index) {

1
components/shop/list/item.vue
View File

@ -44,6 +44,7 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.item{ .item{
width: 330rpx; width: 330rpx;
height: 510rpx;
margin-bottom: 26rpx; margin-bottom: 26rpx;
background-color: #f8f8f8; background-color: #f8f8f8;
border-radius: 10rpx 10rpx 0rpx 0rpx; border-radius: 10rpx 10rpx 0rpx 0rpx;

318
pageE/mine/ImageTextCollection.vue
View File

@ -1,34 +1,38 @@
<template> <template>
<view class="collection"> <view class="collection">
<view class="item-box" v-for="(item, index) in articleList" :key="index"> <view class="container">
<view class="video-item" v-if="item"> <view class="item-box" v-for="(item, index) in articleList" :key="index" @click="toDetailsPage(item.article_id)">
<image class="head" :src="item.article_pic" v-if="item.type == 1"></image> <view class="video-item" v-if="item">
<view class="header_fist" v-else> <image class="head" :src="item.article_pic" v-if="item.type == 1"></image>
<view class="backes"></view> <view class="header_fist" v-else>
<image class="head" :src="item.article_pic" @click="toDetailsPage(item.article_id)"></image> <view class="backes"></view>
</view> <image class="head" :src="item.article_pic"></image>
<view class="title">{{ item.article_title }}</view>
<view class="jianjie">{{ item.article_content }}</view>
<view class="user">
<view class="info">
<image :src="item.member_avatar"></image>
<text>{{ item.member_nickname }}</text>
</view> </view>
<u-icon name="trash" color="#333" size="36" @click="delArticle(item.article_id)"></u-icon> <view class="title u-line-1">{{ item.article_title }}</view>
<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> --> <view class="jianjie u-line-1">{{ item.article_content }}</view>
<!-- <view class="action" v-if="show == item.article_id"> <view class="user">
<view class="bubble"> <view class="info">
<view @click.stop="delArticle(item.article_id)"> <image :src="item.member_avatar"></image>
<image src="/static/image/common/8.png"></image> <text>{{ item.member_nickname }}</text>
<text>删除</text>
</view>
</view> </view>
</view> --> <view @click.stop="delArticle(item.article_id)">
<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view> <u-icon name="trash" color="#333" size="36"></u-icon>
</view>
<!-- <image src="/static/image/common/4.png" @click.stop="showAction(item)"></image> -->
<!-- <view class="action" v-if="show == item.article_id">
<view class="bubble">
<view @click.stop="delArticle(item.article_id)">
<image src="/static/image/common/8.png"></image>
<text>删除</text>
</view>
</view>
</view> -->
<view class="layer" v-if="show == item.article_id" @click.stop="show=-1"></view>
</view>
</view> </view>
</view> </view>
</view> </view>
<u-empty mode="list" v-if="!articleList.length" color="#000" img-width="200" font-size="30" style="margin: 20vh auto 0;"></u-empty> <u-empty mode="list" v-if="!articleList.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
</view> </view>
</template> </template>
<script> <script>
@ -79,159 +83,151 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.collection { .collection {
border-top: 1rpx solid #ECECEC; .container {
padding: 21rpx 30rpx 0; border-top: 1rpx solid #ECECEC;
display: flex; padding: 21rpx 30rpx 0;
flex-wrap: wrap; display: flex;
.item-box { flex-wrap: wrap;
&:not(:nth-child(2n)) { .item-box {
margin-right: 20rpx; &:not(:nth-child(2n)) {
} margin-right: 20rpx;
.video-item{
height: 540rpx;
margin-top: 20rpx;
width: 335rpx;
box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
padding-bottom: 20rpx;
border-radius: 20rpx;
overflow: hidden;
.head{
width: 100%;
height: 334rpx;
} }
.title{ .video-item{
margin:0 auto; height: 540rpx;
margin-top: 20rpx; margin-top: 20rpx;
font-size: 22rpx; width: 335rpx;
color: #333; box-shadow:0 3rpx 7rpx 0 rgba(153, 153, 153, 0.35);
font-weight: 500; padding-bottom: 20rpx;
line-height: 30rpx; border-radius: 20rpx;
width: 300rpx; overflow: hidden;
overflow:hidden; .head{
text-overflow:ellipsis; width: 100%;
display:-webkit-box; height: 334rpx;
-webkit-box-orient:vertical; }
-webkit-line-clamp:2; .title{
} margin:0 auto;
.jianjie{ margin-top: 20rpx;
height: 60rpx; font-size: 22rpx;
margin:0 auto; color: #333;
margin-top: 20rpx; font-weight: 500;
font-size: 22rpx; line-height: 30rpx;
color: #666; width: 300rpx;
line-height: 30rpx; }
width: 300rpx; .jianjie{
margin-left: 18rpx; // height: 60rpx;
overflow:hidden; margin:0 auto;
text-overflow:ellipsis; margin-top: 20rpx;
display:-webkit-box; font-size: 22rpx;
-webkit-box-orient:vertical; color: #666;
-webkit-line-clamp:2; line-height: 30rpx;
} width: 300rpx;
.user{ margin-left: 18rpx;
display: flex; }
justify-content: space-between; .user{
align-items: center;
margin:0 auto;
margin-top: 20rpx;
width: 300rpx;
position: relative;
.info {
display: flex; display: flex;
justify-content: space-between;
align-items: center; align-items: center;
>image{ margin:0 auto;
width: 38rpx; margin-top: 20rpx;
height: 38rpx; width: 300rpx;
border-radius: 50%; position: relative;
.info {
display: flex;
align-items: center;
>image{
width: 38rpx;
height: 38rpx;
border-radius: 50%;
}
>text{
font-size: 20rpx;
color:#333;
margin-left: 9rpx;
}
}
>image{
width: 37rpx;
height: 8rpx;
}
.action {
z-index: 19;
position: absolute;
right: 0rpx;
bottom: 55rpx;
// width: 234rpx;
background: rgba(255,255,255,1);
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
border-radius: 6rpx;
.bubble {
position: relative;
background-color: #fff;
&::after {
position: absolute;
right: 10rpx;
bottom: 0;
content: '';
width: 60rpx;
height: 40rpx;
background-color: inherit;
transform: rotate(45deg);
margin-top: -10rpx;
z-index: -1;
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
} }
> view { >text{
padding: 9rpx 12rpx; font-size: 20rpx;
display: flex; color:#333;
align-items: center; margin-left: 9rpx;
&:not(:last-child) { }
border-bottom: 2rpx #ECECEC solid; }
>image{
width: 37rpx;
height: 8rpx;
}
.action {
z-index: 19;
position: absolute;
right: 0rpx;
bottom: 55rpx;
// width: 234rpx;
background: rgba(255,255,255,1);
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
border-radius: 6rpx;
.bubble {
position: relative;
background-color: #fff;
&::after {
position: absolute;
right: 10rpx;
bottom: 0;
content: '';
width: 60rpx;
height: 40rpx;
background-color: inherit;
transform: rotate(45deg);
margin-top: -10rpx;
z-index: -1;
box-shadow: 0rpx 0rpx 6rpx 0rpx rgba(35,24,21,0.12);
} }
@mixin image-class($width, $height, $right) { > view {
width: $width; padding: 9rpx 12rpx;
height: $height; display: flex;
margin-right: $right; align-items: center;
} &:not(:last-child) {
> image { border-bottom: 2rpx #ECECEC solid;
&:first-child {
@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
} }
&:nth-child(2) { @mixin image-class($width, $height, $right) {
@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx); width: $width;
height: $height;
margin-right: $right;
} }
&:last-child { > image {
@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx); &:first-child {
@include image-class($width: 21rpx, $height: 22rpx, $right: 12rpx);
}
&:nth-child(2) {
@include image-class($width: 22rpx, $height: 22rpx, $right: 12rpx);
}
&:last-child {
@include image-class($width: 24rpx, $height: 20rpx, $right: 9rpx);
}
}
> text {
font-size: 20rpx;
color: rgba(51,51,51,1);
} }
}
> text {
font-size: 20rpx;
color: rgba(51,51,51,1);
} }
} }
} }
.layer {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 9;
background-color: transparent;
}
} }
.layer { .header_fist{
position: fixed; position: relative;
top: 0; .backes{
left: 0; position: absolute;
width: 100%; top: 0;
height: 100%; background: rgba(0,0,0,0.6);
z-index: 9; width: 100%;
background-color: transparent; height: 100%;
color: #fff;
}
} }
} }
.header_fist{
position: relative;
.backes{
position: absolute;
top: 0;
background: rgba(0,0,0,0.6);
width: 100%;
height: 100%;
color: #fff;
}
}
} }
} }
} }

28
pageE/mine/MineConcerns.vue
View File

@ -2,16 +2,14 @@
<view class="concerns"> <view class="concerns">
<view class="concerns-container"> <view class="concerns-container">
<view v-for="(info, index) in list" :key="index"> <view v-for="(info, index) in list" :key="index">
<view class="daren-item" @click="toDetailsPage"> <view class="daren-item">
<image class="head" :src="info.friend_tomavatar"></image> <image class="head" :src="info.friend_tomavatar"></image>
<text class="name">{{ info.friend_tomname }}</text> <text class="name">{{ info.friend_tomname || '' }}</text>
<!-- <text class="zhuangtai">状态: {{ info.live_status == 1 ? '正在直播' : '未开播' }}</text> --> <view class="guanzhu" @click="changeType(info.friend_tomid)" v-if="info.friend_followstate == 1">取消关注</view>
<view class="guanzhu" @click="changeType(info.friend_frommid)" v-if="info.friend_followstate == 1">关注</view>
<view class="guanzhu action" @click="changeType(info.friend_frommid)" v-else>未关注</view>
</view> </view>
</view> </view>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" style="margin: 20vh auto 0;"></u-empty>
</view> </view>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="120"></u-empty>
</view> </view>
</template> </template>
<script> <script>
@ -24,16 +22,30 @@ export default {
onShow() { onShow() {
this.attentionMemberList(); this.attentionMemberList();
}, },
// 下拉刷新
onPullDownRefresh() {
this.attentionMemberList();
},
methods: { methods: {
attentionMemberList() { attentionMemberList() {
this.$u.api.attentionMemberList().then(res => { this.$u.api.attentionMemberList().then(res => {
uni.stopPullDownRefresh();
if(res.errCode == 0) { if(res.errCode == 0) {
this.list = res.data; this.list = res.data;
} else { } else {
this.list = []; this.list = [];
} }
}) })
} },
changeType(id) {
console.log(id);
this.$u.api.attentionMember({
member_id: id
}).then(res => {
this.$u.toast(res.message);
this.attentionMemberList();
})
},
}, },
}; };
</script> </script>
@ -76,7 +88,7 @@ export default {
.guanzhu{ .guanzhu{
width: 130rpx; width: 130rpx;
height: 50rpx; height: 50rpx;
background-color: #FF780F; background-color: #EDEDED;
font-size: 26rpx; font-size: 26rpx;
line-height: 50rpx; line-height: 50rpx;
color: #fff; color: #fff;

8
pages/mine/index.vue
View File

@ -19,14 +19,14 @@
<view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view> <view class="member-service" @click="toOtherPage('/mine/MemberServe')">会员服务</view>
</view> </view>
<view class="bottom"> <view class="bottom">
<view @click="toOtherPage('/mine/GoodsCollection')"> <!-- <view @click="toOtherPage('/mine/GoodsCollection')">
<view>{{ userInfo.member_fav_goods_num || 0 }}</view> <view>{{ userInfo.member_fav_goods_num || 0 }}</view>
<view>商品收藏</view> <view>商品收藏</view>
</view> </view>
<view @click="toOtherPage('/mine/StoreCollection')"> <view @click="toOtherPage('/mine/StoreCollection')">
<view>{{ userInfo.member_fav_store_num || 0 }}</view> <view>{{ userInfo.member_fav_store_num || 0 }}</view>
<view>店铺收藏</view> <view>店铺收藏</view>
</view> </view> -->
<view @click="toOtherPage('/mine/ImageTextCollection')"> <view @click="toOtherPage('/mine/ImageTextCollection')">
<view>{{ userInfo.member_fav_article_num || 0 }}</view> <view>{{ userInfo.member_fav_article_num || 0 }}</view>
<view>图文收藏</view> <view>图文收藏</view>
@ -248,8 +248,10 @@ export default {
box-sizing: border-box; box-sizing: border-box;
padding: 0 30rpx; padding: 0 30rpx;
display: flex; display: flex;
justify-content: space-between; // justify-content: space-between;
justify-content: flex-start;
> view { > view {
margin-right: 80rpx;
text-align: center; text-align: center;
font-size: 24rpx; font-size: 24rpx;
color:rgba(51,51,51,1); color:rgba(51,51,51,1);