From 6d54fb64df667c0c396fc7d74aeed9e096d95f95 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:36:50 +0800
Subject: [PATCH] Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2

---
 sub_pages/customer/coupon/good-all.vue |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index c8803dc..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>
@@ -208,6 +208,8 @@
 </script>
 
 <style lang="scss" scoped>
+	@import './coupon.scss';
+	
 	.good-list-container {
 		.good-container {
 			.good-item {

--
Gitblit v1.9.3