修复titleandLblCell连线bug

GeliBusinessPlatform/Assets.xcassets/货拉拉/redLoc.imageset/Contents.json

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

GeliBusinessPlatform/Assets.xcassets/货拉拉/矩形.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/Interface/Interface_Z.plist

@@ -240,7 +240,7 @@
 	<string>Lalamove/citySearch</string>
 	<key>货拉拉下单</key>
 	<string>Lalamove/submitOrder</string>
-	<key>选定地址收发货历史</key>
+	<key>选定地址添加收发货历史</key>
 	<string>Lalamove/setSearchLog</string>
 	<key>查看收发货历史</key>
 	<string>Lalamove/getSearchLogList</string>

GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift

@@ -766,6 +766,32 @@ class orderDetailItemAddrInfoArrDataModel: Mappable { //订单地址信息
     }
 }
 
+class poiDataModel: Mappable {
+    var district: String?
+    var location: citySearchDataPoiLocationModel?
+    var city_id: Int?
+    var city: String?
+    var address:String?
+    var wgs84_location: citySearchDataPoiLocationModel?
+    var name: String?
+    
+    required init?(map: Map) {
+        
+    }
+    
+    // Mappable
+    func mapping(map: Map) {
+        name    <- map["name"]
+        district     <- map["district"]
+        wgs84_location   <- map["wgs84_location"]
+        address  <- map["address"]
+        city     <- map["city"]
+        district   <- map["district"]
+        location  <- map["location"]
+    }
+}
+
+
 class orderDetailItemOrderPriceArrDataModel: Mappable { //订单计价明细数组
     
     var type : Int?//

GeliBusinessPlatform/View/Cell/TitleAndLblCell.xib

@@ -26,14 +26,14 @@
                         </constraints>
                     </view>
                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="delS" translatesAutoresizingMaskIntoConstraints="NO" id="pmc-vU-Uf4">
-                        <rect key="frame" x="318" y="71" width="0.0" height="15"/>
+                        <rect key="frame" x="318" y="70.5" width="0.0" height="15"/>
                         <constraints>
                             <constraint firstAttribute="width" id="HMa-Pi-Faw"/>
                             <constraint firstAttribute="height" constant="15" id="veV-Pg-H0Y"/>
                         </constraints>
                     </imageView>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zee-Po-sID">
-                        <rect key="frame" x="57" y="61.5" width="246" height="34.5"/>
+                        <rect key="frame" x="90" y="15" width="213" height="126"/>
                         <attributedString key="attributedText">
                             <fragment content="View.tishiLbl.text = &quot;&quot;View.tishiLbl.text = &quot;&quot;View.tishiLbl.text = &quot;&quot;">
                                 <attributes>
@@ -46,23 +46,28 @@
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yit-1Y-dYH">
-                        <rect key="frame" x="15" y="70.5" width="27" height="16"/>
+                        <rect key="frame" x="15" y="15" width="60" height="16"/>
+                        <constraints>
+                            <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="60" id="0Aj-nY-BpH"/>
+                        </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
                 </subviews>
                 <constraints>
+                    <constraint firstItem="pmc-vU-Uf4" firstAttribute="centerY" secondItem="zee-Po-sID" secondAttribute="centerY" id="0lk-di-OEG"/>
+                    <constraint firstItem="zee-Po-sID" firstAttribute="leading" secondItem="yit-1Y-dYH" secondAttribute="trailing" constant="15" id="7BH-7f-jsc"/>
+                    <constraint firstItem="yit-1Y-dYH" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="GFJ-Cd-oJ8"/>
                     <constraint firstAttribute="trailing" secondItem="FhC-zl-Pqx" secondAttribute="trailing" id="If6-Gs-gZd"/>
-                    <constraint firstItem="pmc-vU-Uf4" firstAttribute="leading" secondItem="zee-Po-sID" secondAttribute="trailing" constant="15" id="JnM-Iz-OpH"/>
                     <constraint firstAttribute="bottom" secondItem="FhC-zl-Pqx" secondAttribute="bottom" id="LYe-vI-oas"/>
-                    <constraint firstItem="yit-1Y-dYH" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="OJc-GC-Jrq"/>
+                    <constraint firstItem="yit-1Y-dYH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="PWu-Se-f3g"/>
                     <constraint firstAttribute="trailing" secondItem="pmc-vU-Uf4" secondAttribute="trailing" constant="15" id="Qok-R2-hO0"/>
-                    <constraint firstItem="pmc-vU-Uf4" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="VxE-7o-zqj"/>
+                    <constraint firstItem="zee-Po-sID" firstAttribute="top" secondItem="yit-1Y-dYH" secondAttribute="top" id="XtI-x2-NDG"/>
                     <constraint firstItem="yit-1Y-dYH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="YOe-m8-0fd"/>
-                    <constraint firstItem="zee-Po-sID" firstAttribute="centerY" secondItem="yit-1Y-dYH" secondAttribute="centerY" id="f9d-5w-jXw"/>
+                    <constraint firstItem="pmc-vU-Uf4" firstAttribute="leading" secondItem="zee-Po-sID" secondAttribute="trailing" constant="15" id="ioZ-OU-UDz"/>
                     <constraint firstItem="FhC-zl-Pqx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="jug-3M-ccD"/>
-                    <constraint firstItem="zee-Po-sID" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="yit-1Y-dYH" secondAttribute="trailing" constant="15" id="pbP-fH-zAa"/>
+                    <constraint firstItem="FhC-zl-Pqx" firstAttribute="top" secondItem="zee-Po-sID" secondAttribute="bottom" constant="15" id="lG2-t0-yF3"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
@@ -70,6 +75,7 @@
                 <outlet property="btmLine" destination="FhC-zl-Pqx" id="q0E-2a-h3I"/>
                 <outlet property="btmW" destination="HMa-Pi-Faw" id="htd-Lp-MF8"/>
                 <outlet property="contentLbl" destination="zee-Po-sID" id="GmM-kp-g5c"/>
+                <outlet property="contentRight" destination="ioZ-OU-UDz" id="Hsc-5Q-4ue"/>
                 <outlet property="imgRight" destination="Qok-R2-hO0" id="aeV-7Q-HFP"/>
                 <outlet property="nameLbl" destination="yit-1Y-dYH" id="S4K-8f-ncw"/>
             </connections>

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.swift

@@ -593,16 +593,16 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
         vc.rkSelectArr = rkSelectArr
         self.navigationController?.pushViewController(vc, animated: true)
     }
