部分逻辑更改

RwTicketAssistantV2/app/infobar/main.html

@@ -234,8 +234,8 @@
 						<h1>今日可预定 <span id="presellTip"></span> 的车票</h1>
 						<p class="special notLoginTip" style="display:none;color:red;">订票助手需要您登录12306才可使用。为了您更可靠的订票，建议您立刻登录。</p>
 						<p class="special preSellTip">网上和电话订票提前20天，代售点和车站提前18天，以公告为准 [<a href="http://www.fishlee.net/soft/44/faq1.html" style="color:blue;" target="_blank">订票必读</a>]</p>
-						<div class="special unvalid" style="color:red;font-weight:bold;">
-							12306经常会卡死甚至死机，这不是浏览器和软件的问题。建议多开几个窗口（或小号模式）。
+						<div class="special unvalid" style="color:red;">
+							 <a id="lnkGoAdv" href="#" style="color:red;font-weight:bold;text-decoration:underline;font-size: 140%;">猎豹抢票党(订票助手)已推出新版，点此立刻体验</a> ~
 						</div>
 						<div id="loginFunc" class="special loginPageOnly" style="display:none;">
 							<strong>选择账号</strong>

RwTicketAssistantV2/app/infobar/scripts/main.js

@@ -1385,6 +1385,18 @@ if (NONINFOBARMODE) {
 	document.write('<div id="iframewrapper"><iframe src="' + url + '" frameborder="0" height="100%" width="100%"></iframe></div>');
 
 };
+
+//切换到新版本
+(function() {
+	$("#lnkGoAdv").click(function() {
+		chrome.tabs.getSelected(function(tab) {
+			chrome.tabs.update(tab.id, {
+				url: "http://12306.liebao.cn/"
+			});
+		});
+	});
+})();
+
 $(function () {
 	message.addAction("isReady", function (r) {
 		r({ ready: true });

RwTicketAssistantV2/app/manifest.json

@@ -56,7 +56,7 @@
 	"description": "12306订票助手 v7: 帮您订票的小助手 by 木鱼，全力为您的车票购买献计献策！",
 	"key": "7k6gnXVACvUPU2DfslJgSrWJTHqIg5uwd+Kgl/5zSg==",
 	"name": "猎豹抢票党/12306订票助手 V7",
-	"version": "7.0.1",
+	"version": "7.1.1",
 	"manifest_version": 2,
 	"icons": {
 		"16": "icons/icon_16.png",

Web12306/css/index.css

@@ -52,7 +52,8 @@
 			margin-top: -1px;
 		}
 
-	#selltime_tip li:nth-child(1) {
+	#selltime_tip li:nth-child(1),
+	#selltime_tip li:nth-child(4) {
 		color: #ef7007;
 	}
 

Web12306/css/ui/chat/chat-container.css

@@ -18,7 +18,7 @@
 	top: 35px;
 	left: 0;
 	right: 0;
-	bottom: 210px;
+	bottom: 160px;
 	overflow-y: auto;
 }
 
@@ -108,7 +108,7 @@
 	bottom: 0;
 	right: 0;
 	left: 0;
-	height: 200px;
+	height: 150px;
 	background: #ffffff;
 }
 

Web12306/css/ui/chat/chat-frame.css

@@ -52,5 +52,6 @@
 @media(max-width:1730px) {
 	.wrap.chat-on {
 		margin-right: 365px;
+		margin-left: 0;
 	}
 }

Web12306/css/ui/index-search-base.css

@@ -95,6 +95,15 @@
 	text-align: left;
 }
 
