// 赴港

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHMakeCertificatePlaceModel.swift

@@ -11,7 +11,7 @@ import SmartCodable
 
 class YHMakeCertificatePlaceModel: SmartCodable {
     
-    var id: Int = 0
+    var id: Int = -1
     var name: String = ""
     
     // 自定义
@@ -20,5 +20,9 @@ class YHMakeCertificatePlaceModel: SmartCodable {
     required init() {
         
     }
+    
+    func isEmpty() -> Bool {
+        return id == -1 && name.isEmpty
+    }
 
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantGroupCell.swift

@@ -211,6 +211,7 @@ class YHSelectApplicantGroupCell: UITableViewCell {
             if let arr = dataModel?.placeList, arr.count > 0 {
                 let listView =  YHSelectHKPlaceListView.listView()
                 listView.listArr = arr
+                listView.selectModel = dataModel?.model?.hkPlace
                 listView.selectBlock = {
                     [weak self] selectPlace in
                     guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectHKPlaceListView.swift

@@ -15,11 +15,29 @@ class YHSelectHKPlaceListView: UIView {
         return view
     }
     
-    var selectModel: YHMakeCertificatePlaceModel? = nil
+    var selectModel: YHMakeCertificatePlaceModel? = nil {
+        
+        didSet {
+            if let selectItem = selectModel {
+                for item in listArr {
+                    item.isSelect =  (selectItem.id == item.id && selectItem.name == item.name)
+                }
+            } else {
+                for item in listArr {
+                    item.isSelect =  false
+                }
+            }
+            self.tableView.reloadData()
+        }
+        
+    }
     var selectBlock: ((YHMakeCertificatePlaceModel)->())?
     
     var listArr:[YHMakeCertificatePlaceModel] = [] {
         didSet {
+            for item in listArr {
+                item.isSelect = false
+            }
             self.tableView.reloadData()
         }
     }
@@ -98,10 +116,12 @@ class YHSelectHKPlaceListView: UIView {
     }
     
     @objc func sure() {
-        if let model = self.selectModel {
+        if let model = self.selectModel, !model.isEmpty() {
             selectBlock?(model)
+            self.dismiss()
+            return
         }
-        self.dismiss()
+        YHHUD.flash(message: "请选择港府办证地点")
     }
     
     override init(frame: CGRect) {
@@ -197,9 +217,6 @@ extension YHSelectHKPlaceListView: UITableViewDelegate, UITableViewDataSource {
         if 0 <= indexPath.row && indexPath.row < listArr.count {
             let model = listArr[indexPath.row]
             selectModel = model
-            for item in listArr {
-                item.isSelect =  (model.id == item.id)
-            }
             self.tableView.reloadData()
         }
     }