Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 家庭信息确认
  部分上传证件页面
  //  家庭信息确认
  新增配偶

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyInformationItemCell.swift

@@ -215,6 +215,16 @@ class YHMyInformationItemCell: UITableViewCell {
                     block(self.dataSource ?? YHUserInformationModel())
                 }
             }
+        case .selectAddress:
+            YHSheetPickerView.show(type:.educationDegree, selectTitle: self.dataSource?.message) {
+                [weak self]  item in
+                guard let self = self else { return }
+                self.dataSource?.message = item.title
+                self.updateAllViews()
+                if let block = self.block {
+                    block(self.dataSource ?? YHUserInformationModel())
+                }
+            }
         }
     }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAddAdoptersViewController.swift

@@ -125,10 +125,12 @@ extension YHAddAdoptersViewController: UITableViewDelegate, UITableViewDataSourc
                     [weak self] editType in
                     guard let self = self else { return }
                     if editType == .rename {
-                        
+                        let vc = YHAdopterNewPeopleViewController()
+                        self.navigationController?.pushViewController(vc)
                     }
                     if editType == .preview {
-                        
+                        let vc = YHAdopterNewPeopleViewController()
+                        self.navigationController?.pushViewController(vc)
                     }
                     if editType == .delete {
                         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterBirthViewController.swift

+//
+//  YHAdopterBirthViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterBirthViewController: YHBaseViewController {
+    var tableView: UITableView!
+    var nextButton: UIButton!
+    var clickIndex = -1
+    var data: [YHItemModel] = []
+    var viewModel = YHYHAdopterTravelViewModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "上传出生医学证明"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        data = viewModel.getChinaDataSource(false)
+        tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .white
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .white
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHAdopterExampleTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterResidentTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterCardExplainTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 8)
+            make.bottom.left.right.equalTo(view)
+        }
+    
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandMainColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("确认上传", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(48)
+        }
+        
+    }
+    
+    @objc func nextStep() {
+        
+    }
+    
+    @objc func submit() {
+        
+    }
+    
+}
+
+extension YHAdopterBirthViewController: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
+            return cell
+        }
+        if indexPath.row == 1 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterCardExplainTableViewCell.self)
+            return cell
+        }
+        if indexPath.row == 2 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            return cell
+        }
+ 
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0 {
+            return 118
+        }
+        if indexPath.row == 1 {
+            return 58
+        }
+        if indexPath.row == 2 {
+            return 173
+        }
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterChinaViewController.swift

+//
+//  YHAdopterChinaViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterChinaViewController: YHBaseViewController {
+    var tableView: UITableView!
+    var nextButton: UIButton!
+    var clickIndex = -1
+    var data: [YHItemModel] = []
+    var viewModel = YHYHAdopterTravelViewModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "上传中国身份证"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        data = viewModel.getChinaDataSource(false)
+        tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .white
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .white
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHAdopterExampleTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterTravelCardTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterTravelItemTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterCardExplainTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 8)
+            make.bottom.left.right.equalTo(view)
+        }
+    
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandMainColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("确认上传", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(48)
+        }
+        
+    }
+    
+    @objc func nextStep() {
+        
+    }
+    
+    @objc func submit() {
+        
+    }
+    
+}
+
+extension YHAdopterChinaViewController: UITableViewDelegate, UITableViewDataSource {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return 3
+        }
+        return data.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
+                return cell
+            }
+            if indexPath.row == 1 {
+                let cell = tableView.dequeueReusableCell(withClass: YHAdopterCardExplainTableViewCell.self)
+                return cell
+            }
+            if indexPath.row == 2 {
+                let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
+                return cell
+            }
+        }
+        let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelItemTableViewCell.self)
+        cell.dataSource = data[indexPath.row]
+        cell.informationBlock = {[weak self] model in
+            guard let self = self else { return }
+//            self.viewModel.updateModel(model)
+//            let id = model.id
+//            if id != .id32 && id != .id4 && id != .id8 && id != .id9 && id != .id12 && id != .id13 && id != .id17 && id != .id18 && id != .id21 && id != .id22 && id != .id23 && id != .id34 && id != .id29 && id != .id30 && id != .id35 {
+//                self.updateDataSource()
+//            }
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                return 118
+            }
+            if indexPath.row == 1 {
+                return 58
+            }
+            if indexPath.row == 2 {
+                return 173
+            }
+        }
+        
+        let model = data[indexPath.row]
+        let isShow = model.isShowPrompts ?? false
+        let message = model.message ?? ""
+        let isNeed = model.isNeed ?? false
+        if isShow && message.count == 0 && isNeed {
+            return 52 + 20
+        } else {
+            return 52
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterIdCardViewController.swift

+//
+//  YHAdopterIdCardViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterIdCardViewController: YHBaseViewController {
+    var tableView: UITableView!
+    var nextButton: UIButton!
+    var clickIndex = -1
+    var data: [YHItemModel] = []
+    var viewModel = YHYHAdopterTravelViewModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "上传证件照片"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        data = viewModel.getChinaDataSource(false)
+        tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .white
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .white
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHAdopterExampleTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterResidentTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterCardExplainTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 8)
+            make.bottom.left.right.equalTo(view)
+        }
+    
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandMainColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("确认上传", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(48)
+        }
+        
+    }
+    
+    @objc func nextStep() {
+        
+    }
+    
+    @objc func submit() {
+        
+    }
+    
+}
+
+extension YHAdopterIdCardViewController: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterCardExplainTableViewCell.self)
+            cell.alertLabel.text = "要求：2寸白底照"
+            return cell
+        }
+        if indexPath.row == 1 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            return cell
+        }
+ 
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0 {
+            return 84
+        }
+        if indexPath.row == 1 {
+            return 173
+        }
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterMarryViewController.swift

+//
+//  YHAdopterMarryViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterMarryViewController: YHBaseViewController {
+    var tableView: UITableView!
+    var nextButton: UIButton!
+    var clickIndex = -1
+    var data: [YHItemModel] = []
+    var viewModel = YHYHAdopterTravelViewModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "上传结婚证"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        data = viewModel.getChinaDataSource(false)
+        tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .white
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .white
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHAdopterExampleTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterMarryCardTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterCardExplainTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 8)
+            make.bottom.left.right.equalTo(view)
+        }
+    
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandMainColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("确认上传", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(48)
+        }
+        
+    }
+    
+    @objc func nextStep() {
+        
+    }
+    
+    @objc func submit() {
+        
+    }
+    
+}
+
+extension YHAdopterMarryViewController: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
+            return cell
+        }
+        if indexPath.row == 1 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterCardExplainTableViewCell.self)
+            cell.alertLabel.text = "提供主申人的信息页，复婚情况提供最新的结婚证"
+            return cell
+        }
+        if indexPath.row == 2 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterMarryCardTableViewCell.self)
+            return cell
+        }
+ 
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0 {
+            return 118
+        }
+        if indexPath.row == 1 {
+            return 84
+        }
+        if indexPath.row == 2 {
+            return 318
+        }
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterNewPeopleViewController.swift

