补充未定位方案

GeliBusinessPlatform/View/AlertView/GLMessageAlertView.swift

@@ -15,6 +15,8 @@ class GLMessageAlertView: UIView {
     var contentView:UIView!
     var delegate:GLMessageAlertViewDelegate?
     
+    @IBOutlet weak var topLbl: UILabel!
+    @IBOutlet weak var tbvH: NSLayoutConstraint!
     @IBAction func submitAction(_ sender: Any) {
         delegate?.GLMessageAlertViewCloseAction()
     }
@@ -26,6 +28,10 @@ class GLMessageAlertView: UIView {
         delegate?.GLMessageAlertViewCloseAction()
     }
     
+    func setUI(){
+        topLbl?.layer.cornerRadius = 5
+        topLbl?.layer.maskedCorners = [CACornerMask.layerMinXMinYCorner,CACornerMask.layerMaxXMinYCorner]
+    }
    
     
     //初始化时将xib中的view添加进来

GeliBusinessPlatform/View/AlertView/GLMessageAlertView.xib

@@ -12,6 +12,8 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="GLMessageAlertView" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="btnLbl" destination="J4M-4x-wWQ" id="L5R-bG-Rv3"/>
+                <outlet property="tbvH" destination="U4Q-y5-xZl" id="6Vr-wO-x5I"/>
+                <outlet property="topLbl" destination="YlV-1D-5EA" id="DMs-28-oOi"/>
             </connections>
         </placeholder>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
@@ -53,19 +55,53 @@
                     <color key="textColor" name="白色背景色"/>
                     <nil key="highlightedColor"/>
                 </label>
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="wCN-zG-K2b">
+                    <rect key="frame" x="0.0" y="663" width="414" height="150"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="150" id="U4Q-y5-xZl"/>
+                    </constraints>
+                    <color key="sectionIndexBackgroundColor" name="白色背景色"/>
+                </tableView>
+                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="标题" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="YlV-1D-5EA">
+                    <rect key="frame" x="0.0" y="612" width="414" height="50"/>
+                    <color key="backgroundColor" name="白色背景色"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="50" id="hZ8-Le-5mO"/>
+                    </constraints>
+                    <fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
+                    <color key="textColor" name="标题字颜色"/>
+                    <nil key="highlightedColor"/>
+                </label>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="X4c-4d-3n7">
+                    <rect key="frame" x="0.0" y="662" width="414" height="1"/>
+                    <color key="backgroundColor" name="灰色分界线"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="1" id="4pK-fB-4Xo"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
                 <constraint firstAttribute="trailing" secondItem="6IR-Z3-KFf" secondAttribute="trailing" id="1St-sF-4tf"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="bottom" secondItem="J4M-4x-wWQ" secondAttribute="bottom" id="9Ct-Qj-noH"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="wCN-zG-K2b" secondAttribute="trailing" id="9G3-wJ-MaJ"/>
                 <constraint firstItem="6IR-Z3-KFf" firstAttribute="top" secondItem="iN0-l3-epB" secondAttribute="top" id="Bje-CU-4R6"/>
+                <constraint firstItem="YlV-1D-5EA" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="HMG-LD-AQX"/>
                 <constraint firstAttribute="bottom" secondItem="2v6-Uq-44p" secondAttribute="bottom" id="JqB-jb-6JL"/>
                 <constraint firstItem="J4M-4x-wWQ" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="LoT-OL-eaf"/>
                 <constraint firstItem="2v6-Uq-44p" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="Pff-UQ-MdA"/>
                 <constraint firstAttribute="trailing" secondItem="2v6-Uq-44p" secondAttribute="trailing" id="SIE-fO-goD"/>
+                <constraint firstItem="wCN-zG-K2b" firstAttribute="top" secondItem="X4c-4d-3n7" secondAttribute="bottom" id="X75-9M-QrW"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="YlV-1D-5EA" secondAttribute="trailing" id="Zuh-rI-LsE"/>
+                <constraint firstItem="wCN-zG-K2b" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="c3w-DN-LGk"/>
                 <constraint firstAttribute="bottom" secondItem="6IR-Z3-KFf" secondAttribute="bottom" id="lc5-5I-4Nm"/>
+                <constraint firstItem="X4c-4d-3n7" firstAttribute="leading" secondItem="vUN-kp-3ea" secondAttribute="leading" id="npv-6K-SsU"/>
+                <constraint firstItem="2v6-Uq-44p" firstAttribute="top" secondItem="wCN-zG-K2b" secondAttribute="bottom" id="qDN-Zq-9gP"/>
+                <constraint firstItem="X4c-4d-3n7" firstAttribute="top" secondItem="YlV-1D-5EA" secondAttribute="bottom" id="r4y-M2-J2b"/>
                 <constraint firstItem="6IR-Z3-KFf" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" id="ty5-uJ-slj"/>
                 <constraint firstItem="2v6-Uq-44p" firstAttribute="top" secondItem="J4M-4x-wWQ" secondAttribute="top" id="vII-n5-kU6"/>
+                <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="X4c-4d-3n7" secondAttribute="trailing" id="z1l-Yb-MlE"/>
                 <constraint firstItem="vUN-kp-3ea" firstAttribute="trailing" secondItem="J4M-4x-wWQ" secondAttribute="trailing" id="zmi-XG-FAL"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
@@ -82,6 +118,9 @@
         <namedColor name="标题字颜色">
             <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="灰色分界线">
+            <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

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

@@ -854,7 +854,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
                 }
                 let vc = CityListViewController()
                 vc.adrDatas = self.adrDatas
-                vc.locatStr = self.selectLoc
+                vc.locatStr = "未定位"
+                if self.selectLoc.count != 0 || self.selectLoc != nil {
+                    vc.locatStr = self.selectLoc
+                }
                 vc.delegate = self
                 self.navigationController?.pushViewController(vc, animated: true)
                 HUD.hide()
@@ -864,7 +867,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
         }else{
             let vc = CityListViewController()
             vc.adrDatas = adrDatas
-            vc.locatStr = self.selectLoc
+               vc.locatStr = "未定位"
+                if self.selectLoc.count != 0 || self.selectLoc != nil {
+                    vc.locatStr = self.selectLoc
+                }
             vc.delegate = self
             self.navigationController?.pushViewController(vc, animated: true)
         }

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

@@ -99,7 +99,10 @@ class ToAndFormSelectViewController: BaseViewController, MAMapViewDelegate, CLLo
         
         let vc = CityListViewController()
         vc.adrDatas = adrDatasArr!
-        vc.locatStr = cityName as String
+        vc.locatStr = "未定位"
+        if cityName.length != 0 || cityName != nil{
+            vc.locatStr = cityName as String
+        }
         vc.delegate = self
         self.navigationController?.pushViewController(vc, animated: true)