sadfasdfasdf332323

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -164,7 +164,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
             }
         }
-        
+        getPPH_Price()
+    }
+    
+    func getPPH_Price(){
         if pph_send_arr.count > 0 && pph_receive_arr.count > 0 {
             var tempArr:Array<addPinPinOrder_adrInfo> = []
             pph_send_arr.forEach { (item) in
@@ -1087,7 +1090,11 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     var carTypesArr:Array<vehicle_arr_data> = []
     
     var isPPH_Already = true
-    var pph_selectCarType = 0
+    var pph_selectCarType = 0{
+        didSet{
+            getPPH_Price()
+        }
+    }
     var pphCarTypesArr:Array<getVehicleTypeData_model> = []
     
     @IBAction func selectAction(_ sender: UIButton) {

GeliBusinessPlatform/ViewController/拼拼货group/PPH_YDXQ_VC.swift

@@ -9,7 +9,22 @@
 import UIKit
 import LGButton
 
-class PPH_YDXQ_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource {
+class PPH_YDXQ_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource, GeliAlertViewDelegate {
+    func sureGeliAlertViewAction(sender: UIButton) {
+        
+        cancelOrder(["wb_no":wb_no as Any,"user_token":userToken as Any]) {[self] (data) in
+                        HUD.hide()
+                        title_lbl_h.constant = 0
+                        action_btn.isHidden = true
+                        HUD.flash(.label("订单取消成功!"), onView: self.view, delay: 1.2) { (result) in
+                            top_img = UIImage(named: "pph_cancel")
+                            status_str = "已取消"
+                            list_view.reloadData()
+                        }
+                        NotificationCenter.default.post(name: NSNotification.Name(rawValue: "logistDetail"), object: nil, userInfo: nil)
+                    } failture: { (err) in
+                    }
+    }
     
     var top_img = UIImage(named: "pph_order")
     var status_str = "派单中"
@@ -20,22 +35,14 @@ class PPH_YDXQ_VC: BaseViewController,UITableViewDelegate,UITableViewDataSource
     var wb_no = ""
     @IBAction func cancel_action(_ sender: Any) {
         if btm_title_lbl.text == "取消订单" {
-            cancelOrder(["wb_no":wb_no as Any,"user_token":userToken as Any]) {[self] (data) in
-                HUD.hide()
-                title_lbl_h.constant = 0
-                action_btn.isHidden = true
-                HUD.flash(.label("订单取消成功!"), onView: self.view, delay: 1.2) { (result) in
-                    top_img = UIImage(named: "pph_cancel")
-                    status_str = "已取消"
-                    
-                    list_view.reloadData()
-                }
-                NotificationCenter.default.post(name: NSNotification.Name(rawValue: "logistDetail"), object: nil, userInfo: nil)
-                
-                
-            } failture: { (err) in
-                
-            }
+            
+            let alertView = GeliAlertView(frame: self.view.window!.bounds)
+            alertView.delegate = self;
+            alertView.tishiLbl.text = ""
+            alertView.titileLbl.text = "是否确认取消订单？"
+            alertView.rightBtn.setAttributedTitle(NSAttributedString(string: "确认"), for: .normal)
+            self.view.window?.addSubview(alertView)
+
         }else{
             let phone = "telprompt://" + mobile
             if UIApplication.shared.canOpenURL(URL(string: phone)!) {

GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift

@@ -360,7 +360,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return cell
         }
         if indexPath.section == 1 {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "DriverItemTableViewCell") as! DriverItemTableViewCell
+            let cell = tableView.dequeueReusableCell(withIdentifier: "DriverItemTableViewCell") as! DriverItemTableViewCell 
             if dataModel?.driver_info != nil {
                 cell.driverNameLbl.text = dataModel?.driver_info?.name
                 cell.driverNumLbL.text = dataModel?.driver_info?.license_plate

GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift

@@ -832,8 +832,9 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         }
         
         cell.acButton.tag = indexPath.row
-        
-        cell.title1.text = "运单号：" + rowModel.lwb_no!
+        if rowModel.lwb_no != nil {
+            cell.title1.text = "运单号：" + rowModel.lwb_no!
+        }
         if rowModel.lc_name == "货拉拉" {
             cell.title1.text = "运单号：" + rowModel.wb_no!
         }