货拉拉运单详情ing

GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉待接单.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "货拉拉待接单.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "货拉拉待接单@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "货拉拉待接单@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉待装货.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "货拉拉待装货.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "货拉拉待装货@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "货拉拉待装货@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉运单取消.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "货拉拉运单取消.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "货拉拉运单取消@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "货拉拉运单取消@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉运单完成.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "货拉拉运单完成.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "货拉拉运单完成@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "货拉拉运单完成@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉运输中.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "货拉拉运输中.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "货拉拉运输中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "货拉拉运输中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift

@@ -541,6 +541,7 @@ class getHllOrderDetailsDataModel: Mappable {
 
     var order_detail_item :getHllOrderDetailsOrderDetailItemDataModel?//订单明细信息
     var driver_info :getHllOrderDetailsdriverInfoDataModel?//接单司机信息
+    var delivery :getHllOrderDetailsSalePlatDataModel?//关联信息
 
     required init?( map: Map) {
         
@@ -548,8 +549,24 @@ class getHllOrderDetailsDataModel: Mappable {
     func mapping(map: Map) {
         order_detail_item <- map["order_detail_item"]
         driver_info <- map["driver_info"]
+        delivery <- map["delivery"]
+
      }
 }
+class getHllOrderDetailsSalePlatDataModel: Mappable {
+    var sale_plat : String?
+    var order_sn : String?
+ 
+
+    required init?( map: Map) {
+        
+    }
+    func mapping(map: Map) {
+        sale_plat <- map["sale_plat"]
+        order_sn <- map["order_sn"]
+ 
+    }
+}
 class getHllOrderDetailsdriverInfoDataModel: Mappable {
     var name : String?
     var phone_no : String?
@@ -670,7 +687,7 @@ class orderDetailItemDataModel: Mappable { //订单信息
     var create_time : String?// 订单创建时间， 示例：2019-12-25 12:47:14
     var order_reason : String?//员工用车原因
     var remark : String?//订单备注
-    var price_fen : Int?//订单总价格
+    var price_fen : Float?//订单总价格
     var user_id : Int?//下单用户ID
     var city_id : Int?//下单城市ID
     var ep_id : Int?//下单用户企业账号ID
@@ -753,14 +770,14 @@ class orderDetailItemOrderPriceArrDataModel: Mappable { //订单计价明细数
     
     var type : Int?//
 //    计价类型 1-起步价,2-超里程价,3-拉拉券扣减,4-额外需求产生的费用,5-小费,6-规格,7-平台订单补贴,8-司机添加的额外费用,15-货物保险费用,21-高速费,22-停车费,23-搬运费,24-其他,25-逾时等候费
-    var price_fen : Int?//费用金额(分) 示例：0
+    var price_fen : Float?//费用金额(分) 示例：0
     var pay_status : Int?//支付状态 1已支付, 0未支付
 
     required init?( map: Map) {
         
     }
     func mapping(map: Map) {
-        type <- map["bill_type"]
+        type <- map["type"]
         price_fen <- map["price_fen"]
         pay_status <- map["pay_status"]
     }

GeliBusinessPlatform/View/Cell/TitleAndLblCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>

GeliBusinessPlatform/View/Cell/TitleHeaderCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -17,10 +18,10 @@
                 <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                 <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="KOf-o4-7xH">
-                        <rect key="frame" x="15" y="25.5" width="65.5" height="18.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="额外费用" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KOf-o4-7xH">
+                        <rect key="frame" x="15" y="25.5" width="52.5" height="18.5"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
-                        <color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
+                        <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
@@ -36,4 +37,9 @@
             <point key="canvasLocation" x="132" y="107"/>
         </tableViewCell>
     </objects>
+    <resources>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
 </document>

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

@@ -12,38 +12,70 @@ import UIKit
 class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITableViewDataSource{
     //测试数据
     var datas = [1,2,3]
-    
+    var dataModel:getHllOrderDetailsDataModel? = nil
     @IBOutlet weak var listView: UITableView!
     override func viewDidLoad() {
         super.viewDidLoad()
-        
        
-        
         navbar.title = "运单详情"
         self.view.addSubview(navbar)
         SetTopFrameView(view: listView, btmView: self.view)
-        listView.register(UINib(nibName: "WayBillAddressCanDelItemCell", bundle: nil), forCellReuseIdentifier: "WayBillAddressCanDelItemCell")
+        listView.register(UINib(nibName: "WayBillAddressItemCell", bundle: nil), forCellReuseIdentifier: "WayBillAddressItemCell")
         listView.register(UINib(nibName: "DriverItemTableViewCell", bundle: nil), forCellReuseIdentifier: "DriverItemTableViewCell")
         listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
         listView.register(UINib(nibName: "WayBillStautsTableViewCell", bundle: nil), forCellReuseIdentifier: "WayBillStautsTableViewCell")
         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")
+
+//        setPaymentUI(data:datas)
+        loadData()
         
-        setPaymentUI(data:datas)
+    }
+    func loadData(){
+        HUD.flash(.progress)
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+
+        getHllOrderDetails(["user_token":UserToken as Any,"lwb_no":"206520102047" as Any], success: { (data) in
+            HUD.hide()
+            let model = data as! getHllOrderDetailsModel
+            self.dataModel = model.data!
+            self.listView.reloadData()
+        }) { (error) in
+            HUD.hide()
+        }
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView.tag == 99 {
             return datas.count
         }
+        if dataModel == nil {
+            return 0
+        }
+        
         if section == 0 || section == 1 || section == 6 {
             return 1
         }
- 
+        
         if section == 4 || section == 5{
             return 2
         }
-        return 3
+        if section == 3 {
+            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)!
+            }
+            return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)!
+        }
+        return (dataModel?.order_detail_item?.order_item?.addr_info_arr!.count)!
     }
     func numberOfSections(in tableView: UITableView) -> Int {
+        if tableView.tag == 99 {
+            return 1
+        }
+        if dataModel == nil {
+            return 0
+        }
+        
         return 7;
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -54,17 +86,29 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             return 60
         }
         if indexPath.section == 1 {
+            if dataModel?.driver_info == nil {
+                return 0
+            }
             return 103
         }
         if indexPath.section == 3 {
             return 30
         }
-        if indexPath.section == 4 || indexPath.section == 5{
+        if indexPath.section == 4 {
             return 35
         }
+        if indexPath.section == 5{
+            if indexPath.row == 1 {
+                return UITableView.automaticDimension
+
+            }
+            return 35
+        }
+        
         if indexPath.section == 6 {
             return 108
         }
+       
         return UITableView.automaticDimension
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -84,29 +128,135 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         }
         if indexPath.section == 0 {
             let cell = tableView.dequeueReusableCell(withIdentifier: "WayBillStautsTableViewCell") as! WayBillStautsTableViewCell
+            
+            switch dataModel?.order_detail_item?.order_item?.order_status {
+            case 0:
+                cell.statusLbl.text  = "等待司机接单"
+                cell.statusImgV.image = UIImage.init(named: "货拉拉待接单")
+            case 1:
+                cell.statusLbl.text  = "待装货"
+                cell.statusImgV.image = UIImage.init(named: "货拉拉待装货")
+            case 15:
+                cell.statusLbl.text  = "待装中"
+                cell.statusImgV.image = UIImage.init(named: "货拉拉运输中")
+            case 7:
+                cell.statusLbl.text  = "运输中"
+                cell.statusImgV.image = UIImage.init(named: "货拉拉运输中")
+            case 10,11,13,2,14:
+                cell.statusLbl.text  = "已完成"
+                cell.statusImgV.image = UIImage.init(named: "货拉拉运单完成")
+            case 3,4,5:
+                cell.statusLbl.text  = "已取消"
+                cell.statusImgV.image = UIImage.init(named: "货拉拉运单取消")
+            default:
+                break
+            }
 
             return cell
         }
         if indexPath.section == 1 {
             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
+                cell.driverTypeLbl.text = dataModel?.driver_info?.phone_no
+            }
+            
             return cell
         }
         if indexPath.section == 3 || indexPath.section == 4  || indexPath.section == 5{
+            
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
 
             cell.textTF.isUserInteractionEnabled = false
             cell.line.isHidden = true
             
             if indexPath.section == 3 {
-                cell.nameLbl.text = "起步价（小面包车）"
-                cell.textTF.text = "¥22.4"
+  
+                if (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
+                    if indexPath.row == (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
+                        let cell = tableView.dequeueReusableCell(withIdentifier: "TitleHeaderCell") as! TitleHeaderCell
+                        return cell
+                    }
+         
+                }
+                if indexPath.row < (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
+                    let rowModel = dataModel?.order_detail_item?.order_item?.order_price_arr![indexPath.row]
+                    cell.nameLbl.text = ""
+
+                    switch rowModel?.type {
+                    case 1:
+                        cell.nameLbl.text = "起步价"
+                    case 2:
+                        cell.nameLbl.text = "超里程价"
+                    case 3:
+                        cell.nameLbl.text = "拉拉券扣减"
+                    case 4:
+                        cell.nameLbl.text = "额外需求产生的费用"
+                    case 5:
+                        cell.nameLbl.text = "小费"
+                    case 6:
+                        cell.nameLbl.text = "规格"
+                    case 7:
+                        cell.nameLbl.text = "平台订单补贴"
+                    case 8:
+                        cell.nameLbl.text = "司机添加的额外费用"
+                    case 15:
+                        cell.nameLbl.text = "货物保险费用"
+                    case 21:
+                        cell.nameLbl.text = "高速费"
+                    case 22:
+                        cell.nameLbl.text = "停车费"
+                    case 23:
+                        cell.nameLbl.text = "搬运费"
+                    case 24:
+                        cell.nameLbl.text = "其他"
+                    case 25:
+                        cell.nameLbl.text = "逾时等候费"
+                    default:
+                        break
+                    }
+                    cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
+                }
+                if indexPath.row > (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
+                    
+                    let rowModel = dataModel?.order_detail_item?.bill_price_arr![(indexPath.row - (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)!) - 1]
+                    cell.nameLbl.text = ""
+
+                    switch rowModel?.bill_type {
+                    case 1:
+                        cell.nameLbl.text = "过桥费"
+                    case 2:
+                        cell.nameLbl.text = "停车费"
+                    case 3:
+                        cell.nameLbl.text = "搬运费"
+                    case 5:
+                        cell.nameLbl.text = "逾时等候费"
+                    default:
+                        break
+                    }
+                    cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
+
+                }
+
                 cell.nameLbl.textColor = UIColor.init(named: "灰色字体颜色")
                 cell.textTF.textColor = UIColor.init(named: "标题字颜色")
 
             }else if indexPath.section == 4 {
-                cell.nameLbl.text = "关联平台"
-                cell.textTF.text = "格利食品网"
+                cell.textTF.text = "-"
+                cell.nameLbl.text = "关联平台："
+                if dataModel?.delivery?.sale_plat != nil {
+                    cell.textTF.text = dataModel?.delivery?.sale_plat
+
+                }
+                if indexPath.row == 1 {
+                    cell.nameLbl.text = "关联订单号："
+                    if dataModel?.delivery?.order_sn != nil {
+                        cell.textTF.text = dataModel?.delivery?.order_sn
+                    }
+                    
+                }
+
                 cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
                 cell.textTF.textColor = UIColor.init(named: "标题字颜色")
 
@@ -114,7 +264,16 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
                 cell.textTF.textColor = UIColor.init(named: "灰色字体颜色")
                 cell.nameLbl.text = "货物保障"
-                cell.textTF.text = "保障成功"
+                cell.textTF.text = "-"
+                if indexPath.row == 1 {
+                    let cell1 = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
+                    cell1.nameLbl.text = "备注"
+                    cell1.contentLbl.text = dataModel?.order_detail_item?.order_item?.remark
+                    cell1.contentLbl.textColor = UIColor.init(named: "灰色字体颜色")
+                    cell1.btmLine.isHidden = true
+
+                    return cell1
+                }
             }
             return cell
         }
@@ -123,32 +282,35 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
 
             return cell
         }
-        let cell = tableView.dequeueReusableCell(withIdentifier: "WayBillAddressCanDelItemCell") as! WayBillAddressCanDelItemCell
+        let cell = tableView.dequeueReusableCell(withIdentifier: "WayBillAddressItemCell") as! WayBillAddressItemCell
         
         cell.iconW.constant = 22
         cell.iconH.constant = 22
         cell.iconLbl.layer.cornerRadius = 11
         cell.lineTopView.isHidden = false
 
+        let rowModel = dataModel?.order_detail_item?.order_item?.addr_info_arr![indexPath.row]
+        cell.addressDetailLbl.text = (rowModel?.addr)! + (rowModel?.house_number)!
+        cell.namePhoneLbl.text = (rowModel?.contact_name)! + " " +  (rowModel?.contact_phone_no)!
+        cell.addressLbl.text = rowModel?.name
+        
         if indexPath.row == 0 {
-            cell.addressDetailLbl.text = ""
-            cell.namePhoneLbl.text = ""
-
             cell.iconLbl.text = "发"
             cell.iconLbl.backgroundColor = UIColor.init(named: "蓝色字体颜色")
             cell.lineTopView.isHidden = true
-
-        }else{
-            cell.addressDetailLbl.text = "广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗村民委员会西侧约150米））"
         }
-        if indexPath.row == 1 {
-            cell.iconLbl.text = ""
-            cell.iconLbl.backgroundColor = UIColor.init(named: "虚线分界线颜色")
-            cell.iconW.constant = 12
-            cell.iconH.constant = 12
-            cell.iconLbl.layer.cornerRadius = 6
+        if (dataModel?.order_detail_item?.order_item?.addr_info_arr!.count)! > 2 {
+            if indexPath.row != 0 && indexPath.row != ((dataModel?.order_detail_item?.order_item?.addr_info_arr!.count)!  - 1){
+                cell.iconLbl.text = ""
+                cell.iconLbl.backgroundColor = UIColor.init(named: "虚线分界线颜色")
+                cell.iconW.constant = 12
+                cell.iconH.constant = 12
+                cell.iconLbl.layer.cornerRadius = 6
+            }
+            
         }
-        if indexPath.row == 2 {
+ 
+        if indexPath.row == ((dataModel?.order_detail_item?.order_item?.addr_info_arr!.count)!  - 1){
             //最后的不显示lineview
             cell.lineView.isHidden = true
             cell.iconLbl.text = "收"
@@ -161,8 +323,11 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if section == 2 || section == 3{
-            return 45
+        if section == 2{
+            return 35
+        }
+        if  section == 3{
+            return 35
         }
         if section == 4  || section == 5{
             return 10
@@ -182,9 +347,13 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             headerV.snp.makeConstraints { (make) in
                 make.left.top.right.bottom.equalTo(0);
             }
+            if section == 2 {
+                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 {
                 headerV.titleLbl.text = "订单费用"
-                headerV.fuTitleLbl.text = "总计¥662.6"
+                headerV.fuTitleLbl.text = "总计¥" + String(format: "%.2f", (dataModel?.order_detail_item?.order_item?.price_fen)!)
                 headerV.titleLbl.font = UIFont.boldSystemFont(ofSize: 15)
                 headerV.fuTitleLbl.font = UIFont.boldSystemFont(ofSize: 15)
 
@@ -195,7 +364,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
         if section == 2 {
-            return 110
+            return 95
         }
         if section == 3 {
             return 60
@@ -222,8 +391,35 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 make.left.top.right.bottom.equalTo(0);
             }
             footerV.titleLbl.text = "联系人："
-            footerV.fuTitleLbl.text = "梁小锋(15577124121)"
+            footerV.fuTitleLbl.text = (dataModel?.order_detail_item?.contact_name)! + " " +  (dataModel?.order_detail_item?.contact_phone_no)!
+            
+            footerV.driveTypeNameLbl.text = dataModel?.order_detail_item?.order_item?.vehicle_type_name
             
+            for i in 0..<(dataModel?.order_detail_item?.spec_req_price_arr?.count)! {
+                let model = dataModel?.order_detail_item?.spec_req_price_arr![i]
+                switch i {
+                case 0:
+                    footerV.specLbl0.isHidden = false
+                    footerV.specLbl0.text = model?.name
+                case 1:
+                    footerV.specLbl1.isHidden = false
+                    footerV.specLbl1.text = model?.name
+                case 2:
+                    footerV.specLbl2.isHidden = false
+                    footerV.specLbl2.text = model?.name
+                case 3:
+                    footerV.specLbl3.isHidden = false
+                    footerV.specLbl3.text = model?.name
+                case 4:
+                    footerV.specLbl4.isHidden = false
+                    footerV.specLbl4.text = model?.name
+                case 5:
+                    footerV.specLbl5.isHidden = false
+                    footerV.specLbl5.text = model?.name
+                default:
+                    break
+                }
+            }
 
             footerView.addSubview(lineView)
             lineView.snp.makeConstraints { (make) in

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/DriverItemTableViewCell.swift

@@ -10,6 +10,9 @@ import UIKit
 
 class DriverItemTableViewCell: UITableViewCell {
 
+    @IBOutlet weak var driverTypeLbl: UILabel!
+    @IBOutlet weak var driverNumLbL: UILabel!
+    @IBOutlet weak var driverNameLbl: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/DriverItemTableViewCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -31,20 +31,20 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </imageView>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄师傅" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3R-LQ-jdQ">
-                        <rect key="frame" x="130" y="37" width="45" height="21"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3R-LQ-jdQ">
+                        <rect key="frame" x="130" y="37" width="0.0" height="0.0"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="粤ADK023  (野马)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhF-X3-1zA">
-                        <rect key="frame" x="130" y="64.5" width="107" height="19"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhF-X3-1zA">
+                        <rect key="frame" x="130" y="102" width="0.0" height="0.0"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                         <color key="textColor" name="灰色字体颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="厢式货车（长27*款16.7*高3.6）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bcL-SK-guN">
-                        <rect key="frame" x="130" y="86.5" width="188" height="18.5"/>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bcL-SK-guN">
+                        <rect key="frame" x="130" y="105" width="0.0" height="0.0"/>
                         <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                         <color key="textColor" name="灰色字体颜色"/>
                         <nil key="highlightedColor"/>
@@ -62,6 +62,11 @@
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="driverNameLbl" destination="c3R-LQ-jdQ" id="C3m-lo-xJH"/>
+                <outlet property="driverNumLbL" destination="nhF-X3-1zA" id="Ytf-0e-zQk"/>
+                <outlet property="driverTypeLbl" destination="bcL-SK-guN" id="9w6-1w-7Ik"/>
+            </connections>
             <point key="canvasLocation" x="173.18840579710147" y="157.36607142857142"/>
         </tableViewCell>
     </objects>

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/TitleTimeHeaderFooterView.swift

@@ -10,6 +10,13 @@ import Foundation
 class TitleTimeHeaderFooterView: UIView {
     var contentView:UIView!
 
+    @IBOutlet weak var specLbl5: UILabel!
+    @IBOutlet weak var specLbl4: UILabel!
+    @IBOutlet weak var specLbl3: UILabel!
+    @IBOutlet weak var specLbl2: UILabel!
+    @IBOutlet weak var specLbl1: UILabel!
+    @IBOutlet weak var specLbl0: UILabel!
+    @IBOutlet weak var driveTypeNameLbl: UILabel!
     @IBOutlet weak var fuTitleLbl: UILabel!
     @IBOutlet weak var titleLbl: UILabel!
     //初始化时将xib中的view添加进来

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/TitleTimeHeaderFooterView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -11,7 +11,14 @@
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TitleTimeHeaderFooterView">
             <connections>
+                <outlet property="driveTypeNameLbl" destination="h7r-wa-Gms" id="Wmu-fe-CVb"/>
                 <outlet property="fuTitleLbl" destination="U3M-HQ-3bj" id="cTf-2e-8iZ"/>
+                <outlet property="specLbl0" destination="ORs-MY-Kik" id="e52-7A-99s"/>
+                <outlet property="specLbl1" destination="yq5-ip-1PT" id="vcJ-ZV-SrH"/>
+                <outlet property="specLbl2" destination="08U-Ha-EC7" id="FPF-Ln-zfg"/>
+                <outlet property="specLbl3" destination="Dpv-Pj-Ny6" id="sXC-wo-YgB"/>
+                <outlet property="specLbl4" destination="5dr-22-oZC" id="WV5-6a-1mm"/>
+                <outlet property="specLbl5" destination="BzW-hw-Icj" id="WQ4-yj-a3S"/>
                 <outlet property="titleLbl" destination="emb-2G-yUh" id="iqt-KB-soZ"/>
             </connections>
         </placeholder>
@@ -21,55 +28,55 @@
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="06月22日  16:03" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="emb-2G-yUh">
-                    <rect key="frame" x="15" y="15" width="98" height="19"/>
+                    <rect key="frame" x="15" y="8" width="98" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题字颜色"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="#20200710592" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="U3M-HQ-3bj">
-                    <rect key="frame" x="269.5" y="15" width="90.5" height="19"/>
+                    <rect key="frame" x="269.5" y="8" width="90.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题字颜色"/>
                     <nil key="highlightedColor"/>
                 </label>
                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小面包车" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h7r-wa-Gms">
-                    <rect key="frame" x="307" y="44" width="53" height="19"/>
+                    <rect key="frame" x="307" y="35" width="53" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="纸质回单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ORs-MY-Kik">
-                    <rect key="frame" x="307" y="73" width="53" height="19"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="纸质回单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ORs-MY-Kik">
+                    <rect key="frame" x="307" y="62" width="53" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代收货款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yq5-ip-1PT">
-                    <rect key="frame" x="244" y="73" width="53" height="19"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="代收货款" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yq5-ip-1PT">
+                    <rect key="frame" x="244" y="62" width="53" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="返程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="08U-Ha-EC7">
-                    <rect key="frame" x="207.5" y="73" width="26.5" height="19"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="返程" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="08U-Ha-EC7">
+                    <rect key="frame" x="207.5" y="62" width="26.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="海运入仓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dpv-Pj-Ny6">
-                    <rect key="frame" x="145" y="73" width="52.5" height="19"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="海运入仓" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Dpv-Pj-Ny6">
+                    <rect key="frame" x="145" y="62" width="52.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小推车" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5dr-22-oZC">
-                    <rect key="frame" x="95.5" y="73" width="39.5" height="19"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="小推车" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5dr-22-oZC">
+                    <rect key="frame" x="95.5" y="62" width="39.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
-                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="拍照回单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BzW-hw-Icj">
-                    <rect key="frame" x="33" y="73" width="52.5" height="19"/>
+                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="拍照回单" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BzW-hw-Icj">
+                    <rect key="frame" x="33" y="62" width="52.5" height="19"/>
                     <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                     <color key="textColor" name="标题背景色"/>
                     <nil key="highlightedColor"/>
@@ -79,16 +86,16 @@
             <constraints>
                 <constraint firstItem="ORs-MY-Kik" firstAttribute="leading" secondItem="yq5-ip-1PT" secondAttribute="trailing" constant="10" id="3Om-M1-NIZ"/>
                 <constraint firstItem="BzW-hw-Icj" firstAttribute="centerY" secondItem="5dr-22-oZC" secondAttribute="centerY" id="7zL-zN-dHh"/>
-                <constraint firstItem="h7r-wa-Gms" firstAttribute="top" secondItem="U3M-HQ-3bj" secondAttribute="bottom" constant="10" id="947-Kb-3ku"/>
+                <constraint firstItem="h7r-wa-Gms" firstAttribute="top" secondItem="U3M-HQ-3bj" secondAttribute="bottom" constant="8" id="947-Kb-3ku"/>
                 <constraint firstItem="Dpv-Pj-Ny6" firstAttribute="centerY" secondItem="08U-Ha-EC7" secondAttribute="centerY" id="9jn-cd-HJM"/>
                 <constraint firstItem="yq5-ip-1PT" firstAttribute="leading" secondItem="08U-Ha-EC7" secondAttribute="trailing" constant="10" id="GbA-pr-L88"/>
-                <constraint firstItem="U3M-HQ-3bj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="H1F-ke-WiT"/>
+                <constraint firstItem="U3M-HQ-3bj" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="8" id="H1F-ke-WiT"/>
                 <constraint firstItem="08U-Ha-EC7" firstAttribute="centerY" secondItem="yq5-ip-1PT" secondAttribute="centerY" id="OzA-pm-mpe"/>
                 <constraint firstItem="emb-2G-yUh" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" constant="15" id="UVL-Ap-OK2"/>
                 <constraint firstItem="08U-Ha-EC7" firstAttribute="leading" secondItem="Dpv-Pj-Ny6" secondAttribute="trailing" constant="10" id="Vha-b6-OQX"/>
-                <constraint firstItem="ORs-MY-Kik" firstAttribute="top" secondItem="h7r-wa-Gms" secondAttribute="bottom" constant="10" id="aTI-Kq-hU7"/>
+                <constraint firstItem="ORs-MY-Kik" firstAttribute="top" secondItem="h7r-wa-Gms" secondAttribute="bottom" constant="8" id="aTI-Kq-hU7"/>
                 <constraint firstItem="yq5-ip-1PT" firstAttribute="centerY" secondItem="ORs-MY-Kik" secondAttribute="centerY" id="cAG-sT-IYJ"/>
-                <constraint firstItem="emb-2G-yUh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="15" id="cmT-KP-tcF"/>
+                <constraint firstItem="emb-2G-yUh" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" constant="8" id="cmT-KP-tcF"/>
                 <constraint firstAttribute="trailing" secondItem="U3M-HQ-3bj" secondAttribute="trailing" constant="15" id="hbG-Yg-ayd"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="h7r-wa-Gms" secondAttribute="trailing" constant="15" id="kaO-vC-PEI"/>
                 <constraint firstItem="5dr-22-oZC" firstAttribute="leading" secondItem="BzW-hw-Icj" secondAttribute="trailing" constant="10" id="n6J-wD-QA6"/>
@@ -98,7 +105,7 @@
             </constraints>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
-            <point key="canvasLocation" x="184.05797101449278" y="-108.14732142857143"/>
+            <point key="canvasLocation" x="-517" y="-84"/>
         </view>
     </objects>
     <resources>

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressItemCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -49,7 +49,7 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄小丽 18378147992" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4F-L8-sHy">
-                        <rect key="frame" x="46" y="74" width="297" height="16"/>
+                        <rect key="frame" x="46" y="84" width="297" height="16"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="16" id="bGF-qJ-Zma"/>
                         </constraints>
@@ -58,9 +58,23 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JfY-Q9-10Q">
-                        <rect key="frame" x="46" y="29" width="292" height="42"/>
+                        <rect key="frame" x="46" y="29" width="292" height="52"/>
                         <attributedString key="attributedText">
-                            <fragment content="广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗村民委员会西侧约150米">
+                            <fragment content="广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗">
+                                <attributes>
+                                    <color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <font key="NSFont" size="11" name="PingFangSC-Regular"/>
+                                    <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
+                                </attributes>
+                            </fragment>
+                            <fragment content="村民">
+                                <attributes>
+                                    <color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                    <font key="NSFont" size="12" name="PingFangSC-Regular"/>
+                                    <paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
+                                </attributes>
+                            </fragment>
+                            <fragment content="委员会西侧约150米">
                                 <attributes>
                                     <color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                     <font key="NSFont" size="11" name="PingFangSC-Regular"/>
@@ -97,7 +111,7 @@
                     <constraint firstItem="JJG-L3-lyj" firstAttribute="top" secondItem="Zm0-Vi-78r" secondAttribute="bottom" constant="2" id="YGa-qO-R9y"/>
                     <constraint firstItem="Zm0-Vi-78r" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ZMj-hd-wiR"/>
                     <constraint firstItem="JfY-Q9-10Q" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="d9o-tS-vGG"/>
-                    <constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" constant="10" id="enF-EC-E99"/>
+                    <constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" id="enF-EC-E99"/>
                     <constraint firstAttribute="trailing" secondItem="d4F-L8-sHy" secondAttribute="trailing" constant="15" id="fik-0a-bN6"/>
                     <constraint firstItem="d4F-L8-sHy" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="geB-F3-UYR"/>
                     <constraint firstAttribute="trailing" secondItem="JfY-Q9-10Q" secondAttribute="trailing" constant="20" id="rWE-FX-NSP"/>
@@ -117,7 +131,7 @@
                 <outlet property="lineView" destination="eV0-oM-vuy" id="6LP-YK-WUE"/>
                 <outlet property="namePhoneLbl" destination="d4F-L8-sHy" id="4lt-Va-UDs"/>
             </connections>
-            <point key="canvasLocation" x="194.20289855072465" y="120.53571428571428"/>
+            <point key="canvasLocation" x="-252" y="11"/>
         </tableViewCell>
     </objects>
     <resources>

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.swift

@@ -10,6 +10,8 @@ import UIKit
 
 class WayBillStautsTableViewCell: UITableViewCell {
 
+    @IBOutlet weak var statusImgV: UIImageView!
+    @IBOutlet weak var statusLbl: UILabel!
     override func awakeFromNib() {
         super.awakeFromNib()
         // Initialization code

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -50,6 +50,10 @@
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="statusImgV" destination="UfI-eg-vON" id="Cm6-1F-KYy"/>
+                <outlet property="statusLbl" destination="obx-QZ-ioI" id="CRQ-Rf-MIn"/>
+            </connections>
             <point key="canvasLocation" x="136.95652173913044" y="173.77232142857142"/>
         </tableViewCell>
     </objects>