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

修复 694 #222

Merged
theluyuan merged 1 commits from xbx into master 2020-08-17 08:34:02 +00:00
Conversation 0 Commits 1 Files Changed 3 +41 -3
3 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/api/shop.js
View File

@ -360,8 +360,8 @@ export default {
return vm.$u.post('Coupon/isNewmembervoucher') return vm.$u.post('Coupon/isNewmembervoucher')
}, },
//待发货退款 //待发货退款
addrefundall() { addrefundall({order_id,reason_info}) {
return vm.$u.post('order/add_refund_all') return vm.$u.post('order/add_refund_all',{order_id,reason_info})
}, },
} }
} }

1
pageC/spike/index.vue
View File

@ -42,6 +42,7 @@ export default {
// 全部秒杀 // 全部秒杀
getSpikeList() { getSpikeList() {
this.$u.api.getSpikeList({ page: this.page }).then(res => { this.$u.api.getSpikeList({ page: this.page }).then(res => {
console.log(res)
if(res.errCode == 0) { if(res.errCode == 0) {
this.spikeList = res.data.list; this.spikeList = res.data.list;
this.seckillTime = { this.seckillTime = {

37
pageE/mine/Integral.vue
View File

@ -18,7 +18,23 @@
</view> </view>
</view> </view>
<scroll-view scroll-y class="integral-botom" :style="{ height: integralHeight }"> <scroll-view scroll-y class="integral-botom" :style="{ height: integralHeight }">
<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> <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> </scroll-view>
</view> </view>
</template> </template>
@ -30,6 +46,7 @@ export default {
memberInfo: {}, memberInfo: {},
integralHeight: 0, integralHeight: 0,
nodes: '', nodes: '',
dengji:""
} }
}, },
onShow() { onShow() {
@ -47,6 +64,7 @@ export default {
if (res.errCode == 0) { if (res.errCode == 0) {
this.memberInfo = res.data; this.memberInfo = res.data;
this.nodes = common.unescapeHTML(this.memberInfo.points_rule.document_content); 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; top: 251rpx;
z-index: 9; 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> </style>