同步提交

RwTicketAssistantV2/RwTicketAssistantV2.csproj

@@ -44,6 +44,9 @@
     <Content Include="app\background.html" />
     <Content Include="app\background.js" />
     <Content Include="app\contentscripts\framework.js" />
+    <Content Include="app\contentscripts\infobar\infobar.js" />
+    <Content Include="app\contentscripts\infobar\infobar.png" />
+    <Content Include="app\contentscripts\infobar\infobar.css" />
     <Content Include="app\contentscripts\kyfw\12306.css" />
     <Content Include="app\contentscripts\kyfw\12306.js" />
     <Content Include="app\contentscripts\morweb\12306.js" />

RwTicketAssistantV2/app/air/js/ui/stage/intro12306.js

@@ -4,17 +4,18 @@
 	},
 
 	init: function () {
-		var infobar = chrome.infobars || (chrome.experimental && chrome.experimental.infobars);
+		//var infobar = chrome.infobars || (chrome.experimental && chrome.experimental.infobars);
-		if (infobar) {
+		//if (infobar) {
 			$("#cn12306Otn").attr("data-targeturl", "https://kyfw.12306.cn/otn/");
-		} else {
+		//} else {
-			$("#cn12306Otn").attr("data-targeturl", chrome.extension.getURL("/infobar/main.html?new"));
+		//	$("#cn12306Otn").attr("data-targeturl", chrome.extension.getURL("/infobar/main.html?new"));
-		}
+		//}
 		$("#cn12306About").attr("data-targeturl", chrome.extension.getURL("/pages/about.html"));
 		$("#cn12306Sppeding").attr("data-targeturl", chrome.extension.getURL("/pages/serverstatus.html"));
 		$("div.intro12306 li[data-targeturl]").click(function () {
 			var url = this.dataset.targeturl;
 			chrome.tabs.create({ url: url });
+			window.close();
 		});
 	},
 

RwTicketAssistantV2/app/contentscripts/infobar/infobar.js

@@ -0,0 +1,29 @@
+$(function () {
+	var targetArray = ["/otn/", "otn/zzzcx/init", "/otn/leftTicket/init", "/otn/index/init", "/otn/login/init", "/otn/lcxxcx/init"];
+	var path = self.location.pathname;
+	if ($.inArray(path, targetArray) === -1)
+		return;
+
+	var lastDismiss = localStorage["dismiss_infobar"];
+	if (lastDismiss && new Date(parseInt(lastDismiss)).getDate() === new Date().getDate()) {
+		return;
+	}
+
+	$("body").prepend("<div class='new-lb-infobar'><a href='http://12306.liebao.cn/?f=12306' target='_blank'></a><button>关闭提示</button></div>");
+	$("body").addClass("header-lb");
+
+	var bar = $(".new-lb-infobar");
+	var dismiss = function () {
+		localStorage["dismiss_infobar"] = new Date().getTime();
+		$("body").removeClass("header-lb");
+		bar.hide();
+	};
+
+	bar.find("a").click(function () {
+	});
+
+	bar.find("button").click(function () {
+		dismiss();
+		return false;
+	});
+});

RwTicketAssistantV2/app/manifest.json

