// 学历

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -485,6 +485,7 @@
 		047AA3FA2C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */; };
 		047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */; };
 		047AB5E62CD083CE002A3573 /* YHButlerMessageReportHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047AB5E52CD083CE002A3573 /* YHButlerMessageReportHandler.swift */; };
+		047F3DD92CE601D1001B2A6D /* YHEducationCertificateConfirmCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047F3DD82CE601D1001B2A6D /* YHEducationCertificateConfirmCell.swift */; };
 		0480582F2C7CA77900502CAA /* YHDisappointHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */; };
 		048058312C7DBDC900502CAA /* YHTravelCertificateTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */; };
 		048058332C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */; };
@@ -1455,6 +1456,7 @@
 		047AA3F92C60739E009C4554 /* YHInvitationWithGiftsSelectItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInvitationWithGiftsSelectItemView.swift; sourceTree = "<group>"; };
 		047AA3FB2C61EE7F009C4554 /* YHSignAppendStepView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignAppendStepView.swift; sourceTree = "<group>"; };
 		047AB5E52CD083CE002A3573 /* YHButlerMessageReportHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHButlerMessageReportHandler.swift; sourceTree = "<group>"; };
+		047F3DD82CE601D1001B2A6D /* YHEducationCertificateConfirmCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHEducationCertificateConfirmCell.swift; sourceTree = "<group>"; };
 		0480582E2C7CA77900502CAA /* YHDisappointHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDisappointHKAlertView.swift; sourceTree = "<group>"; };
 		048058302C7DBDC900502CAA /* YHTravelCertificateTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsView.swift; sourceTree = "<group>"; };
 		048058322C7DC0CF00502CAA /* YHTravelCertificateTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHTravelCertificateTipsCell.swift; sourceTree = "<group>"; };
@@ -3012,6 +3014,7 @@
 			children = (
 				045EEE152B9F171A0022A143 /* YHCollegeNameCell.swift */,
 				045EEE162B9F171A0022A143 /* YHEducationInfoCell.swift */,
+				047F3DD82CE601D1001B2A6D /* YHEducationCertificateConfirmCell.swift */,
 				045EEE172B9F171A0022A143 /* YHCollegeSearchBar.swift */,
 			);
 			path = V;
@@ -5689,6 +5692,7 @@
 				A567E5B32BD7643D00D5D5A0 /* YHServiceOrderAlertView.swift in Sources */,
 				A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */,
 				A5ACE93B2B4564F7002C94D2 /* UIFont+Extension.swift in Sources */,
