同上

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -144,8 +144,11 @@ class registerModel: Mappable {
 }
 class registerDataModel: Mappable {
     var price_jd:String?
-    var price_sf : String?
+    var price_sf : Float?
     var sf_data : Array<registerSfDataDataModel>?
+    var kjxy_sf:String?
+    var kjxy_jd:String?
+
     required init?( map: Map) {
         
     }
@@ -153,11 +156,14 @@ class registerDataModel: Mappable {
         price_jd <- map["price_jd"]
         price_sf <- map["price_sf"]
         sf_data <- map["sf_data"]
+        kjxy_sf <- map["kjxy_sf"]
+        kjxy_jd <- map["kjxy_jd"]
+
     }
 }
 class registerSfDataDataModel: Mappable {
     var cn:String?
-    var number : Float?
+    var number : String?
     required init?( map: Map) {
         
     }

GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift

@@ -11,6 +11,7 @@ import LGButton
 
 protocol LogisticalSelectViewDelegate {
     func LogisticalSelectViewSure(index:Int)
+    func LogisticalSelectViewWebBy(index:Int)
 }
 
 class LogisticalSelectView: UIView {
@@ -66,6 +67,8 @@ class LogisticalSelectView: UIView {
         }else if sender.tag == 1 {
             print("顺丰快件服务协议")
         }
+        delegate?.LogisticalSelectViewWebBy(index: sender.tag)
+
     }
     
     @IBAction func selectTheLogisticalAction(_ sender: UIButton) {

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

@@ -12,6 +12,7 @@ import MAMapKit
 import SwiftyJSON
 import SwiftDate
 import SDWebImage
+import IQKeyboardManagerSwift
 
 class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate,HLLTopCellDelegate{
     
@@ -311,6 +312,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         self.receive = receive
         self.pickup_time = pickup_time
         self.day = day
+        getLogPayPrice()
         listView.reloadData()
     }
     //MARK:--增值信息
@@ -348,6 +350,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     let title2Arr = ["关联订单号","关联平台"]
     //MARK:--预估费用
     @IBOutlet weak var priceLbl: UILabel!
+    weak var weak_alertView:LogisticalSelectView? = nil
     @IBAction func orderAction(_ sender: Any) {
         if r_city == nil || s_city == nil || weight == nil || tiJi == nil || wenduIndex == 0{
             HUD.flash(.label("请填写相关信息"), delay: 1.2)
@@ -360,29 +363,43 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
         alertView.delegate = self
         alertView.jdPriceLbl.text = "京东冷运（预估运费" + (logPayPriceModel?.price_jd)! + "元）"
-        alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + (logPayPriceModel?.price_sf)! + "元）"
+        alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + String(format: "%.2f",  (logPayPriceModel?.price_sf)!) + "元）"
         self.view.window?.addSubview(alertView)
-        if logPayPriceModel?.price_sf == "-"  {
-            alertView.jdSelectBtn.isSelected = true
-            alertView.sfSelectBtn.isSelected = false
-        }else if logPayPriceModel?.price_sf != "-" && logPayPriceModel?.price_jd != "-" {
+        if logPayPriceModel?.price_jd != "-" {
             alertView.jdSelectBtn.isSelected = false
             alertView.sfSelectBtn.isSelected = true
-            let num1 = logPayPriceModel?.price_sf as! NSString
+            let num1 = logPayPriceModel?.price_sf
             let num2 = logPayPriceModel?.price_jd as! NSString
-            if num1.floatValue > num2.floatValue {
+            if num1! > num2.floatValue {
                 alertView.jdSelectBtn.isSelected = true
                 alertView.sfSelectBtn.isSelected = false
             }
         }
         var futitleArr:Array<String> = []
         logPayPriceModel?.sf_data?.forEach({ (model) in
-            let str = model.cn! + "：￥" + String(format: "%.2f", (model.number)!)
+            let str = model.cn! + "：￥" + (model.number)!
             futitleArr.append(str)
         })
         alertView.fuTitleArr = futitleArr
+        weak_alertView = alertView
         
+    }
+    override func viewWillAppear(_ animated: Bool) {
+        //MARK:--viewWillAppear 因重写出现问题，需要补写
+        self.navigationController?.navigationBar.isHidden = true
+        IQKeyboardManager.shared.shouldPlayInputClicks = true
+        IQKeyboardManager.shared.enable = true
+        IQKeyboardManager.shared.shouldResignOnTouchOutside = true
         
+        //MARK:--每次进来都更新
+        if weak_alertView != nil {
+            weak_alertView!.isHidden = false
+        }
+    }
+    override func viewWillDisappear(_ animated: Bool) {
+        if weak_alertView != nil {
+            weak_alertView!.isHidden = true
+        }
     }
     var lc_id: Int?
     func LogisticalSelectViewSure(index: Int) {
@@ -391,6 +408,18 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         addLogisticsOrderUpdata()
         
     }
+    func LogisticalSelectViewWebBy(index: Int) {
+        let vc = WebViewController()
+        if index == 0 {
+            print("京东快件服务协议")
+            vc.urlStr = logPayPriceModel!.kjxy_jd
+        }else if index == 1 {
+            print("顺丰快件服务协议")
+            vc.urlStr = logPayPriceModel!.kjxy_sf
+        }
+        self.navigationController?.pushViewController(vc, animated: true)
+    }
+    
     @IBOutlet weak var topBtnView: UIView!
     @IBOutlet weak var bottomView: UIView!
     @IBOutlet weak var listView: UITableView!
@@ -1640,14 +1669,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             
             let dataModel = data as! registerModel
             self.logPayPriceModel = dataModel.data
-            self.priceLbl.text = "￥" + (dataModel.data?.price_sf)!
-            if dataModel.data?.price_sf == "-"{
-                self.priceLbl.text = "￥" + (dataModel.data?.price_jd)!
-            }else if dataModel.data?.price_sf != "-" && dataModel.data?.price_jd != "-" {
-                self.priceLbl.text = "￥" + (dataModel.data?.price_sf)!
-                let num1 = dataModel.data?.price_sf as! NSString
+            self.priceLbl.text = "￥" + String(format: "%.2f", (dataModel.data?.price_jd)!)
+            if dataModel.data?.price_jd != "-" {
+                self.priceLbl.text = "￥" + String(format: "%.2f", (dataModel.data?.price_jd)!)
+                let num1 = dataModel.data?.price_sf
                 let num2 = dataModel.data?.price_jd as! NSString
-                if num1.floatValue > num2.floatValue {
+                if num1! > num2.floatValue {
                     self.priceLbl.text = "￥" + (dataModel.data?.price_jd)!
                 }
             }