地址选择（待完善详细出口）

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

@@ -13,7 +13,9 @@ import AMapFoundationKit
 import MAMapKit
 import AMapSearchKit
 import IQKeyboardManagerSwift
-
+protocol ToAndFormSelectViewControllerDelegate {
+    func ToAndFormSelectViewControllerSelectAdr(dict:Dictionary<String,Any>,idx:Int)
+}
 class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLocationManagerDelegate, AMapSearchDelegate, UISearchBarDelegate, SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource{
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         if tableView == searchList {
@@ -21,6 +23,14 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         }
         return 5
     }
+    var delegate:ToAndFormSelectViewControllerDelegate?
+    var dict:Dictionary<String,Any> = Dictionary()
+    
+    
+    var nameStr = ""
+    var phoneNum = ""
+    var adrStr = ""
+    
     var idx:Int?
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         return UITableView.automaticDimension
@@ -30,7 +40,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         let cell = tableView.dequeueReusableCell(withIdentifier: "HuoLaLaDiZhiCell") as! HuoLaLaDiZhiCell
         cell.nameLbl.text = "1"
         if tableView == searchList {
-        let data = adrArr[indexPath.row]
+            let data = adrArr[indexPath.row]
             cell.nameLbl.text = data.name
         }
         
@@ -69,15 +79,15 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     
     @IBOutlet weak var leftBtn: UIButton!
     @IBAction func listViewRefresh(_ sender: UIButton) {
-//        if sender == leftBtn {
-//            leftBtn.isSelected = true
-//            rightBtn.isSelected = false
-//            lineX.constant = 0
-//        }else{
-//            leftBtn.isSelected = false
-//            rightBtn.isSelected = true
-//            lineX.constant = fullScreenWidth * 0.5
-//        }
+        //        if sender == leftBtn {
+        //            leftBtn.isSelected = true
+        //            rightBtn.isSelected = false
+        //            lineX.constant = 0
+        //        }else{
+        //            leftBtn.isSelected = false
+        //            rightBtn.isSelected = true
+        //            lineX.constant = fullScreenWidth * 0.5
+        //        }
     }
     @IBOutlet weak var listViewBG: UIView!
     
@@ -97,7 +107,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     
     override func viewDidLoad() {
         super.viewDidLoad()
-      
+        
         let searchBr = SearchBarView.init()
         navBgView.addSubview(searchBr)
         searchBr.snp.makeConstraints { (make) in
@@ -126,6 +136,10 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         
         
         searchList.register(UINib(nibName: "HuoLaLaDiZhiCell", bundle: nil), forCellReuseIdentifier: "HuoLaLaDiZhiCell")
+        
+        nameTF.text = nameStr
+        phoneTF.text = phoneNum
+        addressDetailTF.text = adrStr
     }
     
     func initMapView(){
@@ -153,7 +167,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     @objc func cancelKeyboard(){
         IQKeyboardManager.shared.resignFirstResponder()
     }
-    
+    var adrDatas:Array<cityListDataModel>?
     func initSearch() {
         search = AMapSearchAPI()
         search.delegate = self
@@ -163,9 +177,28 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         request.requireExtension = true
         search.aMapPOIAroundSearch(request)
     }
-    
+    var adrData:cityListDataModel?
+    var cityName:NSString = ""
     @IBAction func sureSelectAddressAction(_ sender: LGButton) {
         print("sureSelectAddressAction")
+        print(cityName)
+        if adrDatas!.count > 0 {
+            for item in adrDatas! {
+                if cityName.contains(item.name!) {
+                    adrData = item
+                }
+            }
+            
+            dict["menPai"] = addressDetailTF.text
+            dict["shouHuoRen"] = nameTF.text
+            dict["phoneNum"] = phoneTF.text
+            dict["adr"] = adrData
+            if locName.count > 0  {
+                dict["locName"] = titleLbl!.text
+                delegate?.ToAndFormSelectViewControllerSelectAdr(dict: dict,idx:idx!)
+                self.navigationController?.popViewController(animated: true)
+            }
+        }
     }
     //MARK: - 高德地图delegate
     var introView:UIView?
@@ -173,6 +206,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     var contentLbl:UILabel?
     var adrArr:Array<AMapPOI> = []
     var keyword = ""
+    var locName = ""
     func onPOISearchDone(_ request: AMapPOISearchBaseRequest!, response: AMapPOISearchResponse!) {
         
         if response.count == 0 {
@@ -208,8 +242,8 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             introView?.addSubview(contentLbl!)
         }
         titleLbl!.text = response.pois.first?.name
-        
-        
+        cityName = response.pois.first?.city as! NSString
+        locName = response.pois.first?.name as! String
         
         //通过富文本来设置行间距
         let paraph = NSMutableParagraphStyle()
@@ -344,7 +378,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         
     }
     func searchBarSearchButtonClicked(_ searchBar: UISearchBar) {
-       
+        
         keyword = searchBar.text!
         print("点击搜索进行--")
         if searchBar.text!.count == 0 {

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

@@ -7,9 +7,12 @@
 //
 
 import UIKit
-
+protocol WayBillAddressCanDelItemCellDelegate {
+    func WayBillAddressCanDelItemCellDelAc(idx:Int)
+}
 class WayBillAddressCanDelItemCell: UITableViewCell {
-
+    @IBOutlet weak var delBtnTop: NSLayoutConstraint!
+    var delegate:WayBillAddressCanDelItemCellDelegate?
     @IBOutlet weak var topH: NSLayoutConstraint!
     @IBOutlet weak var nodataLbl: UILabel!
     @IBOutlet weak var delBtn: UIButton!
@@ -26,6 +29,9 @@ class WayBillAddressCanDelItemCell: UITableViewCell {
         self.selectionStyle = .none
         
     }
+    @IBAction func delAction(_ sender: Any) {
+        delegate?.WayBillAddressCanDelItemCellDelAc(idx: self.tag)
+    }
     open override func layoutSubviews() {
         super.layoutSubviews()
         self.contentView.setNeedsLayout()

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressCanDelItemCell.xib

@@ -96,6 +96,9 @@
                                 <real key="value" value="3"/>
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
+                        <connections>
+                            <action selector="delAction:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="0Z7-GB-Z7c"/>
+                        </connections>
                     </button>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="请选择或填写发货信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xQh-lb-yiJ">
                         <rect key="frame" x="46" y="6.5" width="133" height="16"/>
@@ -135,6 +138,7 @@
                 <outlet property="addressDetailLbl" destination="JfY-Q9-10Q" id="Xi4-mV-0hL"/>
                 <outlet property="addressLbl" destination="wxD-2W-Kct" id="OPZ-UV-8Wi"/>
                 <outlet property="delBtn" destination="gIq-zy-KC4" id="2h5-bf-ftd"/>
+                <outlet property="delBtnTop" destination="WFS-QX-fNC" id="qLd-qa-ekh"/>
                 <outlet property="iconH" destination="PTZ-fe-NB0" id="UMp-8r-8hy"/>
                 <outlet property="iconLbl" destination="JJG-L3-lyj" id="ZQ1-MD-9C6"/>
                 <outlet property="iconW" destination="Bp5-x3-dmY" id="blT-9t-em8"/>