+				047F3DD92CE601D1001B2A6D /* YHEducationCertificateConfirmCell.swift in Sources */,
 				044EE2232C8FE1D000A2FE3A /* YHServiceCenterViewController.swift in Sources */,
 				A567E5A92BD7643D00D5D5A0 /* YHSearchInfoHistoryView.swift in Sources */,
 				045EEE802B9F171A0022A143 /* YHAcademicPreviewModel.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -21,8 +21,7 @@ class YHEducationDetailVC: YHBaseViewController {
     var isNeedShowError = false
     let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
     var detailInfo: YHEducationDetailInfo = YHEducationDetailInfo()
-    var isChildsEditMode: YHFormTitleItemEditType = .none
-    var isBrothersEditMode: YHFormTitleItemEditType = .none
+    var isCerConfirm: Bool? = nil
     
     var items:[[YHFormItemProtocol]] = []
     
@@ -45,6 +44,7 @@ class YHEducationDetailVC: YHBaseViewController {
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
         tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        tableView.register(YHEducationCertificateConfirmCell.self, forCellReuseIdentifier: YHEducationCertificateConfirmCell.cellReuseIdentifier)
         return tableView
     }()
     
@@ -152,6 +152,11 @@ class YHEducationDetailVC: YHBaseViewController {
         
         let arr0:[YHFormItemProtocol] = [title0, item05, item00, item01, item02, item03, item04, item07]
         items.append(arr0)
+        
+        let item10 = YHFormDetailItem(type: .cerConfirm)
+        let arr1:[YHFormItemProtocol] = [item10]
+        items.append(arr1)
+
         self.tableView.reloadData()
     }
 }
@@ -258,6 +263,31 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                 }
                 cell.setTips(detailItem.tips, isShow: (isNeedShowError && !isValueValid))
                 return cell
+                
+            } else if cellType == .cerConfirm {
+                
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationCertificateConfirmCell.cellReuseIdentifier, for: indexPath) as! YHEducationCertificateConfirmCell
+                
+                var isSelectTrue = false
+                var isSelectFalse = false
+                
+                if let isCerConfirm = isCerConfirm {
+                    isSelectTrue = isCerConfirm
+                    isSelectFalse = !isCerConfirm
+                }
+                let answers = [YHFormChoiceItem(title: "是".local, isSelect: isSelectTrue),
+                               YHFormChoiceItem(title: "否".local, isSelect: isSelectFalse)]
+                cell.answerArr = answers
+                cell.answerBlock = {
+                    [weak self]  (arr, selectIndex) in
+                    guard let self = self else { return }
+            
+                    let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    let option = (selectItem.title == "是".local ? true : false)
+                    self.isCerConfirm = option
+                    self.tableView.reloadData()
+                }
+                return cell
             }
         }
         
@@ -448,17 +478,28 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {
         // 设置每块section圆角
+        
+        if indexPath.row == 0, indexPath.row == arr.count-1 {
+            let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue |
+                                                UIRectCorner.topRight.rawValue |
+                                                UIRectCorner.bottomLeft.rawValue |
+                                                UIRectCorner.bottomRight.rawValue)
+            cell.createCorner(CGSizeMake(12.0, 12.0), corner)
+            return
+        }
         if (indexPath.row == 0) {
             let corner = UIRectCorner(rawValue: UIRectCorner.topLeft.rawValue | UIRectCorner.topRight.rawValue)
             cell.createCorner(CGSizeMake(12.0, 12.0), corner)
-            
-        } else if (indexPath.row == arr.count-1) {
+            return
+        }
+        
+        if (indexPath.row == arr.count-1) {
             let corner = UIRectCorner(rawValue: UIRectCorner.bottomLeft.rawValue | UIRectCorner.bottomRight.rawValue)
             cell.createCorner(CGSizeMake(12.0, 12.0), corner)
-            
-        } else {
-            cell.layer.mask = nil
+            return
         }
+        
+        cell.layer.mask = nil
     }
     
     func getCellType(_ item: Any) ->HKFormItemCellType {
@@ -469,6 +510,10 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
         if item is YHFormDetailItem {
             let detailItem = item as! YHFormDetailItem
             
+            if detailItem.type == .cerConfirm {
+                return .cerConfirm
+            }
+            
             if detailItem.type == .educationCity {
                 if detailInfo.isSchoolInAboard() {
                     return .inputText
@@ -532,19 +577,18 @@ extension YHEducationDetailVC {
             || detailInfo.graduateTime.isEmpty
             || detailInfo.major.isEmpty
             || detailInfo.degree.isEmpty
-            || detailInfo.degreeType.isEmpty
             || detailInfo.schoolAddress.country.isEmpty
         {
             return false
         }
         
-        if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
-            return false
-        }
+//        if detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.foreign.isEmpty {
+//            return false
+//        }
         
-        if !detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.area.count <= 0 {
-            return false
-        }
+//        if !detailInfo.isSchoolInAboard(), detailInfo.schoolAddress.area.count <= 0 {
+//            return false
+//        }
         return true
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/V/YHEducationCertificateConfirmCell.swift

+//
+//  YHEducationCertificateConfirmCell.swift
+//  galaxy
+//
+//  Created by Dufet on 2024/11/14.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHEducationCertificateConfirmCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHEducationCertificateConfirmCell"
+    
+    private let btnWidth = 70.0
+    private let btnHeight = 32.0
+    private let titleFont = UIFont.PFSC_R(ofSize: 14)
+    private let btnTitleSelectColor = UIColor.brandMainColor
+    private let btnTitleDefaultColor = UIColor.mainTextColor
+    private let btnBgDefaultColor = UIColor.contentBkgColor
+    private let btnBgSelectColor = UIColor.brandMainColor.withAlphaComponent(0.08)
+    private let answerBaseTag  = 9527
+    
+    // 是否必须字段
+    var isMust:Bool = false
+    var answerBlock:(([YHFormChoiceItem], Int)->Void)?
+    
+    // 必须传2个item的arr
+    var answerArr:[YHFormChoiceItem]? {
+        didSet {
+            if let answerArr = answerArr, answerArr.count == 2 {
+                
+                var isSelectTrue:Bool? = nil
+                for i in 0...1 {
+                    let answerBtn = self.viewWithTag(answerBaseTag+i) as! UIButton
+                    let item = answerArr[i]
+                    answerBtn.setTitle(item.title, for: .normal)
+                    updateAnswerButton(answerBtn, item.isSelect)
+                    if item.isSelect {
+                        isSelectTrue = (i == 0)
+                    }
+                }
+                if let isSelectTrue = isSelectTrue { // 进行过选择
+                    if isSelectTrue == false {
+                        let a: ASAttributedString = .init("若不能提供以上证明材料，将导致您的该收入", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
+                        let b: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
+                        let c: ASAttributedString = .init("，请尽可能准备以上材料并修改此选项。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
+                        tipsLabel.attributed.text = a+b+c
+                        isNeedShowTips(true)
+                        
+                    } else {
+                        tipsLabel.attributed.text = ""
+                        isNeedShowTips(false)
+                    }
+                    
+                } else { // 没有选择
+                    let tips: ASAttributedString = .init("请选择", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
+                    tipsLabel.attributed.text = tips
+                    isNeedShowTips(true)
+                }
+                
+            } else {
+                // 重置所有答案状态
+                for i in 0...1 {
+                    let answerBtn = self.viewWithTag(answerBaseTag+i) as! UIButton
+                    answerBtn.setTitle("", for: .normal)
+                    updateAnswerButton(answerBtn, false)
+                }
+            }
+        }
+    }
+    
+    private lazy var topLine:UIView = {
+        let view = UIView()
+        view.backgroundColor = .separatorColor
+        return view
+    }()
+    
+    private lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = .mainTextColor
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        label.font = UIFont.PFSC_M(ofSize: 17)
+        label.lineBreakMode = .byCharWrapping
+        label.text = "证件提供确认"
+        return label
+    }()
+    
+    private lazy var questionContentView: UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+    private lazy var questionLabel: UILabel = {
+        let label = UILabel()
+        label.textAlignment = .left
+        label.numberOfLines = 0
+        let a: ASAttributedString = .init("*", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.failColor))
+        let b: ASAttributedString = .init("您是否可以提供以下所有证明文件", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
+        label.attributed.text = a+b
+        return label
+    }()
+    
+    private lazy var answer1Btn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    private lazy var answer2Btn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("", for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
+        btn.setTitleColor(btnTitleDefaultColor, for: .normal)
+        btn.backgroundColor = btnBgDefaultColor
+        btn.layer.cornerRadius = btnHeight/2.0
+        btn.layer.masksToBounds = true
+        btn.layer.borderWidth = 1
+        btn.layer.borderColor = UIColor.clear.cgColor
+        btn.tag = answerBaseTag+1
+        btn.addTarget(self, action: #selector(didClickResponseBtn(btn:)), for: .touchUpInside)
+        return btn
+    }()
+    
+    private lazy var markContentView: UIView = {
+        let view = UIView()
+        view.backgroundColor = UIColor.init(hex: 0xF8F9FB)
+        return view
+    }()
+    
+    private lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.numberOfLines = 0
+        let a: ASAttributedString = .init("若不能提供以上证明材料，将导致您的该收入", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
+        let b: ASAttributedString = .init("不被认可不予加分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.failColor))
+        let c: ASAttributedString = .init("，请尽可能准备以上材料并修改此选项。", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.init(hex: 0x8993A2)))
+        label.attributed.text = a+b+c
+        return label
+    }()
+    
+    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
+        contentView.backgroundColor = .white
+        contentView.addSubview(titleLabel)
+        contentView.addSubview(topLine)
+        contentView.addSubview(questionContentView)
+        questionContentView.addSubview(questionLabel)
+        questionContentView.addSubview(answer1Btn)
+        questionContentView.addSubview(answer2Btn)
+        contentView.addSubview(markContentView)
+        contentView.addSubview(tipsLabel)
+
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(16)
+            make.height.equalTo(24)
+        }
+        
+        topLine.snp.makeConstraints { make in
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+            make.left.right.equalToSuperview()
+            make.height.equalTo(0.5)
+        }
+
+        questionContentView.snp.makeConstraints { make in
+            make.top.equalTo(topLine.snp.bottom).offset(0)
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+        }
+        
+        questionLabel.snp.makeConstraints { make in
+            make.left.equalTo(0)
+            make.right.equalTo(answer1Btn.snp.left).offset(-15)
+            make.top.equalTo(16)
+            make.bottom.equalTo(-16)
+        }
+        
+        answer1Btn.snp.makeConstraints { make in
+            make.centerY.equalTo(questionLabel)
+            make.width.equalTo(74)
+            make.height.equalTo(32)
+            make.right.equalTo(answer2Btn.snp.left).offset(-12)
+        }
+        
+        answer2Btn.snp.makeConstraints { make in
+            make.centerY.equalTo(questionLabel)
+            make.width.equalTo(74)
+            make.height.equalTo(32)
+            make.right.equalTo(0)
+        }
+        
+        markContentView.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(questionContentView.snp.bottom).offset(0)
+            make.height.equalTo(124)
+        }
+        
+        tipsLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(markContentView.snp.bottom).offset(16)
+            make.bottom.equalTo(-16)
+        }
+
+    }
+    
+    // 更新答案按钮选中状态
+    private func updateAnswerButton(_ btn:UIButton, _ isSelect:Bool) {
+        btn.layer.borderColor = (isSelect ? btnTitleSelectColor : .clear).cgColor
+        btn.setTitleColor((isSelect ? btnTitleSelectColor : btnTitleDefaultColor), for: .normal)
+        btn.backgroundColor = (isSelect ? btnBgSelectColor : btnBgDefaultColor)
+    }
+    
+    @objc func didClickResponseBtn(btn: UIButton) {
+        
+        let selectIndex = btn.tag-answerBaseTag
+        if let resultArr = answerArr, resultArr.count == 2 {
+            
+            for i in 0...1 {
+                let item = resultArr[i]
+                item.isSelect = (i == selectIndex)
+            }
+            answerArr = resultArr
+            if let answerBlock = answerBlock {
+                answerBlock(resultArr, selectIndex)
+            }
+        }
+    }
+    
+    func isNeedShowTips(_ isShow: Bool) {
+        
+        tipsLabel.isHidden = !isShow
+        tipsLabel.snp.remakeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(-18)
+            make.top.equalTo(markContentView.snp.bottom).offset(16)
+            make.bottom.equalTo(isShow ? -16 : 0)
+            if !isShow {
+                make.height.equalTo(0)
+            }
+        }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
+    }
+
+}

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

@@ -21,6 +21,8 @@ enum HKFormItemCellType: Int {
     case onlyTwoChoice = 8
     case question = 9
     
+    case cerConfirm = 10 
+    
 }
 
 class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -190,6 +190,8 @@ enum YHFormDetailItemType:Int {
     case educationCountry
     // 上课城市
     case educationCity
+    // 证件提供确认
+    case cerConfirm
     
     // 证书信息
     case certificateInfo
@@ -523,7 +525,10 @@ class YHFormDetailItem : YHFormItemProtocol {
             return "颁授国家/地区".local
         case .conferCity:
             return "颁授城市".local
+        case .cerConfirm:
+            return "证件提供确认".local
         }
+    
 
     }