sad;asd":sadf222

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -182,6 +182,8 @@
 		E0516F832448086700E373CE /* MsgCenterCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0516F812448086700E373CE /* MsgCenterCell.xib */; };
 		E051EBD724A1F0ED00892DA9 /* CGDCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E051EBD524A1F0ED00892DA9 /* CGDCell.swift */; };
 		E051EBD824A1F0ED00892DA9 /* CGDCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E051EBD624A1F0ED00892DA9 /* CGDCell.xib */; };
+		E056960426243AE800CC7431 /* GL_PAY_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E056960226243AE800CC7431 /* GL_PAY_Cell.swift */; };
+		E056960526243AE800CC7431 /* GL_PAY_Cell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E056960326243AE800CC7431 /* GL_PAY_Cell.xib */; };
 		E0571C6C248DC60000E85711 /* AddressListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6B248DC60000E85711 /* AddressListModel.swift */; };
 		E0571C6E248DD4DE00E85711 /* AdressInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0571C6D248DD4DE00E85711 /* AdressInterface.swift */; };
 		E057BB7C2620010B0023E316 /* PPH_D_Cell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E057BB7A2620010B0023E316 /* PPH_D_Cell.swift */; };
@@ -976,6 +978,8 @@
 		E0516F812448086700E373CE /* MsgCenterCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MsgCenterCell.xib; sourceTree = "<group>"; };
 		E051EBD524A1F0ED00892DA9 /* CGDCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CGDCell.swift; sourceTree = "<group>"; };
 		E051EBD624A1F0ED00892DA9 /* CGDCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = CGDCell.xib; sourceTree = "<group>"; };
+		E056960226243AE800CC7431 /* GL_PAY_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GL_PAY_Cell.swift; sourceTree = "<group>"; };
+		E056960326243AE800CC7431 /* GL_PAY_Cell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GL_PAY_Cell.xib; sourceTree = "<group>"; };
 		E0571C6B248DC60000E85711 /* AddressListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressListModel.swift; sourceTree = "<group>"; };
 		E0571C6D248DD4DE00E85711 /* AdressInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdressInterface.swift; sourceTree = "<group>"; };
 		E057BB7A2620010B0023E316 /* PPH_D_Cell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PPH_D_Cell.swift; sourceTree = "<group>"; };
@@ -2190,6 +2194,8 @@
 				E09A7371261EED7B00CB2D70 /* PPH_XQ_Cell.swift */,
 				E09A7372261EED7B00CB2D70 /* PPH_XQ_Cell.xib */,
 				E0FB24E2261FF79B0065E074 /* 下单成功 */,
+				E056960226243AE800CC7431 /* GL_PAY_Cell.swift */,
+				E056960326243AE800CC7431 /* GL_PAY_Cell.xib */,
 			);
 			path = "拼拼货group";
 			sourceTree = "<group>";
@@ -4206,6 +4212,7 @@
 				F961153424E22BA700EB3458 /* OtherInfoTextViewTableViewCell.xib in Resources */,
 				E0A2E82C24555D8600D6DB34 /* KuCunXiangQingCell.xib in Resources */,
 				E020632D246CDD3F007A40C4 /* OrderDViewFooterView.xib in Resources */,
+				E056960526243AE800CC7431 /* GL_PAY_Cell.xib in Resources */,
 				E0CACE8425FF0A3D00ED7998 /* DZSH_UPLOAD_IMG_CELL.xib in Resources */,
 				E02392072490819600C4C632 /* CGDListCell.xib in Resources */,
 				F970B3682550F5AA0026F9D5 /* RetailManageViewController.xib in Resources */,
@@ -4541,6 +4548,7 @@
 				E0AFE970261D45AF00BD2A74 /* NonSelectPiCi_View.swift in Sources */,
 				E077DC5F255124B8000B0DA5 /* GYS_HZ_Vc.swift in Sources */,
 				E02C88262456B24F00925766 /* WuLiuGenZongViewController.swift in Sources */,
+				E056960426243AE800CC7431 /* GL_PAY_Cell.swift in Sources */,
 				E09B03C62445BF6700211A51 /* NavBarView.swift in Sources */,
 				E07C2FFA24ECCD4D0043649B /* GLMessageAlertView.swift in Sources */,
 				E0A409D02464041200CFF109 /* ThirdCell.swift in Sources */,

