按私服大收到发苏打粉

GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift

@@ -284,7 +284,6 @@ class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManag
             annotationView!.centerOffset = CGPoint(x: 0, y: -15);
             return annotationView!
         }
-        
         return nil
     }
   

GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Adr_VC.swift

@@ -84,7 +84,7 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate,UITextViewDel
         let vc = SJMapViewController()
         vc.delegate = self
         vc.isPPH = true
-        if city_lbl.text != "请选择城市" {
+        if city_lbl.text != "请选择定位" {
             vc.alreadySelect = true
             vc.lat = lat
             vc.lng = lng
@@ -133,14 +133,14 @@ class P_P_H_Adr_VC: BaseViewController,SJMapViewControllerDelegate,UITextViewDel
  
     @IBOutlet weak var holder_lbl: UILabel!
     func checkInfo(){
-        if adrTv.text?.count != 0 && phoneTf.text?.count != 0 && nameTf.text?.count != 0 && city_lbl.text != "请选择城市" {
+        if adrTv.text?.count != 0 && phoneTf.text?.count != 0 && nameTf.text?.count != 0 && city_lbl.text != "请选择定位" {
             submit_btn.isUserInteractionEnabled = true
             submit_btn.alpha = 1
         }else{
             submit_btn.isUserInteractionEnabled = false
             submit_btn.alpha = 0.5
         }
-        if adrTv.text?.count != 0 || phoneTf.text?.count != 0 || nameTf.text?.count != 0 || textTV.text.count != 0 || city_lbl.text != "请选择城市" {
+        if adrTv.text?.count != 0 || phoneTf.text?.count != 0 || nameTf.text?.count != 0 || textTV.text.count != 0 || city_lbl.text != "请选择定位" {
             clearBtn.isUserInteractionEnabled = true
             clearBtn.alpha = 1
         }else{