// 家庭信息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -658,6 +658,7 @@
 				04C8F4802B720DAB00ADF59B /* Spouse(配偶) */,
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberInfoVC.swift */,
 				042FBBBA2B62806D00F9DE23 /* YHCertificateInfoController.swift */,
+				0413A6D72B8C76290006D154 /* YHCertificateUploadVC.swift */,
 				042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */,
 				042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */,
 			);
@@ -840,7 +841,6 @@
 			children = (
 				04E86E0E2B70DE9400A35F4B /* YHSpouseInfoContainerVC.swift */,
 				041B52D52B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift */,
-				0413A6D72B8C76290006D154 /* YHCertificateUploadVC.swift */,
 				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
 			);
 			path = "Spouse(配偶)";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -528,8 +528,22 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
 
 extension YHChildBasicInfoVC {
     
+    
     func nextStep()->Bool {
+//        let isChecked = checkIntegrity()
+//        isNeedShowError = !isChecked
+//        
+//        self.tableView .reloadData()
+//        
+//        if !isChecked {
+//            YHHUD.flash(message: "资料还未填完")
+//            return false
+//        }
         return true
     }
+    
+    func loadInfo() {
+        self.tableView.reloadData()
+    }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildInfoContainerVC.swift

@@ -23,6 +23,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     var child:YHFamilyMember? {
         didSet {
             primaryInfoVC.child = child
+            uploadVC.familyMember = child
             certificateVC.familyMember = child
             basicInfoVC.child = child
         }
@@ -37,6 +38,12 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             }
             for vcItem in stepVCs {
                 vcItem.vc.view.isHidden = (vcItem.step != currentStep)
+                if vcItem.step == currentStep {
+                    // 刷新
+                    if vcItem.vc.responds(to: #selector(YHFamilyMemberProtol.loadInfo)) {
+                        vcItem.vc.loadInfo()
+                    }
+                }
             }
         }
     }
@@ -71,7 +78,7 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         updateStepView()
         print("step:\(child.step)")
         currentStep = child.step
-        
+
         view.addSubview(stepView)
         view.addSubview(bottomView)
         
@@ -131,7 +138,10 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             titles.append(vcItem.title)
         }
         stepView.dataSource = titles
-        
+        let step = currentStep
+        currentStep = step
+        stepView.maxIndex = child.step
+
         stepView.block = {
             [weak self] index in
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -457,6 +457,15 @@ extension YHChildPrimaryInfoVC {
     }
     
     func nextStep()->Bool {
+//        let isChecked = checkIntegrity()
+//        isNeedShowError = !isChecked
+//        
+//        self.tableView .reloadData()
+//        
+//        if !isChecked {
+//            YHHUD.flash(message: "资料还未填完")
+//            return false
+//        }
         return true
     }
     
@@ -465,6 +474,10 @@ extension YHChildPrimaryInfoVC {
             delegate.saveInfoSilent()
         }
     }
+    
+    func loadInfo() {
+        self.tableView.reloadData()
+    }
 }
 
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -61,7 +61,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         super.viewDidLoad()
         gk_navTitle = "配偶基本信息填写".local
         createUI()
-        loadBasicInfo()
+        loadInfo()
     }
     
     func createUI() {
@@ -77,7 +77,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         }
     }
     
-    func loadBasicInfo() {
+    func loadInfo() {
         
         guard let spouse = spouse else { return }
         
@@ -349,7 +349,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 guard let self = self else { return }
                 let newDegree = YHHasDegreeJson()
                 self.spouse?.hasDegreeJson.append(newDegree)
-                self.loadBasicInfo()
+                self.loadInfo()
             }
             return cell
         }
