ytj

src/pages/user/mainPage/coffeeIndex/index.vue

@@ -306,7 +306,8 @@ export default {
                 SentCount: res.list[n].SentCount,
                 usedCount: res.list[n].UsedCount,
                 CardId: res.list[n].CouponId,
-                CustomerList: res.list[n].CustomerCoupon || []
+                CustomerList: res.list[n].CustomerCoupon || [],
+                ValidDays: res.list[n].ValidDays
               })
             }
             var count = 0
@@ -398,6 +399,9 @@ export default {
       }
     },
     returnInvalid (item, type) {
+      if (item.ValidDays && item.ValidDays > 0) {
+        return true
+      }
       for (var n = 0; n < this.forbidList.length; n++) {
         if (this.forbidList[n].UserId === this.userInfo.customer.CustomerId && this.forbidList[n].ForbidType === type) {
           return true

src/pages/user/vipDetail/index.vue

@@ -7,7 +7,7 @@
             <img :src='vipBg' width="100%" height="100%">
             <div>
               <span class="balance">￥ <span>{{item.Balance}}</span></span>
-              <span class="date">vip有效日期：{{toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd')}} ~ {{toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd')}}</span>
+              <span class="date">vip有效日期：{{toolClass.dateFormat(item.BeginDate, 'yyyy-MM-dd')}} ~ {{toolClass.dateFormat(item.EndDate, 'yyyy-MM-dd')}}</span>
             </div>
           </div>
           <div class="vip-detail-list">