旧物流管理微调整

GeliBusinessPlatform/View/Cell/PersonCenterCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" 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" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <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"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>

GeliBusinessPlatform/View/Cell/TitleAndTFCell.xib

@@ -26,7 +26,7 @@
                         </constraints>
                     </view>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="标题：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="6wI-Bk-Hnz">
-                        <rect key="frame" x="15" y="15" width="40" height="16"/>
+                        <rect key="frame" x="15" y="17" width="40" height="16"/>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
@@ -43,7 +43,7 @@
                     <constraint firstAttribute="trailing" secondItem="zvz-cN-gmt" secondAttribute="trailing" id="91g-iJ-e2S"/>
                     <constraint firstItem="zvz-cN-gmt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="Mua-VI-kn3"/>
                     <constraint firstItem="6wI-Bk-Hnz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="NXV-5U-lIO"/>
-                    <constraint firstItem="6wI-Bk-Hnz" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="PBH-Gt-wO7"/>
+                    <constraint firstItem="6wI-Bk-Hnz" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="aLi-6W-mr9"/>
                     <constraint firstItem="Q6V-I9-aNd" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="lmF-E2-VqK"/>
                     <constraint firstAttribute="bottom" secondItem="zvz-cN-gmt" secondAttribute="bottom" id="oe1-RM-1UU"/>
                 </constraints>

GeliBusinessPlatform/View/Cell/WenDuCell.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/代客下单（货运）/下运单/XiaYunDanViewController.swift

@@ -105,7 +105,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     let title2Arr = ["关联订单号","关联平台"]
     @IBOutlet weak var priceLbl: UILabel!
     @IBAction func orderAction(_ sender: Any) {
-        
+        let vc = XiaDanChengGongViewController()
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     @IBOutlet weak var bottomView: UIView!
     @IBOutlet weak var listView: UITableView!
@@ -138,6 +139,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         selectBtn!.isSelected = !selectBtn!.isSelected
     }
     //MARK: - CELL DELEGATE
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 0.1
+    }
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         if section == 2 {
             let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 41.5*glscale))
@@ -305,7 +309,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
             }
             if indexPath.row == 1 {
-                if send != nil {
                     var sendStr = "上门提货"
                     if send != 0 {
                         sendStr = "自送到库"
@@ -315,7 +318,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                         receiveStr = "到库自取"
                     }
                     cell.contentStr = sendStr + "; " + receiveStr
-                }
             }
             if indexPath.row == 2 {
                 cell.introLbl.isHidden = false

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

@@ -152,7 +152,7 @@
                         <constraint firstItem="TJP-xc-KTh" firstAttribute="leading" secondItem="b7y-XE-wYd" secondAttribute="trailing" id="xNT-5Q-Tgf"/>
                     </constraints>
                 </view>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="Try-UC-8fP">
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="Try-UC-8fP">
                     <rect key="frame" x="0.0" y="44" width="414" height="769"/>
                     <color key="backgroundColor" name="app底色"/>
                     <connections>

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

@@ -55,6 +55,8 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
     
     @objc func btnClick(sender:UIButton){
         print(sender.tag)
+        let vc = WuLiuGenZongViewController()
+        self.navigationController?.pushViewController(vc, animated: true)
     }
     //MARK: - CELL DELEGATE
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
@@ -102,9 +104,9 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
         if indexPath.section == 0 {
             switch indexPath.row {
             case 0:
-                return 84.5
+                return 86
             case 1,2:
-                return 64.5
+                return 66
             default:
                 return 30
             }

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

@@ -145,7 +145,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
         }
     }
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let vc = XiaYunDanViewController()
+        let vc = YunDanXiangQingViewController()
         self.navigationController?.pushViewController(vc, animated: true)
     }