运单详情完成对接

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

@@ -10,6 +10,8 @@ import UIKit
 
 class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource{
     
+    var orderID:String?
+    var dataModel:logisticsOrderDetailsDataModel?
     
     @IBOutlet weak var listView: UITableView!
     @IBOutlet weak var btmView: UIView!
@@ -50,9 +52,26 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             }
             
         }
+        loadData()
 
     }
+    func loadData(){
+        let UserToken = UserDefaults.standard.value(forKey: "user_token")
+        HUD.flash(.progress)
+        listView.isHidden = true
         
+        logisticsOrderDetails(["user_token":UserToken as Any,"id":"238" as Any], success: { (data) in
+            HUD.hide()
+            
+            let model = data as! logisticsOrderDetailsModel
+            self.dataModel = model.data
+            
+            self.listView.isHidden = false
+            self.listView.reloadData()
+        }) { (error) in
+            
+        }
+    }
     @objc func btnClick(sender:UIButton){
         print(sender.tag)
         let vc = WuLiuGenZongViewController()
@@ -89,12 +108,19 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         return UIView()
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+ 
         return 10
     }
     func numberOfSections(in tableView: UITableView) -> Int {
+        if dataModel == nil {
+            return 0
+        }
         return 2
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if dataModel == nil {
+            return 0
+        }
         if section == 0 {
             return 7
         }
@@ -120,19 +146,37 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             switch indexPath.row {
             case 0:
                 let cell = tableView.dequeueReusableCell(withIdentifier: "JiBenXinXiCell") as! JiBenXinXiCell
+                cell.orderStatusLbl.text = dataModel?.delivery_status_cn
+                cell.payStatusLbl.text = dataModel?.pay_status_cn
                 return cell
             case 1,2:
                 let cell = tableView.dequeueReusableCell(withIdentifier: "XiaDanCGDiZhiCell") as! XiaDanCGDiZhiCell
                 cell.statusLbl.text = "寄"
+                cell.namelbl.text = dataModel?.s_consignee
+                cell.phoneLbl.text = dataModel?.s_mobile
+                cell.adrLbl.text = dataModel?.s_address
                 if indexPath.row == 2 {
                     cell.statusLbl.backgroundColor = UIColor(named: "企业、预售字体")
                     cell.statusLbl.text = "收"
+                    cell.namelbl.text = dataModel?.r_consignee
+                    cell.phoneLbl.text = dataModel?.r_mobile
+                    cell.adrLbl.text = dataModel?.r_address
                 }
                 return cell
             default:
                 let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
                 cell.nameLbl.text = p2Arr[indexPath.row]
-                cell.textTF.text = p2Arr[indexPath.row]
+                var arrStr:[String] = []
+                arrStr.append("")
+                arrStr.append("")
+                arrStr.append("")
+
+                arrStr.append((dataModel?.sale_plat)!)
+                arrStr.append((dataModel?.order_sn)!)
+                arrStr.append(String(format: "%.2f", (dataModel?.freight_pre)!))
+                arrStr.append((dataModel?.fc_flag_cn)!)
+                
+                cell.textTF.text = arrStr[indexPath.row]
                 cell.textTF.isUserInteractionEnabled = false
                 cell.line.isHidden = true
                 return cell
@@ -140,7 +184,18 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         }
         let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
         cell.nameLbl.text = p3Arr[indexPath.row]
-        cell.textTF.text = p3Arr[indexPath.row]
+        var arrStr:[String] = []
+        arrStr.append((dataModel?.express_item_name)!)
+        arrStr.append(String(format: "%.2f", (dataModel?.weight)!))
+        arrStr.append(StringByInt(number: (dataModel?.express_item_qty)!))
+        arrStr.append(String(format: "%.2f", (dataModel?.volume)!))
+        arrStr.append((dataModel?.tempture_num)!)
+        arrStr.append((dataModel?.home_delivery_on_cn)!)
+        arrStr.append((dataModel?.site_delivery_cn)!)
+        arrStr.append(String(format: "%.2f", (dataModel?.guarantee_value)!))
+        arrStr.append((dataModel?.remark)!)
+        
+        cell.textTF.text = arrStr[indexPath.row]
         cell.textTF.isUserInteractionEnabled = false
         cell.line.isHidden = true
         return cell