-    func getStrHeight(str:String) -> CGFloat{
-        let lbl = UILabel()
-        lbl.text = titleArr.last
-        lbl.font = UIFont.systemFont(ofSize: 13)
-        lbl.sizeToFit()
-        let margin = lbl.bounds.size.width + 77
-        let viewSize = CGSize(width:fullScreenWidth - margin , height: CGFloat(MAXFLOAT))
-        let font = UIFont.systemFont(ofSize: 13)
-        return (str as NSString).boundingRect(with: viewSize, options: [.usesLineFragmentOrigin], attributes: [NSAttributedString.Key.font:font], context: nil).height
-    }
+//    func getStrHeight(str:String) -> CGFloat{
+//        let lbl = UILabel()
+//        lbl.text = titleArr.last
+//        lbl.font = UIFont.systemFont(ofSize: 13)
+//        lbl.sizeToFit()
+//        let margin = lbl.bounds.size.width + 77
+//        let viewSize = CGSize(width:fullScreenWidth - margin , height: CGFloat(MAXFLOAT))
+//        let font = UIFont.systemFont(ofSize: 13)
+//        return (str as NSString).boundingRect(with: viewSize, options: [.usesLineFragmentOrigin], attributes: [NSAttributedString.Key.font:font], context: nil).height
+//    }
     //MARK: - cell delegate
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 0 {
@@ -612,9 +612,10 @@ class NewRKVc: BaseViewController ,UITableViewDelegate,UITableViewDataSource, Ne
                 }
             }
             if indexPath.row == 4 {
-                if getStrHeight(str: remark)+30 > 49 {
-                    return getStrHeight(str: remark)+30
-                }
+                return UITableView.automaticDimension
+//                if getStrHeight(str: remark)+30 > 49 {
+//                    return getStrHeight(str: remark)+30
+//                }
             }
             return 49
         }

