// 子女信息

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -16,7 +16,7 @@
 		041B52932B5E6CBA007EBCEB /* YHFormItemTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52922B5E6CBA007EBCEB /* YHFormItemTitleCell.swift */; };
 		041B52952B5E7037007EBCEB /* YHFormItemAddCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52942B5E7037007EBCEB /* YHFormItemAddCell.swift */; };
 		041B52982B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */; };
-		041B52D62B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */; };
+		041B52D62B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52D52B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift */; };
 		041B52DB2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */; };
 		041B52DD2B60A889007EBCEB /* YHTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041B52DC2B60A889007EBCEB /* YHTest.swift */; };
 		042FBBBB2B62806D00F9DE23 /* YHCertificateInfoController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBBA2B62806D00F9DE23 /* YHCertificateInfoController.swift */; };
@@ -25,12 +25,13 @@
 		042FBBC12B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */; };
 		042FBBC32B63DA4C00F9DE23 /* YHParentInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */; };
 		042FBBC52B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC42B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift */; };
-		042FBBC72B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */; };
+		042FBBC72B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC62B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift */; };
 		042FBBC92B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */; };
 		042FBBCB2B65058000F9DE23 /* YHChildBasicInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */; };
 		042FBBD42B67A2FE00F9DE23 /* YHFormPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */; };
 		042FBBD62B67BDD500F9DE23 /* YHBrotherInfoVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */; };
 		043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955202B70955200955D49 /* YHFormPickerViewType.swift */; };
+		043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -236,7 +237,7 @@
 		041B52922B5E6CBA007EBCEB /* YHFormItemTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemTitleCell.swift; sourceTree = "<group>"; };
 		041B52942B5E7037007EBCEB /* YHFormItemAddCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemAddCell.swift; sourceTree = "<group>"; };
 		041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyMemberFormVC.swift; sourceTree = "<group>"; };
-		041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpouseInitialInfoVC.swift; sourceTree = "<group>"; };
+		041B52D52B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSpousePrimaryInfoVC.swift; sourceTree = "<group>"; };
 		041B52DA2B5FDF8E007EBCEB /* YHFamilyInitialInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyInitialInfo.swift; sourceTree = "<group>"; };
 		041B52DC2B60A889007EBCEB /* YHTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTest.swift; sourceTree = "<group>"; };
 		042FBBBA2B62806D00F9DE23 /* YHCertificateInfoController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoController.swift; sourceTree = "<group>"; };
@@ -245,12 +246,13 @@
 		042FBBC02B63B21700F9DE23 /* YHFormItemDegreeInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemDegreeInfoCell.swift; sourceTree = "<group>"; };
 		042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHParentInfoVC.swift; sourceTree = "<group>"; };
 		042FBBC42B64AE3D00F9DE23 /* YHFormItemOnlyDoubleChoiceCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemOnlyDoubleChoiceCell.swift; sourceTree = "<group>"; };
-		042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildInitialInfoVC.swift; sourceTree = "<group>"; };
+		042FBBC62B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildPrimaryInfoVC.swift; sourceTree = "<group>"; };
 		042FBBC82B64DC8900F9DE23 /* YHFormItemExpireDateCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemExpireDateCell.swift; sourceTree = "<group>"; };
 		042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildBasicInfoVC.swift; sourceTree = "<group>"; };
 		042FBBD32B67A2F900F9DE23 /* YHFormPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerView.swift; sourceTree = "<group>"; };
 		042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBrotherInfoVC.swift; sourceTree = "<group>"; };
 		043955202B70955200955D49 /* YHFormPickerViewType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormPickerViewType.swift; sourceTree = "<group>"; };
+		043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildInfoContainerVC.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -500,11 +502,12 @@
 			children = (
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberFormVC.swift */,
 				04D765722B6A173C0055ECBB /* YHSpouseInfoContainerVC.swift */,
-				041B52D52B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift */,
+				041B52D52B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift */,
 				042FBBBA2B62806D00F9DE23 /* YHCertificateInfoController.swift */,
 				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
 				042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */,
-				042FBBC62B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift */,
+				043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */,
+				042FBBC62B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift */,
 				042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */,
 				042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */,
 			);