GeliBusinessPlatform/Assets.xcassets/拼拼货/fff.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "矩形.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "矩形@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "矩形@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/拼拼货/gttt.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "编组 2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "编组 2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "编组 2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Assets.xcassets/拼拼货/ttt.imageset/Contents.json

+{
+  "images" : [
+    {
+      "filename" : "编组 2.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "编组 2@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "编组 2@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

GeliBusinessPlatform/Define/Define.swift

@@ -64,6 +64,7 @@ func SetTopFrame(view:UIView,height:CGFloat){
         make.height.equalTo(height)
     }
 }
+
 func IsOldIos() ->Bool{
     if #available(iOS 11.0, *){
         return false

GeliBusinessPlatform/View/Cell/TitleAndTFBtnCell.swift

@@ -13,6 +13,7 @@ protocol TitleAndTFBtnCellDelegate {
 }
 class TitleAndTFBtnCell: UITableViewCell,UITextFieldDelegate {
 
+    @IBOutlet weak var edit_btn: UIButton!
     var delegate:TitleAndTFBtnCellDelegate?
     @IBOutlet weak var contentTf: UITextField!
     @IBOutlet weak var nameLbl: UILabel!

GeliBusinessPlatform/View/Cell/TitleAndTFBtnCell.xib

@@ -69,6 +69,7 @@
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
                 <outlet property="contentTf" destination="bnV-l5-VU7" id="DEi-VP-3Tz"/>
+                <outlet property="edit_btn" destination="csp-CC-Bh9" id="UbB-Aq-3I9"/>
                 <outlet property="nameLbl" destination="eEh-wt-CxR" id="14K-Uu-GY2"/>
             </connections>
             <point key="canvasLocation" x="131.8840579710145" y="111.83035714285714"/>

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

@@ -15,9 +15,15 @@ import SDWebImage
 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{
-    //MARK: - 拼拼货
+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{
+    
     
+    //MARK: - 拼拼货
+    var pph_time = ""
+    func P_P_H_Time_Select_View_Time_Select(time: String) {
+        pph_time = time
+        pph_listView.reloadData()
+    }
     @IBAction func check_contract_action(_ sender: Any) {
         print("查看条款")
     }
@@ -198,6 +204,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     
     @IBOutlet weak var YuGuPriceLbl: UILabel!
+    
     func pph_showScrollUI(){
         //左右按钮
         for item in pph_lineArr{
@@ -229,48 +236,48 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         
         
         //刷新
-//        if adrArr.count > 0 {
-//            let firstData = adrArr.first! as NSDictionary
-//            if firstData["locName"] as! String != "空" && adrArr.count > 1 {
-//
-//                var adrDs:Array<Any> = []
-//                adrDs.removeAll()
-//                for item in adrArr {
-//                    let data = item["adr"] as! cityListDataModel
-//
-//                    let dict = ["lat":data.lat_lon!.lat!,"lon":data.lat_lon!.lon!,"city_id":data.city_id!] as [String : Any]
-//
-//                    adrDs.append(dict)
-//                }
-//
-//                let lat_lon_arr = dataChangeString(sender: adrDs)
-//
-//                let fD = adrArr.first!
-//                let cityData = fD["adr"] as! cityListDataModel
-//                let params = ["user_token":UserToken as Any,
-//                              "nonce_str":nonce_str as Any,
-//                              "city_id":cityData.city_id as Any,
-//                              "city_info_revision":carModel?.revision as Any,
-//                              "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
-//                              "std_tag_arr":"" as Any,
-//                              "spec_req_arr":spec_select_arr as Any,
-//                              "lat_lon_arr":lat_lon_arr as Any
-//                ]
-//                orderPriceCalculate(params, success: { (data) in
-//                    let model = data as! orderPriceCalculateModel
-//                    self.YuGuPriceLbl.text = "\(model.data!.total_price_fen!/100)"
-//                    self.logisticsCostModel = model
-//                    let view = self.hListView.footerView(forSection: 1)
-//
-//                    view?.layoutIfNeeded()
-//
-//
-//                    self.hListView.reloadData()
-//                }) { (err) in
-//
-//                }
-//            }
-//        }
+        //        if adrArr.count > 0 {
+        //            let firstData = adrArr.first! as NSDictionary
+        //            if firstData["locName"] as! String != "空" && adrArr.count > 1 {
+        //
+        //                var adrDs:Array<Any> = []
+        //                adrDs.removeAll()
+        //                for item in adrArr {
+        //                    let data = item["adr"] as! cityListDataModel
+        //
+        //                    let dict = ["lat":data.lat_lon!.lat!,"lon":data.lat_lon!.lon!,"city_id":data.city_id!] as [String : Any]
+        //
+        //                    adrDs.append(dict)
+        //                }
+        //
+        //                let lat_lon_arr = dataChangeString(sender: adrDs)
+        //
+        //                let fD = adrArr.first!
+        //                let cityData = fD["adr"] as! cityListDataModel
+        //                let params = ["user_token":UserToken as Any,
+        //                              "nonce_str":nonce_str as Any,
+        //                              "city_id":cityData.city_id as Any,
+        //                              "city_info_revision":carModel?.revision as Any,
+        //                              "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
+        //                              "std_tag_arr":"" as Any,
+        //                              "spec_req_arr":spec_select_arr as Any,
+        //                              "lat_lon_arr":lat_lon_arr as Any
+        //                ]
+        //                orderPriceCalculate(params, success: { (data) in
+        //                    let model = data as! orderPriceCalculateModel
+        //                    self.YuGuPriceLbl.text = "\(model.data!.total_price_fen!/100)"
+        //                    self.logisticsCostModel = model
+        //                    let view = self.hListView.footerView(forSection: 1)
+        //
+        //                    view?.layoutIfNeeded()
+        //
+        //
+        //                    self.hListView.reloadData()
+        //                }) { (err) in
+        //
+        //                }
+        //            }
+        //        }
         self.pph_listView.reloadData()
     }
     func showScrollUI(){
@@ -1184,9 +1191,14 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         
         
         //MARK: - 拼拼货
+        pph_listView.backgroundColor = UIColor(named: "app底色")
+        
         pph_listView.register(UINib(nibName: "HLLTopCell", bundle: nil), forCellReuseIdentifier: "HLLTopCell")
         pph_listView.register(UINib(nibName: "OnlyViewCell", bundle: nil), forCellReuseIdentifier: "OnlyViewCell")
+        pph_listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
+        pph_listView.register(UINib(nibName: "Suc_LOG_Cell", bundle: nil), forCellReuseIdentifier: "Suc_LOG_Cell")
         pph_listView.register(UINib(nibName: "TitleAndTFBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFBtnCell")
+        pph_listView.register(UINib(nibName: "GL_PAY_Cell", bundle: nil), forCellReuseIdentifier: "GL_PAY_Cell")
     }
     
     //MARK:--//冷运请求期望上门时间
@@ -1265,6 +1277,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        if tableView == pph_listView {//拼拼货
+            return UIView()
+        }
         if tableView == listView {
             let view = UIView()
             view.backgroundColor = UIColor(named: "app底色")
@@ -1578,6 +1593,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         hListView.reloadData()
     }
     func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        if tableView == pph_listView {
+            if section == 1 {
+                return 0
+            }
+            return 5
+        }
         if tableView == listView {
             if section == 0 {
                 return 10
@@ -1597,6 +1618,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }
     }
     func numberOfSections(in tableView: UITableView) -> Int {
+        if tableView == pph_listView {
+            return 6
+        }
         if tableView.tag == 999 {
             return 1
         }
@@ -1610,6 +1634,17 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if tableView == pph_listView {
+            switch section {
+            case 0:return 1
+            case 1:return 1
+            case 2:return 1
+            case 3:return 1
+            case 4:return 2
+            case 5:return 1
+            default:break
+            }
+        }
         if tableView.tag == 999 {
             return adrArr.count - 1
         }
@@ -1649,6 +1684,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     var bzIdx = 10086
     var bzArr = ["0元最高保5万","3元最高保10万","4元最高保20万","6元最高保30万","10元最高保50万","40元最高保100万","100元最高保200万"]
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        //MARK: - 拼拼货
+        if tableView == pph_listView {
+            if indexPath.section == 3 {
+                let view = P_P_H_Time_Select_View(frame: self.view.bounds)
+                view.delegate = self
+                self.view.addSubview(view)
+            }
+        }
+        
+        //
         if tableView == listView {
             if indexPath.section == 1 {
                 if indexPath.row < 3 {
@@ -1897,9 +1942,12 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
                 return UITableView.automaticDimension
             }
-            if indexPath.section == 1 {
+            if indexPath.section == 1 || indexPath.section == 2 {
                 return UITableView.automaticDimension
             }
+            if indexPath.section == 5 {
+                return 83
+            }
             return 49
         }
     }
@@ -2151,7 +2199,43 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 cell.idx = pph_selectCarType
                 return cell
             }
-            let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
+            
+            if indexPath.section == 1 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "Suc_LOG_Cell") as! Suc_LOG_Cell
+                if indexPath.row == 0 {
+                    cell.top_line.isHidden = true
+                }
+                return cell
+            }
+            if indexPath.section == 2 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "Suc_LOG_Cell") as! Suc_LOG_Cell
+                cell.status_lbl.text = "卸"
+                cell.status_lbl.backgroundColor = UIColor(named: "#FAA376")
+                if indexPath.row == 0 {
+                    cell.btm_line.isHidden = true
+                }
+                return cell
+            }
+            if indexPath.section == 3 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndBtnCell") as! TitleAndBtnCell
+                cell.nameLbl.text = "请选择用车时间"
+                cell.contentLbl.text = pph_time
+                cell.btn.isUserInteractionEnabled = false
+                return cell
+            }
+            
+            if indexPath.section == 4 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFBtnCell") as! TitleAndTFBtnCell
+                cell.nameLbl.text = "关联平台："
+                if indexPath.row == 1 {
+                    cell.nameLbl.text = "关联订单号："
+                }
+                cell.edit_btn.setTitleColor(UIColor(named: "green"), for: .normal)
+                return cell
+                
+            }
+            
+            let cell = tableView.dequeueReusableCell(withIdentifier: "GL_PAY_Cell") as! GL_PAY_Cell
             
             return cell
         }
@@ -2242,7 +2326,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             button.setImage(UIImage(named: "dot"), for: .normal)
             view.addSubview(button)
             button.addTarget(self, action: #selector(pph_selectAllCars), for: .touchUpInside)
-     
+            
             
             let line2 = UIView()
             line2.backgroundColor = UIColor(named: "灰色分界线")
@@ -2334,7 +2418,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             button.setImage(UIImage(named: "dot"), for: .normal)
             view.addSubview(button)
             button.addTarget(self, action: #selector(selectAllCars), for: .touchUpInside)
-      
+            
             let line2 = UIView()
             line2.backgroundColor = UIColor(named: "灰色分界线")
             view.addSubview(line2)
@@ -2375,8 +2459,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     @objc func pph_closeCarList(){
         pph_carListView?.isHidden = true
         pph_cBtn?.isHidden = true
-//        closeBtn?.isHidden = true
-//        changeCellSortView?.isHidden = true
+        //        closeBtn?.isHidden = true
+        //        changeCellSortView?.isHidden = true
     }
     @objc func pph_selectAllCars(){
         print("pphCarTypesArr = ",pphCarTypesArr.count)
@@ -2951,4 +3035,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             }
         }
     }
+    
+    
 }

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

@@ -439,8 +439,8 @@
                                         <constraint firstAttribute="width" constant="12" id="Dzc-ky-bua"/>
                                         <constraint firstAttribute="height" constant="12" id="wKV-jC-JoY"/>
                                     </constraints>
-                                    <state key="normal" image="lmn_accessory_checkbox"/>
-                                    <state key="selected" image="lmn_accessory_checkbox_"/>
+                                    <state key="normal" image="fff"/>
+                                    <state key="selected" image="gttt"/>
                                 </button>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="我已阅读并同意" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cWz-wM-O4T">
                                     <rect key="frame" x="32" y="11.666666666666629" width="70" height="14"/>
@@ -585,9 +585,9 @@
         </designable>
     </designables>
     <resources>
+        <image name="fff" width="12" height="12"/>
+        <image name="gttt" width="13" height="12"/>
         <image name="jinru" width="13" height="23"/>
-        <image name="lmn_accessory_checkbox" width="60" height="60"/>
-        <image name="lmn_accessory_checkbox_" width="60" height="60"/>
         <namedColor name="#E37847">
             <color red="0.88999998569488525" green="0.47099998593330383" blue="0.27799999713897705" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/ViewController/拼拼货group/GL_PAY_Cell.swift

+//
+//  GL_PAY_Cell.swift
+//  GeliBusinessPlatform
+//
+//  Created by junye lu on 2021/4/12.
+//  Copyright © 2021 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class GL_PAY_Cell: UITableViewCell {
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/ViewController/拼拼货group/GL_PAY_Cell.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" 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="17703"/>
+        <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"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="GL_PAY_Cell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="375" height="83"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+            <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
+                <rect key="frame" x="0.0" y="0.0" width="375" height="83"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="支付方式" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wo6-pR-Upt">
+                        <rect key="frame" x="15" y="17" width="60" height="21"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
+                        <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="gwz-Xi-Eeu">
+                        <rect key="frame" x="80" y="19" width="178" height="19"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                        <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="sDw-v3-gaH">
+                        <rect key="frame" x="15" y="53" width="52" height="18.5"/>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                        <color key="textColor" name="标题字颜色"/>
+                        <nil key="highlightedColor"/>
+                    </label>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ttt" translatesAutoresizingMaskIntoConstraints="NO" id="clX-YE-xGa">
+                        <rect key="frame" x="341" y="53" width="19" height="19"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="19" id="gR5-Md-PVL"/>
+                            <constraint firstAttribute="width" constant="19" id="kap-SG-Qyd"/>
+                        </constraints>
+                    </imageView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="sDw-v3-gaH" firstAttribute="top" secondItem="wo6-pR-Upt" secondAttribute="bottom" constant="15" id="3EU-jC-u97"/>
+                    <constraint firstItem="clX-YE-xGa" firstAttribute="centerY" secondItem="sDw-v3-gaH" secondAttribute="centerY" id="7I4-bs-O7q"/>
+                    <constraint firstItem="sDw-v3-gaH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="DRV-ai-QWY"/>
+                    <constraint firstItem="gwz-Xi-Eeu" firstAttribute="bottom" secondItem="wo6-pR-Upt" secondAttribute="bottom" id="aoY-WG-twZ"/>
+                    <constraint firstItem="wo6-pR-Upt" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="dDJ-TW-knr"/>
+                    <constraint firstAttribute="trailing" secondItem="clX-YE-xGa" secondAttribute="trailing" constant="15" id="hpb-3k-CQK"/>
+                    <constraint firstItem="gwz-Xi-Eeu" firstAttribute="leading" secondItem="wo6-pR-Upt" secondAttribute="trailing" constant="5" id="sXf-EA-RMv"/>
+                    <constraint firstItem="wo6-pR-Upt" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="17" id="xMT-v1-bxu"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <point key="canvasLocation" x="141" y="80"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <image name="ttt" width="19" height="19"/>
+        <namedColor name="提示语字体颜色">
+            <color red="0.70588235294117652" green="0.70588235294117652" blue="0.70588235294117652" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Time_Select_View.swift

@@ -22,6 +22,14 @@ class P_P_H_Time_Select_View: UIView,UIPickerViewDelegate,UIPickerViewDataSource
     }
     
     @IBAction func submitAction(_ sender: Any) {
+        if dayArr[daySelect] == "今天" {
+            time_str = dateConvertString(date: DateInRegion().dateAt(.startOfDay).date) + " " + hourArr[hourSelect] + ":" + minArr[minSelect]
+        }else if dayArr[daySelect] == "明天" {
+            time_str = dateConvertString(date: DateInRegion().dateAt(.startOfDay).date + 1.days) + " " + hourArr[hourSelect] + ":" + minArr[minSelect]
+        }else{
+            time_str = dateConvertString(date: DateInRegion().dateAt(.startOfDay).date + daySelect.days + 1.days) + " " + hourArr[hourSelect] + ":" + minArr[minSelect]
+        }
+        
         delegate?.P_P_H_Time_Select_View_Time_Select(time: time_str)
         self.removeFromSuperview()
     }
