同上

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

@@ -10,7 +10,7 @@ import UIKit
 
 class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource{
     
-    var orderID:String?
+    var orderID:Int?
     var dataModel:logisticsOrderDetailsDataModel?
     
     @IBOutlet weak var listView: UITableView!
@@ -61,7 +61,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         HUD.flash(.progress)
         listView.isHidden = true
         
-        logisticsOrderDetails(["user_token":UserToken as Any,"id":"238" as Any], success: { (data) in
+        logisticsOrderDetails(["user_token":UserToken as Any,"id":orderID as Any], success: { (data) in
             HUD.hide()
             
             let model = data as! logisticsOrderDetailsModel
@@ -202,10 +202,8 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
                 arrStr.append((dataModel?.order_sn)!)
                 arrStr.append(String(format: "%.2f", (dataModel?.freight_pre)!))
                 arrStr.append((dataModel?.fc_flag_cn)!)
-                print("sadkf == ",arrStr[indexPath.row])
                 cell.contentLbl.text = arrStr[indexPath.row]
                 cell.imgRight.constant = 0
-//                cell.textTF.isUserInteractionEnabled = false
                 cell.btmLine.isHidden = true
                 return cell
         }
@@ -220,11 +218,8 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         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)!)
-        arrStr.append("jsaldkfja;sldfja;sldjfa;lsjdfasl;kjdfasl;dfjsaldfjasldfjasldfjasl;dfjasldfsjaldfj")
-        
+        arrStr.append((dataModel?.remark)!)
         cell.contentLbl.text = arrStr[indexPath.row]
-//        cell.textTF.isUserInteractionEnabled = false
         cell.imgRight.constant = 0
         cell.btmLine.isHidden = true
         return cell

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

@@ -494,6 +494,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         let vc = YunDanXiangQingViewController()
+        let rowModel = datas[indexPath.row]
+        vc.orderID = rowModel.id
         self.navigationController?.pushViewController(vc, animated: true)
     }
     var BeginDate: Date! = nil
@@ -555,7 +557,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
 
-        jdOrderList(["user_token":UserToken as Any,"keyWord":keyWord as Any,"start_time":start_time as Any,"end_time":end_time as Any,"lc_id":lc_id as Any,"order_sn":order_sn as Any,"sale_plat":sale_plat as Any,"pay_status":pay_status as Any,"delivery_status":delivery_status as Any], success: { (data) in
+        jdOrderList(["user_token":UserToken as Any,"keyword":keyWord as Any,"start_time":start_time as Any,"end_time":end_time as Any,"lc_id":lc_id as Any,"order_sn":order_sn as Any,"sale_plat":sale_plat as Any,"pay_status":pay_status as Any,"delivery_status":delivery_status as Any], success: { (data) in
             
             self.datas.removeAll()
             let dataModel = data as! LogisticsModel