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

src/components/wechatmembers/cardMixin.js

@@ -28,7 +28,7 @@ export default {
     setDefalutTime(){
       let start = new Date();
       start.setFullYear(start.getFullYear() - 1);
-      start.setDate(start.getDate());
+      start.setDate(start.getDate()+1);
       start = `${start.getFullYear()}-${start.getMonth() + 1}-${start.getDate()}`;
       let end = new Date();
       end = `${end.getFullYear()}-${end.getMonth() + 1}-${end.getDate()}`;

src/components/wechatmembers/cardvoucher.vue

@@ -135,7 +135,7 @@
                   label="优惠额度"
                 >
                 <template slot-scope="{row}">
-                  {{row.cardType == 0 ? `${row.cardDenomination}元` : row.cardType == 1 ? `${row.cardDenomination}折` : row.cardType == 2 ? `${row.cardDenomination}` : '--'}}
+                  {{row.cardType == 0 ? `${row.cardDenomination}元` : row.cardType == 1 ? `${row.cardDenomination}折` : '--'}}
                 </template>
                 </el-table-column>
                 <el-table-column
@@ -145,12 +145,9 @@
                 >
                 <template slot-scope="{row}">
                   <span v-if="row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null)">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span>
-                  <span v-if="row.cardEffectiveMode == 1 && row.receiveTime == null">领取后{{row.startDay}}天生效，有效期{{row.limitDay}}</span>
-                  <!-- <span v-if="row.cardEffectiveMode == 1 && row.receiveTime != null">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span> -->
-                  <span v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">领取后当月有效</span>
-                  <!-- <span v-if="row.cardEffectiveMode == 2 && row.receiveTime != null">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span> -->
-                  <!-- {{row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null) ? `${formatTime(row.effectTime) | formatTime}-${row.limitTime | formatTime}` : row.cardEffectiveMode == 1 && row.receiveTime == null ? `领取后${row.startDay}天生效，有效期${row.limitDay}天` : row.cardEffectiveMode == 2 && row.receiveTime == null ? '领取后当月有效' : '--'}} -->
-                  
+                   <span v-if="row.cardEffectiveMode == 1 && row.receiveTime == null">领取后{{row.startDay}}天生效，有效期{{row.limitDay}}天</span>
+                  <!-- <span v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">领取后当月有效</span> -->
+                  <span v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span>
                 </template>
                 </el-table-column>
                 <el-table-column
@@ -394,7 +391,14 @@ export default {
       let _content = '';
       const { status } = row;
       // console.log(row)
-      let isOverdue = Date.now() >= row.limitTime;
+      let isOverdue ;
+      if (row.limitTime == null) {
+        isOverdue = false
+      }else {
+       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) {