+//
+//  YHAdopterNewPeopleViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterNewPeopleViewController: YHBaseViewController {
+    var stepView: YHStepView!
+    var bottomView: YHBottomNextView!
+    var tableView: UITableView!
+    var viewModel: YHAdopterNewPeopleViewModel!
+    var dataSource: [YHSectionItemModel] = []
+    var cardDataSource: [YHAdopterCardModel] = []
+    var isShowPrompt: Bool = false
+    var orderId: Int = 0
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        viewModel = YHAdopterNewPeopleViewModel()
+        gk_navTitle = "新增配偶"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+        // Do any additional setup after loading the view.
+    }
+    
+    func getData() {
+        self.updateDataSource()
+//        viewModel.requestMainInformation("\(orderId)") {[weak self] success, error in
+//            guard let self = self else { return }
+//            self.stepView.maxIndex = self.viewModel.mainModel.step
+//            self.stepView.currentIndex = self.viewModel.mainModel.step
+//            self.updateDataSource()
+//            if self.stepView.currentIndex == 3 {
+//                self.bottomView.nextButton.setTitle("提交", for: .normal)
+//            } else {
+//                self.bottomView.nextButton.setTitle("下一步", for: .normal)
+//            }
+//        }
+    }
+    
+    func updateDataSource() {
+        if self.stepView.currentIndex == 0 {
+            self.dataSource = self.viewModel.getBaseDataSource(isShowPrompt)
+            self.bottomView.nextButton.setTitle("下一步", for: .normal)
+        } else if self.stepView.currentIndex == 1 {
+            self.cardDataSource = self.viewModel.getIdCardInformation()
+//            self.bottomView.nextButton.setTitle("下一步", for: .normal)
+        }
+        self.tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .contentBkgColor
+        
+        stepView = {
+            let step = YHStepView()
+            step.dataSource = ["完善配偶信息", "上传配偶资料"]
+            step.block = { [weak self] (index) in
+                guard let self = self else { return }
+                self.updateDataSource()
+            }
+            return step
+        }()
+        view.addSubview(stepView)
+        stepView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalTo(view)
+            make.height.equalTo(104)
+        }
+        
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.grouped)
+            if #available(iOS 11.0, *) {
+                tableView.contentInsetAdjustmentBehavior = .never
+            }
+            tableView.backgroundColor = .clear
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHMainInformationTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterCardTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + YHStepView.height)
+            make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
+            make.left.right.bottom.equalTo(view)
+        }
+        
+        bottomView = {
+            let bottom = YHBottomNextView()
+            bottom.nextblock = { [weak self] in
+//                bottom.nextButton.isEnabled = false
+                guard let self = self else { return }
+                self.stepView.currentIndex = self.stepView.currentIndex + 1
+                self.updateDataSource()
+//                if self.viewModel.isCanNext(self.stepView.currentIndex) {
+//                    self.viewModel.mainModel.step = self.stepView.currentIndex
+//                } else {
+//                    
+//                }
+            }
+            bottom.saveBlock = { [weak self] in
+                guard let self = self else { return }
+                
+            }
+            return bottom
+        }()
+        view.addSubview(bottomView)
+        bottomView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
+        }
+        bottomView.layoutIfNeeded()
+        bottomView.nextButton.addYinHeGradualLayer()
+    }
+}
+
+extension YHAdopterNewPeopleViewController: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if stepView.currentIndex == 1 {
+            return cardDataSource.count
+        }
+        return dataSource.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if stepView.currentIndex == 1 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterCardTableViewCell.self)
+            cell.dataSource = cardDataSource[indexPath.row]
+            return cell
+        } else {
+            let cell = tableView.dequeueReusableCell(withClass: YHMainInformationTableViewCell.self)
+            cell.country = self.viewModel.mainModel.address.country
+            cell.dataSource = dataSource[indexPath.row]
+            cell.informationBlock = {[weak self] model in
+                guard let self = self else { return }
+//                self.viewModel.updateModel(model)
+//                let id = model.id
+//                if id != .id32 && id != .id4 && id != .id8 && id != .id9 && id != .id12 && id != .id13 && id != .id17 && id != .id18 && id != .id21 && id != .id22 && id != .id23 && id != .id34 && id != .id29 && id != .id30 && id != .id35 {
+//                    self.updateDataSource()
+//                }
+            }
+            return cell
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if stepView.currentIndex == 1 {
+            let model = cardDataSource[indexPath.row]
+            if model.type == .china || model.type == .resident {
+                return 90
+            } else {
+                return 78
+            }
+        } else {
+            let array = dataSource[indexPath.row].models ?? []
+            var h = 0
+            for i in 0..<array.count {
+                let data = array[i]
+                let isShow = data.isShowPrompts ?? false
+                let message = data.message ?? ""
+                let isNeed = data.isNeed ?? false
+                if data.id == .id3 || data.id == .id4 || data.id == .id32 || data.id == .id33 {
+                    if isShow && message.count == 0 && isNeed {
+                        h = h + 72 + 20
+                    } else {
+                        h = h + 72
+                    }
+                } else {
+                    if isShow && message.count == 0 && isNeed {
+                        h = h + 52 + 20
+                    } else {
+                        h = h + 52
+                    }
+                }
+            }
+            return CGFloat(h + 52 + 14)
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 7))
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return 7
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0.01
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if stepView.currentIndex == 1 {
+            let model = cardDataSource[indexPath.row]
+            switch model.type {
+            case .travel:
+                let vc = YHAdopterTravelViewController()
+                self.navigationController?.pushViewController(vc)
+            case .china:
+                let vc = YHAdopterChinaViewController()
+                self.navigationController?.pushViewController(vc)
+            case .resident:
+                let vc = YHAdopterResidentViewController()
+                self.navigationController?.pushViewController(vc)
+            case .birth:
+                let vc = YHAdopterBirthViewController()
+                self.navigationController?.pushViewController(vc)
+            case .id:
+                let vc = YHAdopterIdCardViewController()
+                self.navigationController?.pushViewController(vc)
+            case .other:
+                break
+            case .marry:
+                let vc = YHAdopterMarryViewController()
+                self.navigationController?.pushViewController(vc)
+            }
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterResidentViewController.swift

+//
+//  YHAdopterResidentViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterResidentViewController: YHBaseViewController {
+    var tableView: UITableView!
+    var nextButton: UIButton!
+    var clickIndex = -1
+    var data: [YHItemModel] = []
+    var viewModel = YHYHAdopterTravelViewModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "上传户口信息页"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        data = viewModel.getChinaDataSource(false)
+        tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .white
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .white
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHAdopterExampleTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterResidentTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterCardExplainTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 8)
+            make.bottom.left.right.equalTo(view)
+        }
+    
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandMainColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("确认上传", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(48)
+        }
+        
+    }
+    
+    @objc func nextStep() {
+        
+    }
+    
+    @objc func submit() {
+        
+    }
+    
+}
+
+extension YHAdopterResidentViewController: UITableViewDelegate, UITableViewDataSource {
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return 3
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.row == 0 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterExampleTableViewCell.self)
+            return cell
+        }
+        if indexPath.row == 1 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterCardExplainTableViewCell.self)
+            cell.alertLabel.text = "要求：提供户口的个人页，无需户口本首页"
+            return cell
+        }
+        if indexPath.row == 2 {
+            let cell = tableView.dequeueReusableCell(withClass: YHAdopterResidentTableViewCell.self)
+            return cell
+        }
+ 
+        return UITableViewCell()
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0 {
+            return 118
+        }
+        if indexPath.row == 1 {
+            return 84
+        }
+        if indexPath.row == 2 {
+            return 173
+        }
+        return 0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/C/YHAdopterTravelViewController.swift

