修复 694

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})
 			},
         }
     }

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 = {

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>