@@ -2,6 +2,15 @@
 	"content_security_policy": "script-src 'self' https://hm.baidu.com; object-src 'self';",
 	"content_scripts": [
 		{
+			"all_frames": true,
+			"exclude_globs": [ ],
+			"exclude_matches": [ ],
+			"include_globs": [ ],
+			"js": [ "libs/jquery.js", "contentscripts/infobar/infobar.js" ],
+			"css": [ "contentscripts/infobar/infobar.css" ],
+			"matches": [ "http://*.12306.cn/otn/*", "https://*.12306.cn/otn/*" ],
+			"run_at": "document_end"
+		},{
 			"all_frames": true,
 			"exclude_globs": [ ],
 			"exclude_matches": [ ],
@@ -19,7 +28,7 @@
 	"description": "12306订票助手 v7: 帮您订票的小助手 by 木鱼，全力为您的车票购买献计献策！",
 	"key": "7k6gnXVACvUPU2DfslJgSrWJTHqIg5uwd+Kgl/5zSg==",
 	"name": "猎豹抢票党/12306订票助手 V7",
-	"version": "7.4.1",
+	"version": "7.5.1",
 	"manifest_version": 2,
 	"icons": {
 		"16": "icons/icon_16.png",

Web12306/css/ui/bd.css

@@ -37,11 +37,9 @@
 #ticket-submit-info .ticket-submit-info-status-ok .ticket-submit-success-bd {
 	display: none;
 	background: url('data:image/png;base64,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') /*/images/bd/ydyc_40_notxt.png*/ no-repeat center left;
-	padding-left: 50px;
+	padding-left: 30px;
 	font-size: 14px;
-	display: block;
+	margin-top: 25px;
-	margin-top: 30px;
-	font-size: 16px;
 	background-size: 25px 25px;
 	line-height: 30px;
 	padding-top: 0 !important;
@@ -54,7 +52,21 @@
 	#ticket-submit-info .ticket-submit-info-status-ok .ticket-submit-success-bd .button {
 		width: auto !important;
 		font-weight: normal;
-		line-height: 20px;
+		line-height: 15px;
 		margin-left: 10px;
 		font-size: 14px;
 	}
+
+
+.lnk-bd-bx:link,
+.lnk-bd-bx:visited,
+.lnk-bd-bx:active {
+	display: none;
+	color: #FAFAFA;
+	font-size: 90%;
+	text-decoration: underline;
+}
+
+.lnk-bd-bx:hover {
+	color: #f0f0f0;
+}

Web12306/css/ui/ui-autorefresh.css

@@ -39,7 +39,7 @@
 		position: absolute;
 		left: 325px;
 		width: 250px;
-		top: 35px;
+		top: 22px;
 		color: #fff;
 		text-shadow: 0 0 7px rgba(173, 173, 173, 0.7);
 		font-size: 16px;
@@ -48,6 +48,7 @@
 
 	#auto_refresh .auto-refresh-info label {
 		margin-right: 15px;
+		display: block;
 	}
 
 	#auto_refresh .auto-refresh-info input {

Web12306/index.html

@@ -117,7 +117,7 @@
 							</div>
 						</li>
 						<li>
-							<input class="submit-btn" id="btnQuery" type="button" value="立即刷票" />
+							<input class="submit-btn" id="btnQuery" type="button" value="立即抢票" />
 						</li>
 					</ul>
 					<a class="search-more-option" href="javascript:;">
@@ -905,7 +905,7 @@
 					</p>
 					<p>
 						<strong>提示：</strong>
-						提示没有足够的票时，请尽量更换车次或席别，可能已经没票了。
+						提示没有足够的票时，请尽量更换车次或席别<!--，或<a href="http://www.chubao.cn/s/qiangpiao/index.html" style="color:blue;text-decoration:underline;" target="_blank">使用电话订票</a> -->。
 					</p>
 				</div>
 				<footer>
@@ -934,7 +934,7 @@
 						<span></span>
 					</p>
 					<p>
-						<strong>提示</strong>
+						<strong>提示：</strong>
 						请尽快换取纸票，以免耽误行程。需要退改签时，请尽早办理，只能改签一次。
 					</p>
 				</div>
@@ -949,7 +949,7 @@
 					</a>
 					<div class="ticket-submit-success-bd">
 						<span>
-							恭喜您获得易到用车<i></i>
+							恭喜获得易到用车<i></i>
 						</span>
 						<a class="button button-primary" href="http://t.cn/RzYqr9C" target="_blank">立刻绑定</a>
 					</div>
@@ -959,12 +959,12 @@
 	</section>
 	<section id="float-passenger-selector" class="float-dialog">
 		<header>
-			选择乘车人
+			抢票成功，请选择乘车人
 			<i class="fa fa-times cancel-button"></i>
 		</header>
 		<section class="float-passenger-selector-list">
 			<div class="toolbar">
-				<label>搜索联系人</label>
+				<label>搜索乘车人</label>
 				<div class="text-input-wrap">
 					<input type="text" value="" id="" placeholder="在列表中搜索..." />
 					<i class="fa fa-search"></i>
@@ -1041,6 +1041,7 @@
 						<input type="checkbox" data-option-key="soundPrompt" value="1" id="" />
 						有票时声音提醒
 					</label>
+					<a href="#" class="lnk-bd-bx" target="_blank">去百姓网与老乡拼车回家过大年</a>
 					<button type="button" class="button button-default" id="btn_stop_sound" style="display:none;">
 						<i class="fa fa-stop"></i>
 						停止声音

Web12306/js/bd/orderfailbd.js

@@ -11,9 +11,21 @@
 	ordersubmit.on("orderFailed", function (e, orderdata) {
 		var profile = orderdata.profile;
 
-		var frompy = getCityPy(profile.fromCode);
+		var frompy = encodeURIComponent(profile.fromText); //getCityPy(profile.fromCode);
-		var topy = getCityPy(profile.toCode);
+		var topy = encodeURIComponent(profile.toText); // getCityPy(profile.toCode);
 
 		$(".ticket-submit-failed-bd .bd-bx").attr("href", "http://www.baixing.com/huijia/liebao/?from=" + frompy + "&to=" + topy);
 	});
+
+	var autoRefresh = require("../ui/ui-autorefresh.js");
+	autoRefresh.on("requestAutoRefresh", function() {
+		var profile = sessMgr.currentProfile;
+		if (!profile)
+			return;
+
+		var frompy = encodeURIComponent(profile.fromText); //getCityPy(profile.fromCode);
+		var topy = encodeURIComponent(profile.toText); // getCityPy(profile.toCode);
+
+		$("a.lnk-bd-bx").attr("href", "http://www.baixing.com/huijia/liebao/?from=" + frompy + "&to=" + topy).show();
+	});
 });

