Merge branch 'feature/7月迭代-会员' into dev

src/components/wechatmembers/cardvoucher.vue

@@ -391,6 +391,8 @@ export default {
       const { status } = row;
       // console.log(row)
       let isOverdue = Date.now() >= row.limitTime;
+      // limitTime 为 null 就不算过期
+      if(row.limitTime == null) return isOverdue = false;
       if (status == 3) {
         _content = `<div class="${isOverdue ? 'dm-status--info' : 'dm-status--error'}">${isOverdue ? '已过期' : '待领取'}</div>`;
       } else if (status == 4) {