@@ -124,23 +132,23 @@ class P_P_H_Time_Select_View: UIView,UIPickerViewDelegate,UIPickerViewDataSource
             let num = 24 - hour.integerValue
             if min.integerValue < 50 {
                 for i in 0 ..< num {
-                    hourArr.append("\(hour.integerValue + i)点")
+                    hourArr.append("\(hour.integerValue + i)")
                 }
             }else{
                 for i in 0 ..< num - 1 {
-                    hourArr.append("\(hour.integerValue + i + 1)点")
+                    hourArr.append("\(hour.integerValue + i + 1)")
                 }
             }
         }else{
             for i in 0 ..< 24 {
-                hourArr.append("\(i)点")
+                hourArr.append("\(i)")
             }
         }
         
-        print(min)
-        
         let selectHour = hourArr[hourSelect] as! NSString
-        if selectHour.integerValue > hour.integerValue {
+        let selectDay = dayArr[daySelect]
+        let today = DateInRegion().dateAt(.startOfDay).date.day
+        if selectHour.integerValue > hour.integerValue || selectDay != "今天" {
             for i in 0 ..< 6 {
                 minArr.append("\(i * 10)")
             }

GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.swift

@@ -7,9 +7,17 @@
 //
 
 import UIKit
-
+protocol Suc_LOG_Cell_Delegate {
+    func Suc_LOG_Cell_Add_Action(cell:Suc_LOG_Cell)
+}
 class Suc_LOG_Cell: UITableViewCell {
-
+    var delegate:Suc_LOG_Cell_Delegate?
+    @IBAction func add_action(_ sender: UIButton) {
+        if add_btn.isHidden == false {
+            delegate?.Suc_LOG_Cell_Add_Action(cell: self)
+        }
+    }
+    @IBOutlet weak var add_btn: UILabel!
     @IBOutlet weak var commend_lbl: UILabel!
     @IBOutlet weak var adr_lbl: UILabel!
     @IBOutlet weak var name_lbl: UILabel!

GeliBusinessPlatform/ViewController/拼拼货group/下单成功/Suc_LOG_Cell.xib

@@ -90,11 +90,43 @@
                         </attributedString>
                         <nil key="highlightedColor"/>
                     </label>
+                    <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新增" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ymi-Cs-n6W">
+                        <rect key="frame" x="403" y="35.5" width="40" height="20"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="40" id="iW5-ya-SND"/>
+                            <constraint firstAttribute="height" constant="20" id="yje-H8-B77"/>
+                        </constraints>
+                        <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
+                        <color key="textColor" name="#999999"/>
+                        <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                <real key="value" value="3"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                <color key="value" name="灰色分界线"/>
+                            </userDefinedRuntimeAttribute>
+                            <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                <real key="value" value="0.5"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </label>
+                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ulV-iw-bED">
+                        <rect key="frame" x="398" y="20.5" width="50" height="50"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="50" id="WZ8-uW-9CH"/>
+                            <constraint firstAttribute="width" constant="50" id="ikZ-lf-GTW"/>
+                        </constraints>
+                        <connections>
+                            <action selector="add_action:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="hVE-1F-eLF"/>
+                        </connections>
+                    </button>
                 </subviews>
                 <constraints>
                     <constraint firstAttribute="bottom" secondItem="AAn-aO-nFM" secondAttribute="bottom" id="4jk-Ha-udl"/>
                     <constraint firstItem="Irg-02-L3a" firstAttribute="centerY" secondItem="ZYP-Oa-jcS" secondAttribute="centerY" id="8t9-4b-JtR"/>
                     <constraint firstAttribute="trailing" secondItem="htU-bv-LVR" secondAttribute="trailing" constant="85" id="96I-s0-3LU"/>
+                    <constraint firstItem="ulV-iw-bED" firstAttribute="centerX" secondItem="ymi-Cs-n6W" secondAttribute="centerX" id="E8f-Zm-uoA"/>
                     <constraint firstItem="ZYP-Oa-jcS" firstAttribute="top" secondItem="iGa-XE-p4p" secondAttribute="bottom" id="GQA-Vt-fJM"/>
                     <constraint firstItem="htU-bv-LVR" firstAttribute="leading" secondItem="Irg-02-L3a" secondAttribute="leading" id="KcI-I9-mI8"/>
                     <constraint firstItem="AAn-aO-nFM" firstAttribute="centerX" secondItem="ZYP-Oa-jcS" secondAttribute="centerX" id="O1N-El-j5M"/>
@@ -105,17 +137,21 @@
                     <constraint firstItem="Irg-02-L3a" firstAttribute="leading" secondItem="ZYP-Oa-jcS" secondAttribute="trailing" constant="10" id="dVV-dx-wbl"/>
                     <constraint firstItem="AAn-aO-nFM" firstAttribute="top" secondItem="ZYP-Oa-jcS" secondAttribute="bottom" id="dVv-uQ-60l"/>
                     <constraint firstItem="tIb-8c-DIc" firstAttribute="top" secondItem="htU-bv-LVR" secondAttribute="bottom" constant="5" id="fEk-iJ-Pbj"/>
+                    <constraint firstAttribute="trailing" secondItem="ymi-Cs-n6W" secondAttribute="trailing" constant="15" id="glA-bw-n7d"/>
                     <constraint firstItem="tIb-8c-DIc" firstAttribute="width" secondItem="htU-bv-LVR" secondAttribute="width" id="hY9-LV-DPT"/>
                     <constraint firstItem="ZYP-Oa-jcS" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="hwW-mK-R4F"/>
                     <constraint firstItem="htU-bv-LVR" firstAttribute="top" secondItem="Irg-02-L3a" secondAttribute="bottom" constant="5" id="iq3-yz-Pa6"/>
                     <constraint firstItem="tIb-8c-DIc" firstAttribute="leading" secondItem="htU-bv-LVR" secondAttribute="leading" id="jIP-Sm-oiG"/>
                     <constraint firstAttribute="bottom" secondItem="UzE-pS-esW" secondAttribute="bottom" id="p7a-fw-Aj9"/>
+                    <constraint firstItem="ymi-Cs-n6W" firstAttribute="top" secondItem="htU-bv-LVR" secondAttribute="top" id="rHW-7f-zhX"/>
                     <constraint firstItem="UzE-pS-esW" firstAttribute="top" secondItem="tIb-8c-DIc" secondAttribute="bottom" constant="10" id="xfA-kn-n81"/>
+                    <constraint firstItem="ulV-iw-bED" firstAttribute="centerY" secondItem="ymi-Cs-n6W" secondAttribute="centerY" id="yBB-ff-eFP"/>
                     <constraint firstItem="UzE-pS-esW" firstAttribute="leading" secondItem="htU-bv-LVR" secondAttribute="leading" id="yaV-g7-PQO"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
             <connections>
+                <outlet property="add_btn" destination="ymi-Cs-n6W" id="N79-xO-MCG"/>
                 <outlet property="adr_lbl" destination="htU-bv-LVR" id="zlq-3w-Y7H"/>
                 <outlet property="btm_line" destination="AAn-aO-nFM" id="CWs-Su-zWN"/>
                 <outlet property="commend_lbl" destination="tIb-8c-DIc" id="sp4-pO-uhO"/>
@@ -127,6 +163,9 @@
         </tableViewCell>
     </objects>
     <resources>
+        <namedColor name="#999999">
+            <color red="0.60000002384185791" green="0.60000002384185791" blue="0.60000002384185791" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="app底色">
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

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

@@ -86,13 +86,13 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
             }
             let model = pph_datas[numIdx]
             if pph_datas.count > 0 {
-            if model.truckWeight != nil {
-                weightLbl.text = model.truckWeight
-            }
-            if model.cubage != nil {
-                sizeLbl.text = "\(model.cubage!)"
-            }
-            tjLbl.text = model.truckVolume
+                if model.truckWeight != nil {
+                    weightLbl.text = model.truckWeight! + "吨"
+                }
+                if model.cubage != nil {
+                    sizeLbl.text = model.truckVolume
+                }
+                tjLbl.text = "\(model.cubage!)方"
             }
         }else{
             
@@ -143,12 +143,12 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
             if pph_datas.count > 0 {
                 let model = pph_datas[idx]
                 if model.truckWeight != nil {
-                    weightLbl.text = model.truckWeight
+                    weightLbl.text = model.truckWeight! + "吨"
                 }
                 if model.cubage != nil {
-                    sizeLbl.text = "\(model.cubage!)"
+                    sizeLbl.text = model.truckVolume
                 }
-                tjLbl.text = model.truckVolume
+                tjLbl.text = "\(model.cubage!)方"
             }
         }
     }