// 学历

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -36,6 +36,9 @@
 		043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955202B70955200955D49 /* YHFormPickerViewType.swift */; };
 		043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */; };
 		043955252B70D20300955D49 /* YHFormItemQuestionsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 043955242B70D20300955D49 /* YHFormItemQuestionsCell.swift */; };
+		044CC6252B873F330083FF76 /* YHCollegeSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */; };
+		044CC6272B8740340083FF76 /* YHCollegeNameCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */; };
+		044CC6292B8741AC0083FF76 /* YHSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CC6282B8741AC0083FF76 /* YHSearchBar.swift */; };
 		0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */; };
 		0468D4222B493A5E00CFB916 /* YHPhoneMessageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */; };
 		0468D4242B494BEA00CFB916 /* YHCodeResultViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */; };
@@ -313,6 +316,9 @@
 		043955202B70955200955D49 /* YHFormPickerViewType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormPickerViewType.swift; sourceTree = "<group>"; };
 		043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChildInfoContainerVC.swift; sourceTree = "<group>"; };
 		043955242B70D20300955D49 /* YHFormItemQuestionsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFormItemQuestionsCell.swift; sourceTree = "<group>"; };
+		044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollegeSearchViewController.swift; sourceTree = "<group>"; };
+		044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCollegeNameCell.swift; sourceTree = "<group>"; };
+		044CC6282B8741AC0083FF76 /* YHSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSearchBar.swift; sourceTree = "<group>"; };
 		0468D41F2B49320900CFB916 /* YHVerificationCodeLoginController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVerificationCodeLoginController.swift; sourceTree = "<group>"; };
 		0468D4212B493A5E00CFB916 /* YHPhoneMessageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneMessageView.swift; sourceTree = "<group>"; };
 		0468D4232B494BEA00CFB916 /* YHCodeResultViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeResultViewController.swift; sourceTree = "<group>"; };
@@ -766,14 +772,14 @@
 			path = Localized;
 			sourceTree = "<group>";
 		};
-		04C693652B73183E004C1758 /* 学历专业资格填写 */ = {
+		04C693652B73183E004C1758 /* Education&Qualification(学历专业资格填写) */ = {
 			isa = PBXGroup;
 			children = (
 				042F88892B847720008B60BD /* M */,
 				04C693672B7318D3004C1758 /* V */,
 				04C693662B7318CD004C1758 /* C */,
 			);
-			path = "学历专业资格填写";
+			path = "Education&Qualification(学历专业资格填写)";
 			sourceTree = "<group>";
 		};
 		04C693662B7318CD004C1758 /* C */ = {
@@ -782,6 +788,7 @@
 				04C693682B73191A004C1758 /* YHEducationInfoListVC.swift */,
 				04C693702B735C6F004C1758 /* YHQualificationDetailVC.swift */,
 				04C6936E2B7350E7004C1758 /* YHEducationDetailVC.swift */,
+				044CC6242B873F330083FF76 /* YHCollegeSearchViewController.swift */,
 			);
 			path = C;
 			sourceTree = "<group>";
@@ -790,6 +797,8 @@
 			isa = PBXGroup;
 			children = (
 				04C6936A2B7329E7004C1758 /* YHEducationInfoCell.swift */,
+				044CC6262B8740340083FF76 /* YHCollegeNameCell.swift */,
+				044CC6282B8741AC0083FF76 /* YHSearchBar.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -1489,7 +1498,7 @@
 			isa = PBXGroup;
 			children = (
 				04E86E222B81EA1000A35F4B /* WorkExperience */,
-				04C693652B73183E004C1758 /* 学历专业资格填写 */,
+				04C693652B73183E004C1758 /* Education&Qualification(学历专业资格填写) */,
 				A5234E382B72346A00A33433 /* OtherInformation(其他信息) */,
 				A58556BB2B6BD81C003746B2 /* BaseInformation(基本资料) */,
 				A5167B2D2B6A23D10084C08F /* PersonInfoList(个人信息表) */,
@@ -1834,6 +1843,7 @@
 				04C6936B2B7329E7004C1758 /* YHEducationInfoCell.swift in Sources */,
 				04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */,
 				04E86E342B83268F00A35F4B /* YHWorkExperienceViewController.swift in Sources */,
+				044CC6292B8741AC0083FF76 /* YHSearchBar.swift in Sources */,
 				A5ACE9422B4564F7002C94D2 /* AppDelegate+Extension.swift in Sources */,
 				A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */,
 				A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */,
@@ -1879,6 +1889,7 @@
 				043955212B70955200955D49 /* YHFormPickerViewType.swift in Sources */,
 				043955232B70BC2500955D49 /* YHChildInfoContainerVC.swift in Sources */,
 				04E86E442B8357EC00A35F4B /* YHCountryMessage.swift in Sources */,
+				044CC6252B873F330083FF76 /* YHCollegeSearchViewController.swift in Sources */,
 				0468D42B2B55019900CFB916 /* YHAnalytics.swift in Sources */,
 				A5ACE93C2B4564F7002C94D2 /* UIColor+Extension.swift in Sources */,
 				04E86E4F2B8479B700A35F4B /* YHWorkIntroductionItemView.swift in Sources */,
@@ -1902,6 +1913,7 @@
 				A5ACE9582B4564F7002C94D2 /* YHNoDataTipView.swift in Sources */,
 				04E86E592B84AD6200A35F4B /* YHWorkExampleViewController.swift in Sources */,
 				042FBBBB2B62806D00F9DE23 /* YHCertificateInfoController.swift in Sources */,
+				044CC6272B8740340083FF76 /* YHCollegeNameCell.swift in Sources */,
 				042FBBC72B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift in Sources */,
 				A5234E2A2B6E349600A33433 /* YHBasicInfoFillBottomView.swift in Sources */,
 				04A7BC912B6B7B89000E8D47 /* YHTwoOptionAlertView.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHCollegeSearchViewController.swift

+//
+//  YHCollegeSearchViewController.swift
+//  galaxy
+//
+//  Created by edy on 2024/2/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCollegeSearchViewController: YHBaseViewController {
+    
+    var searchCollegeName:String?
+    var selectBlock:(()->Void)?
+    var colleges:[Any] = [1,2,3]
+    
+    lazy var searchBar: YHSearchBar = {
+        let bar = YHSearchBar.createBar()
+        return bar
+    }()
+    
+    lazy var tableView: UITableView = {
+        
+        let tableView = UITableView(frame:.zero, style:.plain)
+        
+        if #available(iOS 11.0, *) {
+            tableView.contentInsetAdjustmentBehavior = .never
+        }
+        tableView.showsVerticalScrollIndicator = false
+        tableView.backgroundColor = .clear
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHCollegeNameCell.self, forCellReuseIdentifier: YHCollegeNameCell.cellReuseIdentifier)
+        return tableView
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+    }
+    
+    func createUI() {
+        
+        self.view.backgroundColor = .white
+        self.gk_navTitle = "学校名称".local
+
+        view.addSubview(tableView)
+        view.addSubview(searchBar)
+        
+        if let searchCollegeName = searchCollegeName {
+            searchBar.textField.text = searchCollegeName
+        }
+        searchBar.textChange = {
+           [weak self]  text in
+            guard let self = self else { return }
+        }
+        searchBar.confirmBlock = {
+            
+        }
+        
+        searchBar.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+            make.height.equalTo(YHSearchBar.height)
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar+16)
+        }
+        
+        tableView.snp.makeConstraints { make in
+            make.top.equalTo(searchBar.snp.bottom).offset(8)
+            make.left.right.bottom.equalToSuperview()
+        }
+    }
+}
+
+extension YHCollegeSearchViewController: UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return colleges.count
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 36.0
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHCollegeNameCell.cellReuseIdentifier, for: indexPath) as! YHCollegeNameCell
+        cell.titleLabel.text = "XXXXXXXXX"
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHEducationDetailVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -190,7 +190,6 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             let formItem = item as! YHFormTitleItem
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
             cell.titleLabel.text = formItem.getTitle()
-            cell.subTitleLabel.text = formItem.getSubTitle()
             return cell
         }
         
@@ -300,6 +299,10 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
             
             if detailItem.type == .universityFullName { // 选择大学名称
                 
+               let vc = YHCollegeSearchViewController()
+               vc.searchCollegeName = detailInfo.college
+               self.navigationController?.pushViewController(vc)
+                
             } else if detailItem.type == .educationStyle { // 授课形式
                 YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) {
                     [weak self] selectType in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/学历专业资格填写/C/YHEducationInfoListVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -195,7 +195,6 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
             
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
             cell.titleLabel.text = formItem.getTitle()
-            cell.subTitleLabel.text = formItem.getSubTitle()
             
             // 决定右边按钮显示样式
             cell.showEditType(type: .none)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHCollegeNameCell.swift

+//
+//  YHCollegeNameCell.swift
+//  galaxy
+//
+//  Created by edy on 2024/2/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHCollegeNameCell: UITableViewCell {
+
+    static let cellReuseIdentifier = "YHCollegeNameCell"
+
+    lazy var titleLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = .mainTextColor
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_B(ofSize: 14)
+        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.addSubview(titleLabel)
+        
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(21)
+            make.right.equalToSuperview().offset(-21)
+            make.top.bottom.equalToSuperview()
+        }
+    }
+
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/V/YHSearchBar.swift

+//
+//  YHSearchBar.swift
+//  galaxy
+//
+//  Created by edy on 2024/2/22.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHSearchBar: UIView {
+
+    static let height = 40.0
+    static let confirmBtnHeight = height-8.0
+    
+    var textChange:((String?)->Void)?
+    var confirmBlock:(()->Void)?
+    var placeHolder:String? {
+        didSet {
+            if let placeholder = placeHolder {
+                textField.attributedPlaceholder = NSAttributedString(string: placeholder, attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
+            }
+        }
+    }
+    private lazy var contentView = {
+        let view = UIView()
+        view.backgroundColor = .contentBkgColor
+        view.layer.cornerRadius = Self.height/2.0
+        view.clipsToBounds = true
+        return view
+    }()
+    
+    lazy var textField:UITextField = {
+        let textField = UITextField()
+        textField.backgroundColor = .clear
+        textField.attributedPlaceholder = NSAttributedString(string: "请输入学校全称", attributes: [NSAttributedString.Key.foregroundColor : UIColor.placeHolderColor])
+        textField.font = UIFont.PFSC_M(ofSize: 12)
+        textField.tintColor = UIColor(hexString: "#3D88F8")
+        textField.textColor = UIColor.mainTextColor
+        textField.addTarget(self, action: #selector(textFieldChanged(textField:)), for: .editingChanged)
+        return textField
+    }()
+    
+    lazy var confirmBtn: UIButton = {
+        let btn = UIButton()
+        btn.setTitle("确认".local, for: .normal)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
+        btn.setTitleColor(.white, for: .normal)
+        btn.backgroundColor = UIColor(hexString: "#3D88F8")
+        btn.layer.cornerRadius = Self.confirmBtnHeight/2.0
+        btn.addTarget(self, action: #selector(confirmBtnClicked), for: .touchUpInside)
+        return btn
+    }()
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        self.createUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        super.init(coder: coder)
+    }
+    
+    static func createBar() -> YHSearchBar {
+        let view = YHSearchBar(frame: CGRect(x: 0, y: 0, width: KScreenWidth-32, height: height))
+        return view
+    }
+    
+    @objc func confirmBtnClicked() {
+        if let confirmBlock = confirmBlock {
+            confirmBlock()
+        }
+    }
+    
+    func createUI() {
+        
+        self.backgroundColor = .white
+        
+        contentView.addSubview(textField)
+        contentView.addSubview(confirmBtn)
+        self.addSubview(contentView)
+        
+        contentView.snp.makeConstraints { make in
+            make.edges.equalToSuperview()
+        }
+        
+        textField.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(Self.height/2.0)
+            make.right.equalTo(confirmBtn.snp.left).offset(-4)
+            make.centerY.equalToSuperview()
+        }
+        
+        confirmBtn.snp.makeConstraints { make in
+            make.size.equalTo(CGSize(width: 66, height: Self.height-8.0))
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview().offset(-4)
+        }
+    }
+    
+    @objc func textFieldChanged(textField:UITextField) {
+        if let textChange = textChange {
+            textChange(textField.text)
+        }
+    }
+}

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

@@ -30,7 +30,6 @@ class YHFormItemAddCell: UITableViewCell {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
         btn.setTitleColor(btnTitleColor, for: .normal)
         btn.iconInLeft(spacing: 6)
-        
         btn.setImage(UIImage(named: "form_add_info"), for: .normal)
         btn.addTarget(self, action: #selector(didClickAddBtn), for: .touchUpInside)
         return btn