@@ -1477,7 +1480,7 @@
 				0468D4472B624AF000CFB916 /* YHBottomNextView.swift in Sources */,
 				A5ACE94C2B4564F7002C94D2 /* YHHUDErrorView.swift in Sources */,
 				04A7BC8F2B6B2BC2000E8D47 /* YHFamilyRequestViewModel.swift in Sources */,
-				041B52D62B5F899E007EBCEB /* YHSpouseInitialInfoVC.swift in Sources */,
+				041B52D62B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift in Sources */,
 				A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */,
 				A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
@@ -1504,6 +1507,7 @@
 				0468D44B2B625AAB00CFB916 /* YHItemModel.swift in Sources */,
 				041B52872B5657B3007EBCEB /* IMAppKey.swift in Sources */,
 				043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */,
+				043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */,
 				0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
 				A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
 				042FBBBD2B63519C00F9DE23 /* YHFormItemSelectSheetCell.swift in Sources */,
@@ -1522,7 +1526,7 @@
 				049A48A82B49417300D0C641 /* YHAboutUsViewController.swift in Sources */,
 				A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */,
 				042FBBBB2B62806D00F9DE23 /* YHCertificateInfoController.swift in Sources */,
-				042FBBC72B64CFBF00F9DE23 /* YHChildInitialInfoVC.swift in Sources */,
+				042FBBC72B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift in Sources */,
 				A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */,
 				04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,
 				0468D4792B68A08600CFB916 /* YHAddressViewController.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildBasicInfoVC.swift

@@ -11,8 +11,7 @@ import UIKit
 class YHChildBasicInfoVC: YHBaseViewController {
 
     var child:YHFamilyMember?
-    
-    var cardInfo: YHCNIdentityCard?
+    weak var delegate:YHSpouseInfoVCProtocol?
         
     var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
     
@@ -23,6 +22,8 @@ class YHChildBasicInfoVC: YHBaseViewController {
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
@@ -49,11 +50,13 @@ class YHChildBasicInfoVC: YHBaseViewController {
     func createUI() {
         
         view.addSubview(tableView);
+        let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
+        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalToSuperview().offset(-100)
+            make.top.equalToSuperview().offset(topHeight)
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview().offset(-16)
+            make.bottom.equalToSuperview().offset(-bottomHeight)
         }
     }
     
@@ -247,12 +250,19 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
         return 52.0
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
     
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         return UIView()
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 1.0
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
         return 14.0
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildInfoContainerVC.swift

+//
+//  YHChildInfoContainerVC.swift
+//  galaxy
+//
+//  Created by edy on 2024/2/5.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+//@objc protocol YHchildInfoVCProtocol {
+//    
+//    @objc optional func updateStepView()
+//    @objc optional func saveInfo()
+//}
+
+class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
+
+    let familyRequest:YHFamilyRequestViewModel = YHFamilyRequestViewModel()
+
+    var orderId:Int = 0
+
+    var child:YHFamilyMember? {
+        didSet {
+            initalInfoVC.child = child
+            certificateVC.familyMember = child
+            basicInfoVC.child = child
+        }
+    }
+    
+    var currentIndex = 0 {
+        didSet {
+            currentIndex %= self.children.count
+            stepView.currentIndex = currentIndex
+            for (i, vc) in self.children.enumerated() {
+                vc.view.isHidden = (currentIndex != i)
+                if currentIndex == i {
+                    
+                }
+            }
+        }
+    }
+    
+    var stepView:YHStepView = {
+        let step = YHStepView()
+        return step
+    }()
+    
+    var bottomView: YHSaveAndSubmitView = {
+        return YHSaveAndSubmitView.createView()
+    }()
+        
+    let initalInfoVC =  YHChildPrimaryInfoVC()
+    let uploadVC = UIViewController()
+    let certificateVC = YHCertificateInfoController()
+    let basicInfoVC = YHChildBasicInfoVC()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+    }
+    
+    func createUI() {
+        
+        guard child != nil else { return }
+        
+        initalInfoVC.delegate = self
+        certificateVC.delegate = self
+        basicInfoVC.delegate = self
+        
+        updateStepView()
+
+        currentIndex = 0
+        
+        view.addSubview(stepView)
+        view.addSubview(bottomView)
+        
+        bottomView.submitBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            self.didClickSubmitBtn()
+        }
+        
+        bottomView.saveBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            self.saveInfo()
+        }
+        
+        stepView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalTo(view)
+            make.height.equalTo(YHStepView.height)
+        }
+        
+        bottomView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(-k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(YHSaveAndSubmitView.height)
+        }
+    }
+    
+    func didClickSubmitBtn() {
+        currentIndex += 1;
+        
+    }
+    
+    func updateStepView() {
+        
+        guard let child = child else { return }
+        
+        for vc in self.children {
+            vc.willMove(toParent: nil)
+            vc.removeFromParent()
+        }
+        
+        if child.isFollow() {
+            
+            self.addChild(initalInfoVC)
+            self.addChild(uploadVC)
+            self.addChild(certificateVC)
+            self.addChild(basicInfoVC)
+            
+            self.view.addSubview(basicInfoVC.view)
+            self.view.addSubview(certificateVC.view)
+            self.view.addSubview(uploadVC.view)
+            self.view.addSubview(initalInfoVC.view)
+            
+            stepView.dataSource = ["初始信息".local, "证件上传".local, "证件信息".local, "基本信息".local]
+            stepView.block = {[weak self]  (index) in
+                guard let self = self else { return }
+                print("follow:%d", self.orderId)
+            }
+            
+        } else {
+            self.addChild(initalInfoVC)
+            self.addChild(basicInfoVC)
+            
+            self.view.addSubview(basicInfoVC.view)
+            self.view.addSubview(initalInfoVC.view)
+            
+            stepView.dataSource = ["初始信息".local, "基本信息".local]
+            stepView.block = {[weak self]  (index) in
+                guard let self = self else { return }
+                print("follow:%d", self.orderId)
+
+            }
+        }
+        self.view.bringSubviewToFront(stepView)
+        self.view.bringSubviewToFront(bottomView)
+
+    }
+}
+
+extension YHChildInfoContainerVC {
+    func saveInfo() {
+        
+        guard  let child = child else { return }
+        guard let info = child.toDictionary() else { return }
+        
+        let dict:[String: Any] = ["orderId":child.orderId,
+                                  "relation":child.relationType.rawValue,
+                                  "step":child.step,
+                                  "next":false,
+                                  "info":info]
+        
+        self.familyRequest.addOrSaveFamilyMember(params:dict) { [weak self] success, error in
+            guard let self = self else { return }
+            if success {
+                
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildInitialInfoVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildPrimaryInfoVC.swift

@@ -8,9 +8,10 @@
 
 import UIKit
 
-class YHChildInitialInfoVC: YHBaseViewController {
+class YHChildPrimaryInfoVC: YHBaseViewController {
 
     var child:YHFamilyMember?
+    weak var delegate:YHSpouseInfoVCProtocol?
     
     lazy var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
     
@@ -21,6 +22,8 @@ class YHChildInitialInfoVC: YHBaseViewController {
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        tableView.estimatedSectionHeaderHeight = 14.0
+        tableView.estimatedSectionFooterHeight = 1.0
         tableView.showsVerticalScrollIndicator = false
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
@@ -38,36 +41,6 @@ class YHChildInitialInfoVC: YHBaseViewController {
         return tableView
     }()
     
-    lazy var submitBtn:UIButton = {
-        let btn = UIButton()
-        btn.setTitle("提交".local, for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
-        btn.setTitleColor(.white, for: .normal)
-        btn.backgroundColor = UIColor(hexString:"#4388FF")
-        btn.layer.cornerRadius = 8.0
-        btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
-        return btn
-    }()
-    
-    lazy var saveBtn:UIButton = {
-        let btn = UIButton()
-        btn.setTitle("保存", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
-        btn.setTitleColor(UIColor(hexString:"#222222"), for: .normal)
-        btn.backgroundColor = UIColor(hexString:"#F8F9FB")
-        btn.layer.cornerRadius = 8.0
-        btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside)
-        return btn
-    }()
-    
-    lazy var bottomView:UIView = {
-        let view = UIView()
-        view.backgroundColor = .white
-        view.addSubview(submitBtn)
-        view.addSubview(saveBtn)
-        return view
-    }()
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         gk_navTitle = "子女信息填写".local
@@ -94,16 +67,55 @@ class YHChildInitialInfoVC: YHBaseViewController {
             // 国籍
             let title1 = YHFormTitleItem(type: .nationality)
             let item10 = YHFormDetailItem(type: .nationOrArea)
+            item10.value = child.nationality
+            item10.placeHolder = "请选择".local
             let arr1:[YHFormItemProtocol] = [title1, item10]
             
             // 居住信息
+            var arr2 = [YHFormItemProtocol]()
             let title2 = YHFormTitleItem(type: .liveInfo)
             let item20 = YHFormDetailItem(type: .isLiveTother)
             item20.value = String(child.isLiveTother())
+            arr2.append(title2)
+            arr2.append(item20)
+            
+            if !child.isLiveTother() { // 不同住 才需填写国家/地区
                 let item21 = YHFormDetailItem(type: .nationOrArea)
+                item21.value = child.address?.country
+                item21.placeHolder = "请选择".local
+                arr2.append(item21)
+                
+                // 国家/地区已填写 才显示现居住城市和详细地址两行
+                
+                if let address = child.address {
+                    if  let country = address.country, !country.isEmpty {
+                        
+                        // 居住信息中选择中国才会显示现居住城市
+                        let isLiveInChina = country.contains("中国".local)
+                        if isLiveInChina {
                             let item22 = YHFormDetailItem(type: .liveCity)
+                            if let area = address.area {
+                                item22.value = area.joined(separator: "/")
+                            }
+                            item22.placeHolder = "请选择城市".local
+                            arr2.append(item22)
+                        }
+                        
                         let item23 = YHFormDetailItem(type: .detailAddress)
-            let arr2:[YHFormItemProtocol] = [title2, item20, item21, item22, item23]
+                        item23.value = address.details
+                        item23.placeHolder = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
+                        arr2.append(item23)
+                        
+                        if !isLiveInChina {// 在国外
+                            // 是否在海外居住满1年及以上
+                            let item24 = YHFormDetailItem(type: .isLiveOverSeasMore1Year)
+                            item24.value = String(child.isOverSeasOver1Year())
+                            arr2.append(item24)
+                        }
+                            
+                    }
+                }
+            }
             
             // 港澳通信证
             let title3 = YHFormTitleItem(type: .hkAndMacaoPassport)
@@ -111,43 +123,22 @@ class YHChildInitialInfoVC: YHBaseViewController {
             item30.value = String(child.isNeedHandleHKPassPort())
             let arr3:[YHFormItemProtocol] = [title3, item30]
             items.append(contentsOf:[arr1, arr2, arr3])
-
         }
 
+
         tableView.reloadData()
     }
     
     func createUI() {
         
         view.addSubview(tableView);
-        view.addSubview(bottomView)
-        
-        let submitBtnHeight = 48.0
-        let gap = 8.0
-        bottomView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.bottom.equalTo(view)
-            make.height.equalTo(submitBtnHeight+gap*2+k_Height_safeAreaInsetsBottom())
-        }
-        
-        saveBtn.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(16)
-            make.size.equalTo(CGSize(width: 86.0, height: 48.0))
-            make.top.equalTo(8)
-        }
-        
-        submitBtn.snp.makeConstraints { make in
-            make.left.equalTo(saveBtn.snp.right).offset(10)
-            make.right.equalToSuperview().offset(-16)
-            make.height.equalTo(48)
-            make.centerY.equalTo(saveBtn)
-        }
-        
+        let topHeight = k_Height_NavigationtBarAndStatuBar+YHStepView.height
+        let bottomHeight = k_Height_safeAreaInsetsBottom() + YHSaveAndSubmitView.height
         tableView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalTo(bottomView.snp.top)
+            make.top.equalToSuperview().offset(topHeight)
             make.left.equalToSuperview().offset(16)
             make.right.equalToSuperview().offset(-16)
+            make.bottom.equalToSuperview().offset(-bottomHeight)
         }
     }
     
@@ -161,7 +152,7 @@ class YHChildInitialInfoVC: YHBaseViewController {
 }
 
 
-extension YHChildInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
+extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return items.count
@@ -209,21 +200,29 @@ extension YHChildInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
                     [weak self]  (arr, selectIndex) in
                     
                     let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    let option = (selectItem.title == "是".local ? true : false)
 
+                    guard let self = self else { return }
                     if detailItem.type == .isAccompanyToHK { // 是否随行
-                        let follow = (selectItem.title == "是".local ? 1 : 0)
-                        self?.child?.follow = follow
-                        self?.loadSponseInfo()
+                        
+                        self.child?.setFollow(option)
+                        self.loadSponseInfo()
+                        if let delegate = self.delegate {
+                            delegate.updateStepView?()
+                        }
                         
                     } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
-                        let handlePassport = (selectItem.title == "是".local ? 1 : 0)
-                        self?.child?.isHandled = handlePassport
-                        self?.loadSponseInfo()
+                        self.child?.setNeedHandleHKPassPort(option)
+                        self.loadSponseInfo()
                         
                     } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
-                        let isLiveTother = (selectItem.title == "是".local ? 1 : 0)
-                        self?.child?.finishFollow = (selectItem.title == "是".local ? 1 : 0)
-                        self?.loadSponseInfo()
+                        self.child?.setLiveTother(option)
+                        if option {
+                            self.child?.address?.country = nil
+                            self.child?.address?.details = nil
+                            self.child?.address?.area = nil
+                        }
+                        self.loadSponseInfo()
                     }
                 }
                 return cell
@@ -285,12 +284,19 @@ extension YHChildInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
         return 52.0
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        return UIView()
+    }
     
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         return UIView()
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 1.0
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
         return 14.0
     }
     
@@ -318,3 +324,5 @@ extension YHChildInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
     }
 }
 
+
+

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift

@@ -456,7 +456,7 @@ extension YHFamilyMemberFormVC : UITableViewDelegate, UITableViewDataSource {
              
              // 子女
              if detailItem.relationType == .child {
-             let vc = YHChildInitialInfoVC()
+             let vc = YHChildInfoContainerVC()
              vc.child = detailItem
              self.navigationController?.pushViewController(vc)
              return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInfoContainerVC.swift

@@ -51,7 +51,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         return YHSaveAndSubmitView.createView()
     }()
         
-    let initalInfoVC =  YHSpouseInitialInfoVC()
+    let initalInfoVC =  YHSpousePrimaryInfoVC()
     let uploadVC = UIViewController()
     let certificateVC = YHCertificateInfoController()
     let basicInfoVC = YHSpouseBasicInfoVC()
@@ -157,22 +157,11 @@ extension YHSpouseInfoContainerVC {
     func saveInfo() {
         
         guard  let spouse = spouse else { return }
-        guard var info = spouse.toDictionary() else { return }
+        guard let info = spouse.toDictionary() else { return }
         
-//        let certi = [ "cnIdentityCard":
-//                        ["id":116871,"number":"421087199005010811","issue_at":"深圳","issue_date_start_at":"2017-01-01","issue_date_end_at":"2029-01-01","img_front":"","img_back":""],
-//                        "passport":["id":116872,"number":"421087199005010811","issue_at":"深圳","issue_date_start_at":"2020-01-01","issue_date_end_at":"2023-01-01","img_front":"","img_back":"","passport_type":3],
-//                        "hkMacaoPass":["id":118182,"number":"P103265(1)","issue_at":"SFAA","issue_date_start_at":"2024-01-31","issue_date_end_at":"2024-01-31","img_front":"","img_back":""]
-//                        ]
-//        
-//        if let cer = info["certificates"] {
-//            info["certificates"] = certi
-//        }
-        
-        let cer = info["certificates"]
-        let dict:[String: Any] = ["orderId":self.orderId,
+        let dict:[String: Any] = ["orderId":spouse.orderId,
                                   "relation":spouse.relationType.rawValue,
-                                  "step":0,
+                                  "step":spouse.step,
                                   "next":false,
                                   "info":info]
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpouseInitialInfoVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHSpousePrimaryInfoVC.swift

@@ -9,7 +9,7 @@
 import UIKit
 import SmartCodable
 
-class YHSpouseInitialInfoVC: YHBaseViewController {
+class YHSpousePrimaryInfoVC: YHBaseViewController {
     
     var spouse:YHFamilyMember?
     weak var delegate:YHSpouseInfoVCProtocol?
@@ -141,7 +141,7 @@ class YHSpouseInitialInfoVC: YHBaseViewController {
 }
 
 
-extension YHSpouseInitialInfoVC : UITableViewDelegate, UITableViewDataSource {
+extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
     
     func numberOfSections(in tableView: UITableView) -> Int {
         return items.count