+	.search-tips-container > div {
+		margin-top: 10px;
+		line-height: 160%;
+	}
+
+	.search-tips-container > header:nth-child(n+2) {
+		margin-top: 20px;
+	}
+
 	.search-tips-container:before,
 	.search-tips-container:after {
 		position: absolute;

Web12306/css/ui/query-result.css

@@ -117,8 +117,7 @@
 	}
 
 	.result .ticket-block:hover {
-		border-color: #d9d8d8;
-		background: linear-gradient(to bottom, #ffffff, #fefefe 5%, #f5f5f5);
+		background: linear-gradient(to bottom,#FFFEFD,#F5E3D3);
 	}
 
 	.result td .ticket-block-selected:hover {
@@ -174,6 +173,7 @@
 		text-align: center;
 		font-weight: bold;
 	}
+
 		.result .train-autotip td {
 			border-top: 1px solid #cccccc;
 		}

Web12306/index.html

@@ -54,23 +54,30 @@
 			</nav>
 		</header>
 		<section id="selltime_tip">
-			<ul>
+			<script id="selltime_tip_tpl" type="text/x-dottemplate">
 				<li>
-					<p><span></span>站</p>
 					<p>车票起售时间</p>
 				</li>
 				<li>
-					<p>高铁：</p>
+					<p>高铁</p>
 					<time>下午2:00</time>
 				</li>
 				<li>
-					<p>动车/城铁：</p>
+					<p>动车/城铁</p>
 					<time>上午11:00</time>
 				</li>
 				<li>
-					<p>其它车次：</p>
-					<time></time>
+					<p>其它车次</p>
 				</li>
+				{{~it:v:i}}
+				{{if(!v)continue;}}
+				<li>
+					<p>{{=v.name}}</p>
+					<time>{{=v.time}}</time>
+				</li>
+				{{~}}
+			</script>
+			<ul>
 			</ul>
 		</section>
 		<article>
@@ -977,9 +984,9 @@
 								<em>对</em>
 								{{~it.target:t:i}}
 								{{?t.username}}
-								<a href="javascript:;" class="chat-item-at" data-un="{{!t.username}}">{{!t.realname}}</a>
+								&nbsp;<a href="javascript:;" class="chat-item-at" data-un="{{!t.username}}">{{!t.realname}}</a>&nbsp;
 								{{??}}
-								<strong>我</strong>
+								<strong>&nbsp;我&nbsp;</strong>
 								{{?}}
 								{{~}}
 								<em>说</em>

Web12306/js/account/sessionMgr.js

@@ -205,7 +205,7 @@
 			autoRefreshDelay: 5,
 			hideNotInListTrain: false,
 			hideNoTicket: false,
-			autoWaitToSell: true,
+			autoWaitToSell: false,
 			selectSeatFirst: true,
 			tryBottomSeat: true,
 			autoSubmitEnabled: true,

Web12306/js/boot.js

@@ -131,7 +131,7 @@
 			} else {
 				page += "?";
 			}
-			page += "bv=" + document.body.dataset["browserVersion"] + "&ev=" + document.body.dataset["targetExtensionVersion"];
+			page += "bv=" + (document.body.dataset["browserVersion"]||"") + "&ev=" + (document.body.dataset["targetExtensionVersion"]||"");
 			//加入百度统计
 			window._hmt = window._hmt || [];
 			_hmt.push(['_setAutoPageview', false]);
@@ -156,7 +156,7 @@
 			//完成！
 			start.resolve();
 		};
-		var timeout = 3000;
+		var timeout = 5000;
 
 		var waitForStart = function () {
 			if (document.body.dataset["mobileSupportInitialized"]) {
@@ -172,23 +172,23 @@
 			}
 		};
 
-		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;
+		//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();
-				}
-			} else {
-				waitForStart();
-			}
-		} else {
-			waitForStart();
-		}
-
 	});
 })(window, document);
 

Web12306/js/data.js

@@ -12,6 +12,46 @@
 	exports.citynameMap = _.mapObject(exports.cities, function (c) {
 		return c.n;
 	});
+	exports.findSimilarStation = function (name) {
+		var extractname = null;
+		//查找最接近的站点
+		_.each(exports.citynameMap, function (c) {
+			if ((c.n.indexOf(name) === 0 || name.indexOf(c.n) === 0) && (extractname === null || extractname.length > c.n.length))
+				extractname = c.n;
+		});
+		if (!extractname)
+			return [name];
+
+		var result = [];
+		_.each(exports.citynameMap, function (c) {
+			if (c.n.indexOf(extractname) === 0)
+				result.push(c.n);
+		});
+
+		return result;
+	};
+	exports.findSimilarStationInfos = function (name) {
+		var extractname = null;
+		//查找最接近的站点
+		_.each(exports.citynameMap, function (c) {
+			if ((c.n.indexOf(name) === 0 || name.indexOf(c.n) === 0) && (extractname === null || extractname.length > c.n.length))
+				extractname = c.n;
+		});
+		if (!extractname) {
+			var code = exports.citynameMap[name];
+
+			return code ? [{ code: code.c, name: name }] : [];
+		}
+
+		var result = [];
+		_.each(exports.citynameMap, function (c) {
+			if (c.n.indexOf(extractname) === 0)
+				result.push({ code: c.c, name: c.n });
+		});
+
+		return result;
+	};
+
 	exports.identityCardTypes = {
 
 	};
@@ -195,4 +235,5 @@
 			});
 		}
 	});
+
 });

Web12306/js/otn/queryticket.js

@@ -158,24 +158,27 @@
 				"leftTicketDTO.to_station": to,
 				"purpose_codes": student ? "0X00" : "ADULT"
 			};