+//
+//  YHAdopterTravelViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterTravelViewController: YHBaseViewController {
+
+    var tableView: UITableView!
+    var nextButton: UIButton!
+    var clickIndex = -1
+    var data: [YHItemModel] = []
+    var viewModel = YHYHAdopterTravelViewModel()
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        gk_navTitle = "上传旅行证件"
+        gk_navBackgroundColor = .white
+        gk_navBarAlpha = 1
+        setView()
+        getData()
+    }
+    
+    func getData() {
+        data = viewModel.getBaseDataSource(false)
+        tableView.reloadData()
+    }
+    
+    func setView() {
+        view.backgroundColor = .white
+        tableView = {
+            let tableView = UITableView(frame:.zero, style:.plain)
+            tableView.contentInsetAdjustmentBehavior = .never
+            tableView.backgroundColor = .white
+            tableView.separatorStyle = .none
+            tableView.delegate = self
+            tableView.dataSource = self
+            tableView.register(cellWithClass: YHAdopterIncomeTitleTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterTravelCardTableViewCell.self)
+            tableView.register(cellWithClass: YHAdopterTravelItemTableViewCell.self)
+//            tableView.register(cellWithClass: YHAdopterIncomeFileCountTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(tableView)
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 8)
+            make.bottom.left.right.equalTo(view)
+        }
+    
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandMainColor
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("确认上传", for: .normal)
+            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-8 - k_Height_safeAreaInsetsBottom())
+            make.height.equalTo(48)
+        }
+        
+    }
+    
+    @objc func nextStep() {
+        
+    }
+    
+    @objc func submit() {
+        
+    }
+    
+}
+
+extension YHAdopterTravelViewController: UITableViewDelegate, UITableViewDataSource {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return 2
+    }
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if section == 0 {
+            return 2
+        }
+        return data.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                let cell = tableView.dequeueReusableCell(withClass: YHAdopterIncomeTitleTableViewCell.self)
+                return cell
+            }
+            if indexPath.row == 1 {
+                let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelCardTableViewCell.self)
+                return cell
+            }
+        }
+        let cell = tableView.dequeueReusableCell(withClass: YHAdopterTravelItemTableViewCell.self)
+        cell.dataSource = data[indexPath.row]
+        cell.informationBlock = {[weak self] model in
+            guard let self = self else { return }
+//            self.viewModel.updateModel(model)
+//            let id = model.id
+//            if id != .id32 && id != .id4 && id != .id8 && id != .id9 && id != .id12 && id != .id13 && id != .id17 && id != .id18 && id != .id21 && id != .id22 && id != .id23 && id != .id34 && id != .id29 && id != .id30 && id != .id35 {
+//                self.updateDataSource()
+//            }
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.section == 0 {
+            if indexPath.row == 0 {
+                return 119
+            }
+            if indexPath.row == 1 {
+                return 173
+            }
+        }
+        
+        let model = data[indexPath.row]
+        let isShow = model.isShowPrompts ?? false
+        let message = model.message ?? ""
+        let isNeed = model.isNeed ?? false
+        if isShow && message.count == 0 && isNeed {
+            return 52 + 20
+        } else {
+            return 52
+        }
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+       
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/M/YHAdopterCardModel.swift

+//
+//  YHAdopterCardModel.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+enum YHAdopterCardType {
+    case travel
+    case china
+    case resident
+    case birth
+    case id
+    case other
+    case marry
+    case chinaTravel
+    case chinaLife
+}
+
+struct YHAdopterCardModel {
+    var type: YHAdopterCardType = .travel
+    var title: String = ""
+    var state: Int = 0 // 0 1 2 3 待上传 审核中 已通过 已驳回
+    
+    init(type: YHAdopterCardType, title: String, state: Int) {
+        self.type = type
+        self.title = title
+        self.state = state
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/V/YHAdopterCardExplainTableViewCell.swift

+//
+//  YHAdopterCardExplainTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterCardExplainTableViewCell: UITableViewCell {
+    var titleLabel: UILabel!
+    var subTitleLabel: UILabel!
+    var alertLabel: UILabel!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        backgroundColor = .clear
+
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_R(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            label.text = "中国身份证"
+            return label
+        }()
+        contentView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(34)
+            make.height.equalTo(24)
+        }
+        
+        subTitleLabel = {
+            let label = UILabel()
+            label.text = "已完成"
+            label.font = UIFont.PFSC_R(ofSize: 10)
+            label.textColor = UIColor(hex: 0x3cc694)
+            label.backgroundColor = UIColor(hex: 0xf0fbf7)
+            //带上传
+//            label.textColor = UIColor.brandMainColor
+//            label.backgroundColor = UIColor(hex: 0xf0f4fb)
+            //审核中
+//            label.textColor = UIColor(hex: 0xff8000)
+//            label.backgroundColor = UIColor(hex: 0xfff5eb)
+            //已驳回
+//            label.textColor = UIColor(hex: 0xf81d22)
+//            label.backgroundColor = UIColor(hex: 0xfff2f2)
+            return label
+        }()
+        contentView.addSubview(subTitleLabel)
+        subTitleLabel.snp.makeConstraints { make in
+            make.left.equalTo(titleLabel.snp.right).offset(4)
+            make.width.equalTo(38)
+            make.height.equalTo(16)
+            make.centerY.equalTo(titleLabel.snp.centerY)
+        }
+        
+        alertLabel = {
+            let label = UILabel()
+//            label.text = "存款证明有效期为3个月，并且存款金额为每个成员（包括额外新增受养人）最低为12万"
+            label.font = UIFont.PFSC_R(ofSize: 14)
+            label.textColor = UIColor.mainTextColor50
+            label.numberOfLines = 0
+            return label
+        }()
+        contentView.addSubview(alertLabel)
+        alertLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(64)
+            make.right.equalTo(-18)
+        }
+        
+    }
+
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/V/YHAdopterCardTableViewCell.swift

