合并货拉拉切换

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

@@ -142,12 +142,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     @IBOutlet weak var topBtnView: UIView!
     @IBOutlet weak var bottomView: UIView!
     @IBOutlet weak var listView: UITableView!
-    var locBtn = UIButton()
     
+    var locBtn = UIButton()
     @IBOutlet weak var hListView: UITableView!
     
-    
-    
     @IBAction func selectAction(_ sender: UIButton) {
         if rightBtn == sender {
             rightBtn.isSelected = true
@@ -169,28 +167,34 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     @IBOutlet weak var lineV: UIView!
     @IBOutlet weak var leftBtn: UIButton!
-    
     @IBOutlet weak var hBtnViewH: NSLayoutConstraint!
     @IBOutlet weak var hllView: UIView!
-    
     @IBOutlet weak var rightBtn: UIButton!
 
+    @objc func locSelect(){
+        print("locSelect")
+    }
     override func viewDidLoad() {
         super.viewDidLoad()
+    
         navbar.title = "运单列表"
         self.view.addSubview(navbar)
-        listView.snp.makeConstraints { (make) in
-            make.top.equalTo(NavCGRect.height)
-            make.left.right.equalTo(0)
-            make.bottom.equalTo(bottomView.snp_top)
-        }
-        locBtn.backgroundColor = UIColor.red
+        
+        locBtn.setImage(UIImage(named: "dzdingwei"), for: .normal)
+        locBtn.setTitle("  " + "广州", for: .normal)
+        locBtn.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
+        locBtn.titleLabel?.font = UIFont.systemFont(ofSize: 13)
+        locBtn.sizeToFit()
+        locBtn.addTarget(self, action: #selector(locSelect), for: .touchUpInside)
+
+        
+        
         self.view.addSubview(locBtn)
         locBtn.snp_makeConstraints({ (make) in
             make.right.equalTo(-15)
             make.centerY.equalTo(navbar.snp_centerY).offset(10)
             make.height.equalTo(30)
-            make.width.equalTo(100)
+            make.width.equalTo(locBtn.bounds.size.width)
         })
         
         SetTopFrame(view: topBtnView, height: 44)
@@ -200,7 +204,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter")
         listView.register(UINib(nibName: "TitleAndTFBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFBtnCell")
         listView.register(UINib(nibName: "WenDuCell", bundle: nil), forCellReuseIdentifier: "WenDu")
-        // Do any additional setup after loading the view.
+        //MARK: - 货拉拉
+        hListView.separatorStyle = .none
+        
+        
     }
     
     

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

@@ -61,25 +61,13 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="00z-eF-Akb" customClass="LGButton" customModule="LGButton">
                             <rect key="frame" x="304" y="0.0" width="110" height="49"/>
-                            <subviews>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下运单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wU5-88-RNl">
-                                    <rect key="frame" x="0.0" y="0.0" width="110" height="49"/>
-                                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
-                                    <color key="textColor" name="白色背景色"/>
-                                    <nil key="highlightedColor"/>
-                                </label>
-                            </subviews>
                             <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                             <constraints>
-                                <constraint firstAttribute="bottom" secondItem="wU5-88-RNl" secondAttribute="bottom" id="6ms-kj-Etu"/>
-                                <constraint firstItem="wU5-88-RNl" firstAttribute="leading" secondItem="00z-eF-Akb" secondAttribute="leading" id="VwB-sE-o6w"/>
                                 <constraint firstAttribute="width" constant="110" id="nhu-c8-Mft">
                                     <userDefinedRuntimeAttributes>
                                         <userDefinedRuntimeAttribute type="boolean" keyPath="isAdaptateScreen" value="YES"/>
                                     </userDefinedRuntimeAttributes>
                                 </constraint>
-                                <constraint firstAttribute="trailing" secondItem="wU5-88-RNl" secondAttribute="trailing" id="vnG-vV-raa"/>
-                                <constraint firstItem="wU5-88-RNl" firstAttribute="top" secondItem="00z-eF-Akb" secondAttribute="top" id="yRb-MU-1Fp"/>
                             </constraints>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
@@ -97,6 +85,12 @@
                                 <action selector="orderAction:" destination="-1" eventType="touchUpInside" id="J3x-Db-ytY"/>
                             </connections>
                         </view>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下运单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wU5-88-RNl">
+                            <rect key="frame" x="333.66666666666669" y="12.666666666666629" width="51" height="24"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
+                            <color key="textColor" name="白色背景色"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="预估:" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b7y-XE-wYd">
                             <rect key="frame" x="30" y="10" width="28" height="15"/>
                             <constraints>
@@ -158,7 +152,9 @@
                         <constraint firstItem="Dlt-Q6-zeB" firstAttribute="leading" secondItem="zlN-AZ-k0b" secondAttribute="trailing" constant="10" id="HRH-Zj-eYd"/>
                         <constraint firstItem="zlN-AZ-k0b" firstAttribute="centerY" secondItem="b7y-XE-wYd" secondAttribute="centerY" id="JH5-7l-9Y2"/>
                         <constraint firstItem="b7y-XE-wYd" firstAttribute="top" secondItem="BXb-QP-ceT" secondAttribute="top" constant="10" id="KrG-Hd-v9x"/>
+                        <constraint firstItem="wU5-88-RNl" firstAttribute="centerX" secondItem="00z-eF-Akb" secondAttribute="centerX" id="MKf-Ad-GQL"/>
                         <constraint firstAttribute="height" constant="49" id="Pmn-SY-6cw"/>
+                        <constraint firstItem="wU5-88-RNl" firstAttribute="centerY" secondItem="BXb-QP-ceT" secondAttribute="centerY" id="ZN7-xN-aGx"/>
                         <constraint firstItem="Jke-gH-KJE" firstAttribute="leading" secondItem="Dlt-Q6-zeB" secondAttribute="trailing" constant="5" id="co5-WL-8Y2"/>
                         <constraint firstItem="i3n-wg-dGW" firstAttribute="leading" secondItem="BXb-QP-ceT" secondAttribute="leading" constant="30" id="hCf-5p-jFN"/>
                         <constraint firstItem="i3n-wg-dGW" firstAttribute="top" secondItem="b7y-XE-wYd" secondAttribute="bottom" constant="3" id="hPQ-Dm-etp"/>

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -488,8 +488,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             //            HUD.flash(.label("敬请期待"),delay: 1.2)
             //            return
             
-//            let vc = XiaYunDanViewController()
-            let vc = ShouZhiTongJiViewController()
+            let vc = XiaYunDanViewController()
+//            let vc = ShouZhiTongJiViewController()
             self.navigationController?.pushViewController(vc, animated: true)
             return
         case 76: //收支详情