From 09fb3632c7cff133c8c9d6d9551c322b237d9328 Mon Sep 17 00:00:00 2001
From: iFish <iccfish@qq.com>
Date: Tue, 9 Sep 2014 20:13:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E6=9B=B4=E7=99=BE=E5=BA=A6=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BB=A3=E7=A0=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Web12306/Properties/AssemblyInfo.cs   | 2 +-
 Web12306/TrainSuggestion.cs           | 8 ++++++++
 Web12306/js/platform/extensionPort.js | 8 +-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/Web12306/Properties/AssemblyInfo.cs b/Web12306/Properties/AssemblyInfo.cs
index 034ae0e..159d94b 100644
--- a/Web12306/Properties/AssemblyInfo.cs
+++ b/Web12306/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // 你可以指定所有值，也可以让修订版本和内部版本号采用默认值，
 // 方法是按如下所示使用 "*":
-[assembly: AssemblyVersion("1.0.14252.73")]
+[assembly: AssemblyVersion("1.0.14252.74")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/Web12306/TrainSuggestion.cs b/Web12306/TrainSuggestion.cs
index b595e9f..3feadd0 100644
--- a/Web12306/TrainSuggestion.cs
+++ b/Web12306/TrainSuggestion.cs
@@ -684,6 +684,14 @@ namespace Web12306
 					return true;
 			}
 
+			//added 2014-9-9 检测非法车次
+			if (SelectedTrain != null && SelectedTrain.Length > 0)
+			{
+				var reg = new Regex("^(" + string.Join("|", SelectedTrain) + ")$", RegexOptions.IgnoreCase);
+				if (Stops.Keys.Any(s => !reg.IsMatch(s)))
+					return true;
+			}
+
 			return false;
 		}
 
diff --git a/Web12306/js/platform/extensionPort.js b/Web12306/js/platform/extensionPort.js
index c2eea1e..62c7006 100644
--- a/Web12306/js/platform/extensionPort.js
+++ b/Web12306/js/platform/extensionPort.js
@@ -68,13 +68,7 @@
 		//百度统计
 		if (window._hmt && type !== param.trackTypes.OPEN_PAGE_INDEX) {
 			try {
-				var data = "";
-				if (values) {
-					data = values.map(function(s) {
-						return encodeURIComponent(s);
-					}).join("&");
-				}
-				window._hmt.push(['_trackEvent', '12306', type, data]);
+				window._hmt.push(['_trackEvent', '12306_' + type]);
 			} catch (e) {
 
 			}