fix 自动提交不等待整点

This commit is contained in:
iFish(木鱼) 2015-12-18 12:36:19 +08:00
parent f3af1b9acb
commit 582b05526c

View File

@ -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';
});
@ -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 = [/.*/];
}
@ -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;