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

Merge pull request 'fixing bug' (#321) from zhy into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/deming/pulls/321
This commit is contained in:
hansu 2020-09-01 18:08:30 +08:00
commit 4fa530d2d6
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pageE/mine/Integral.vue
View File

@ -124,6 +124,7 @@ export default {
align-items: center;
justify-content: center;
margin-bottom: 52rpx;
// font-weight: bold;
> image {
width: 22rpx;
height: 22rpx;

24
pageE/mine/MemberServe.vue
View File

@ -24,7 +24,14 @@
</view>
</view>
<scroll-view scroll-y class="integral-botom" :style="{ height: richHeight }">
<rich-text :nodes="nodes"></rich-text>
<view class="rich-container">
<view class="title">{{ memberInfo.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>
<rich-text :nodes="nodes"></rich-text>
</view>
</scroll-view>
</view>
</swiper-item>
@ -69,6 +76,7 @@ export default {
swiperCurrent: 0,
pointslogList: [],
memberInfo: {},
pointsNodes: '',
nodes: '',
}
},
@ -103,7 +111,9 @@ export default {
this.$u.api.getMemberPointsStat().then((res)=>{
if(res.errCode == 0) {
this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
this.nodes = common.unescapeHTML(this.memberInfo.xunzhang_rule.document_content);
this.pointsNodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
console.log(this.memberInfo.xunzhang_rule);
}
})
},
@ -180,6 +190,16 @@ export default {
border-radius: 20rpx 20rpx 0rpx 0rpx;
top: 250rpx;
z-index: 9;
.rich-container {
margin-bottom: 20rpx;
.title {
text-align: center;
font-size: 32rpx;
color: #333333;
margin-bottom: 10rpx;
// font-weight: bold;
}
}
}
}
.coupon {