下单列表完善

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

@@ -719,6 +719,17 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         
         let rowModel = datas[indexPath.row]
         
+        if rowModel.lc_name == "货拉拉" {
+            if rowModel.delivery_status == 1 {
+                return 257
+            }
+            if rowModel.delivery_status == 4 && rowModel.pay_status == 1   {
+                return 257
+
+            }
+            return 227
+        }
+        
         if rowModel.delivery_status == 1 {
             return 257
         }
@@ -742,15 +753,27 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         cell.acButton.isHidden = true
         
         let rowModel = datas[indexPath.row]
-        
-        if rowModel.delivery_status == 1 {
-            cell.acButton.isHidden = false
-            cell.acButton.setTitle("取消运单", for: .normal)
-        }
-        if ((rowModel.freight)! > 0) && rowModel.pay_status == 1 {
-            cell.acButton.isHidden = false
-            cell.acButton.setTitle("支付运费", for: .normal)
+        if rowModel.lc_name == "货拉拉" {
+            if rowModel.delivery_status == 1 {
+                cell.acButton.isHidden = false
+                cell.acButton.setTitle("取消运单", for: .normal)
+                
+            }
+            if rowModel.delivery_status == 4 && rowModel.pay_status == 1   {
+                cell.acButton.isHidden = false
+                cell.acButton.setTitle("支付运费", for: .normal)
+            }
+        }else{
+            if rowModel.delivery_status == 1 {
+                cell.acButton.isHidden = false
+                cell.acButton.setTitle("取消运单", for: .normal)
+            }
+            if ((rowModel.freight)! > 0) && rowModel.pay_status == 1 {
+                cell.acButton.isHidden = false
+                cell.acButton.setTitle("支付运费", for: .normal)
+            }
         }
+
         cell.acButton.tag = indexPath.row
         
         cell.title1.text = "运单号：" + rowModel.lwb_no!
@@ -774,13 +797,25 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         if rowModel.order_sn?.count == 0 {
             cell.orderNumLbl.text = "订单号：-"
         }
+
+        
         return cell
     }
     //MARK:--cell 按钮方法
     var paymentView:PaymentView?
     var selectIndex: Int?
     func YunDanLieBiaoCellAction(sender: UIButton) {
+        
+
+        
         let rowModel = datas[sender.tag]
+        if rowModel.lc_name == "货拉拉" {
+            let vc = WaybillDetailViewController()
+            vc.lwb_no = rowModel.lwb_no!
+            self.navigationController?.pushViewController(vc, animated: true)
+            return
+        }
+        
         selectIndex = sender.tag
         switch sender.titleLabel?.text {
         case "支付运费":