Merge branch 'feature/6.10日常迭代'

index.html

@@ -39,7 +39,7 @@
     <script src="//web-1251519181.file.myqcloud.com/components/track.1.0.4.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/activity-select.1.0.2.1.js"></script><!-- 数据对话 -->
     <script src="//web-1251519181.file.myqcloud.com/components/upload-file.1.0.6.js"></script><!-- 文件上传 -->
-    <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.20.js"></script><!-- 卡券弹窗 -->
+    <script src="//web-1251519181.file.myqcloud.com/components/card.2.0.21.js"></script><!-- 卡券弹窗 -->
     <script src="//web-1251519181.file.myqcloud.com/components/radio-transfer.1.0.13.js"></script><!-- 单选穿梭框 -->
     <script src="//web-1251519181.file.myqcloud.com/components/steps.1.0.1.js"></script>
     <script src="//web-1251519181.file.myqcloud.com/components/material.1.0.9.js"></script>

src/components/libs/cardTemp/index.vue

@@ -36,6 +36,7 @@
         <template slot-scope="scope">
           <div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ formatDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formatDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
           <div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : '第' + scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
+          <div v-if="scope.row.cardEffectiveMode == 2">投放后当月</div>
         </template>
       </el-table-column>
       <el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">

src/views/card/partials/send-preview.vue

@@ -36,6 +36,7 @@
                     </p>
                     <p class="card-d-time" v-if="data.cardEffectiveMode == 0">{{ time }}</p>
                     <p class="card-d-time ellipsis" v-if="data.cardEffectiveMode == 1">领取后{{ (data.startDay === 0 ? '当' : '第' + data.startDay) + '天，有效天数' + data.limitDay }}天</p>
+                    <p class="card-d-time" v-if="data.cardEffectiveMode == 2">投放后当月</p>
                   </div>
                 </div>
                 <dl class="give-rule mt40">

src/views/card/partials/shelf-add.vue

@@ -30,6 +30,7 @@
         <template slot-scope="scope">
           <div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ formatDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formatDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
           <div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : '第' + scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
+          <div v-if="scope.row.cardEffectiveMode == 2">投放后当月</div>
         </template>
       </el-table-column>
       <el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">

src/views/ecm/marketing-event/components/lib-card.vue

@@ -42,6 +42,7 @@
         <template slot-scope="scope">
           <div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ formatDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formatDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
           <div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : '第' + scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
+          <div v-if="scope.row.cardEffectiveMode == 2">投放后当月</div>
         </template>
       </el-table-column>
       <el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">

src/views/sign/components/lib-card.vue

@@ -38,6 +38,7 @@
         <template slot-scope="scope">
           <div v-if="scope.row.cardEffectiveMode == 0">固定日期：{{ formatDateTimeByType(scope.row.beginDate, 'yyyy-MM-dd') + '至' + formatDateTimeByType(scope.row.endDate, 'yyyy-MM-dd') }}</div>
           <div v-if="scope.row.cardEffectiveMode == 1">领取后{{ (scope.row.startDay === 0 ? '当' : '第' + scope.row.startDay) + '天，有效天数' + scope.row.limitDay }}天</div>
+          <div v-if="scope.row.cardEffectiveMode == 2">投放后当月</div>
         </template>
       </el-table-column>
       <el-table-column prop="cardLimit" :show-overflow-tooltip="false" label="领取限制" width="90">