调整货拉拉运单详情UI

GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/BtmBtnCell.xib

@@ -2,6 +2,7 @@
 <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">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
+        <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>

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

@@ -20,22 +20,21 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         listView.register(UINib(nibName: "DriverItemTableViewCell", bundle: nil), forCellReuseIdentifier: "DriverItemTableViewCell")
         listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
         listView.register(UINib(nibName: "WayBillStautsTableViewCell", bundle: nil), forCellReuseIdentifier: "WayBillStautsTableViewCell")
+        listView.register(UINib(nibName: "BtmBtnCell", bundle: nil), forCellReuseIdentifier: "BtmBtnCell")
 
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        if section == 0 {
-            return 1
-        }
-        if section == 1 {
+        if section == 0 || section == 1 || section == 6 {
             return 1
         }
+ 
         if section == 4 || section == 5{
             return 2
         }
         return 3
     }
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 6;
+        return 7;
     }
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0 {
@@ -50,6 +49,9 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
         if indexPath.section == 4 || indexPath.section == 5{
             return 35
         }
+        if indexPath.section == 6 {
+            return 108
+        }
         return UITableView.automaticDimension
     }
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -89,6 +91,11 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
             }
             return cell
         }
+        if indexPath.section == 6 {
+            let cell = tableView.dequeueReusableCell(withIdentifier: "BtmBtnCell") as! BtmBtnCell
+
+            return cell
+        }
         let cell = tableView.dequeueReusableCell(withIdentifier: "WayBillAddressItemCell") as! WayBillAddressItemCell
         
         cell.iconW.constant = 22

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

@@ -22,7 +22,7 @@
             <subviews>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="t9e-fZ-mil">
                     <rect key="frame" x="0.0" y="44" width="414" height="852"/>
-                    <color key="backgroundColor" name="白色背景色"/>
+                    <color key="backgroundColor" name="app底色"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="Ue9-ix-Dvl"/>
                         <outlet property="delegate" destination="-1" id="g8m-rX-68V"/>
@@ -41,8 +41,8 @@
         </view>
     </objects>
     <resources>
-        <namedColor name="白色背景色">
-            <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        <namedColor name="app底色">
+            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressItemCell.xib

@@ -49,7 +49,7 @@
                         </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄小丽 18378147992" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4F-L8-sHy">
-                        <rect key="frame" x="46" y="69" width="297" height="16"/>
+                        <rect key="frame" x="46" y="74" width="297" height="16"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="16" id="bGF-qJ-Zma"/>
                         </constraints>
@@ -58,7 +58,7 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JfY-Q9-10Q">
-                        <rect key="frame" x="46" y="29" width="292" height="37"/>
+                        <rect key="frame" x="46" y="29" width="292" height="42"/>
                         <attributedString key="attributedText">
                             <fragment content="广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗村民委员会西侧约150米">
                                 <attributes>
@@ -97,7 +97,7 @@
                     <constraint firstItem="JJG-L3-lyj" firstAttribute="top" secondItem="Zm0-Vi-78r" secondAttribute="bottom" constant="2" id="YGa-qO-R9y"/>
                     <constraint firstItem="Zm0-Vi-78r" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ZMj-hd-wiR"/>
                     <constraint firstItem="JfY-Q9-10Q" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="d9o-tS-vGG"/>
-                    <constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" constant="15" id="enF-EC-E99"/>
+                    <constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" constant="10" id="enF-EC-E99"/>
                     <constraint firstAttribute="trailing" secondItem="d4F-L8-sHy" secondAttribute="trailing" constant="15" id="fik-0a-bN6"/>
                     <constraint firstItem="d4F-L8-sHy" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="geB-F3-UYR"/>
                     <constraint firstAttribute="trailing" secondItem="JfY-Q9-10Q" secondAttribute="trailing" constant="20" id="rWE-FX-NSP"/>