From 6302677c6505c812c6c7a340f54c58b7d4cc941b Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 2 Sep 2020 08:55:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageE/mine/MemberServe.vue | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
index a5cf40b..cd10fe9 100644
--- a/pageE/mine/MemberServe.vue
+++ b/pageE/mine/MemberServe.vue
@@ -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;
 					}
 				}
-- 
2.45.2


From 4911a0c948c3e017fb337f6de63029bca9b7ec36 Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Wed, 2 Sep 2020 08:55:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=9A=E5=91=98?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pageE/mine/MemberServe.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pageE/mine/MemberServe.vue b/pageE/mine/MemberServe.vue
index cd10fe9..d3809e9 100644
--- a/pageE/mine/MemberServe.vue
+++ b/pageE/mine/MemberServe.vue
@@ -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>
-- 
2.45.2