From aeb62f16efd57874cbd8ef913cd6b2259be114d5 Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Mon, 17 Aug 2020 16:01:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20694?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/api/shop.js      |  4 ++--
 pageC/spike/index.vue   |  1 +
 pageE/mine/Integral.vue | 39 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/common/api/shop.js b/common/api/shop.js
index 1ae6cc2..50dd9e5 100644
--- a/common/api/shop.js
+++ b/common/api/shop.js
@@ -360,8 +360,8 @@ export default {
 				return vm.$u.post('Coupon/isNewmembervoucher')
 			},
 			//待发货退款
-			addrefundall() {
-				return vm.$u.post('order/add_refund_all')
+			addrefundall({order_id,reason_info}) {
+				return vm.$u.post('order/add_refund_all',{order_id,reason_info})
 			},
         }
     }
diff --git a/pageC/spike/index.vue b/pageC/spike/index.vue
index 09b2711..c11020d 100644
--- a/pageC/spike/index.vue
+++ b/pageC/spike/index.vue
@@ -42,6 +42,7 @@ export default {
 		// 全部秒杀
 		getSpikeList() {
 			this.$u.api.getSpikeList({ page: this.page }).then(res => {
+				console.log(res)
 				if(res.errCode == 0) {
 					this.spikeList = res.data.list;
 					this.seckillTime = {
diff --git a/pageE/mine/Integral.vue b/pageE/mine/Integral.vue
index da88a62..ccb066a 100644
--- a/pageE/mine/Integral.vue
+++ b/pageE/mine/Integral.vue
@@ -18,7 +18,23 @@
 			</view>
 		</view>
 		<scroll-view scroll-y class="integral-botom" :style="{ height: integralHeight }">
-			<rich-text :nodes="nodes"></rich-text>
+			
+			<view class="medal-title">
+				<!-- <image src="../static/mine/29.png"></image> -->
+				<view>积分获取规则</view>
+				<!-- <image src="../static/mine/30.png"></image> -->
+			</view>
+			<view class="medal-content">
+				<rich-text :nodes="nodes"></rich-text>
+			</view>
+			<view class="medal-title">
+				<!-- <image src="../static/mine/29.png"></image> -->
+				<view>会员等级权益</view>
+				<!-- <image src="../static/mine/30.png"></image> -->
+			</view>
+			<view class="medal-content">
+				<rich-text :nodes="dengji"></rich-text>
+			</view>
 		</scroll-view>
 	</view>
 </template>
@@ -30,6 +46,7 @@ export default {
 			memberInfo: {},
 			integralHeight: 0,
 			nodes: '',
+			dengji:""
 		}
 	},
 	onShow() {
@@ -47,6 +64,7 @@ export default {
 				if (res.errCode == 0) {
 					this.memberInfo = res.data;
 					this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content);
+					this.dengji = common.unescapeHTML(res.data.grade_rule.document_content)
 				}
 			})
 		},
@@ -100,5 +118,24 @@ export default {
 		top: 251rpx;
 		z-index: 9;
 	}
+
+		.medal-title {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-bottom: 52rpx;
+			> image {
+				width: 22rpx;
+				height: 22rpx;
+			}
+			> view {
+				font-size: 32rpx;
+				color: rgba(51,51,51,1);
+				margin: 0 30rpx;
+			}
+		}
+		.medal-content {
+			padding-bottom: 20rpx;
+		}
 }
 </style>
\ No newline at end of file
-- 
2.45.2