Skip to content

M
member
Commit 6a0ec4c0 by huaying
Options

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

parents fabf2c86 931ef72e
Showing with 10 additions and 4 deletions
src/components/wechatmembers/cardvoucher.vue
......@@ -150,10 +150,16 @@
min-width="230px"
>
<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 == 2 && row.receiveTime == null">领取后当月有效</span> -->
<span v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">{{row.effectTime | formatTime}}-{{row.limitTime | formatTime}}</span>
<div v-if="row.cardEffectiveMode == 0 || (row.cardEffectiveMode == 2 && row.receiveTime != null) || (row.cardEffectiveMode == 1 && row.receiveTime != null)">
<p>{{row.effectTime | formatTime}}-</p>
<p>{{row.limitTime | formatTime}}</p>
</div>
<p v-if="row.cardEffectiveMode == 1 && row.receiveTime == null">领取后{{row.startDay}}天生效，有效期{{row.limitDay}}天</p>
<!-- <p v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">领取后当月有效</p> -->
<div v-if="row.cardEffectiveMode == 2 && row.receiveTime == null">
<p>{{row.effectTime | formatTime}}-</p>
<p>{{row.limitTime | formatTime}}</p>
</div>
</template>
</el-table-column>
<el-table-column
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment