修正京东顺丰物流

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -2493,6 +2493,13 @@
 			path = CustomerModel;
 			sourceTree = "<group>";
 		};
+		F932F9E124E0F8D500F57A10 /* 取消订单 */ = {
+			isa = PBXGroup;
+			children = (
+			);
+			path = "取消订单";
+			sourceTree = "<group>";
+		};
 		F933F6AD2452C65C00189561 /* HUD */ = {
 			isa = PBXGroup;
 			children = (
@@ -2971,6 +2978,7 @@
 		F9A4AB6A24C9220C00094BD1 /* 货拉拉 */ = {
 			isa = PBXGroup;
 			children = (
+				F932F9E124E0F8D500F57A10 /* 取消订单 */,
 				F9D44E8A24CBD9F400FBD8DB /* 调整地址 */,
 				F9D44E8524CBC66900FBD8DB /* 收发货地址 */,
 				F9A4F25124C9926700D1DD13 /* 运单详情 */,

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -145,12 +145,25 @@ class registerModel: Mappable {
 class registerDataModel: Mappable {
     var price_jd:String?
     var price_sf : String?
+    var sf_data : Array<registerSfDataDataModel>?
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
         price_jd <- map["price_jd"]
         price_sf <- map["price_sf"]
+        sf_data <- map["sf_data"]
+    }
+}
+class registerSfDataDataModel: Mappable {
+    var cn:String?
+    var number : Float?
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        cn <- map["cn"]
+        number <- map["number"]
     }
 }
 //MARK: - 运单详情

GeliBusinessPlatform/View/Cell/LalamoveBillTableViewCell.xib

@@ -19,13 +19,13 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="查看票据" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sR8-2p-s0j">
-                        <rect key="frame" x="15" y="15" width="52.5" height="18.5"/>
+                        <rect key="frame" x="15" y="5" width="52.5" height="18.5"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7RH-D6-2bx">
-                        <rect key="frame" x="15" y="43.5" width="117" height="75"/>
+                        <rect key="frame" x="15" y="33.5" width="117" height="75"/>
                         <color key="backgroundColor" name="app底色"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="117" id="ZJG-4R-D6X"/>
@@ -38,7 +38,7 @@
                         </userDefinedRuntimeAttributes>
                     </imageView>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Peb-o2-hIW">
-                        <rect key="frame" x="142" y="43.5" width="117" height="75"/>
+                        <rect key="frame" x="142" y="33.5" width="117" height="75"/>
                         <color key="backgroundColor" name="app底色"/>
                         <constraints>
                             <constraint firstAttribute="width" constant="117" id="AuI-9f-C9C"/>
@@ -57,7 +57,7 @@
                     <constraint firstItem="Peb-o2-hIW" firstAttribute="centerY" secondItem="7RH-D6-2bx" secondAttribute="centerY" id="RDe-Xm-sLP"/>
                     <constraint firstItem="7RH-D6-2bx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="XOw-ad-VYm"/>
                     <constraint firstItem="Peb-o2-hIW" firstAttribute="leading" secondItem="7RH-D6-2bx" secondAttribute="trailing" constant="10" id="f6M-Wd-Sy1"/>
-                    <constraint firstItem="sR8-2p-s0j" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="iGe-VU-VAf"/>
+                    <constraint firstItem="sR8-2p-s0j" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="5" id="iGe-VU-VAf"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>

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

@@ -353,6 +353,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             HUD.flash(.label("请填写相关信息"), delay: 1.2)
             return
         }
+        if logPayPriceModel == nil {
+            HUD.flash(.label("无法估算运费"), delay: 1.2)
+            return
+        }
         let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
         alertView.delegate = self
         alertView.jdPriceLbl.text = "京东冷运（预估运费" + (logPayPriceModel?.price_jd)! + "元）"
@@ -371,7 +375,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 alertView.sfSelectBtn.isSelected = false
             }
         }
-        alertView.fuTitleArr = ["运费：¥56151","提货费：¥684151","配送费：¥26222"]
+        var futitleArr:Array<String> = []
+        logPayPriceModel?.sf_data?.forEach({ (model) in
+            let str = model.cn! + "：￥" + String(format: "%.2f", (model.number)!)
+            futitleArr.append(str)
+        })
+        alertView.fuTitleArr = futitleArr
         
         
     }
