yuantianjiao 6 years ago
parent
commit
e7d285c740

+ 5
- 1
src/pages/user/mainPage/coffeeIndex/index.vue View File

306
                 SentCount: res.list[n].SentCount,
306
                 SentCount: res.list[n].SentCount,
307
                 usedCount: res.list[n].UsedCount,
307
                 usedCount: res.list[n].UsedCount,
308
                 CardId: res.list[n].CouponId,
308
                 CardId: res.list[n].CouponId,
309
-                CustomerList: res.list[n].CustomerCoupon || []
309
+                CustomerList: res.list[n].CustomerCoupon || [],
310
+                ValidDays: res.list[n].ValidDays
310
               })
311
               })
311
             }
312
             }
312
             var count = 0
313
             var count = 0
398
       }
399
       }
399
     },
400
     },
400
     returnInvalid (item, type) {
401
     returnInvalid (item, type) {
402
+      if (item.ValidDays && item.ValidDays > 0) {
403
+        return true
404
+      }
401
       for (var n = 0; n < this.forbidList.length; n++) {
405
       for (var n = 0; n < this.forbidList.length; n++) {
402
         if (this.forbidList[n].UserId === this.userInfo.customer.CustomerId && this.forbidList[n].ForbidType === type) {
406
         if (this.forbidList[n].UserId === this.userInfo.customer.CustomerId && this.forbidList[n].ForbidType === type) {
403
           return true
407
           return true

+ 1
- 1
src/pages/user/vipDetail/index.vue View File

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