update: 合并

src/views/ai/task/components/birthActiveTime.vue

@@ -236,7 +236,7 @@ export default {
         let year = new Date(val[1]).getFullYear();
         let month = new Date(val[1]).getMonth() + 2;
         this.form.birthDate2[0] = new Date(val[0]).getMonth() + 1 == new Date().getMonth() + 1 ? this.currentTime : val[0];
-        this.form.birthDate2[1] = new Date(year + '/' + month).getTime() - 1;
+        this.form.birthDate2[1] = new Date(`${year}/${month}/1`).getTime() - 1;
         console.log(this.form.birthDate2);
       }
       this.form = Object.assign({}, this.form);

src/views/card/record-get.vue

@@ -214,10 +214,10 @@ export default {
           }
         },
         disabledDate: time => {
+          const { days, prevDays } = daysFun();
           if (minTime && maxTime && this.listParams.allCouponFlag == 1) {
-            return time.getTime() < minTime || time.getTime() > maxTime;
+            return time.getTime() < minTime || time.getTime() > maxTime || time.getTime() < Date.now() - (days * 8.64e7 + prevDays * 8.64e7) || time.getTime() > new Date().getTime();
           } else {
-            const { days, prevDays } = daysFun();
             return time.getTime() < Date.now() - (days * 8.64e7 + prevDays * 8.64e7) || time.getTime() > new Date().getTime();
           }
         }
@@ -466,6 +466,9 @@ export default {
       }
       return _content;
     }
+  },
+  destroyed() {
+    maxTime = minTime = null;
   }
 };
 </script>