Merge branch 'feature/GFRS-2301【需求】健康险渠道国富无忧卡金掌桂开发的需求' into dev

src/views/ebiz/cardList/ShowPDF.vue

@@ -26,7 +26,7 @@ export default {
       src: 'http://139.199.50.151' + '/pdfjs/web/viewer.html?file=',
       index: this.$route.query.index || 0, //阅读文件指针
       timer: null,
-      time: 5,
+      time: 2,
       cardListPDF: [],
       orderDTO: [],
       docType: ''
@@ -59,7 +59,7 @@ export default {
       this.interval()
     },
     interval() {
-      this.time = 5
+      this.time = 2
       this.timer = setInterval(() => {
         this.time--
         if (this.time == 0) return clearInterval(this.timer)

src/views/ebiz/cardList/information.vue

@@ -336,6 +336,7 @@
       @confirm="onDateConfirm($event, '6')"
       ref="effectiveDate"
       input-align:right
+      :maxDate="filterMaxDate"
     >
     </FieldDatePicter>
     <div v-if="cvaliDate.length > 0" class="van-cell van-field" style="border-bottom: 1px solid rgb(235, 237, 240)">
@@ -476,6 +477,7 @@ export default {
       ],
       maxDate: beforeDate.getBeforeYear(18), //投保人出生日期可选最大值
       insuredMaxDate: beforeDate.getBeforeDays(28), //被保人出生日期可选最大值
+      filterMaxDate:beforeDate.getBeforeYear(-2),
       popupShow: false,
       areaShow: false, //省级联动
       homeShow: false, //家庭地址联动