Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2

陶杰

2024-09-11 6d54fb64df667c0c396fc7d74aeed9e096d95f95

 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>