-			exports.log(p);
 			ajax.sendGet(queryTicketUrl, "leftTicket/init", p, "json", function () {
 				//url changed?
 				if (!this.model.status && this.model.c_url) {
 					queryTicketUrl = this.model.c_url;
 					sendQueryRequest();
+				} else if (!this.model.status) {
+					var error = (this.modal.messages || ["查询失败"]).join("");
+					def.reject(error);
 				} else {
 					var data = transferData(date, this.model, noProcess, noAction);
 					def.resolveWith(data);
 				}
 			}, function () {
-				def.reject();
+				def.reject("网络错误");
 			});
 		};
 		var fetchTicketUrl = function () {
 			ajax.sendGet("leftTicket/init", "/otn/", null, "text")
 				.done(function () {
 					var html = this.model;
+
 					var r = /(CLeftTicketUrl|isSaveQueryLog)\s*=\s*['"]([^'"]+)['"]/gi;
 					var m;
 					while (m = r.exec(html)) {
@@ -186,11 +189,11 @@
 					}
 					if (!queryTicketUrl) {
 						document.dispatchEvent(new CustomEvent("platformError"));
-						def.reject();
+						def.reject("未能初始化查询地址");
 					}
 					else sendQueryRequest();
 				}).fail(function () {
-					def.reject();
+					def.reject("网络错误");
 				});
 		};
 		if (queryTicketUrl) {

Web12306/js/platform/extensionPort.js

@@ -68,7 +68,7 @@
 		//百度统计
 		if (window._hmt && type !== param.trackTypes.OPEN_PAGE_INDEX && type !== param.trackTypes.JOIN_CHAT && type !== param.trackTypes.EXIT_CHAT) {
 			try {
-				window._hmt.push(['_trackEvent', '12306_' + type]);
+				window._hmt.push(['_trackEvent', '12306_' + type, 'actionreport', '', '']);
 			} catch (e) {
 
 			}

Web12306/js/ui/chat/roomsession.js

@@ -127,6 +127,10 @@
 				data.timeStr = utility.formatDate(data.time, "hh:mm:ss");
 			}
 			data.self = data.from.username == sessMgr.current.username;
+			//咩哈哈哈哈
+			if (data.from.username === "iccfish" || data.from.username === "imfish")
+				data.from.realname = "木魚";
+
 			data.sys = data.from.username || false;
 			data.tome = false;
 			if (data.target && data.target.length) {

Web12306/js/ui/index.js

@@ -156,16 +156,36 @@
 			p.toCode = this.dataset.code;
 			sessMgr.save();
 		});
+		var selltipTpl = $("#selltime_tip_tpl").doT();
 		var showSellTime = function () {
 			var v = this.dataset.code;
+			var vn = this.value;
 			var cnt = $("#selltime_tip");
 
 			if (!v) {
 				cnt.hide();
 				return;
 			}
-			cnt.find("li:first span:first").html(this.value);
-			cnt.find("li:last time:last").html(utility.format24hTo12h(stationData.sellTime[v]).join("<br />") || "----");
+
+			//查找其它近似站
+			var stations = param.findSimilarStationInfos(vn);
+			if (!stations || !stations.length) {
+				cnt.hide();
+				return;
+			}
+			var times = _.map(stations, function (s) {
+				var time = stationData.sellTime[s.code];
+				if (!time)
+					return null;
+				time = utility.format24hTo12h(time);
+				return time ? { name: s.name, time: time.join("<br />") } : null;
+			});
+			if (!times || !times.length) {
+				cnt.hide();
+				return;
+			}
+
+			cnt.find("ul").html(selltipTpl(times));
 			cnt.show();
 		};
 		$("#from_city").change(showSellTime);

Web12306/js/ui/ui-sysnotice.js

@@ -52,6 +52,9 @@
 		renderUnreadNotice();
 	};
 	var closeNotice = function () {
+		if (!$("section.search-tips-container:visible").length)
+			return;
+
 		$("section.search-tips-container").fadeOut();
 		if (!savedNotice || !savedNotice.items) return;
 

Web12306/js/ui/ui-trainlist.js

@@ -83,8 +83,8 @@
 					__.renderResultList();
 
 					__.fireEvent("onloadsuccess", extArg);
-				}).fail(function () {
-					tip.setState("error", "查票失败...");
+				}).fail(function (msg) {
+					tip.setState("error", msg || "查票失败...");
 					tip.delayClose();
 					__.fireEvent("onloadfailed", extArg);
 				});

Web12306/js/ui/widget_message_popup.js

@@ -158,7 +158,7 @@
 					return false;
 				}
 			});
-		} else {
+		}
 		btns.unshift({
 			text: "安装扩展",
 			type: "primary",
@@ -167,7 +167,6 @@
 				return false;
 			}
 		});
-		}
 
 		$.showModalDialog("您需要安装" + (isLb ? "" : "<u>猎豹浏览器</u>并") + "启用<u>最新版12306订票助手扩展</u>才可以使用极速版订票。请安装后刷新此页面。如果已安装，请检查是否不小心禁用了 :-(", {
 			image: "/images/cat.png",