ui调整

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

@@ -192,6 +192,19 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
                 make.height.equalTo(21)
             }
             return view
+        case 3:
+           let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 36))
+            view.backgroundColor = UIColor.white
+            let lbl = UILabel()
+            lbl.text = "增值服务"
+            lbl.textColor = UIColor(named: "标题字颜色")
+            lbl.font = UIFont.boldSystemFont(ofSize: 15)
+            view.addSubview(lbl)
+            lbl.snp.makeConstraints { (make) in
+                make.top.left.right.equalTo(15)
+                make.height.equalTo(21)
+            }
+            return view
         default:
             let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
             view.backgroundColor = UIColor.white
@@ -212,7 +225,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         if section == 0 {
             return 0.001
         }
-        if section == 1 {
+        if section == 1 || section == 3{
             return 20
         }
         return 10
@@ -221,7 +234,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         if dataModel == nil {
             return 0
         }
-        return 3
+        return 4
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if dataModel == nil {
@@ -231,9 +244,12 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             return 3
         }
         if section == 1 {
+            return 5
+        }
+        if section == 3 {
             return 4
         }
-        return 9
+        return p3Arr.count
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0 {
@@ -247,15 +263,16 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         if indexPath.section == 1 {
             return 30
         }
-        if indexPath.section == 2 {
-            if indexPath.row == 8 {
+        if indexPath.section == 3 {
+            if indexPath.row == 3 {
                 return UITableView.automaticDimension
             }
         }
         return 30
     }
-    let p2Arr = ["关联平台：","关联订单号：","运费：","运费支付方式："]
-    let p3Arr = ["寄托物：","总重量：","总件数：","体积：","温控范围：","寄件方式：","派件方式：","保价（元人民币）：","备注："]
+    let p2Arr = ["关联平台：","关联订单号：","运单号：","运费：","运费支付方式："]
+    let p3Arr = ["寄托物","寄托物包装","温类","总重量","件数","体积","寄件方式","派件方式","付款方式"]
+    let p4Arr = ["额外服务","声明服务","保费","备注"]
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         if indexPath.section == 0 {
             switch indexPath.row {
@@ -288,6 +305,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
             var arrStr:[String] = []
             arrStr.append((dataModel?.sale_plat)!)
             arrStr.append((dataModel?.order_sn)!)
+            arrStr.append("--运单号")
             arrStr.append(String(format: "%.2f", (dataModel?.freight)!))
             arrStr.append((dataModel?.fc_flag_cn)!)
             var str = arrStr[indexPath.row]
@@ -303,14 +321,14 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         cell.nameLbl.text = p3Arr[indexPath.row]
         var arrStr:[String] = []
         arrStr.append((dataModel?.express_item_name)!)
+        arrStr.append("--寄托物包装")
+        arrStr.append((dataModel?.tempture_num)!)
         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)!)
+        arrStr.append((dataModel?.fc_flag_cn)!)
         var str = arrStr[indexPath.row]
         if str == "" {
             str = "-"
@@ -318,6 +336,26 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         cell.contentLbl.text = str
         cell.imgRight.constant = 0
         cell.btmLine.isHidden = true
+        
+        if indexPath.section == 3 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
+            cell.nameLbl.text = p4Arr[indexPath.row]
+            var arrStr:[String] = []
+            arrStr.append("--额外服务")
+            arrStr.append("--声明服务")
+            arrStr.append("--保费")
+            arrStr.append((dataModel?.remark)!)
+            var str = arrStr[indexPath.row]
+            if str == "" {
+                str = "-"
+            }
+            cell.contentLbl.text = str
+            cell.imgRight.constant = 0
+            cell.btmLine.isHidden = true
+            return cell
+        }
+        
+        
         return cell
     }
 }

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

@@ -85,6 +85,9 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
             if item.isKind(of: UIButton.self){
                 let btn = item as! UIButton
                 switch btn.titleLabel!.text {
+                case "鑫源物流":
+                    wlgsArr.append(btn)
+                    break
                 case "顺丰":
                     wlgsArr.append(btn)
                     break
@@ -224,6 +227,19 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         //            btnUISet(btn: sender)
         //        }
         switch sender.titleLabel?.text {
+        case "鑫源物流":
+            for item in wlgsArr {
+                if item.titleLabel!.text == sender.titleLabel?.text{
+                    item.isSelected = true
+                    item.setTitleColor(UIColor.white, for: .normal)
+                    item.backgroundColor = UIColor(named: "按钮渐变色上")
+                }else{
+                    item.isSelected = false
+                    item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
+                    item.backgroundColor = UIColor(named: "多选按钮背景颜色")
+                }
+            }
+            break
         case "顺丰":
             for item in wlgsArr {
                 if item.titleLabel!.text == sender.titleLabel?.text{
@@ -473,6 +489,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
             var zfztStr = ""
             var dyztStr = ""
             var ydztStr = ""
+            
             for item in wlgsArr {
                 if item.isSelected {
                     wlgsStr = item.titleLabel?.text as! String