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/coupon-self.vue | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue
index 6039b35..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 {
@@ -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