修复右上角城市定位bug

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

@@ -361,7 +361,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 let cell = hListView.cellForRow(at: IndexPath(row: 0, section: 0)) as! HLLTopCell
                 cell.scrollView?.setContentOffset(CGPoint(x: selectCarType * Int(CGFloat(cell.scViewBg.bounds.size.width)), y: 0), animated: true)
                 cell.idx = selectCarType
-                locBtn.setTitle("  " + adrModel.name!, for: .normal)
+                var city_name = ""
+                for item in adrDatas {
+                    if item.city_id == city_id {
+                        city_name = item.name!
+                    }
+                }
+                locBtn.setTitle("  " + city_name, for:.normal)
                 extractedFunc()
             }
         }

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

@@ -214,7 +214,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             citySelectBtn.setTitle(model.city!, for: .normal)
             let locData = JZLocationConverter.wgs84(toGcj02: CLLocationCoordinate2D(latitude: (model.location?.lat)!, longitude: (model.location?.lon)!))
             isMove = false
-            print("fuli2 === ",locData.latitude,locData.longitude)
+            
             adrName = model.name!
             detailAdr = model.address!
             mapView.setCenter(CLLocationCoordinate2DMake(locData.latitude,locData.longitude), animated: false)
@@ -252,12 +252,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     let searchBr = SearchBarView.init()
     override func viewDidLoad() {
         super.viewDidLoad()
-//        let data1 = JZLocationConverter.wgs84(toGcj02: CLLocationCoordinate2D(latitude: 23.139385038284008, longitude: 113.24607265183259))
-//        let data2 = JZLocationConverter.gcj02(toWgs84: data1)
 
-        
-//        print("2222 === ",data2.latitude,data2.longitude)
-        
         navBgView.addSubview(searchBr)
         searchBr.snp.makeConstraints { (make) in
             make.left.equalTo(citySelectBtn.snp_right).offset(5)
@@ -388,7 +383,6 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
                          "name":model.name,
                          "city_id":model.city_id
                     ] as [String : Any]
-                print()
                 adrDataModel = cityListDataModel(JSON: d)
                 
             }
@@ -554,7 +548,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             adrDataModel = cityListDataModel(JSON: d)
         }
         isHistory = false
-        print("fuli1 === ",adrDataModel?.lat_lon!.lat,adrDataModel?.lat_lon!.lon)
+        
         let attributes = [NSAttributedString.Key.font:UIFont.systemFont(ofSize: 11),
                           NSAttributedString.Key.paragraphStyle: paraph]
         contentLbl!.attributedText = NSAttributedString(string: str, attributes: attributes)