@@ -394,7 +394,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     }
                     
                     if isEditEnd {
-                        self.loadBasicInfo()
+                        self.loadInfo()
                         if detailItem.type == .hkIdentityCardNumber {
                             if let text = text, !text.isHKIdentityCardNumber() {
                                 YHHUD.flash(message: "请输入正确的香港身份证号格式")
@@ -439,7 +439,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                         guard let self = self else { return }
                          let selectItem = answers[index]
                         self.spouse?.setBirthOverSeas(selectItem.title == "国外".local)
-                        self.loadBasicInfo()
+                        self.loadInfo()
                     }
                 } else if detailItem.type == .isHaveHkIdentityCard || detailItem.type == .isNowInHK { // 是否办理过香港身份证 是否在岗
                     var select = false
@@ -458,7 +458,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                         } else if detailItem.type == .isHaveHkIdentityCard {
                             self.spouse?.setHaveHKIdentityCard(selectItem.title == "是".local)
                         }
-                        self.loadBasicInfo()
+                        self.loadInfo()
                     }
                 }
                 
@@ -501,21 +501,21 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                             YHFormPickerView.show(type: .degree) { [weak self] selectType in
                                 guard let self = self else { return }
                                 degreeInfo.degree = String(selectType.index)
-                                self.loadBasicInfo()
+                                self.loadInfo()
                             }
                         }
                         cell.areaClickBlock = {
                             YHFormPickerView.show(type: .degreeLocation) { [weak self] selectType in
                                 guard let self = self else { return }
                                 degreeInfo.address = String(selectType.index)
-                                self.loadBasicInfo()
+                                self.loadInfo()
                             }
                         }
                         cell.deleteBlock = {
                             [weak self] in
                             guard let self = self else { return }
                             self.spouse?.hasDegreeJson.remove(at: indexPath.row-2)
-                            self.loadBasicInfo()
+                            self.loadInfo()
                         }
                     }
                     
@@ -541,24 +541,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         
-        if indexPath.section >= items.count { return 0.0 }
-        let arr:[YHFormItemProtocol] = items[indexPath.section]
-        if indexPath.row >= arr.count {  return 0.0 }
-        
-        let item = arr[indexPath.row]
-        
-        if item is YHFormTitleItem { // 标题
-            return 52.0
-        }
-        
-        if item is YHFormAddItem {
-            return 70.0
-        }
-        
-        if item is YHFormDetailItem {
-            return UITableView.automaticDimension
-        }
-        return 52.0
+        return UITableView.automaticDimension
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
@@ -596,7 +579,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     } else if detailItem.type == .stayHKDate {
                         self.spouse?.childInHk.info =  date
                     }
-                    self.loadBasicInfo()
+                    self.loadInfo()
                 }
                 
             } else if detailItem.type == .birthCity { // 出生城市
@@ -614,7 +597,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                      guard let self = self else { return }
                      print("\(string1)\n\(string2)\n\(string3)\n\(string4)")
                      self.spouse?.birthPlace.area = [string2, string3, string4]
-                     self.loadBasicInfo()
+                     self.loadInfo()
                  }
                 self.present(vc, animated: true)
  
@@ -625,7 +608,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     [weak self] selectType in
                     guard let self = self else { return }
                     self.spouse?.hkIdentity = selectType.title
-                    self.loadBasicInfo()
+                    self.loadInfo()
                 }
             } else if detailItem.type == .occupation {
                 let occupation = self.spouse?.occupation ?? ""
@@ -633,7 +616,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     [weak self] selectType in
                     guard let self = self else { return }
                     self.spouse?.occupation = selectType.title
-                    self.loadBasicInfo()
+                    self.loadInfo()
                 }
                 
             } else if detailItem.type == .ownDegree {
@@ -643,7 +626,7 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     guard let self = self else { return }
                     let ownDegree = (selectType.index == YHFormPickerViewSubType.ownDegree(.hasDegree).index)
                     self.spouse?.setHaveDegree(ownDegree)
-                    self.loadBasicInfo()
+                    self.loadInfo()
                 }
                 
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -15,8 +15,9 @@ import UIKit
     @objc func saveInfoSilent()
 }
 
-@objc protocol YHFamilyMemberProtol {
+@objc protocol YHFamilyMemberProtol:NSObjectProtocol {
     @objc func nextStep()->Bool
+    @objc func loadInfo()
 }
 
 class YHFaimilyStepItem {
@@ -58,6 +59,12 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             }
             for vcItem in stepVCs {
                 vcItem.vc.view.isHidden = (vcItem.step != currentStep)
+                if vcItem.step == currentStep {
+                    // 刷新
+                    if vcItem.vc.responds(to: #selector(YHFamilyMemberProtol.loadInfo)) {
+                        vcItem.vc.loadInfo()
+                    }
+                }
             }
         }
     }
