From 18d59ca85b2bc9ccac4a90203c3b2486acf3b113 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 12 九月 2024 09:19:55 +0800
Subject: [PATCH] Merge branch 'master-2.0' of http://47.96.225.205:8888/r/hmy_farmer-main into master-2.0
---
sub_pages/customer/coupon/coupon-self.vue | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue
index fa6a535..23a6e2b 100644
--- a/sub_pages/customer/coupon/coupon-self.vue
+++ b/sub_pages/customer/coupon/coupon-self.vue
@@ -20,9 +20,12 @@
<view class="info flex1">
<view class="title">
{{item.couponName||'-'}}
+ <radio :checked="cache_coupon.id===item.id" v-if="source==='shopping'" class="select-coupon"></radio>
+
</view>
<view class="time">
- {{item.usageEndDate&&('有效期至：'+item.usageEndDate) || '长久有效'}}
+ {{item.effectiveStart&&(item.effectiveStart+' 生效,') || ''}}
+ {{item.effectiveEnd&&('有效期至 '+item.effectiveEnd) || '长久有效'}}
</view>
</view>
</view>
@@ -38,6 +41,9 @@
</template>
<script>
+ import {
+ mapState
+ } from 'vuex'
export default {
data() {
return {
@@ -86,7 +92,7 @@
this.getList()
},
-onReachBottom() {
+ onReachBottom() {
this.getMore()
},
methods: {
@@ -119,6 +125,16 @@
uni.stopPullDownRefresh()
},
+ computed: {
+ ...mapState({
+ cache_coupon: state => {
+ return state.cache.coupon || {}
+ },
+ cache_goods: state => {
+ return state.cache.goods || []
+ },
+ }),
+ }
}
</script>
--
Gitblit v1.9.3