Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/components/mixin.js

@@ -27,7 +27,7 @@ export default {
               start = start.setFullYear(start.getFullYear() - 2);
               start2 = start2.setDate(start2.getDate() - 59);
               start = start > start2 ? start : start2;
-              end2 = end2.setDate(end2.getDate() + 60);
+              end2 = end2.setDate(end2.getDate() + 59) + 24 * 60 * 60 * 1000 - 1000; // end2算到晚上23:59:59
               end = end.getTime() > end2 ? end2 : end.getTime();
             } else {
               start = start.setFullYear(start.getFullYear() - 2);