+//
+//  YHAdopterCardTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHAdopterCardTableViewCell: UITableViewCell {
+    typealias ClicktBlock = (_ model: Int) -> ()
+    var clickBlock: ClicktBlock?
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var selectLabel: UILabel!
+    var moreButton: UIButton!
+    var dataSource: YHAdopterCardModel? {
+        didSet {
+            updateContent()
+        }
+    }
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        backgroundColor = .clear
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        contentView.addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.top.equalTo(7)
+            make.bottom.equalTo(-7)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_R(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            label.text = "主申请人资料"
+            let str = "*" + "受养人信息核实"
+            let attributes: [NSAttributedString.Key: Any] = [
+                .font: UIFont.PFSC_R(ofSize: 17),
+                .foregroundColor: UIColor.mainTextColor
+            ]
+            let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+            let starRange = NSRange(location: 0, length: 1)
+            questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.failColor, range: starRange)
+            label.attributedText = questionAttrStr
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.top.equalTo(20)
+            make.height.equalTo(22)
+            make.right.equalTo(-18)
+        }
+        
+        selectLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.textColor = UIColor.mainTextColor50
+            label.numberOfLines = 0
+            let a: ASAttributedString = .init("温馨提示：", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            let b: ASAttributedString = .init("存款证明有效期为3个月", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
+            let c: ASAttributedString = .init("，并且存款金额为每个成员（包括额外新增受养人）", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            let d: ASAttributedString = .init("最低为12万", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
+            label.attributed.text = a + b + c + d
+            return label
+        }()
+        centerView.addSubview(selectLabel)
+        selectLabel.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.bottom.equalTo(-12)
+            make.right.equalTo(-20)
+        }
+        
+        moreButton = {
+            let button = UIButton(type: .custom)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("待上传", for: .normal)
+            button.setImage(UIImage(named: "service_adopter_income_start"), for: .normal)
+            button.setTitleColor(UIColor.brandMainColor, for: .normal)
+            button.addTarget(self, action: #selector(more), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(moreButton)
+        moreButton.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-20)
+            make.height.equalTo(20)
+            make.width.equalTo(69)
+        }
+
+        moreButton.iconInRight(with: 1)
+    }
+    
+    @objc func more() {
+        if let block = clickBlock {
+            block(0)
+        }
+    }
+    
+    func updateContent() {
+        guard let data = dataSource else { return }
+        if data.type == .travel || data.type == .marry || data.type == .id {
+            let str = "*" + data.title
+            let attributes: [NSAttributedString.Key: Any] = [
+                .font: UIFont.PFSC_R(ofSize: 16),
+                .foregroundColor: UIColor.mainTextColor
+            ]
+            let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+            let starRange = NSRange(location: 0, length: 1)
+            questionAttrStr.addAttribute(NSAttributedString.Key.foregroundColor, value: UIColor.failColor, range: starRange)
+            titleLabel.attributedText = questionAttrStr
+        } else {
+            let str = data.title
+            let attributes: [NSAttributedString.Key: Any] = [
+                .font: UIFont.PFSC_R(ofSize: 16),
+                .foregroundColor: UIColor.mainTextColor
+            ]
+            let questionAttrStr = NSMutableAttributedString(string: str, attributes: attributes)
+            titleLabel.attributedText = questionAttrStr
+        }
+        
+        if data.type == .china {
+            let a: ASAttributedString = .init("如有", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            let b: ASAttributedString = .init("中国身份证", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.brandMainColor))
+            let c: ASAttributedString = .init("，需要供用做证明", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            selectLabel.attributed.text = a + b + c
+            titleLabel.snp.remakeConstraints { make in
+                make.left.equalTo(20)
+                make.top.equalTo(12)
+                make.height.equalTo(22)
+                make.right.equalTo(-18)
+            }
+        } else if data.type == .resident {
+            let a: ASAttributedString = .init("如曾更名，需要供用做证明", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            selectLabel.attributed.text = a
+            titleLabel.snp.remakeConstraints { make in
+                make.left.equalTo(20)
+                make.top.equalTo(12)
+                make.height.equalTo(22)
+                make.right.equalTo(-18)
+            }
+        } else {
+            let a: ASAttributedString = .init("", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor50))
+            selectLabel.attributed.text = a
+            titleLabel.snp.remakeConstraints { make in
+                make.left.equalTo(20)
+                make.top.equalTo(20)
+                make.height.equalTo(22)
+                make.right.equalTo(-18)
+            }
+        }
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/V/YHAdopterExampleTableViewCell.swift

+//
+//  YHAdopterExampleTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterExampleTableViewCell: UITableViewCell {
+    typealias ExampleBlock = () -> ()
+    var exampleBlock: ExampleBlock?
+    var titleLabel: UILabel!
+    var templateView: YHCertificateSampleTemplateView!
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_R(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            label.text = "中国身份证示例模版"
+            return label
+        }()
+        contentView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.top.equalTo(16)
+            make.height.equalTo(24)
+        }
+        
+        templateView = {
+            let view = YHCertificateSampleTemplateView()
+            return view
+        }()
+        contentView.addSubview(templateView)
+        templateView.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.right.equalTo(-20)
+            make.top.equalTo(56)
+            make.height.equalTo(62)
+        }
+        
+        let tapGesture = UITapGestureRecognizer(target: self, action: #selector(tapAction))
+                // 给视图添加手势识别器
+        templateView.addGestureRecognizer(tapGesture)
+    }
+    
+    @objc func tapAction(gesture: UITapGestureRecognizer) {
+        if let block = exampleBlock {
+            block()
+        }
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/V/YHAdopterResidentTableViewCell.swift

+//
+//  YHAdopterResidentTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterResidentTableViewCell: UITableViewCell {
+    typealias InformationBlock = (_ type: YHCardType, _ image: UIImage, _ isleft: Bool) -> ()
+    var informationBlock: InformationBlock?
+    var frontLabel: UILabel!
+    var frontImageButton: YHCardButton!
+    var frontDeleteButton: UIButton!
+    var activityIndicator: UIActivityIndicatorView!
+    var viewModel: YHMainApplicantInformationViewModel! {
+        didSet {
+            if viewModel.mainModel.certificates.cn_identity_card.img_front.count != 0 {
+                self.viewModel.getPublicImageUrl(viewModel.mainModel.certificates.cn_identity_card.img_front) {[weak self] success, error in
+                    guard let self = self else { return }
+                    guard let url = success else { return }
+                    self.frontImageButton.kf.setBackgroundImage(with: URL(string: url), for: .normal, completionHandler:  { _ in
+                        self.frontDeleteButton.isHidden = false
+                    })
+                    self.frontImageButton.setContent("", "")
+                }
+            }
+        }
+    }
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        
+        let lineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        contentView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(16)
+            make.height.equalTo(1)
+            make.right.equalTo(-18)
+        }
+        
+        frontLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_R(ofSize: 12)
+            label.textColor = UIColor.subTextColor
+            label.text = "证件页1"
+            label.textAlignment = .center
+            return label
+        }()
+        contentView.addSubview(frontLabel)
+        frontLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(self.snp.centerX)
+            make.top.equalTo(28)
+            make.height.equalTo(20)
+        }
+        
+        frontImageButton = {
+            let button = YHCardButton()
+            button.setContent("card_upload", "点击上传")
+            button.setBackgroundImage(UIImage(named: "service_cn_card_front"), for: .normal)
+            button.addTarget(self, action: #selector(frontImageClick), for: .touchUpInside)
+            button.layer.cornerRadius = 4
+            button.clipsToBounds = true
+            return button
+        }()
+        contentView.addSubview(frontImageButton)
+        frontImageButton.snp.makeConstraints { make in
+            make.left.equalTo(20)
+            make.top.equalTo(60)
+            make.height.equalTo(99)
+            make.width.equalTo(160)
+        }
+        
+        frontDeleteButton = {
+            let button = UIButton(type: .custom)
+            button.setBackgroundImage(UIImage(named: "service_card_delete"), for: .normal)
+            button.addTarget(self, action: #selector(frontDeleteClick), for: .touchUpInside)
+            button.isHidden = true
+            return button
+        }()
+        contentView.addSubview(frontDeleteButton)
+        frontDeleteButton.snp.makeConstraints { make in
+            make.centerX.equalTo(frontImageButton.snp.right)
+            make.centerY.equalTo(frontImageButton.snp.top)
+            make.height.equalTo(21)
+            make.width.equalTo(21)
+        }
+        
+        activityIndicator = {
+            let view = UIActivityIndicatorView()
+            view.style = .medium
+            return view
+        }()
+        contentView.addSubview(activityIndicator)
+        activityIndicator.snp.makeConstraints { make in
+            make.center.equalTo(frontImageButton.snp.center)
+            make.height.equalTo(25)
+            make.width.equalTo(25)
+        }
+        
+    }
+    
+    @objc func frontImageClick() {
+//        if viewModel.mainModel.certificates.cn_identity_card.img_front.count != 0 {
+//            if viewModel.mainModel.certificates.cn_identity_card.img_front.isEmpty == false {
+//                let vc = YHImageViewController()
+//                vc.imgString = viewModel.mainModel.certificates.cn_identity_card.img_front
+//                UIViewController.current?.navigationController?.pushViewController(vc)
+//            }
+//            return
+//        }
+//        YHImagePickerView.show() {[weak self] image in
+//            guard let self = self else { return }
+//            self.frontImageButton.setContent("card_loading", "上传中")
+//            self.frontImageButton.startRotationAnimation()
+//            self.viewModel.uploadImage(image) {[weak self] success, error in
+//                guard let self = self else { return }
+//                self.frontImageButton.stopRotationAnimation()
+//                self.frontImageButton.setContent("", "")
+//
+//                guard let url = success else { return }
+////                self.viewModel.updateModel(self.type, isFront: true, url: url)
+//                self.frontImageButton.setBackgroundImage(image, for: .normal)
+//                self.frontDeleteButton.isHidden = false
+//
+//                self.viewModel.getPublicImageUrl(url) {[weak self] success, error in
+//                    guard let self = self else { return }
+//                    guard let url = success else { return }
+//
+//
+//                    self.viewModel.requestHkIDCardMessage(url, isBack: 0) {[weak self] success, error in
+//                    }
+//                }
+//            }
+//        }
+    }
+    
+    @objc func frontDeleteClick() {
+        frontDeleteButton.isHidden = true
+        frontImageButton.setBackgroundImage(UIImage(named: "service_hk_card_front"), for: .normal)
+        frontImageButton.setContent("card_upload", "点击上传")
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/V/YHAdopterTravelItemTableViewCell.swift

+//
+//  YHAdopterTravelItemTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterTravelItemTableViewCell: UITableViewCell {
+    typealias InformationBlock = (_ model: YHItemModel) -> ()
+    var informationBlock: InformationBlock?
+    var itemView: YHItemView!
+
+    var dataSource: YHItemModel? {
+        didSet {
+            updateAllViews()
+        }
+    }
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        selectionStyle = .none
+        setupUI()
+    }
+    
+    func setupUI() {
+        contentView.backgroundColor = .clear
+        backgroundColor = .clear
+        let line = UIView()
+        line.backgroundColor = UIColor.separatorColor
+        contentView.addSubview(line)
+        line.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.equalTo(y)
+            make.height.equalTo(1)
+            make.right.equalTo(-18)
+        }
+        itemView = {
+            let view = YHItemView()
+            return view
+        }()
+        itemView.block = {[weak self] model in
+            guard let self = self else { return }
+            if let block = self.informationBlock {
+                block(model)
+            }
+        }
+        contentView.addSubview(itemView)
+        itemView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.top.bottom.equalTo(0)
+            make.right.equalTo(-18)
+        }
+    }
+    
+    func updateAllViews() {
+        itemView.dataSource = dataSource
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/VM/YHAdopterNewPeopleViewModel.swift

+//
+//  YHAdopterNewPeopleViewModel.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHAdopterNewPeopleViewModel: YHBaseViewModel {
+    var mainModel: YHMainInformationModel = YHMainInformationModel()
+    
+    override init() {
+        super.init()
+    }
+    
+    func getBaseDataSource(_ isShowPrompt: Bool) -> [YHSectionItemModel] {
+        let item = YHItemModel(id: .id1, isNeed: true, title: "姓名", isUserKeyBoard: true, prompts: "请输入", message: "", isShowPrompts: isShowPrompt, alertMessage:"请选择国家/地区")
+        let item1 = YHItemModel(id: .id1, isNeed: true, title: "国家/地区", isUserKeyBoard: false, prompts: "请选择", message: "", type: .selectAddress, isShowPrompts: isShowPrompt, alertMessage:"请选择国家/地区")
+        let section = YHSectionItemModel(title: "配偶信息", models: [item, item1])
+        return [section]
+    }
+    
+    func getIdCardInformation() -> [YHAdopterCardModel] {
+        let item = YHAdopterCardModel(type: .travel, title: "旅行证件（港澳通行证/护照）", state: 0)
+        let item1 = YHAdopterCardModel(type: .china, title: "身份证-正反面", state: 0)
+        let item2 = YHAdopterCardModel(type: .resident, title: "户口信息页", state: 0)
+        let item3 = YHAdopterCardModel(type: .birth, title: "中国居留许可签证", state: 0)
+        let item4 = YHAdopterCardModel(type: .id, title: "2寸白底证件照片", state: 0)
+        let item5 = YHAdopterCardModel(type: .other, title: "其他相关证件", state: 0)
+        let item6 = YHAdopterCardModel(type: .marry, title: "结婚证", state: 0)
+        let item7 = YHAdopterCardModel(type: .chinaTravel, title: "中国旅行证", state: 0)
+        let item8 = YHAdopterCardModel(type: .chinaLife, title: "中国居留许可证", state: 0)
+        return [item, item1, item2, item3, item4, item5, item6, item7, item8]
+    }
+    
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters/VM/YHYHAdopterTravelViewModel.swift

+//
+//  YHYHAdopterTravelViewModel.swift
+//  galaxy
+//
+//  Created by EDY on 2024/8/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHYHAdopterTravelViewModel: YHBaseViewModel {
+    var mainModel: YHMainInformationModel = YHMainInformationModel()
+    
+    override init() {
+        super.init()
+    }
+    
+    func getBaseDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
+        let item = YHItemModel(id: .id1, isNeed: true, title: "旅行证件类型", isUserKeyBoard: false, prompts: "请选择", message: "", type: .id, isShowPrompts: isShowPrompt, alertMessage:"请选择旅行证件类型")
+        let item1 = YHItemModel(id: .id1, isNeed: true, title: "英文姓名", isUserKeyBoard: true, prompts: "请输入", message: "", isShowPrompts: isShowPrompt, alertMessage:"请输入英文姓名")
+        let item2 = YHItemModel(id: .id1, isNeed: true, title: "旅行证件号码", isUserKeyBoard: true, prompts: "请输入", message: "", isShowPrompts: isShowPrompt, alertMessage:"请输入旅行证件号码")
+        let item3 = YHItemModel(id: .id1, isNeed: true, title: "签发地点", isUserKeyBoard: true, prompts: "请输入", message: "", isShowPrompts: isShowPrompt, alertMessage:"请输入签发地点")
+        let item4 = YHItemModel(id: .id1, isNeed: true, title: "签发日期", isUserKeyBoard: false, prompts: "请选择", message: "", type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择签发日期")
+        let item5 = YHItemModel(id: .id1, isNeed: true, title: "届满日期", isUserKeyBoard: false, prompts: "请选择", message: "", type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择届满日期")
+        return [item, item1, item2, item3, item4, item5]
+    }
+    
+    func getChinaDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
+        let item = YHItemModel(id: .id1, isNeed: true, title: "姓名", isUserKeyBoard: true, prompts: "请输入", message: "", type: .id, isShowPrompts: isShowPrompt, alertMessage:"请输入姓名")
+        let item1 = YHItemModel(id: .id1, isNeed: true, title: "身份证号码", isUserKeyBoard: true, prompts: "请输入", message: "", isShowPrompts: isShowPrompt, alertMessage:"请输入身份证号码")
+        let item2 = YHItemModel(id: .id1, isNeed: true, title: "出生日期", isUserKeyBoard: false, prompts: "请选择", message: "", type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择出生日期")
+        let item3 = YHItemModel(id: .id1, isNeed: true, title: "出生地点", isUserKeyBoard: true, prompts: "请输入", message: "", isShowPrompts: isShowPrompt, alertMessage:"请输入出生地点")
+        let item4 = YHItemModel(id: .id1, isNeed: true, title: "性别", isUserKeyBoard: false, prompts: "请选择", message: "", type: .sex, isShowPrompts: isShowPrompt, alertMessage:"请选择性别")
+        return [item, item1, item2, item3, item4]
+    }
+}

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

@@ -72,6 +72,10 @@ class YHFamilyInfoConfirmViewController: YHBaseViewController {
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(98)
         }
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
         getFamilyInfo()
     }
     
