解决筛选之后提交订单出错的Bug

fancymax · Sep 16, 2016 · 93ee8d5 · 93ee8d5
1 parent 901303c
commit 93ee8d5
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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">