GeliBusinessPlatform/ViewController/1.1入库&出库/入库/NewRKVc.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" 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"/>
@@ -74,7 +74,7 @@
                         <constraint firstItem="oHy-P4-Poe" firstAttribute="top" secondItem="DkD-m0-Phd" secondAttribute="bottom" id="z06-Y0-qev"/>
                     </constraints>
                 </view>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="XJ1-MD-tGD">
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="XJ1-MD-tGD">
                     <rect key="frame" x="0.0" y="44" width="414" height="769"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <connections>

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.swift

@@ -494,9 +494,10 @@ class XinCaiGouViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
             }
             if indexPath.row == 5 {
-                if getStrHeight(str: contentStr)+30 > 49 {
-                    return getStrHeight(str: contentStr)+30
-                }
+                return UITableView.automaticDimension
+//                if getStrHeight(str: contentStr)+30 > 49 {
+//                    return getStrHeight(str: contentStr)+30
+//                }
             }
         }
         return 49

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" 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"/>
@@ -54,7 +54,7 @@
                         <constraint firstAttribute="height" constant="1" id="fK5-AP-LGO"/>
                     </constraints>
                 </view>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="Cs6-iU-pYN">
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Cs6-iU-pYN">
                     <rect key="frame" x="0.0" y="44" width="414" height="768"/>
                     <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                     <connections>

GeliBusinessPlatform/ViewController/订单详情/TitleAndLblView.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
         <capability name="Named colors" 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" customClass="TitleAndLblView" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="TitleAndLblView" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="contentLbl" destination="3w0-Kw-4SZ" id="By3-e9-dBy"/>
                 <outlet property="nameLbl" destination="1sO-Ny-zDO" id="yti-qp-uz3"/>
@@ -64,7 +65,7 @@
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="蓝色字体颜色">
-            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
     </resources>
 </document>

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

@@ -14,6 +14,7 @@ import MAMapKit
 import AMapSearchKit
 import IQKeyboardManagerSwift
 
+
 protocol ToAndFormSelectViewControllerDelegate {
     func ToAndFormSelectViewControllerSelectAdr(dict:Dictionary<String,Any>,idx:Int)
 }
@@ -55,7 +56,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         if tableView == searchList {
             return searchAdrDatas.count
         }
-        return 5
+        return historyArr.count
     }
     var delegate:ToAndFormSelectViewControllerDelegate?
     var dict:Dictionary<String,Any> = Dictionary()
@@ -104,6 +105,17 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             cell.marginValue.constant = 0
             cell.btnViewH.constant = 0
             cell.btmH.constant = 12
+            
+            let data = historyArr[indexPath.row]
+            let dict = getDicFromJSONString(jsonString: data.poi!)
+            let poiData = poiDataModel(JSON: dict)
+            cell.nameLbl.text = poiData?.name
+            cell.contentLbl.text = (poiData?.city)! as String + (poiData?.district)! as String + (poiData?.address)! as String
+            if data.contact_name!.count > 0 || data.contact_phone_no!.count > 0 || data.house_number!.count > 0 {
+                let str = cell.contentLbl.text! + "\n" + data.contact_name! + data.contact_phone_no! + data.house_number!
+                cell.contentLbl.text = str
+            }
+          
         }
         
         return cell
@@ -273,9 +285,14 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     }
     var adrData:cityListDataModel?
     var cityName:NSString = ""
