// 预约

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

@@ -10,9 +10,11 @@ import UIKit
 
 class YHCertificateAppointViewController: YHBaseViewController {
 
+    var orderId: Int = 0
+    
     var items = ["", "", ""]
     let viewModel = YHCerAppointViewModel()
-    
+    var isNeedGoHK: Int = 3 // 0不需要 1需要赴港  2没有选择
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
         tableView.estimatedSectionHeaderHeight = 16.0
@@ -49,6 +51,12 @@ class YHCertificateAppointViewController: YHBaseViewController {
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
         }
     }
+    
+    func requetIsGoToHK() {
+        viewModel.getIsNeedGoToHK(orderId: orderId) { needGoHK in
+            
+        }
+    }
 }
 
 extension YHCertificateAppointViewController: UITableViewDelegate, UITableViewDataSource {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift

@@ -154,6 +154,7 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
                 guard let self = self else { return }
                 if success {
                     YHHUD.flash(message: "提交成功")
+                    self.navigationController?.popViewController()
                     return
                 }
                 
@@ -181,6 +182,7 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
     }
     
     override func backItemClick(_ sender: Any) {
+        self.view.endEditing(true)
         if self.isInfoEditing {
             showRetainAlertView()
             return
@@ -190,6 +192,7 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
     
     // 是否可以返回，包括点击返回和手势返回，默认YES
     override func navigationShouldPop() -> Bool {
+        self.view.endEditing(true)
         if self.isInfoEditing {
             showRetainAlertView()
             return false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHIFamilyInfoListCell.swift

@@ -80,7 +80,7 @@ class YHFamilyInfoItem {
         // 必填
         // value 为空的情况
         if self.id == .mainApplicantName {
-            return "请输入主申请人姓名"
+            return "请输入主申人姓名"
         }
             
         if self.id == .spouseName {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHInfoItemView.swift

@@ -397,7 +397,7 @@ extension YHInfoItemView: UITextFieldDelegate {
     
     func getPlaceHolder() -> String {
         if self.item.id == .mainApplicantName {
-            return "请输入主申请人姓名"
+            return "请输入主申人姓名"
         }
         
         if self.item.id == .spouseName {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift

@@ -169,7 +169,7 @@ extension YHFamilyInfoConfirmViewModel {
         
         if model.info.relation == YHFamilyMemberRelationType.mainApplicant.rawValue {
             id = .mainApplicantName
-            nameTitle = "主申请人姓名"
+            nameTitle = "主申人姓名"
             previousNameTitle = "原主申人姓名"
             
         } else if model.info.relation == YHFamilyMemberRelationType.spouse.rawValue {