@@ -1606,14 +1615,28 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     
     //MARK:---预估费用操作
-    var logPayPriceModel :registerDataModel?
+    var logPayPriceModel :registerDataModel? = nil
     func getLogPayPrice() {
         
         if r_city == nil || s_city == nil || weight == nil || tiJi == nil{
             return
         }
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-        estimatedCost(["user_token":UserToken as Any,"s_city":s_city as Any,"r_city":r_city as Any,"weight":weight as Any,"volume":tiJi as Any], success: { (data) in
+        let addr = ["s_city":s_city as Any,"r_city":r_city as Any,"s_province_name":s_province_name as Any,"r_province_name":r_province_name as Any,"s_city_name":s_city_name as Any,"r_city_name":r_city_name as Any,"s_district_name":s_district_name as Any,"r_district_name":r_district_name as Any]
+        
+        var home_delivery_on = "false"
+        if send == 0 {
+            home_delivery_on = "true"
+        }
+        var site_delivery = "false"
+        if receive == 0 {
+            site_delivery = "true"
+        }
+        let info = ["weight":weight as Any,"volume":tiJi as Any,"home_delivery_on":home_delivery_on as Any,"site_delivery":site_delivery as Any]
+        
+        
+        let dict = ["user_token":UserToken as Any,"addr":addr as Any,"info":info as Any]
+        estimatedCost(dict, success: { (data) in
             
             let dataModel = data as! registerModel
             self.logPayPriceModel = dataModel.data

GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift

@@ -290,7 +290,11 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             arrStr.append((dataModel?.order_sn)!)
             arrStr.append(String(format: "%.2f", (dataModel?.freight)!))
             arrStr.append((dataModel?.fc_flag_cn)!)
-            cell.contentLbl.text = arrStr[indexPath.row]
+            var str = arrStr[indexPath.row]
+            if str == "" {
+                str = "-"
+            }
+            cell.contentLbl.text = str
             cell.imgRight.constant = 0
             cell.btmLine.isHidden = true
             return cell
@@ -307,7 +311,11 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         arrStr.append((dataModel?.site_delivery_cn)!)
         arrStr.append(String(format: "%.2f", (dataModel?.guarantee_value)!))
         arrStr.append((dataModel?.remark)!)
-        cell.contentLbl.text = arrStr[indexPath.row]
+        var str = arrStr[indexPath.row]
+        if str == "" {
+            str = "-"
+        }
+        cell.contentLbl.text = str
         cell.imgRight.constant = 0
         cell.btmLine.isHidden = true
         return cell

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

@@ -27,6 +27,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         listView.register(UINib(nibName: "BtmBtnCell", bundle: nil), forCellReuseIdentifier: "BtmBtnCell")
         listView.register(UINib(nibName: "TitleHeaderCell", bundle: nil), forCellReuseIdentifier: "TitleHeaderCell")
         listView.register(UINib(nibName: "TitleAndLblCell", bundle: nil), forCellReuseIdentifier: "TitleAndLblCell")
+        listView.register(UINib(nibName: "LalamoveBillTableViewCell", bundle: nil), forCellReuseIdentifier: "LalamoveBillTableViewCell")
 
 //        setPaymentUI(data:datas)
         loadData()
@@ -53,14 +54,17 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return 0
         }
         
-        if section == 0 || section == 1 || section == 6 {
+        if section == 0 || section == 1 || section == 7 {
+            return 1
+        }
+        if section == 3 {
             return 1
         }
         
-        if section == 4 || section == 5{
+        if section == 5 || section == 6{
             return 2
         }
-        if section == 3 {
+        if section == 4 {
             if (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
                 return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + 1 + (dataModel?.order_detail_item?.bill_price_arr?.count)!
             }
@@ -76,7 +80,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return 0
         }
         
-        return 7;
+        return 8;
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if tableView.tag == 99 {
@@ -92,12 +96,16 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return 103
         }
         if indexPath.section == 3 {
-            return 30
+            return 120
         }
+        
         if indexPath.section == 4 {
+            return 30
+        }
+        if indexPath.section == 5 {
             return 35
         }
-        if indexPath.section == 5{
+        if indexPath.section == 6{
             if indexPath.row == 1 {
                 return UITableView.automaticDimension
 
@@ -105,7 +113,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return 35
         }
         
-        if indexPath.section == 6 {
+        if indexPath.section == 7 {
             return 108
         }
        
@@ -164,14 +172,19 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             
             return cell
         }
-        if indexPath.section == 3 || indexPath.section == 4  || indexPath.section == 5{
+        if indexPath.section == 3 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "LalamoveBillTableViewCell") as! LalamoveBillTableViewCell
+
+            return cell
+        }
+        if indexPath.section == 4 || indexPath.section == 5  || indexPath.section == 6{
             
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
 
             cell.textTF.isUserInteractionEnabled = false
             cell.line.isHidden = true
             
-            if indexPath.section == 3 {
+            if indexPath.section == 4 {
   
                 if (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
                     if indexPath.row == (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
@@ -242,7 +255,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 cell.nameLbl.textColor = UIColor.init(named: "灰色字体颜色")
                 cell.textTF.textColor = UIColor.init(named: "标题字颜色")
 
-            }else if indexPath.section == 4 {
+            }else if indexPath.section == 5 {
                 cell.textTF.text = "-"
                 cell.nameLbl.text = "关联平台："
                 if dataModel?.delivery?.sale_plat != nil {
@@ -260,7 +273,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
                 cell.textTF.textColor = UIColor.init(named: "标题字颜色")
 
-            }else if indexPath.section == 5 {
+            }else if indexPath.section == 6 {
                 cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
                 cell.textTF.textColor = UIColor.init(named: "灰色字体颜色")
                 cell.nameLbl.text = "货物保障"
@@ -277,7 +290,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             }
             return cell
         }
-        if indexPath.section == 6 {
+        if indexPath.section == 7 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "BtmBtnCell") as! BtmBtnCell
 
             return cell
@@ -326,10 +339,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         if section == 2{
             return 35
         }
-        if  section == 3{
+        if  section == 4{
             return 35
         }
-        if section == 4  || section == 5{
+        if section == 5  || section == 6 || section == 3{
             return 10
         }
         return 0.01
@@ -341,7 +354,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         }
         headerView.backgroundColor = UIColor.white
 
-        if section == 2  || section == 3 {
+        if section == 2  || section == 4 {
             let headerV = TitleTimeHeaderFooterView()
             headerView.addSubview(headerV)
             headerV.snp.makeConstraints { (make) in
@@ -351,7 +364,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 headerV.titleLbl.text = dataModel?.order_detail_item?.order_item?.create_time
                 headerV.fuTitleLbl.text = "#" + (dataModel?.order_detail_item?.order_item?.order_display_id!)!
             }
-            if section == 3 {
+            if section == 4 {
                 headerV.titleLbl.text = "订单费用"
                 headerV.fuTitleLbl.text = "总计¥" + String(format: "%.2f", (dataModel?.order_detail_item?.order_item?.price_fen)!)
                 headerV.titleLbl.font = UIFont.boldSystemFont(ofSize: 15)
@@ -366,10 +379,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         if section == 2 {
             return 95
         }
-        if section == 3 {
+        if section == 4 {
             return 60
         }
-        if section == 4 || section == 5{
+        if section == 5 || section == 6 || section == 3{
             return 10
         }
         
@@ -427,7 +440,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 make.height.equalTo(5)
             }
         }
-        if section == 3 {
+        if section == 4 {
             let tishiLbl = UILabel()
             tishiLbl.text = "若产生消费、高速费、停车费、逾时等候费和搬运费，需要您额外支付。额外费用不可使用赠金支付"
             tishiLbl.numberOfLines = 0
@@ -447,7 +460,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 make.height.equalTo(5)
             }
         }
-        if section == 4 {
+        if section == 5 || section == 3 {
             footerView.addSubview(lineView)
             lineView.snp.makeConstraints { (make) in
                 make.left.bottom.right.equalTo(0)