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

Merge pull request 'zhy' (#323) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/323
This commit is contained in:
hansu 2020-09-02 08:59:57 +08:00
commit c4f23cc5c4
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pageE/mine/MemberServe.vue
View File

@ -9,11 +9,11 @@
<view class="integral-top">
<view>
<view class="title">总积分</view>
<view class="value">{{ memberInfo.member_points }}</view>
<view class="value">{{ memberInfo.member_points || 0 }}</view>
</view>
<view>
<view class="title">经验值</view>
<view class="value">{{ memberInfo.member_exppoints }}</view>
<view class="value">{{ memberInfo.member_exppoints || 0 }}</view>
</view>
<view @click="viewProgress">
<view class="title">预计进度</view>
@ -25,11 +25,11 @@
</view>
<scroll-view scroll-y class="integral-botom" :style="{ height: richHeight }">
<view class="rich-container">
<view class="title">{{ memberInfo.points_rule.document_title }}</view>
<view class="title">{{ points_rule.document_title }}</view>
<rich-text :nodes="pointsNodes"></rich-text>
</view>
<view class="rich-container">
<view class="title" >{{ memberInfo.xunzhang_rule.document_title }}</view>
<view class="title" >{{ member_rule.document_title }}</view>
<rich-text :nodes="nodes"></rich-text>
</view>
</scroll-view>
@ -78,6 +78,8 @@ export default {
memberInfo: {},
pointsNodes: '',
nodes: '',
points_rule: {},
member_rule: {}
}
},
components: {
@ -111,9 +113,10 @@ export default {
this.$u.api.getMemberPointsStat().then((res)=>{
if(res.errCode == 0) {
this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.xunzhang_rule.document_content);
this.nodes = common.unescapeHTML(this.memberInfo.grade_rule.document_content);
this.pointsNodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
console.log(this.memberInfo.xunzhang_rule);
this.points_rule = this.memberInfo.points_rule;
this.member_rule = this.memberInfo.grade_rule;
}
})
},
@ -191,12 +194,14 @@ export default {
top: 250rpx;
z-index: 9;
.rich-container {
margin-bottom: 20rpx;
&:not(:last-child) {
margin-bottom: 56rpx;
}
.title {
text-align: center;
font-size: 32rpx;
color: #333333;
margin-bottom: 10rpx;
margin-bottom: 26rpx;
// font-weight: bold;
}
}