阿斯顿发送到发斯蒂芬

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

@@ -61,12 +61,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             case 2://未设置支付密码
                 HUD.flash(.label("请设置支付密码"), delay: 1.2)
                 break
-//            case 3://资金不足额
-//                HUD.flash(.label("资金余额不足"), delay: 1.2)
-//                break
-            case 3,4://资金足额
-                
-                
+            case 3://资金不足额
+                HUD.flash(.label("资金余额不足"), delay: 1.2)
+                break
+            case 4://资金足额
                 var tempArr:Array<addPinPinOrder_adrInfo> = []
                 pph_send_arr.forEach { (item) in
                     tempArr.append(item)
@@ -95,16 +93,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     infos.append(info)
                 }
                 let infosData = dataChangeString(sender: infos)
-//                if pph_time.count == 0 {
-//                    HUD.flash(.label("请选择用车时间"), delay: 1.2)
-//                    return
-//                }
+                if timeStamp == -1 {
+                    HUD.flash(.label("请选择用车时间"), delay: 1.2)
+                    return
+                }
 
                 let dict = ["user_token":UserToken as Any,
                             "uid":pphCarTypesArr[pph_selectCarType].id as Any,
                             "price":totalPrice as Any,
                             "orderType":1 as Any,
-                            "startDate":"" as Any,
+                            "startDate":timeStamp as Any,
                             "demo":"" as Any,
                             "typeid":pphCarTypesArr[pph_selectCarType].type as Any,
                             "tailplate":0 as Any,

GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift

@@ -213,8 +213,11 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
     //    }
     @objc func submitAction(){
         
-        if adrStr != nil {
-            delegate?.SJMapViewControllerSelectArd(adr: adrStr!,cityData: cityData!,loc: "\(lat)-\(lng)")
+        if idx != nil {
+            
+            let cell = listView?.cellForRow(at: idx!) as! SJMapCell
+            
+            delegate?.SJMapViewControllerSelectArd(adr: cell.nameLbl.text!, cityData: cell.cityData, loc: "\(cell.lat!)-\(cell.lng!)")
             self.navigationController?.popViewController(animated: true)
         }else{
             HUD.flash(.label("请选择地址"), delay: 1.2)
@@ -327,8 +330,7 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
                 let cell = tableView.cellForRow(at: idx!) as! SJMapCell
                 mapView.setCenter(CLLocationCoordinate2D(latitude:CLLocationDegrees(cell.lat!), longitude: CLLocationDegrees(cell.lng!)), animated: false)
                 adrStr = cell.nameLbl.text
-                print("abc == ",cell.lat,cell.lng)
-                delegate?.SJMapViewControllerSelectArd(adr: cell.nameLbl.text!, cityData: cityData!, loc: "\(cell.lat!)-\(cell.lng!)")
+                delegate?.SJMapViewControllerSelectArd(adr: cell.nameLbl.text!, cityData: cell.cityData, loc: "\(cell.lat!)-\(cell.lng!)")
 
                 self.navigationController?.popViewController(animated: true)
             }
@@ -340,7 +342,7 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
             listView?.reloadData()
             adrStr = cell.nameLbl.text
             if isSearchMode {
-                delegate?.SJMapViewControllerSelectArd(adr: cell.nameLbl.text!, cityData: cityData!, loc: "\(cell.lat!)-\(cell.lng!)")
+                delegate?.SJMapViewControllerSelectArd(adr: cell.nameLbl.text!, cityData: cell.cityData, loc: "\(cell.lat!)-\(cell.lng!)")
                 self.navigationController?.popViewController(animated: true)
             }
         }

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

@@ -39,11 +39,10 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate, UIPickerView
     func SJMapViewControllerSelectArd(adr:String,cityData:String,loc:String) {
         city_lbl.text = cityData
         let ar = loc.components(separatedBy: "-")
-        print("pass_loc = ",loc)
+        print("pass_loc = ",loc,cityData)
         self.lng = (ar.last! as NSString).doubleValue
         self.lat = (ar.first! as NSString).doubleValue
       
-        print("location == ",self.lng,self.lat)
         let arr = cityData.components(separatedBy: "-")
         for i in 0 ..< addressArray.count {
             let provinceData = addressArray[i] as! Dictionary<String,Any>