调试版本

GeliBusinessPlatform/View/Cell/OtherInfoTextViewTableViewCell.swift

@@ -11,6 +11,8 @@ import UIKit
 class OtherInfoTextViewTableViewCell: UITableViewCell,UITextViewDelegate {
     @IBOutlet weak var nameLbl: UILabel!
     
+    @IBOutlet weak var bgLeft: NSLayoutConstraint!
+    @IBOutlet weak var titleLeft: NSLayoutConstraint!
     @IBOutlet weak var textViewBgV: UIView!
     @IBOutlet weak var iconImV: UIImageView!
     @IBOutlet weak var textCountLbl: UILabel!

GeliBusinessPlatform/View/Cell/OtherInfoTextViewTableViewCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
@@ -73,11 +73,13 @@
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="bgLeft" destination="Rka-4h-HqE" id="B2O-sX-d0C"/>
                 <outlet property="iconImV" destination="KdD-A9-t9b" id="oOM-J8-tt5"/>
                 <outlet property="nameLbl" destination="tSR-kG-qOO" id="eHn-4u-qaa"/>
                 <outlet property="textCountLbl" destination="15H-Lc-ErQ" id="Di0-bt-vv1"/>
                 <outlet property="textView" destination="e6f-gU-5ea" id="Ezp-VT-AAh"/>
                 <outlet property="textViewBgV" destination="XeS-lF-UgT" id="eXg-wt-IUC"/>
+                <outlet property="titleLeft" destination="g8O-hu-yUD" id="u21-5v-64G"/>
             </connections>
             <point key="canvasLocation" x="-40.579710144927539" y="166.74107142857142"/>
         </tableViewCell>

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -287,7 +287,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     var carModel:cityCartDataModel?
     fileprivate func extractedFunc() {
         HUD.flash(.progress)
-        cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any,"city_id":city_id as Any], success: { (data) in
+        cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len:30) as Any,"city_id":city_id as Any], success: { (data) in
             
             let model = data as! cityCartModel
             self.carModel = model.data

GeliBusinessPlatform/ViewController/货拉拉/下单联系人信息/XiaDanUserInfoViewController.swift

@@ -39,7 +39,7 @@ class XiaDanUserInfoViewController: BaseViewController , CNContactPickerDelegate
             userPhoneTF.text = arr![1]
             messageTV.text = arr![2]
         }
-        
+        messageTV.text = "格利食品"
      }
 
 

GeliBusinessPlatform/ViewController/货拉拉/取消订单/HuolalaCancelViewController.swift

@@ -44,7 +44,7 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
     func loadData(){
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
 
-        orderCancelReason(["user_token":UserToken as Any,"lwb_no":lwbno as Any], success: { (data) in
+        orderCancelReason(["user_token":UserToken as Any,"lwb_no":lwbno as Any,"nonce_str":String.randomStr(len:30) as Any], success: { (data) in
             
             let model =  data as! orderCancelReasonModel
             
@@ -79,6 +79,9 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
         let rowModel =  sectionModel.sub_cat![indexPath.row]
         
         if rowModel.sub_name == "其他" || sectionModel.category == "其他"{
+            if rowModel.sub_name != "其他" {
+                return 50
+            }
             if selectID == rowModel.sub_id {
                 return 175
             }else{
@@ -95,6 +98,20 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
         let rowModel =  sectionModel.sub_cat![indexPath.row]
         
         if rowModel.sub_name == "其他"  || sectionModel.category == "其他"{
+            if rowModel.sub_name != "其他" {
+                let cellS = tableView.dequeueReusableCell(withIdentifier: "SecondCell") as! SecondCell
+                cellS.nameLbl.text = rowModel.sub_name
+                if rowModel.sub_id == selectID {
+                    cellS.imgView.image = UIImage.init(named: "yuxuan")
+                    cellS.nameLbl.textColor = UIColor.init(named: "蓝色字体颜色")
+                }else{
+                    cellS.imgView.image = UIImage.init(named: "daixuan")
+                    cellS.nameLbl.textColor = UIColor.init(named: "标题字颜色")
+                }
+                cellS.contentView.backgroundColor = UIColor.white
+                cellS.line.backgroundColor = UIColor.init(named: "灰色分界线")
+                return cellS
+            }
             let cell = tableView.dequeueReusableCell(withIdentifier: "OtherInfoTextViewTableViewCell") as! OtherInfoTextViewTableViewCell
             if rowModel.sub_id == selectID {
                 cell.iconImV.image = UIImage.init(named: "yuxuan")
@@ -107,6 +124,13 @@ class HuolalaCancelViewController: BaseViewController ,UITableViewDelegate,UITab
                 cell.textCountLbl.textColor = UIColor.init(named: "标题字颜色")
                 cell.textViewBgV.isHidden = true
             }
+            if rowModel.sub_name == "其他"  && sectionModel.category == "其他" {
+                cell.titleLeft.constant = 40
+                cell.bgLeft.constant = 40
+            }else{
+                cell.titleLeft.constant = 15
+                cell.bgLeft.constant = 15
+            }
         
             return cell
         }

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

@@ -172,7 +172,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
                 orderPriceArrName.append("起步价" + "(" + (dataModel?.order_detail_item?.order_item?.vehicle_type_name)! + ")")
                 orderPriceArrStr.append("¥" + String(format: "%.2f", (rowModel.price_fen!/100.0)))
             case 2:
-                let distance = ((dataModel?.order_detail_item?.exceed_distance)!) / 1000
+                let distance = CGFloat((dataModel?.order_detail_item?.exceed_distance)!) / 1000.0
                 orderPriceArrName.append("超里程价"  + "(" + String(format: "%.d", distance) + "公里" + ")")
                 orderPriceArrStr.append("¥" + String(format: "%.2f", (rowModel.price_fen!/100.0)))
             case 4: