// 家庭

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -91,6 +91,7 @@
 		044D0C1C2C22C30B00C5CF5E /* YHEditSchoolViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0C1B2C22C30B00C5CF5E /* YHEditSchoolViewController.swift */; };
 		044D0C1E2C22CFBF00C5CF5E /* YHEditWorkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0C1D2C22CFBF00C5CF5E /* YHEditWorkViewController.swift */; };
 		044D0C202C22D37500C5CF5E /* YHEditHonorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044D0C1F2C22D37500C5CF5E /* YHEditHonorViewController.swift */; };
+		04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */; };
 		045A08C02C37ABF500BCBABA /* YHSegmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A08BF2C37ABF500BCBABA /* YHSegmentView.swift */; };
 		045A08C22C37EB8B00BCBABA /* YHMyFileListNoneCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A08C12C37EB8B00BCBABA /* YHMyFileListNoneCell.swift */; };
 		045A7E672C2ACB1A008F995B /* YHLoginOneLeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A7E662C2ACB1A008F995B /* YHLoginOneLeadView.swift */; };
@@ -333,6 +334,7 @@
 		049D62C02C6F1E6700E811A1 /* YHFamilyInfoWarmTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049D62BF2C6F1E6700E811A1 /* YHFamilyInfoWarmTipsView.swift */; };
 		049D62C22C6F258700E811A1 /* YHFamilyInfoConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049D62C12C6F258700E811A1 /* YHFamilyInfoConfirmViewController.swift */; };
 		049D62C52C6F272800E811A1 /* YHRiskWarningCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049D62C42C6F272800E811A1 /* YHRiskWarningCell.swift */; };
+		049D62C72C6F2F4F00E811A1 /* YHApproverInfoVerifyCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 049D62C62C6F2F4F00E811A1 /* YHApproverInfoVerifyCell.swift */; };
 		04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A271222BABFF3200652B1B /* YHCertificateUploadTypeCell.swift */; };
 		04A271252BAC33BB00652B1B /* YHFilePreviewTool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A271242BAC33BB00652B1B /* YHFilePreviewTool.swift */; };
 		04A671592B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A671582B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift */; };
@@ -748,6 +750,7 @@
 		044D0C1B2C22C30B00C5CF5E /* YHEditSchoolViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEditSchoolViewController.swift; sourceTree = "<group>"; };
 		044D0C1D2C22CFBF00C5CF5E /* YHEditWorkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEditWorkViewController.swift; sourceTree = "<group>"; };
 		044D0C1F2C22D37500C5CF5E /* YHEditHonorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEditHonorViewController.swift; sourceTree = "<group>"; };
+		04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyMemberInfoCell.swift; sourceTree = "<group>"; };
 		045A08BF2C37ABF500BCBABA /* YHSegmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSegmentView.swift; sourceTree = "<group>"; };
 		045A08C12C37EB8B00BCBABA /* YHMyFileListNoneCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileListNoneCell.swift; sourceTree = "<group>"; };
 		045A7E662C2ACB1A008F995B /* YHLoginOneLeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginOneLeadView.swift; sourceTree = "<group>"; };
@@ -993,6 +996,7 @@
 		049D62BF2C6F1E6700E811A1 /* YHFamilyInfoWarmTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyInfoWarmTipsView.swift; sourceTree = "<group>"; };
 		049D62C12C6F258700E811A1 /* YHFamilyInfoConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyInfoConfirmViewController.swift; sourceTree = "<group>"; };
 		049D62C42C6F272800E811A1 /* YHRiskWarningCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHRiskWarningCell.swift; sourceTree = "<group>"; };
+		049D62C62C6F2F4F00E811A1 /* YHApproverInfoVerifyCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHApproverInfoVerifyCell.swift; sourceTree = "<group>"; };
 		04A271222BABFF3200652B1B /* YHCertificateUploadTypeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadTypeCell.swift; sourceTree = "<group>"; };
 		04A271242BAC33BB00652B1B /* YHFilePreviewTool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFilePreviewTool.swift; sourceTree = "<group>"; };
 		04A671582B9F18C800C1FB91 /* YHCertificateUploadSheetView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadSheetView.swift; sourceTree = "<group>"; };
@@ -2243,6 +2247,8 @@
 				046A95302C6EFB980059326A /* YHFamilyMemberRiskWarningAlertView.swift */,
 				049D62BF2C6F1E6700E811A1 /* YHFamilyInfoWarmTipsView.swift */,
 				049D62C42C6F272800E811A1 /* YHRiskWarningCell.swift */,
+				049D62C62C6F2F4F00E811A1 /* YHApproverInfoVerifyCell.swift */,
+				04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -3822,6 +3828,7 @@
 				04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */,
 				045EEEB02B9F171A0022A143 /* YHWorkItemView.swift in Sources */,
 				0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */,
+				049D62C72C6F2F4F00E811A1 /* YHApproverInfoVerifyCell.swift in Sources */,
 				048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */,
 				A567E5AC2BD7643D00D5D5A0 /* YHAgreementAlertView.swift in Sources */,
 				04CE1ADD2C2AD91F001CB80A /* YHActivityDetailCell.swift in Sources */,
@@ -4227,6 +4234,7 @@
 				A5A89FD72C256B94005A71DD /* YHHomeLastMessageModel.swift in Sources */,
 				045EEF172B9F171A0022A143 /* YHSelectCountryViewController.swift in Sources */,
 				044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */,
+				04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */,
 				A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
 				A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */,
 				045EEE962B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemsView.swift in Sources */,

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

@@ -10,13 +10,13 @@ import UIKit
 
 class YHFamilyInfoConfirmViewController: YHBaseViewController {
 
-    var items: [String] = ["1"]
+    var items: [String] = ["1", "1"]
 
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame:.zero, style:.grouped)
-        tableView.contentInsetAdjustmentBehavior = .never
-        tableView.estimatedSectionHeaderHeight = 24.0
+        tableView.estimatedSectionHeaderHeight = 16.0
         tableView.estimatedSectionFooterHeight = 1.0
+        tableView.contentInsetAdjustmentBehavior = .never
         tableView.showsVerticalScrollIndicator = false
         tableView.separatorStyle = .none
         tableView.delegate = self
@@ -24,6 +24,7 @@ class YHFamilyInfoConfirmViewController: YHBaseViewController {
         tableView.backgroundColor = UIColor(hex: 0xF8F9FB)
         tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
         tableView.register(YHRiskWarningCell.self, forCellReuseIdentifier: YHRiskWarningCell.cellReuseIdentifier)
+        tableView.register(YHApproverInfoVerifyCell.self, forCellReuseIdentifier: YHApproverInfoVerifyCell.cellReuseIdentifier)
         return tableView
     }()
     
@@ -54,9 +55,15 @@ extension YHFamilyInfoConfirmViewController: UITableViewDelegate, UITableViewDat
         let cell = tableView.dequeueReusableCell(withIdentifier: YHRiskWarningCell.cellReuseIdentifier, for: indexPath) 
         
         if 0 <= indexPath.section && indexPath.section < items.count {
-            
+            if indexPath.section == 0 {
+                let warningCell = tableView.dequeueReusableCell(withIdentifier: YHRiskWarningCell.cellReuseIdentifier, for: indexPath)
+                return warningCell
             }
-        return cell
+        }
+            
+        let approveCell = tableView.dequeueReusableCell(withIdentifier: YHApproverInfoVerifyCell.cellReuseIdentifier, for: indexPath)
+        return approveCell
+        
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
@@ -71,20 +78,24 @@ extension YHFamilyInfoConfirmViewController: UITableViewDelegate, UITableViewDat
     }
     
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
-        return 16
+        return 16.0
     }
     
     private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
-        return 0.001
+        return 1.0
     }
     
-    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         
-        return UIView()
+        let view = UIView()
+        view.backgroundColor = .blue
+        return view
     }
     
-    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         
-        return UIView()
+        let view = UIView()
+        view.backgroundColor = .yellow
+        return view
     }
 }

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

+//
+//  YHApproverInfoVerifyCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHApproverInfoVerifyCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHApproverInfoVerifyCell"
+
+    var items:[String] = ["", "", "", "", ""]
+    let memberRowHeight = 69.0
+    
+    lazy var whiteContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.layer.cornerRadius = kCornerRadius6
+        return view
+    }()
+    
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        // 标题
+        var title: ASAttributedString = .init("获批者信息核实", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.mainTextColor))
+        // 是否必填
+        if true {
+            let mustTag: ASAttributedString = .init("*", .font(UIFont.PFSC_M(ofSize: 17)),.foreground(UIColor.failColor))
+            title = mustTag + title
+        }
+        label.attributed.text = title
+        return label
+    }()
+    
+    lazy var tableView: UITableView = {
+        let tableView = UITableView(frame: CGRect.zero, style:.grouped)
+        if #available(iOS 15.0, *) {
+           tableView.sectionHeaderTopPadding = 0.0
+        }
+        tableView.estimatedSectionHeaderHeight = 0.1
+        tableView.estimatedSectionFooterHeight = 0.1
+        tableView.contentInsetAdjustmentBehavior = .never
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.bounces = false
+        tableView.register(YHFamilyMemberInfoCell.self, forCellReuseIdentifier: YHFamilyMemberInfoCell.cellReuseIdentifier)
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.isScrollEnabled = false
+        return tableView
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        self.contentView.backgroundColor = .clear
+        contentView.addSubview(whiteContentView)
+        whiteContentView.addSubview(titleLabel)
+        whiteContentView.addSubview(tableView)
+        
+        whiteContentView.snp.makeConstraints { make in
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+        }
+        
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(16)
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.height.equalTo(24)
+        }
+        
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+            make.height.equalTo(memberRowHeight * Double(items.count))
+            make.left.right.bottom.equalToSuperview()
+        }
+        tableView.reloadData()
+    }
+}
+
+extension YHApproverInfoVerifyCell: UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return items.count
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHFamilyMemberInfoCell.cellReuseIdentifier, for: indexPath)
+        
+        if 0 <= indexPath.section && indexPath.section < items.count {
+            
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 69.0
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+        if 0 <= indexPath.row && indexPath.row < items.count {
+            
+        }
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {
+        return 0.1
+    }
+    
+    private func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> CGFloat {
+        return 0.1
+    }
+    
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        let view = UIView()
+        view.backgroundColor = .red
+        return view
+    }
+    
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView()
+        view.backgroundColor = .green
+        return view
+    }
+}

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

+//
+//  YHFamilyMemberInfoCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/8/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFamilyMemberInfoCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHFamilyMemberInfoCell"
+    
+    lazy var lineView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    lazy var relationLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.text = "主审人"
+        label.textColor = UIColor.mainTextColor
+        return label
+    }()
+    
+    lazy var nameLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_M(ofSize: 14)
+        label.text = "张山峰"
+        label.textColor = UIColor.mainTextColor
+        return label
+    }()
+    
+    lazy var pinyinLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        label.text = "ZHANG SHANGFENG"
+        label.textColor = UIColor.mainTextColor(alpha: 0.5)
+        return label
+    }()
+    
+    lazy var statusLabel: UILabel = {
+        let label = UILabel()
+        label.font = UIFont.PFSC_R(ofSize: 14)
+        label.text = "待核对"
+        label.textColor = UIColor.brandMainColor
+        return label
+    }()
+    
+    lazy var arrowImgView: UIImageView = {
+        let view = UIImageView(image: UIImage(named: "family_info_arrow"))
+        return view
+    }()
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    func setupUI() {
+        
+        self.selectionStyle = .none
+        self.backgroundColor = .clear
+        self.contentView.backgroundColor = .clear
+        contentView.addSubview(relationLabel)
+        contentView.addSubview(nameLabel)
+        contentView.addSubview(pinyinLabel)
+        contentView.addSubview(statusLabel)
+        contentView.addSubview(arrowImgView)
+        contentView.addSubview(lineView)
+
+        lineView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalToSuperview()
+            make.height.equalTo(0.5)
+        }
+        
+        relationLabel.snp.makeConstraints { make in
+            make.left.equalTo(18.0)
+            make.width.equalTo(42)
+            make.centerY.equalToSuperview()
+        }
+        
+        nameLabel.snp.makeConstraints { make in
+            make.left.equalTo(relationLabel.snp.right).offset(60)
+            make.right.equalTo(statusLabel.snp.left).offset(-14)
+            make.top.equalTo(16)
+            make.height.equalTo(20)
+        }
+        
+        pinyinLabel.snp.makeConstraints { make in
+            make.left.equalTo(nameLabel)
+            make.right.equalTo(nameLabel)
+            make.top.equalTo(nameLabel.snp.bottom)
+            make.height.equalTo(17)
+        }
+        
+        arrowImgView.snp.makeConstraints { make in
+            make.width.height.equalTo(20)
+            make.right.equalTo(-18)
+            make.centerY.equalToSuperview()
+        }
+        
+        statusLabel.snp.makeConstraints { make in
+            make.width.equalTo(56)
+            make.right.equalTo(arrowImgView.snp.left)
+            make.height.equalTo(20)
+            make.centerY.equalToSuperview()
+        }
+    }
+    
+}

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -337,6 +337,12 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             return
         }
         
+        if true {
+            let vc = YHFamilyInfoConfirmViewController()
+            self.navigationController?.pushViewController(vc)
+            return
+        }
+        
         let item: PersonalModuleItem = items[indexPath.row]
         switch item.type {
         case .myCard://我的名片

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/客服段/办证段/family_info_arrow.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "箭头中@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "箭头中@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}