asdfsadfasf232323dasdf

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

@@ -17,7 +17,7 @@ import IQKeyboardManagerSwift
 
 class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate,HLLTopCellDelegate,OtherDemandViewControllerDelegate,OnlyViewCellDelegate, XiaDanUserInfoViewControllerDelegate, P_P_H_Time_Select_View_Delegate{
     
-    
+    var isPPH = false
     //MARK: - 拼拼货
     var pph_time = ""
     func P_P_H_Time_Select_View_Time_Select(time: String) {
@@ -357,11 +357,22 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     
     func HLLTopCellScrollIdx(idx: Int) {
+        if isPPH {
+            pph_selectCarType = idx
+            pph_showScrollUI()
+            return
+        }
         selectCarType = idx
         showScrollUI()
     }
     
     func HLLTopCellBtnClick(idx: Int) {
+        print("abc == ",idx)
+        if isPPH {
+            pph_selectCarType = idx
+            pph_showScrollUI()
+            return
+        }
         selectCarType = idx
         showScrollUI()
     }
@@ -885,6 +896,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     
     @IBAction func selectAction(_ sender: UIButton) {
         closeCarList()
+        isPPH = false
         pph_closeCarList()
         lineV.frame.origin.x = fullScreenWidth * 0.333 * CGFloat(sender.tag)
         if rightBtn == sender {//货拉拉
@@ -935,6 +947,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 hllView.isHidden = true
                 
             }else{//拼拼货
+                isPPH = true
                 rightBtn.isSelected = false
                 leftBtn.isSelected = false
                 pin_pin_huo.isSelected = true
@@ -2666,7 +2679,23 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     
     @objc func carSelect(sender:UIButton){
+        if isPPH {
+            let btn = pph_btnArr[sender.tag]
+            pph_topBtnClick(btn: btn)
+            pph_closeCarList()
+            let idx = IndexPath(row: 0, section: 0)
+            let cell = pph_listView.cellForRow(at:idx) as! HLLTopCell
+            let w = cell.scViewBg.bounds.size.width
+            cell.scrollView?.setContentOffset(CGPoint(x: sender.tag * Int(w), y: 0), animated: true)
+            cell.idx = sender.tag
             
+            let x = btn.frame.minX
+            let rect = CGRect(x: Int(x), y: 0, width: Int(w), height: 1)
+            pph_topBtnScv.scrollRectToVisible(rect, animated: true)
+            
+            pph_selectCarType = sender.tag
+            return
+        }
         let btn = btnArr[sender.tag]
         topBtnClick(btn: btn)
         closeCarList()

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

@@ -29,6 +29,14 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
             if idx == 0 {
                 leftBtn.isHidden = true
             }
+        }else{
+            if isPPH {
+                if idx < pph_datas.count - 1 {
+                    idx += 1
+                }
+                if idx == pph_datas.count - 1 {
+                    rightBtn.isHidden = true
+                }
             }else{
                 if idx < datas.count - 1 {
                     idx += 1
@@ -37,6 +45,7 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
                     rightBtn.isHidden = true
                 }
             }
+        }
         
         scrollView?.setContentOffset(CGPoint(x: scViewBg.bounds.size.width * CGFloat(idx), y: (scrollView?.frame.origin.y)!), animated: true)
         delegate?.HLLTopCellBtnClick(idx: idx)
@@ -48,9 +57,15 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
             if idx < 0 {
                 idx = 0
             }
+            if isPPH {
+                if idx > pph_datas.count - 1 {
+                    idx = pph_datas.count - 1
+                }
+            }else{
                 if idx > datas.count - 1 {
                     idx = datas.count - 1
                 }
+            }
             delegate?.HLLTopCellScrollIdx(idx:idx)
         }
     }