下单调试成功

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

@@ -136,20 +136,23 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
       
             
             var addr_info_arr:Array<Any> = []
+            
+//
             addr_info_arr.removeAll()
             for i in 0 ..< adrArr.count {
                 let item = adrArr[i]
                 let itemModel = item["adr"] as! cityListDataModel
                 let itemData = (item["detailAdr"] as! NSString).components(separatedBy: "_")
 
-                let dict = ["name":itemData.last! as Any,
-                            "addr":item["menPai"]! as Any,
+                //            "addr_info":"[{\"lat_lon\":{\"lat\":\"31.196027516575054\",\"lon\":\"121.31625670047288\"},\"addr\":\"闵行区申贵路1500号\",\"name\":\"申贵路1500号\",\"city_id\":\"1006\",\"district_name\":\"闵行区\"},{\"lat_lon\":{\"lat\":\"31.202375193368646\",\"lon\":\"121.32264161728554\"},\"addr\":\"长宁区人民医院\",\"name\":\"人民医院\",\"city_id\":\"1006\",\"district_name\":\"长宁区\"}]"}
+                let dict = ["name":(itemData.last)! as Any,
+                            "addr":itemData[2] as Any,
                             "city_id":itemModel.city_id! as Any,
                             "district_name":itemData[1] as Any,
-                            "house_number":item["menPai"]! as Any,
-                            "contact_name":firstDict!["shouHuoRen"] as Any,
-                            "contact_phone_no":firstDict!["phoneNum"] as Any,
-                            "lat_lon":dictChangeString(sender: ["lat":itemModel.lat_lon!.lat as Any,"lon":itemModel.lat_lon!.lon as Any])]
+//                            "house_number":item["menPai"]! as Any,
+//                            "contact_name":firstDict!["shouHuoRen"] as Any,
+//                            "contact_phone_no":firstDict!["phoneNum"] as Any,
+                            "lat_lon":["lat":itemModel.lat_lon!.lat as Any,"lon":itemModel.lat_lon!.lon as Any]]
                 
                 addr_info_arr.append(dict)
             }
@@ -173,35 +176,32 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 r_consignee = lastDict!["shouHuoRen"] as! String
             }
             let total = YuGuPriceLbl.text! as NSString
+            var spec_select_arr_str = ""
+            if spec_select_arr.count > 0 {
+               spec_select_arr_str = dataChangeString(sender: spec_select_arr)
+            }
+            
+//            print(dataChangeString(sender: addr_info_arr))
+//            return
             let dict1 = ["user_token":UserToken as Any,
                         "nonce_str":String.randomStr(len: 30) as Any,
-                        "s_city":firstArr[0] as Any,
-                        "s_area":firstArr[1] as Any,
-                        "s_address":firstArr[2] as Any,
-                        "s_consignee":s_consignee as Any,
-                        "s_mobile":s_mobile as Any,
-                        "r_city":lastArr[0] as Any,
-                        "r_area":lastArr[1] as Any,
-                        "r_address":lastArr[2] as Any,
-                        "r_consignee":r_consignee as Any,
-                        "r_mobile":r_mobile as Any,
                         "city_id":firstCity.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,
+                        "spec_req_arr":spec_select_arr_str as Any,
                         "order_time":stime as Any,
                         "total_price_fen":total.floatValue * 100 as Any,
                         "contact_name":msgArr.first as Any,
                         "contact_phone_no":msgArr[1] as Any,
-                        "pay_type":"" as Any,
+                        "pay_type":"3" as Any,
                         "order_reason":"" as Any,
                         "remark":msgArr.last as Any,
                         "sale_plat":guanlianPingStr as Any,
                         "order_sn":guanlianDingStr as Any,
                         "addr_info":dataChangeString(sender: addr_info_arr) as Any
                         ]
-            print("23399=",dict1)
+            
             
             shopsAuthList(dict1, success: { (data) in
                 let model = data as! shopsAuthListModel
@@ -316,6 +316,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     var carModel:cityCartDataModel?
     fileprivate func extractedFunc() {
         HUD.flash(.progress)
+
         cityCart(["user_token":UserToken as Any,"nonce_str":String.randomStr(len: 30) as Any,"city_id":city_id as Any], success: { (data) in
             HUD.hide()
             let model = data as! cityCartModel
@@ -324,6 +325,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
             for item in model.data!.vehicle_arr! {
                 self.carTypesArr.append(item)
             }
+            if self.carTypesArr.count == 0 {
+                HUD.flash(.label("暂无可选车型"),delay: 1.2)
+                return
+            }
             let view = self.hListView.footerView(forSection: 0)
             view?.layoutIfNeeded()
             self.setBtnUI(carTypesArr: self.carTypesArr,view: self.topCarBtnSelectView)
@@ -830,6 +835,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                     self.locBtn.addTarget(self, action: #selector(self.locSelect), for: .touchUpInside)
                     self.locBtn.setTitle("  " + (firstPL?.postalAddress?.city)!, for: .normal)
                     self.selectLoc = (firstPL?.postalAddress?.city)!
+                    print("abc == ",self.selectLoc)
                     self.locBtn.sizeToFit()
                     self.view.addSubview(self.locBtn)
                     

GeliBusinessPlatform/ViewController/货拉拉/收发货地址/ToAndFormSelectViewController.swift

@@ -451,7 +451,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             titleLbl!.text = adrName
             str = detailAdr
         }
-        detailAdrStr = "\(city)_\(districet)_\(ad)_\(titleLbl!.text)"
+        detailAdrStr = "\(city)_\(districet)_\(ad)_\(titleLbl!.text!)"
         
         let attributes = [NSAttributedString.Key.font:UIFont.systemFont(ofSize: 11),
                           NSAttributedString.Key.paragraphStyle: paraph]