diff --git a/Web12306/js/ui/ui-autorefresh.js b/Web12306/js/ui/ui-autorefresh.js index 8919d2a..5bfc6b9 100644 --- a/Web12306/js/ui/ui-autorefresh.js +++ b/Web12306/js/ui/ui-autorefresh.js @@ -24,7 +24,7 @@ var ignoreIllegalData = currentProfile.ignoreIllegalData; if (ignoreIllegalData) { - trainList = _.filter(trainList, _.matcher({ maybeIllegal: false })); + trainList = _.filter(trainList, _.matcher({maybeIllegal: false})); } if (seatFirst) { @@ -32,7 +32,7 @@ seat = _.find(seatOrder, function (s) { var treg = _.find(trainFilter, function (t) { train = _.find(trainList, function (item) { - return t.test(item.code) && (_.findWhere(item.tickets, { code: s }) || {}).count >= count; + return item.available == 1 && t.test(item.code) && (_.findWhere(item.tickets, {code: s}) || {}).count >= count; }); return typeof (train) != 'undefined'; }); @@ -43,7 +43,7 @@ _.find(trainFilter, function (t) { seat = _.find(seatOrder, function (s) { train = _.find(trainList, function (item) { - return t.test(item.code) && (_.findWhere(item.tickets, { code: s }) || {}).count >= count; + return item.available == 1 && t.test(item.code) && (_.findWhere(item.tickets, {code: s}) || {}).count >= count; }); return typeof (train) != 'undefined'; }); @@ -52,7 +52,7 @@ } if (seat) - return { seat: seat, train: train }; + return {seat: seat, train: train}; return null; } @@ -71,7 +71,9 @@ //TODO 没有查到任何车次 } - var trainRegCache = _.map(expdata.translateTrain(currentProfile.selectedTrain || []), function (s) { return new RegExp("^" + s + "$", "i"); }); + var trainRegCache = _.map(expdata.translateTrain(currentProfile.selectedTrain || []), function (s) { + return new RegExp("^" + s + "$", "i"); + }); if (!trainRegCache || !trainRegCache.length) { trainRegCache = [/.*/]; } @@ -90,7 +92,7 @@ //查找结果 if (seat) { //乘客 - var ticketCount = _.findWhere(entry.tickets, { code: seat }).count; + var ticketCount = _.findWhere(entry.tickets, {code: seat}).count; var pcount = Math.min(ticketCount, currentProfile.passengers ? currentProfile.passengers.length : 0); data.auto = { @@ -99,9 +101,13 @@ passengers: _.first(currentProfile.passengers || [], pcount), data: entry }; - data.auto.passengers.forEach(function (p) { p.seat = data.auto.seat; }); + data.auto.passengers.forEach(function (p) { + p.seat = data.auto.seat; + }); if (currentProfile.submitStuAsCommon && !currentProfile.studentTicket) { - data.auto.passengers.forEach(function (p) { if (p.passenger_type === "3") p.passenger_type = "1"; }); + data.auto.passengers.forEach(function (p) { + if (p.passenger_type === "3") p.passenger_type = "1"; + }); } } else { data.auto = null; @@ -315,11 +321,11 @@ $("#date_loop_editor>span.selected").removeClass("selected"); if (currentDateLoopIndex > sessMgr.currentProfile.dateloop.length - 1) { sessMgr.currentProfile.depDate = sessMgr.currentProfile.trueDate; - sessMgr.currentProfile.inLoop=false; + sessMgr.currentProfile.inLoop = false; currentDateLoopIndex = -1; } else { - sessMgr.currentProfile.trueDate=sessMgr.currentProfile.depDate; - sessMgr.currentProfile.inLoop=true; + sessMgr.currentProfile.trueDate = sessMgr.currentProfile.depDate; + sessMgr.currentProfile.inLoop = true; sessMgr.currentProfile.depDate = sessMgr.currentProfile.dateloop[currentDateLoopIndex]; $("#date_loop_editor>span:eq(" + currentDateLoopIndex + ")").addClass("selected"); }