+    
+    
+    var city = ""
+    var ad = ""
+    var districet = ""
+    
     @IBAction func sureSelectAddressAction(_ sender: LGButton) {
         print("sureSelectAddressAction")
-        
         if adrDatas!.count > 0 {
             for item in adrDatas! {
                 if cityName.contains(item.name!) {
@@ -289,10 +306,48 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             dict["adr"] = adrData
             if locName.count > 0  {
                 dict["locName"] = titleLbl!.text
-                delegate?.ToAndFormSelectViewControllerSelectAdr(dict: dict,idx:idx!)
-                self.navigationController?.popViewController(animated: true)
+                var sr_type = 1
+                if idx != 0 {
+                    sr_type = 2
+                }
+             
+                let ll = ["lat":adrData?.lat_lon!.lat as Any,
+                          "lon":adrData?.lat_lon?.lon as Any]
+                let lldata = dictChangeString(sender: ll)
+                
+                if adrName.count > 0 {
+                    moveAdrName = adrName
+                }
+                
+                let poiData = [
+                    "city":city as Any,
+                    "address":ad as Any,
+                    "district":districet as Any,
+                    "city_id":adrData?.city_id as Any,
+                    "location":lldata as Any,
+                    "wgs84_location":lldata as Any,
+                    "name":moveAdrName as Any
+                ]
+                let poiStr = dictChangeString(sender: poiData)
+                let dic = ["user_token":UserToken as Any,
+                           "poi":poiStr as Any,
+                           "house_number":addressDetailTF.text as Any,
+                           "contact_name":nameTF.text as Any,
+                           "contact_phone_no": phoneTF.text as Any,
+                           "sr_type":sr_type as Any
+                ]
+                print("dic == ",dict)
+                setSearchLog(dic, success: { (data) in
+                    self.delegate?.ToAndFormSelectViewControllerSelectAdr(dict: self.dict,idx:self.idx!)
+                    self.navigationController?.popViewController(animated: true)
+                }) { (err) in
+
+                }
+                
             }
         }
+        
+        
     }
     //MARK: - 高德地图delegate
     var introView:UIView?
@@ -303,6 +358,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
     var locName = ""
     var adrName:String = ""
     var detailAdr:String = ""
+    var moveAdrName = ""
     var isMove = false
     func onPOISearchDone(_ request: AMapPOISearchBaseRequest!, response: AMapPOISearchResponse!) {
         
@@ -349,12 +405,19 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         
         var str = "\(String(describing: response.pois.first!.province!))\(String(describing: response.pois.first!.city!))\(String(describing: response.pois.first!.district!))\( String(describing: response.pois.first!.address!))"
         
+        city = response.pois.first!.city
+        ad = response.pois.first?.address as! String
+        districet = response.pois.first?.district as! String
+        
+        moveAdrName = response.pois.first?.name as! String
+        
         if adrName.count > 0 {
             
             isMove = true
             titleLbl!.text = adrName
             str = detailAdr
         }
+        
         let attributes = [NSAttributedString.Key.font:UIFont.systemFont(ofSize: 11),
                           NSAttributedString.Key.paragraphStyle: paraph]
         contentLbl!.attributedText = NSAttributedString(string: str, attributes: attributes)
@@ -404,6 +467,15 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             make.height.equalTo(h+20)
         })
         
+        let img = UIImageView()
+        img.image = UIImage(named: "矩形")
+        MapBgView.addSubview(img)
+        img.snp.makeConstraints { (make) in
+            make.centerX.equalTo(introView!.snp.centerX)
+            make.top.equalTo(introView!.snp.bottom)
+            make.height.equalTo(7.25)
+            make.width.equalTo(13.68)
+        }
     }
     
     func getStrHeight(str:String,fontSize:CGFloat) -> CGFloat{
@@ -430,7 +502,7 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
             adrName = ""
             detailAdr = ""
         }
-  
+        
         req.location = AMapGeoPoint.location(withLatitude: CGFloat(mapView.centerCoordinate.latitude), longitude: CGFloat(mapView.centerCoordinate.longitude))
         req.requireExtension = true
         search.aMapPOIAroundSearch(req)
@@ -466,7 +538,11 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
                 annotationView = MAAnnotationView(annotation: annotation, reuseIdentifier: pointReuseIndetifier)
             }
             
-            annotationView!.image = UIImage(named: "dingzhen")
+            if idx != 0{
+                annotationView!.image = UIImage(named: "redLoc")
+            }else{
+                annotationView!.image = UIImage(named: "dingzhen")
+            }
             //设置中心点偏移，使得标注底部中间点成为经纬度对应点
             annotationView!.centerOffset = CGPoint(x: 0, y: -15);
             
@@ -531,11 +607,27 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         }
     }
     
+    var historyArr:Array<getSearchLogListDataModel> = []
     func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
         print("调起搜索后添加个蒙版本")
         closeBtn.isHidden = false
         listViewBG.isHidden = false
         
+        var type = 1
+        if idx != 0 {
+            type = 2
+        }
+        historyArr.removeAll()
+        getSearchLogList(["user_token":UserToken as Any,"sr_type":type as Any], success: { (data) in
+            let model = data as! getSearchLogListModel
+            for item in model.data! {
+                self.historyArr.append(item)
+            }
+            self.selectListV.reloadData()
+        }) { (err) in
+            
+        }
+        
         return true
     }