货拉拉界面合并

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

@@ -271,7 +271,7 @@
                         </label>
                         <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" estimatedSectionHeaderHeight="-1" sectionFooterHeight="18" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="IhS-vZ-6YK">
                             <rect key="frame" x="0.0" y="44" width="414" height="714"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" name="app底色"/>
                             <connections>
                                 <outlet property="dataSource" destination="-1" id="VHp-ja-2wO"/>
                                 <outlet property="delegate" destination="-1" id="atq-MI-T7V"/>

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: //收支详情

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift

@@ -40,7 +40,11 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
         if scrollView.contentOffset.x/scViewBg.bounds.size.width <= 0 {
             leftBtn.isHidden = true
         }
-        if scrollView.contentOffset.x/scViewBg.bounds.size.width >= CGFloat(datas.count-1) {
+        var num = datas.count-1
+        if num > 4 {
+             num = 4
+        }
+        if scrollView.contentOffset.x/scViewBg.bounds.size.width >= CGFloat(num) {
             rightBtn.isHidden = true
         }
         
@@ -72,9 +76,13 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
     }
     override func layoutIfNeeded() {
         super.layoutIfNeeded()
-        scrollView?.contentSize = CGSize(width: (scViewBg.bounds.size.width) * CGFloat(datas.count), height: (scViewBg.bounds.size.height))
+        var num = datas.count - 1
+        if num > 5 {
+            num = 5
+        }
+        scrollView?.contentSize = CGSize(width: (scViewBg.bounds.size.width) * CGFloat(num), height: (scViewBg.bounds.size.height))
         
-        for i in 0 ..< datas.count{
+        for i in 0 ..< num{
             let view = UIView(frame: CGRect(x: CGFloat(i) * (scViewBg.bounds.size.width), y:0, width: scViewBg.bounds.size.width, height: scViewBg.bounds.size.height))
             if i % 2 == 0 {
                 view.backgroundColor = UIColor.blue