@@ -98,10 +105,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         print("step:\(spouse.step)")
         currentStep = spouse.step
         
-        let tap = UITapGestureRecognizer(target: self, action: #selector(tap))
-        tap.cancelsTouchesInView = false
-        self.view.addGestureRecognizer(tap)
-        
         bottomView.submitBlock = {
             [weak self] in
             guard let self = self else { return }
@@ -159,6 +162,10 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         }
         
         stepView.dataSource = titles
+        stepView.maxIndex = spouse.step
+        // 数据源可能会变，所以需要重新设置step
+        let step = currentStep
+        currentStep = step
         
         stepView.block = {
             [weak self] index in
@@ -169,8 +176,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             }
             print("index:\(index)")
         }
-        let step = currentStep
-        currentStep = step
+        
         self.view.bringSubviewToFront(stepView)
         self.view.bringSubviewToFront(bottomView)
 
@@ -267,10 +273,3 @@ extension YHSpouseInfoContainerVC {
         return nil
     }
 }
-
-extension YHSpouseInfoContainerVC: UIGestureRecognizerDelegate {
-    
-    @objc func tap() {
-        print("点击了parentViewController: YHSpouseInfoContainerVC")
-    }
-}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -44,10 +44,10 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         super.viewDidLoad()
         gk_navTitle = "配偶信息填写".local
         createUI()
-        loadSponseInfo()
+        loadInfo()
     }
     
-    func loadSponseInfo() {
+    func loadInfo() {
                         
         guard let spouse = spouse else { return }
         
@@ -187,14 +187,14 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     if detailItem.type == .isAccompanyToHK { // 是否随行
                         
                         self.spouse?.setFollow(option)
-                        self.loadSponseInfo()
+                        self.loadInfo()
                         if let delegate = delegate, delegate.responds(to: #selector(YHSpouseInfoVCProtocol.updateStepView)) {
                             delegate.updateStepView()
                         }
                         
                     } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
                         self.spouse?.setNeedHandleHKPassPort(option)
-                        self.loadSponseInfo()
+                        self.loadInfo()
                         
                     } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
                         self.spouse?.setLiveTother(option)
@@ -203,11 +203,11 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                             self.spouse?.address.details = ""
                             self.spouse?.address.area = []
                         }
-                        self.loadSponseInfo()
+                        self.loadInfo()
                         
                     } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
                         self.spouse?.setOverSearsOver1Year(option)
-                        self.loadSponseInfo()
+                        self.loadInfo()
                     }
                     save()
                 }
@@ -240,7 +240,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     guard let self = self else { return }
                     self.spouse?.address.details = text ?? ""
                     if isEditEnd {
-                        self.loadSponseInfo()
+                        self.loadInfo()
                         save()
                     }
                 }
@@ -308,7 +308,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                         self.spouse?.address.country = country
 
                     }
-                    self.loadSponseInfo()
+                    self.loadInfo()
                     save()
                 }
                 self.navigationController?.pushViewController(vc)
@@ -321,7 +321,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                      guard let self = self else { return }
                      print("\(string1)\n\(string2)\n\(string3)\n\(string4)")
                      self.spouse?.address.area = [string2, string3, string4]
-                     self.loadSponseInfo()
+                     self.loadInfo()
                      save()
                  }
                 self.present(vc, animated: true)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHCertificateInfoController.swift

@@ -355,6 +355,10 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
         }
     }
     
+    func loadInfo() {
+        self.tableView.reloadData()
+    }
+    
     func nextStep()->Bool {
         return true
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHCertificateUploadVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHCertificateUploadVC.swift

@@ -26,6 +26,10 @@ class YHCertificateUploadVC: YHBaseViewController, YHFamilyMemberProtol {
         createUI()
     }
     
+    func loadInfo() {
+        self.tableView.reloadData()
+    }
+    
     func nextStep()->Bool {
         return true
     }