From 93ee8d59acbd5dc28239a995aff0748b125a3e92 Mon Sep 17 00:00:00 2001
From: fancymax <lindahai_max@126.com>
Date: Fri, 16 Sep 2016 20:50:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=AD=9B=E9=80=89=E4=B9=8B?=
 =?UTF-8?q?=E5=90=8E=E6=8F=90=E4=BA=A4=E8=AE=A2=E5=8D=95=E5=87=BA=E9=94=99?=
 =?UTF-8?q?=E7=9A=84Bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 12306ForMac/Info.plist                                        | 2 +-
 .../TicketViewControllers/TicketQueryViewController.swift     | 4 ++--
 .../TicketViewControllers/TicketQueryViewController.xib       | 4 ++--
 .../TicketViewControllers/TrainFilterWindowController.swift   | 4 ++--
 .../TicketViewControllers/TrainFilterWindowController.xib     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/12306ForMac/Info.plist b/12306ForMac/Info.plist
index 6b32c86..229e9cf 100644
--- a/12306ForMac/Info.plist
+++ b/12306ForMac/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>2</string>
 	<key>Fabric</key>
 	<dict>
 		<key>APIKey</key>
diff --git a/12306ForMac/TicketViewControllers/TicketQueryViewController.swift b/12306ForMac/TicketViewControllers/TicketQueryViewController.swift
index 0306568..90d7cb2 100644
--- a/12306ForMac/TicketViewControllers/TicketQueryViewController.swift
+++ b/12306ForMac/TicketViewControllers/TicketQueryViewController.swift
@@ -484,7 +484,7 @@ class TicketQueryViewController: NSViewController {
         }
         
         let selectedRow = leftTicketTable.rowForView(sender)
-        MainModel.selectedTicket = ticketQueryResult[selectedRow]
+        MainModel.selectedTicket = filterQueryResult[selectedRow]
         setSeatCodeForSelectedPassenger(MainModel.selectedTicket!.TrainCode! ,seatCodeName: sender.identifier!)
         
         self.loadingTipController.start(tip:"正在提交...")
@@ -521,7 +521,7 @@ class TicketQueryViewController: NSViewController {
         
         for i in 0..<ticketQueryResult.count {
             if ticketQueryResult[i].TrainCode == trainCode {
-                queryByTrainCodeParam.train_no = ticketQueryResult[i].train_no!
+                queryByTrainCodeParam.train_no = ticketQueryResult[i].train_no
                 queryByTrainCodeParam.from_station_telecode = ticketQueryResult[i].FromStationCode!
                 queryByTrainCodeParam.to_station_telecode = ticketQueryResult[i].ToStationCode!
                 break
diff --git a/12306ForMac/TicketViewControllers/TicketQueryViewController.xib b/12306ForMac/TicketViewControllers/TicketQueryViewController.xib
index 765aa4b..0849658 100644
--- a/12306ForMac/TicketViewControllers/TicketQueryViewController.xib
+++ b/12306ForMac/TicketViewControllers/TicketQueryViewController.xib
@@ -51,7 +51,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" columnSelection="YES" multipleSelection="NO" autosaveColumns="NO" rowHeight="40" headerView="mkA-fg-IPp" viewBased="YES" id="vdR-Hc-SYr">
-                                <rect key="frame" x="0.0" y="0.0" width="955" height="493"/>
+                                <rect key="frame" x="0.0" y="0.0" width="955" height="487"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" red="0.98039215686274506" green="0.98039215686274506" blue="0.98039215686274506" alpha="1" colorSpace="calibratedRGB"/>
@@ -462,7 +462,7 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="mkA-fg-IPp">
-                        <rect key="frame" x="0.0" y="0.0" width="955" height="17"/>
+                        <rect key="frame" x="0.0" y="0.0" width="955" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
diff --git a/12306ForMac/TicketViewControllers/TrainFilterWindowController.swift b/12306ForMac/TicketViewControllers/TrainFilterWindowController.swift
index 9ff5851..379dfa3 100644
--- a/12306ForMac/TicketViewControllers/TrainFilterWindowController.swift
+++ b/12306ForMac/TicketViewControllers/TrainFilterWindowController.swift
@@ -168,11 +168,11 @@ class TrainFilterWindowController: NSWindowController,NSTableViewDelegate,NSTabl
         return "TrainFilterWindowController"
     }
     
-    @IBAction func cancelButtonClicked(button:NSButton){
+    @IBAction func clickCancel(sender: AnyObject) {
         dismissWithModalResponse(NSModalResponseCancel)
     }
     
-    @IBAction func okButtonClicked(button:NSButton){
+    @IBAction func clickOK(sender: AnyObject) {
         getFilterKey()
         dismissWithModalResponse(NSModalResponseOK)
     }
diff --git a/12306ForMac/TicketViewControllers/TrainFilterWindowController.xib b/12306ForMac/TicketViewControllers/TrainFilterWindowController.xib
index b9ec4f0..bfd2154 100644
--- a/12306ForMac/TicketViewControllers/TrainFilterWindowController.xib
+++ b/12306ForMac/TicketViewControllers/TrainFilterWindowController.xib
@@ -205,7 +205,7 @@ DQ
 </string>
                         </buttonCell>
                         <connections>
-                            <action selector="okButtonClicked:" target="-2" id="nPo-Gg-7E8"/>
+                            <action selector="clickOK:" target="-2" id="7v5-UF-LJu"/>
                         </connections>
                     </button>
                     <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="OUn-9d-T7P">
@@ -226,7 +226,7 @@ DQ
                             <font key="font" metaFont="system"/>
                         </buttonCell>
                         <connections>
-                            <action selector="cancelButtonClicked:" target="-2" id="VWz-ek-nvc"/>
+                            <action selector="clickCancel:" target="-2" id="HDh-Jk-ZRo"/>
                         </connections>
                     </button>
                     <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dUJ-JT-Azj">