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

classify 8.4

Browse Source
This commit is contained in:
ghusermoon
2020-08-04 19:08:04 +08:00
parent 1e9f442b7b
commit 2fd62acb73
26 changed files with 563 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pageE/mine/ImageTextCollection.vue
View File

@@ -28,6 +28,7 @@
</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>
</view>
</template>
<script>

2
pageE/mine/MemberServeCoupon.vue
View File

@@ -19,7 +19,7 @@ import Coupon from "@/components/mine/coupon/index";
export default {
data() {
return {
pageSize: 1,
pageSize: 12,
swiperHeight: '',
couponCurrent: 0,
swiperCouponCurrent: 0,

6
pageE/mine/MineConcerns.vue
View File

@@ -10,7 +10,7 @@
<view class="guanzhu action" @click="changeType(info.friend_frommid)" v-else>未关注</view>
</view>
</view>
<u-empty mode="list" v-if="!list.length" color="#000" img-width="200" font-size="30" margin-top="300"></u-empty>
<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>
</template>
@@ -43,7 +43,9 @@ export default {
padding: 30rpx;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
&:not(:nth-child(3n)) {
margin-right: 20rpx;
}
.daren-item{
width: 215rpx;
height: 282rpx;

116
pageE/mine/MineProgress.vue
View File

@@ -5,74 +5,38 @@
<view class="rank-value">lv{{ memberInfo.member_level }}</view>
<view class="line-box">
<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
<text>{{ memberInfo.member_exppoints | percentExp(rank[memberInfo.member_level - 1])}}</text>
<text>{{ memberInfo.member_exppoints }}</text>
</view>
<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
</view>
<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
<view class="distance">距离下一级还需要{{ memberInfo.member_exppoints | residualExp(rank[memberInfo.member_level - 1]) }}经验值</view>
<!-- <view class="distance">距离下一级还需要{{ memberInfo.next_grade_exppoints_diff }}经验值</view> -->
<view class="distance">距离下一级还需要{{ memberInfo.next_grade_exppoints_diff }}经验值</view>
</view>
<view class="body">
<view class="title">
<image src="/static/image/mine/34.png"></image>
<text>等级定义</text>
</view>
<view class="rank-list">
<!-- <view class="rank-list">
<view v-for="(rank, index) in rank" :key="index" class="list-item">
<view class="rank-value">lv{{ rank.level }}</view>
<view class="rank-interval"><span>经验值:</span>{{ rank.max == '--' ? rank.min + '及以上' : rank.min + '~' + rank.max }}</view>
</view>
</view> -->
<view class="rich">
<rich-text :nodes="nodes"></rich-text>
</view>
</view>
<!-- <view class="body">
<u-parse :html="memberInfo.grade_rule"></u-parse>
</view> -->
</view>
</template>
<script>
import common from '@/static/js/common.js';
export default {
data() {
return {
rank: [
{
level: 1,
min: 50,
max: 99,
},
{
level: 2,
min: 100,
max: 199,
},
{
level: 3,
min: 200,
max: 399,
},
{
level: 4,
min: 400,
max: 999,
},
{
level: 5,
min: 1000,
max: 1999,
},
{
level: 6,
min: 2000,
max: 4999,
},
{
level: 7,
min: 5000,
max: '--',
}
],
percent: 0,
memberInfo: {},
nodes: '',
}
},
filters: {
@@ -82,11 +46,6 @@ export default {
if(rank) result = value + '/' + rank.max;
return result;
},
residualExp(value, rank) {
let result = 0;
if(rank) result = rank.max - value;
return result;
}
},
onShow() {
this.getMemberPointsStat();
@@ -96,7 +55,7 @@ export default {
this.$u.api.getMemberPointsStat().then((res)=>{
if (res.errCode == 0) {
this.memberInfo = res.data;
this.percent = (this.memberInfo.member_exppoints / this.rank[this.memberInfo.member_level - 1].max) * 100;
this.nodes = common.unescapeHTML(res.data.points_rule);
// console.log(this.percent);
}
})
@@ -159,6 +118,7 @@ export default {
}
}
.body {
margin-top: 60rpx;
.title {
height: 88rpx;
display: flex;
@@ -167,39 +127,43 @@ export default {
font-size: 30rpx;
font-weight: 500;
color: rgba(51,51,51,1);
border-bottom: #ECECEC 1rpx solid;
// border-bottom: #ECECEC 1rpx solid;
margin-bottom: 30rpx;
> image {
width: 29rpx;
height: 36rpx;
margin-right: 20rpx;
}
}
.rank-list {
padding: 30rpx;
.list-item {
margin-bottom: 40rpx;
display: flex;
align-items: center;
.rank-value {
color: #FFF;
height: 30rpx;
line-height: 30rpx;
box-sizing: content-box;
background:rgba(255,213,101,1);
border-radius: 6rpx;
padding: 0 10rpx;
margin-right: 15rpx;
}
.rank-interval {
font-size: 28rpx;
color: #999999;
> span {
margin-right: 10rpx;
color: rgba(51,51,51,1);
}
}
}
.rich {
padding: 0 60rpx;
}
// .rank-list {
// padding: 30rpx;
// .list-item {
// margin-bottom: 40rpx;
// display: flex;
// align-items: center;
// .rank-value {
// color: #FFF;
// height: 30rpx;
// line-height: 30rpx;
// box-sizing: content-box;
// background:rgba(255,213,101,1);
// border-radius: 6rpx;
// padding: 0 10rpx;
// margin-right: 15rpx;
// }
// .rank-interval {
// font-size: 28rpx;
// color: #999999;
// > span {
// margin-right: 10rpx;
// color: rgba(51,51,51,1);
// }
// }
// }
// }
}
}
</style>