@@ -99,7 +103,7 @@ extension YHFamilyInfoConfirmViewController: UITableViewDelegate, UITableViewDat
             }
             if indexPath.section == 1 {
                 let approveCell = tableView.dequeueReusableCell(withIdentifier: YHApproverInfoVerifyCell.cellReuseIdentifier, for: indexPath) as! YHApproverInfoVerifyCell
-                approveCell.updateFamilyArr(self.familyArr)
+                approveCell.updateFamilyArr(self.familyArr, familyGroup: self.viewModel.familyInfo)
                 return approveCell
             }
             if indexPath.section == 2 {

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

@@ -82,6 +82,8 @@ class YHFamilyMemberInfoModel: SmartCodable {
     
     // 自定义属性
     var relation:Int = YHFamilyMemberRelationType.none.rawValue
+    // 是否检测编辑字段
+    var isCheck: Bool = false
     
     func getRelation() -> String {
         
@@ -97,6 +99,44 @@ class YHFamilyMemberInfoModel: SmartCodable {
         return ""
     }
     
+    func getMarriageState() -> String {
+        return self.getMarriageStatus(self.married)
+    }
+    
+    func getHistoryMarriageState() -> String {
+        return self.getMarriageStatus(self.marriedHistory)
+    }
+    
+    func getBirthNation() -> String {
+        if self.birthPlaceAboard == 0 {
+            return "国内"
+            
+        } else if self.birthPlaceAboard == 1 {
+            return "国外"
+        }
+        return "未知"
+    }
+    
+    func getHistoryBirthNation() -> String {
+        if self.birthPlaceAboardHistory == 0 {
+            return "国内"
+            
+        } else if self.birthPlaceAboardHistory == 1 {
+            return "国外"
+        }
+        return "未知"
+    }
+    
+    private func getMarriageStatus(_ marrage: String) -> String {
+        let arr = YHSheetPickerView.dataSource[.marriage1]!
+        for item in arr {
+            if item.index == Int(marrage) {
+                return item.title
+            }
+        }
+        return ""
+    }
+    
     required init() {
         
     }
@@ -127,6 +167,7 @@ class YHFamilyMemberInfoModel: SmartCodable {
     }
 
     init(id: Int, name: String, nameHistory: String, familyName: String, familyNameHistory: String, givenName: String, givenNameHistory: String, married: String, marriedHistory: String, birthPlaceAboard: Int, birthPlaceAboardHistory: Int, birthPlace: YHApplicantBirthPlaceModel, birthPlaceHistory: YHApplicantBirthPlaceModel, nationalityType: Int, nationalityTypeHistory: Int, nationality: String, nationalityHistory: String, hkIdentityid: String, hkIdentityidHistory: String, identity: YHApplicantIdentityModel, occupationName: String, occupationNameHistory: String) {
+        
         self.id = id
         self.name = name
         self.nameHistory = nameHistory

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

@@ -14,10 +14,13 @@ class YHApproverInfoVerifyCell: UITableViewCell {
     static let cellReuseIdentifier = "YHApproverInfoVerifyCell"
 
     var familyArr:[YHApplicantInfoModel] = []
+    var familyGroupInfo: YHFamilyGroupModel = YHFamilyGroupModel()
+
     let memberRowHeight = 69.0
     
-    func updateFamilyArr(_ familyArr: [YHApplicantInfoModel]) {
+    func updateFamilyArr(_ familyArr: [YHApplicantInfoModel], familyGroup:YHFamilyGroupModel) {
         self.familyArr = familyArr
+        self.familyGroupInfo = familyGroup
         tableView.snp.updateConstraints { make in
             make.height.equalTo(memberRowHeight * Double(familyArr.count) + 4.0)
         }
@@ -128,8 +131,9 @@ extension YHApproverInfoVerifyCell: UITableViewDelegate, UITableViewDataSource {
         
         if 0 <= indexPath.row && indexPath.row < familyArr.count {
             let model = familyArr[indexPath.row]
-            let vc = YHFamilyInfoConfirmViewController()
-            vc.orderId = model.info.id
+            let vc = YHFamilyInfoUpdateViewController()
+            vc.memberId = model.info.id
+            vc.familyGroupModel = self.familyGroupInfo
             UIViewController.current?.navigationController?.pushViewController(vc)
         }
     }

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

@@ -16,14 +16,15 @@ enum YHFamilyInfoType: Int {
     case lastName = 3
     case marriage = 4
     case birthNation = 5
-    case birthPlace = 6
-    case declareNation = 7
-    case occupation = 8
-    case hongKongId = 9
-    case travelCertificateType = 10
-    case travelCertificateId = 11
-    case childName = 12
-    case spouseName = 13
+    case birthPlaceInChina = 6
+    case birthPlaceAboard = 7
+    case declareNation = 8
+    case occupation = 9
+    case hongKongId = 10
+    case travelCertificateType = 11
+    case travelCertificateId = 12
+    case childName = 13
+    case spouseName = 14
 }
 
 enum YHFamilyInfoActionType: Int {
@@ -35,9 +36,11 @@ enum YHFamilyInfoActionType: Int {
 
 class YHFamilyInfoOption {
     var value: String = ""
+    var index: Int = -1
     var isSelect: Bool = false
     
-    init(value: String, isSelect: Bool) {
+    init(index: Int, value: String, isSelect: Bool) {
+        self.index = index
         self.value = value
         self.isSelect = isSelect
     }
@@ -55,6 +58,9 @@ class YHFamilyInfoItem {
     var isEditMode: Bool = false
     var isShowPreviousInfo: Bool = false
     
+    var tips: String = ""
+    var isCheck: Bool = false
+    
     required init() {
         
     }
@@ -76,6 +82,7 @@ class YHFamilyInfoItem {
 class YHIFamilyInfoListCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHIFamilyInfoListCell"
+    var familyInfo: YHFamilyMemberInfoModel = YHFamilyMemberInfoModel()
     
     var isEditState: Bool = false {
         didSet {
@@ -84,6 +91,7 @@ class YHIFamilyInfoListCell: UITableViewCell {
         }
     }
     var editBlock:((Bool)->())?
+    var selectBirthNation:((Bool)->())?
     
     lazy var whiteView: UIView = {
         let view = UIView()
@@ -174,11 +182,19 @@ class YHIFamilyInfoListCell: UITableViewCell {
             }
             if let itemView = itemView as? YHInfoItemView {
                 itemsContentView.addSubview(itemView)
-                itemView.updateItem(item)
+                itemView.updateItem(item, familyInfo: familyInfo)
                 
             } else if let itemView = itemView as? YHInfoOptionView {
+                itemView.clickBlock = {
+                    [weak self] selectItem in
+                    guard let self = self else { return }
+                    if item.id == .birthNation {
+                        familyInfo.birthPlaceAboard = selectItem.index
+                        self.selectBirthNation?(familyInfo.birthPlaceAboard == 0)
+                    }
+                }
                 itemsContentView.addSubview(itemView)
-                itemView.updateItem(item)
+                itemView.updateItem(item, familyInfo: familyInfo)
             }
             
             if let itemView = itemView {

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

@@ -529,7 +529,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 }
                 
             } else if detailItem.type == .marriageState { // 婚姻
-                YHSheetPickerView.show(type: .marriage, selectTitle:self.child?.married) {
+                YHSheetPickerView.show(type: .marriageText, selectTitle:self.child?.married) {
                     [weak self] selectItem in
                     guard let self = self else { return }
                     self.child?.married = selectItem.title

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -483,7 +483,7 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
                 
             } else if detailItem.type == .marriageState { // 婚姻
                 let marriage = self.brotherInfo?.married
-                YHSheetPickerView.show(type: .marriage, selectTitle:marriage) {
+                YHSheetPickerView.show(type: .marriageText, selectTitle:marriage) {
                     [weak self] selectItem in
                     guard let self = self else { return }
                     self.brotherInfo?.married = selectItem.title

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -530,7 +530,7 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
                 }
                 
             } else if detailItem.type == .marriageState { // 婚姻
-                YHSheetPickerView.show(type: .marriage, selectTitle:self.parentInfo?.married) {
+                YHSheetPickerView.show(type: .marriageText, selectTitle:self.parentInfo?.married) {
                     [weak self] selectItem in
                     guard let self = self else { return }
                     self.parentInfo?.married = selectItem.title

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift

@@ -193,13 +193,25 @@ class YHSheetPickerView: UIView {
 
             
             // 婚姻
-            .marriage:
+            .marriageText:
                 [YHSheetPickerViewItem(title:"已婚".local, index:1),
                  YHSheetPickerViewItem(title:"未婚".local, index:0),
                  YHSheetPickerViewItem(title:"分居".local, index:2),
                  YHSheetPickerViewItem(title:"离婚".local, index:3),
                  YHSheetPickerViewItem(title:"丧偶".local, index:4),
                 ],
+            
+            // 婚姻
+            .marriage1:
+                [YHSheetPickerViewItem(title:"已婚".local, index:1),
+                 YHSheetPickerViewItem(title:"未婚".local, index:2),
+                 YHSheetPickerViewItem(title:"离婚".local, index:3),
+                 YHSheetPickerViewItem(title:"分居".local, index:4),
+                 YHSheetPickerViewItem(title:"丧偶".local, index:5),
+                 YHSheetPickerViewItem(title:"事实婚姻".local, index:6),
+                 YHSheetPickerViewItem(title:"鳏寡".local, index:7),
+                ],
+                
     
             // 教育
             .educationStyle:
@@ -333,7 +345,7 @@ class YHSheetPickerView: UIView {
         
         var whiteContentHeight = 322.0
         if self.type == .educationDegree
-            || self.type == .marriage
+            || self.type == .marriageText
             || self.type == .profession
             || self.type == .certificate
             || self.type == .identity
@@ -389,7 +401,9 @@ extension YHSheetPickerView {
             return "选择学位"
         case .educationDegree:
             return "选择学位"
-        case .marriage:
+        case .marriageText:
+            return "选择婚姻状况"
+        case .marriage1:
             return "选择婚姻状况"
         case .educationStyle:
             return "选择授课形式"
@@ -411,6 +425,8 @@ extension YHSheetPickerView {
             return "选择证书名称"
         case .degreeCategory:
             return "选择学位类型"
+        case .selectAdress:
+            return "选择国家地区"
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerViewType.swift

@@ -18,8 +18,11 @@ enum YHSheetPickerViewType: Int {
     case educationDegree
     // 学位有无
     case ownDegree
-    // 婚姻
-    case marriage
+    // 婚姻(文字有效)
+    case marriageText
+    // 婚姻(index有效)
+    case marriage1
+    
     // 授课形式
     case educationStyle
     // 职业
@@ -38,6 +41,8 @@ enum YHSheetPickerViewType: Int {
     case professionCertificate
     // 学位类型
     case degreeCategory
+    // 国家地区
+    case selectAdress
 }
 
 class YHSheetPickerViewItem {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/M/YHItemModel.swift

@@ -20,6 +20,7 @@ enum YHItemSelectType: Int {
     case constellation = 8
     case school = 9
     case degree = 10
+    case selectAddress = 11
 }
 
 enum YHItemID: Int {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -505,6 +505,16 @@ class YHItemView: UIView {
                     block(self.dataSource ?? YHItemModel())
                 }
             }
+        case .selectAddress: 
+            YHOtherPickerView.show(type: .selectAddress, selectTitle: self.dataSource?.message ?? "") {[weak self] data in
+                guard let self = self else { return }
+                self.dataSource?.message = data.title
+                self.dataSource?.value = [data.index]
+                self.updateAllViews()
+                if let block = self.block {
+                    block(self.dataSource ?? YHItemModel())
+                }
+            }
         default: break
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift

@@ -244,6 +244,8 @@ class YHOtherPickerView: UIView {
             return "选择婚姻状况"
         case .constellation:
             return "选择星座"
+        case .selectAddress:
+            return "选择国家地区"
         default:
             return "请选择"
         }
@@ -281,7 +283,7 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
     func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
         
         switch type {
-        case  .nature,.certificate,.structure,.level,.prove,.idType,.sex,.marry,.constellation:
+        case  .nature,.certificate,.structure,.level,.prove,.idType,.sex,.marry,.constellation,.selectAddress:
             let label = UILabel()
             label.textColor = UIColor.mainTextColor
             label.font = UIFont.PFSC_M(ofSize: 14)
@@ -430,6 +432,14 @@ extension YHOtherPickerView {
                 arrData.append(model)
             }
             title = getTitle(type: type)
+        case .selectAddress:
+            let arr = YHConstantArrayData.arrSelectAddress
+            arrData.removeAll()
+            arr.forEach { item in
+                let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
+                arrData.append(model)
+            }
+            title = getTitle(type: type)
         default:
             return
         }

galaxy/galaxy/Classes/Tools/Helper/YHConstantArrayData.swift

@@ -37,6 +37,8 @@ enum YHOtherPickerViewType: Int {
     case degreeAddress
     //星座
     case constellation
+    //选择国家地区
+    case selectAddress
 }
 
 
@@ -361,7 +363,7 @@ class YHConstantArrayData {
         [
             "id" : "3",
             "title" : "博士学位",
-        ],
+        ]
     ]
     
     //学位颁发地
@@ -418,7 +420,26 @@ class YHConstantArrayData {
         [
             "id" : "capricorn",
             "title" : "摩羯座",
+        ]
+    ]
+    
+    static let arrSelectAddress = [
+        [
+            "id":"中国大陆",
+            "title" : "中国大陆",
         ],
+        [
+            "id" : "中国澳门",
+            "title" : "中国澳门",
+        ],
+        [
+            "id" : "中国台湾",
+            "title" : "中国台湾",
+        ],
+        [
+            "id":"外国地区",
+            "title" : "外国地区",
+        ]
     ]
     //通过 id 获取 title
     static func getShowNameBy(indexStr:String,type : YHOtherPickerViewType) -> String {
@@ -443,6 +464,8 @@ class YHConstantArrayData {
             arrData = YHConstantArrayData.arrDegreeAddress
         case .constellation:
             arrData = YHConstantArrayData.arrDegreeConstellation
+        case .selectAddress:
+            arrData = YHConstantArrayData.arrSelectAddress
         default:
             arrData = [[:]]
         }