diff --git a/Web12306/js/ui/ui-sysnotice.js b/Web12306/js/ui/ui-sysnotice.js index f5ca466..1566f99 100644 --- a/Web12306/js/ui/ui-sysnotice.js +++ b/Web12306/js/ui/ui-sysnotice.js @@ -9,11 +9,12 @@ var loadSystemNotice = function () { $.get(loadUrl).done(function (json) { + var nowDate = new Date().getTime(); json.lastLoad = new Date().getTime(); if (savedNotice.lastReadId) { var takeCounter = 0; json.items = _.filter(json.items, function (i) { - return !savedNotice.lastReadId || savedNotice.lastReadId < i.id || (takeCounter++ < data.sysNoticeMaxShowCount); + return (!i.expiresTime || nowDate > i.expiresTime) && (!savedNotice.lastReadId || savedNotice.lastReadId < i.id || (takeCounter++ < data.sysNoticeMaxShowCount)); }); json.lastReadId = savedNotice.lastReadId; }