微信扫描领最高99元打车券 →
的 起售日期为（），建议开启提醒。
++ 的 起售日期为（），建议 + + + + ，领最高99打车券。 +
高峰期预售期可能有变动或增开临客，因此预售期会有变动，详情请密切留意12306公告。
diff --git a/Web12306/js/bd/orderfailbd.js b/Web12306/js/bd/orderfailbd.js
new file mode 100644
index 0000000..d03e97e
--- /dev/null
+++ b/Web12306/js/bd/orderfailbd.js
@@ -0,0 +1,19 @@
+define(function (require, exports, module) {
+ var ordersubmit = require("../ui/ui-submit-order.js");
+ var sessMgr = require("../account/sessionMgr.js");
+ var data = require("../data.js");
+
+ var getCityPy = function (code) {
+ var city = data.cities[code];
+ return city && city.p;
+ };
+
+ ordersubmit.on("orderFailed", function (e, orderdata) {
+ var profile = orderdata.profile;
+
+ var frompy = getCityPy(profile.fromCode);
+ var topy = getCityPy(profile.toCode);
+
+ $(".ticket-submit-failed-bd .bd-bx").attr("href", "http://www.baixing.com/huijia/liebao/?from=" + frompy + "&to=" + topy);
+ });
+});
diff --git a/Web12306/js/bd/ydcoupon.js b/Web12306/js/bd/ydcoupon.js
new file mode 100644
index 0000000..d93ade3
--- /dev/null
+++ b/Web12306/js/bd/ydcoupon.js
@@ -0,0 +1,52 @@
+define(function (require, exports, module) {
+ var ordersubmit = require("../ui/ui-submit-order.js");
+ var sessMgr = require("../account/sessionMgr.js");
+
+ var toHex = function (b) {
+ var str = b.toString(16);
+ return str.length == 2 ? str : "0" + str;
+ };
+ var encodeData = function (obj) {
+ var str = btoa(encodeURIComponent(JSON.stringify(obj)));
+ var code = Math.floor(Math.random() * 256);
+
+ var result = [toHex(code)];
+ for (var i = 0; i < str.length; i++) {
+ result.push(toHex(str.charCodeAt(i) ^ code));
+ }
+
+ return result.join("");
+ };
+
+ ordersubmit.on("orderSuccess", function (e, orderdata) {
+ var orderId = orderdata.orderId;
+ var userid = sessMgr.current.username;
+ var amount = _.reduce(_.map(orderdata.passengers, function (p) {
+ var seat = _.findWhere(p.seats, { code: p.seat });
+ return (seat && seat.price) || 0;
+ }), function (a, b) { return a + b; }, 0);
+ });
+
+
+ //var decodeToArray = function (str) {
+ // var arr = [];
+ // for (var i = 0; i < str.length; i += 2)
+ // arr.push(parseInt(str.substr(i, 2), 16));
+
+ // return arr;
+ //};
+ //var decodeArray = function (arr) {
+ // var seed = arr.shift();
+ // for (var i = 0; i < arr.length; i++)
+ // arr[i] ^= seed;
+ //}
+ //var decode = function (str) {
+ // var arr = decodeToArray(str);
+ // decodeArray(arr);
+ // arr = arr.map(function (code) { return String.fromCharCode(code); });
+ // var resultStr = decodeURIComponent(atob(arr.join("")));
+ // return JSON.parse(resultStr);
+ //};
+
+ //window.decodeTest = decode;
+});
diff --git a/Web12306/js/boot.js b/Web12306/js/boot.js
index 78c3683..e13e788 100644
--- a/Web12306/js/boot.js
+++ b/Web12306/js/boot.js
@@ -92,13 +92,13 @@
if (idx !== -1)
array.splice(idx, 1);
},
- sortArray:function(array, comparer) {
+ sortArray: function (array, comparer) {
//保存原始排序
var map = {};
for (var i = 0; i < array.length; i++) {
map[array[i]] = array[i];
}
- array.sort(function(x, y) {
+ array.sort(function (x, y) {
var result = comparer && comparer(x, y);
return result === 0 ? map[x] - map[y] : result;
@@ -117,91 +117,95 @@
seajs.use("ui/extesniondisabled");
};
window.targetExtensionId = null;
- $(function () {
- //确保内容脚本启动
- var start = $.Deferred();
- start.done(function () {
- chrome.runtime.sendMessage(window.targetExtensionId, { action: "getStorage" }, function (m) {
- window.storage = m.detail;
+ if ('ontouchstart' in window) {
+ self.location.replace("http://12306.m.liebao.cn/?f=pc");
+ } else {
+ $(function () {
+ //确保内容脚本启动
+ var start = $.Deferred();
+ start.done(function () {
+ chrome.runtime.sendMessage(window.targetExtensionId, { action: "getStorage" }, function (m) {
+ window.storage = m.detail;
- //TODO: 因为压缩需要mark所有的页面名，所以不可以用变量计算。
- if (pagename === "index")
- seajs.use("ui/index");
+ //TODO: 因为压缩需要mark所有的页面名，所以不可以用变量计算。
+ if (pagename === "index")
+ seajs.use("ui/index");
- });
- });
- start.fail(function (reason) {
- if (reason === "disabled")
- extensionDisabled();
- else
- notInstallExtension();
- });
- start.always(function () {
- var page = location.pathname;
- if (location.search) {
- page += location.search + "&";
- } else {
- page += "?";
- }
- page += "bv=" + (document.body.dataset["browserVersion"] || "") + "&ev=" + (document.body.dataset["targetExtensionVersion"] || "");
- //加入百度统计
- window._hmt = window._hmt || [];
- _hmt.push(['_setAutoPageview', false]);
- _hmt.push(['_trackPageview', page]);
-
- var hm = document.createElement("script");
- hm.src = "//hm.baidu.com/hm.js?c7150a056b54f666f90c1a05e0700798";
- document.getElementsByTagName("head")[0].appendChild(hm);
- });
-
- var checkExtensionInfo = function () {
- window.targetExtensionId = document.body.dataset["targetExtensionId"];
- window.targetExtensionVersion = document.body.dataset["targetExtensionVersion"];
-
- if (!window.targetExtensionId) {
- start.reject();
- return;
- }
- //检测版本吗？暂时不需要
-
-
- //完成！
- start.resolve();
- };
- var timeout = 5000;
-
- var waitForStart = function () {
- if (document.body.dataset["mobileSupportInitialized"]) {
- checkExtensionInfo();
- } else {
- var timer = setTimeout(function () {
- start.reject();
- }, timeout);
- document.addEventListener("mobileSupportInitialized", function () {
- window.clearTimeout(timer);
- checkExtensionInfo();
});
- }
- };
+ });
+ start.fail(function (reason) {
+ if (reason === "disabled")
+ extensionDisabled();
+ else
+ notInstallExtension();
+ });
+ start.always(function () {
+ var page = location.pathname;
+ if (location.search) {
+ page += location.search + "&";
+ } else {
+ page += "?";
+ }
+ page += "bv=" + (document.body.dataset["browserVersion"] || "") + "&ev=" + (document.body.dataset["targetExtensionVersion"] || "");
+ //加入百度统计
+ window._hmt = window._hmt || [];
+ _hmt.push(['_setAutoPageview', false]);
+ _hmt.push(['_trackPageview', page]);
- //var extJson = null;
- //if (window.external.GetExtensionInfoListJson && (extJson = window.external.GetExtensionInfoListJson())) {
- // var ext = _.findWhere(JSON.parse(extJson), { id: "gkbheeokbgmmnbjhhlphckobccejghjn" });
- // if (ext) {
- // if (!ext.enabled)
- // start.reject("disabled");
- // else {
- // timeout = 10000;
- // waitForStart();
- // }
- // } else {
- // waitForStart();
- // }
- //} else {
- // waitForStart();
- //}
- waitForStart();
- });
+ var hm = document.createElement("script");
+ hm.src = "//hm.baidu.com/hm.js?c7150a056b54f666f90c1a05e0700798";
+ document.getElementsByTagName("head")[0].appendChild(hm);
+ });
+
+ var checkExtensionInfo = function () {
+ window.targetExtensionId = document.body.dataset["targetExtensionId"];
+ window.targetExtensionVersion = document.body.dataset["targetExtensionVersion"];
+
+ if (!window.targetExtensionId) {
+ start.reject();
+ return;
+ }
+ //检测版本吗？暂时不需要
+
+
+ //完成！
+ start.resolve();
+ };
+ var timeout = 5000;
+
+ var waitForStart = function () {
+ if (document.body.dataset["mobileSupportInitialized"]) {
+ checkExtensionInfo();
+ } else {
+ var timer = setTimeout(function () {
+ start.reject();
+ }, timeout);
+ document.addEventListener("mobileSupportInitialized", function () {
+ window.clearTimeout(timer);
+ checkExtensionInfo();
+ });
+ }
+ };
+
+ //var extJson = null;
+ //if (window.external.GetExtensionInfoListJson && (extJson = window.external.GetExtensionInfoListJson())) {
+ // var ext = _.findWhere(JSON.parse(extJson), { id: "gkbheeokbgmmnbjhhlphckobccejghjn" });
+ // if (ext) {
+ // if (!ext.enabled)
+ // start.reject("disabled");
+ // else {
+ // timeout = 10000;
+ // waitForStart();
+ // }
+ // } else {
+ // waitForStart();
+ // }
+ //} else {
+ // waitForStart();
+ //}
+ waitForStart();
+ });
+ }
})(window, document);
diff --git a/Web12306/js/ui/index.js b/Web12306/js/ui/index.js
index 68e6ee1..1fab0b2 100644
--- a/Web12306/js/ui/index.js
+++ b/Web12306/js/ui/index.js
@@ -322,6 +322,10 @@
});
autoQuery();
+ //易到用车
+ //require("../bd/ydcoupon.js");
+ require("../bd/orderfailbd.js");
+
//$("#passenger_editor").showModalDialog({
// title: "新增联系人",
// buttons: [
diff --git a/Web12306/js/ui/ui-dnsspeeding.js b/Web12306/js/ui/ui-dnsspeeding.js
index 5cf272c..bfc9f44 100644
--- a/Web12306/js/ui/ui-dnsspeeding.js
+++ b/Web12306/js/ui/ui-dnsspeeding.js
@@ -20,14 +20,15 @@
if (isValid <= 0) {
$("#swDnsSpeeding").hide();
} else {
- $("#swDnsSpeeding").show();
- if (sysConfig.enableServerAutoChange) {
- serverSpan.show();
- $("#swDnsSpeeding").html("关闭加速");
- refreshSpeed();
- } else {
- $("#swDnsSpeeding").html("启用加速");
- }
+ //$("#swDnsSpeeding").show();
+ //if (sysConfig.enableServerAutoChange) {
+ // serverSpan.show();
+ // $("#swDnsSpeeding").html("关闭加速");
+ // refreshSpeed();
+ //} else {
+ // $("#swDnsSpeeding").html("启用加速");
+ //}
+ $("#swDnsSpeeding").hide();
}
if (isValid > 0) {
if (!checkSpeedTimer)
diff --git a/Web12306/js/ui/ui-submit-order.js b/Web12306/js/ui/ui-submit-order.js
index f48ffe4..1f1e4b8 100644
--- a/Web12306/js/ui/ui-submit-order.js
+++ b/Web12306/js/ui/ui-submit-order.js
@@ -105,7 +105,9 @@
submitDef = pProfile.resign ? op.submitOrder(pTrain, pProfile, pPassengers, randCode) : op.fastSubmitOrder(pTrain, pProfile, pPassengers, randCode);
submitDef.done(function (data) {
- that.fireEvent("orderSuccess", data);
+ var evdata = $.extend({}, data, { train: pTrain, profile: pProfile, passengers: pPassengers });
+
+ that.fireEvent("orderSuccess", evdata);
var dom = $("#ticket-submit-info").find("section.ticket-submit-info-vc").hide().end().find("section.ticket-submit-info-status-ok").show();
dom.find("div>p:eq(0) span").html(data.orderId);
submitProgress.removeClass().addClass("ticket-submit-status ticket-submit-status-ok");
@@ -126,7 +128,9 @@
]);
});
submitDef.fail(function (data) {
- that.fireEvent("orderFailed", data);
+ var evdata = $.extend({}, data, { train: pTrain, profile: pProfile, passengers: pPassengers });
+ that.fireEvent("orderFailed", evdata);
+
submitProgress.removeClass().addClass("ticket-submit-status ticket-submit-status-error");
submitProgress.find("span").html("订票失败...错误信息：" + data.msg);
submitBtn[0].disabled = false;
diff --git a/Web12306/js/vc/touchvc.js b/Web12306/js/vc/touchvc.js
new file mode 100644
index 0000000..abe2623
--- /dev/null
+++ b/Web12306/js/vc/touchvc.js
@@ -0,0 +1,49 @@
+define(function (require, exports, module) {
+
+
+ var init = function () {
+ $(document).on("load", "img.vc-touchclick", initEle).on("click", "img.vc-touchclick", touchClick);
+ }
+
+ var initEle = function () {
+ var img = $(this);
+
+ img.removeData("poslist");
+ img.data("poslist", []);
+
+ refreshSteps(img);
+ };
+
+ var touchClick = function(e) {
+ var img = $(this);
+ var pos = { x: e.x, y: e.y };
+ var poslist = img.data("poslist");
+ var strlist = img.data("strlist");
+
+ if (strlist.length <= poslist.length)
+ return;
+
+ poslist.push(pos);
+ refreshSteps(img);
+
+ if (strlist.length <= poslist.length) {
+ img.trigger("touchVcFinished");
+ }
+ };
+
+ var refreshSteps = function (dom) {
+ var descTarget = $(dom.attr("data-target"));
+ var strlist = dom.data("strlist");
+ var poslist = dom.data("poslist");
+
+ var descArray = ["请依次在图中点击"];
+ for (var i = 0; i < strlist.length; i++) {
+ var clicked = poslist.length - 1 >= i;
+ var currentClick = poslist.length == i;
+
+ //已点击绿色，待点击蓝色，未来点击黑色
+ descArray.push("" + strlist[i] + "");
+ }
+ descTarget.html(descArray.join(""));
+ }
+});