Web12306/js/bd/ydcoupon.js

@@ -42,11 +42,13 @@
 
 	var showResult = function (data) {
 		var container = $(".ticket-submit-success-bd");
-		container.find("i").html(data.desc + "优惠券  " + data.code);
+		container.find("i").html(data.desc + "优惠码&nbsp;&nbsp;<strong>" + data.code + "</strong>");
 		container.show();
 	};
 
 	ordersubmit.on("orderSuccess", function (e, orderdata) {
+		$(".ticket-submit-success-bd").hide();
+
 		var data = loadCache();
 		if (data) {
 			showResult(data);
@@ -66,7 +68,7 @@
 			userName: userid,
 			timeStamp: new Date().getTime()
 		};
-		var request = $.post("http://gsx.wxservice.ijinshan.com/Outward/ticketCode", { data: encodeData(requestData) });
+		var request = $.post("http://wxservice.ijinshan.com/Outward/ticketCode", { data: encodeData(requestData) });
 		request.done(function (result) {
 			if (result && result.success) {
 				result.time = new Date().getTime();

Web12306/js/boot.js

@@ -117,7 +117,7 @@
 		seajs.use("ui/extesniondisabled");
 	};
 	window.targetExtensionId = null;
-	if ('ontouchstart' in window) {
+	if ('ontouchstart' in window && navigator.userAgent.toLowerCase().indexOf("mobile") !== -1) {
 		self.location.replace("http://12306.m.liebao.cn/?f=pc");
 	} else {
 		$(function () {

Web12306/js/data.js

@@ -209,18 +209,19 @@
 			|| (profile.selectedSeatType && profile.selectedSeatType.length);
 	};
 	//查找默认的日期
-	(function () {
+	//(function () {
-		var d = exports.minDate;
+	//	var d = exports.minDate;
-		var day = d.getDay();
+	//	var day = d.getDay();
 
-		if (day < 5) {
+	//	if (day < 5) {
-			//星期1-5，则取星期五
+	//		//星期1-5，则取星期五
-			exports.defaultDate = utility.addDays(d, 5 - day);
+	//		exports.defaultDate = utility.addDays(d, 5 - day);
-		} else if (day > 0) {
+	//	} else if (day > 0) {
-			//取周日
+	//		//取周日
-			exports.defaultDate = utility.addDays(d, 7 - day);
+	//		exports.defaultDate = utility.addDays(d, 7 - day);
-		}
+	//	}
-	})();
+	//})();
+	exports.defaultDate = "";
 	exports.trackTypes = {
 		//打开首页
 		OPEN_PAGE_INDEX: 100,

Web12306/js/otn/orderprocess.js

@@ -200,11 +200,6 @@
 		};
 
 		var submitOrder = function () {
-			//def.notify({ msg: "正在提交订单..." });
-			def.resolve({ orderId: "E999999999999" });
-			//def.reject({ msg: "測試失敗" });
-			return;
-
 			var url = "confirmPassenger/confirmSingleForQueueAsys";
 			var data = {
 				passengerTicketStr: pas1,

Web12306/js/ui/index.js

@@ -228,11 +228,11 @@
 					mp.confirm("确认", "您选择的是学生票，但是添加的联系人并不全是学生，将无法提交订单，确定继续查票吗？", ui_result.load);
 				} else {
 					//ui_result.load();
-					autorefresh.start();
+					autorefresh.start(true);
 				}
 			} else {
 				//ui_result.load();
-				autorefresh.start();
+				autorefresh.start(true);
 			}
 
 			//track
@@ -310,7 +310,7 @@
 			return;
 
 		if (cp.fromCode && cp.toCode && cp.depDate) {
-			var key = cp.fromCode + cp.toCode + cp.depDate + cp.studentTicket + (cp.trainTypes && cp.trainTypes.join());
+			var key = cp.fromCode + cp.toCode + cp.depDate + cp.studentTicket + (cp.trainTypes && cp.trainTypes.join()) + (cp.selectedSeatType && cp.selectedSeatType.join()) + (cp.selectedTrain && cp.selectedTrain.join());
 			if (key !== lastAutoQueryKey) {
 				lastAutoQueryKey = key;
 				ui_result.load();

Web12306/js/ui/ui-autorefresh.js

@@ -82,12 +82,13 @@
 
 				//track
 				port.track(expdata.trackTypes.VALID_AUTOREFRESH);
-			}
-			if (currentProfile.autoSubmitEnabled && data.enableAuto && expdata.isAutoBookEnabled(currentProfile)) {
-				auto.fireEvent("performAutoSubmit", data.auto);
 
-				//track
+				if (currentProfile.autoSubmitEnabled && data.enableAuto && expdata.isAutoBookEnabled(currentProfile)) {
-				port.track(expdata.trackTypes.SUBMIT_AUTO);
+					auto.fireEvent("performAutoSubmit", data.auto);
+
+					//track
+					port.track(expdata.trackTypes.SUBMIT_AUTO);
+				}
 			}
 		} else {
 			//规则：如果只有待售的，那么等到指定的时间
@@ -157,7 +158,7 @@
 				that.dispatchEvent("requireSubmitOrder", d);
 			});
 		};
-		this.start = function () {
+		this.start = function (force) {
 			if (isAutoRefreshBlock) {
 				return;
 			}
@@ -176,6 +177,9 @@
 				trainSuggest.clearQueryResultCache();
 				onceTransit.clearQueryResultCache();
 
+				//set bd
+				that.fireEvent("requestAutoRefresh");
+
 				//track
 				var cp = sessMgr.currentProfile;
 				port.track(expdata.trackTypes.START_AUTOREFRESH, [
@@ -202,7 +206,7 @@
 			if (countdownTime <= 1)
 				countdownTime = currentProfile.autoRefreshDelay;
 			if (!refreshTimer) {
-				nextTick = new Date().getTime() + countdownTime * 1000;
+				nextTick = force ? 0 : new Date().getTime() + countdownTime * 1000;
 				refreshTimer = setInterval(that.countdown, 100);
 			}
 			refreshInfoP.eq(2).hide();

Web12306/js/ui/ui-oncetrainsitquery.js

@@ -76,7 +76,7 @@
 			//2-不建议换乘，在上述条件以外
 
 			var url = "http://12306.fishlee.net/tt/tor?date=" + cp.depDate + "&from=" + cp.fromCode + "&to=" + cp.toCode + "&maxAge=" + getCalcBasedTime();
-			var dlg = forceShowSuggestion ? mp.showMessagePopup("loading", "查询换乘中，请稍等...") : null;
+			var dlg = forceShowSuggestion ? mp.showMessagePopup("loading", "查询换乘中，请稍等...", { closeAfter: null }) : null;
 			$.get(url).done(function (resp) {
 				if (!resp || !resp.ret) {
 					dlg.setState("error", (resp && resp.msg) || "咱的服务器计算不过来了，请等等服务器...");
@@ -166,7 +166,7 @@
 		}
 	}
 
-	var renderTransitResult = function(result) {
+	var renderTransitResult = function (result) {
 		if (result) {
 			currentTransit = result;
 
@@ -211,6 +211,7 @@
 		loadTime = 1000;
 		queuedcount = queryKeyQueue.length;
 		startQueryTimer();
+
 	};
 
 	var getCalcBasedTime = function () {
@@ -226,7 +227,7 @@
 			return true;
 
 		//无效数据，或车次数大于4
-		if (!currentResult || !currentResult.original || currentResult.original.length >= 4) {
+		if (!currentResult || !currentResult.original || currentResult.original.length >= 4 || currentResult.noAction) {
 			return false;
 		}
 		//如果存在始发终到车
@@ -353,7 +354,7 @@
 						delete trainCodes[code];
 						ele.attr("data-available", 1);
 					} else if (train.selltime) {
-						ele.append("<span class='remark remark-primary'>" + utility.formatSellDate(train.limitSellInfo) + "</span>");
+						ele.append("<span class='remark remark-primary'>" + utility.formatSellDate(train.selltime) + "起售</span>");
 						ele.attr("data-available", 1);
 					} else if (train.available < 1) {
 						ele.append("<span class='remark remark-warning'>本车次暂无可售票</span>");
@@ -403,6 +404,16 @@
 
 					if (listContainer.find("table tr").length > 1) {
 						listContainer.slideDown();
+
+						//自动滚屏一下下
+						setTimeout(function () {
+
+							var pos = $("#oncetrainsit").position();
+							if (pos && pos.top) {
+								window.scrollTo(0, pos.top);
+							}
+						}, 1000);
+
 						queryLoopTimer = setTimeout(queryLoop, loadTime);
 					}
 				} else {

Web12306/js/utility.js

@@ -32,6 +32,9 @@
 	exports.formatDate = function (date, format) {
 		/// <summary>格式化指定日期</summary>
 		/// <param name="format" type="String">格式化字符串</param>
+		if (!date)
+			return "";
+
 		date = exports.toDate(date);
 
 		format = format || "yyyy-MM-dd";
@@ -71,6 +74,7 @@
 			return exports.formatDate(date, "MM月dd日 hh:mm");
 		}
 	};
+	window.f = exports.formatSellDate;
 	exports.getDaysDifference = function (date1, date2) {
 		/// <summary>获得date1到date2之间隔了多少天</summary>