From e3c0ebbd9f9ee111f29be9f76979edd97f1d6f3a Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 10:32:33 +0800
Subject: [PATCH] Merge branch 'v2' of http://47.96.225.205:8888/r/hmy_farmer-main into remote-v2
---
sub_pages/customer/coupon/good-all.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 7647cb4..9e36900 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -78,13 +78,13 @@
{{item.couponName||'-'}}
</view>
<view class="time">
- 领取后{{item.usageTimeNum||''}}{{item.usageTimeTypeName||''}}有效
+ {{item.getStartDate||'领取后'}}{{item.getEndDate&&(' 至 ' + item.getEndDate )||''}}有效
</view>
<view class="flex">
<view class="t-red">
{{item.point||'0'}}积分
</view>
- <view class="button m-l-a m-r-0" @click="exchange('coupon',item)">
+ <view class="button m-l-a m-r-15" @click="exchange('coupon',item)">
兑换
</view>
</view>
@@ -158,7 +158,8 @@
},
{
name: '优惠券',
- api: '/api/v2/coupon/app/activy/list',
+ // api: '/api/v2/coupon/app/activy/list',
+ api: '/api/v2/coupon/point/active/list',
},
],
@@ -207,6 +208,8 @@
</script>
<style lang="scss" scoped>
+ @import './coupon.scss';
+
.good-list-container {
.good-container {
.good-item {
--
Gitblit v1.9.3