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

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj

galaxy/Gemfile.lock

@@ -168,7 +168,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3, < 2.0.0)
     fastlane-plugin-pgyer (0.2.9)
     fastlane-plugin-upload_to_bugly (0.1.2)
-    fastlane-plugin-versioning (0.7.0)
+    fastlane-plugin-versioning (0.7.1)
     ffi (1.16.3)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -34,6 +34,7 @@
 		0411CF182D1D502D00644D35 /* YHlifeCollectionReusableView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF172D1D502D00644D35 /* YHlifeCollectionReusableView.swift */; };
 		0411CF1A2D22960900644D35 /* YHGCWorkExperienceListReasonTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF192D22960900644D35 /* YHGCWorkExperienceListReasonTableViewCell.swift */; };
 		0411CF1C2D2BA99500644D35 /* YHGCWorkExperienceListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF1B2D2BA99500644D35 /* YHGCWorkExperienceListTableViewCell.swift */; };
+		041938712D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041938702D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift */; };
 		04307B662D1942F500ED8E8D /* YHDynamicSheetPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B652D1942F500ED8E8D /* YHDynamicSheetPickerView.swift */; };
 		04307B682D19911800ED8E8D /* YHIncomeInfoEditCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B672D19911800ED8E8D /* YHIncomeInfoEditCell.swift */; };
 		04307B6A2D1A4C6500ED8E8D /* YHIncomeInfoSelectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B692D1A4C6500ED8E8D /* YHIncomeInfoSelectCell.swift */; };
@@ -1252,6 +1253,7 @@
 		0411CF172D1D502D00644D35 /* YHlifeCollectionReusableView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHlifeCollectionReusableView.swift; sourceTree = "<group>"; };
 		0411CF192D22960900644D35 /* YHGCWorkExperienceListReasonTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkExperienceListReasonTableViewCell.swift; sourceTree = "<group>"; };
 		0411CF1B2D2BA99500644D35 /* YHGCWorkExperienceListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkExperienceListTableViewCell.swift; sourceTree = "<group>"; };
+		041938702D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCCollegeSearchViewController.swift; sourceTree = "<group>"; };
 		04307B652D1942F500ED8E8D /* YHDynamicSheetPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDynamicSheetPickerView.swift; sourceTree = "<group>"; };
 		04307B672D19911800ED8E8D /* YHIncomeInfoEditCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHIncomeInfoEditCell.swift; sourceTree = "<group>"; };
 		04307B692D1A4C6500ED8E8D /* YHIncomeInfoSelectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHIncomeInfoSelectCell.swift; sourceTree = "<group>"; };
@@ -6415,6 +6417,7 @@
 			children = (
 				04AE203A2D13C01B00891D24 /* YHGCEducationInfoListVC.swift */,
 				04AE203C2D13C14900891D24 /* YHGCEducationDetailVC.swift */,
+				041938702D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift */,
 				04AE203E2D13C36500891D24 /* YHGCQualificationDetailVC.swift */,
 			);
 			path = C;
@@ -7243,6 +7246,7 @@
 				045C11462D12CA5F00BD2DC0 /* YHSearchInfoHistoryView.swift in Sources */,
 				045C11472D12CA5F00BD2DC0 /* YHAdopterItemView.swift in Sources */,
 				045C11482D12CA5F00BD2DC0 /* YHHomeInfoClassifyModel.swift in Sources */,
+				041938712D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift in Sources */,
 				045C11492D12CA5F00BD2DC0 /* YHOrderDetailViewController.swift in Sources */,
 				045C114A2D12CA5F00BD2DC0 /* YHAdopterCardModel.swift in Sources */,
 				045C114B2D12CA5F00BD2DC0 /* YHDocumentMessageTableViewCell.swift in Sources */,
@@ -8022,7 +8026,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8166,7 +8170,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8373,7 +8377,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -8420,7 +8424,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift

@@ -110,24 +110,19 @@ class YHServiceCenterViewController: YHBaseViewController {
         }
         
         NotificationCenter.default.addObserver(self, selector: #selector(logoutSuccess), name: YhConstant.YhNotification.didLogoutSuccessNotifiction, object: nil)
-        NotificationCenter.default.addObserver(self, selector: #selector(jumpServiceList), name: YhConstant.YhNotification.goToServiceListNotification, object: nil)
         noDataView.isHidden = false
         homeTableView.isHidden = true
         
         NotificationCenter.default.addObserver(self, selector: #selector(leaveTopOp), name:Notification.Name(rawValue: "leaveTop0"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(beginDragging), name:Notification.Name(rawValue: "scrollViewWillBeginDragging0"), object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(endDragging), name:Notification.Name(rawValue: "scrollViewDidEndDragging0"), object: nil)
+        
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(didJumpToServiceProgess), name: YhConstant.YhNotification.didJumpToServiceProgressNotification, object: nil)
     }
     
-    @objc func logoutSuccess() {
-        self.model = YHContactItemModel()
-        self.oldModel = YHContactItemModel()
-        self.state = 0
-        self.headIndex = 0
-        self.isCanSelectStep = false
-    }
     
-    @objc func jumpServiceList() {
+    private func goToServiceProgressVC() {
         let vc = YHOrderDetailViewController()
         vc.model = oldModel
         vc.backDate = { [weak self] model in
@@ -140,6 +135,19 @@ class YHServiceCenterViewController: YHBaseViewController {
         self.navigationController?.pushViewController(vc)
     }
     
+    @objc func didJumpToServiceProgess() {
+        /// 服务进度
+        goToServiceProgressVC()
+    }
+    
+    @objc func logoutSuccess() {
+        self.model = YHContactItemModel()
+        self.oldModel = YHContactItemModel()
+        self.state = 0
+        self.headIndex = 0
+        self.isCanSelectStep = false
+    }
+    
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
         loadData()
@@ -259,16 +267,7 @@ extension YHServiceCenterViewController {
         YHServiceMoreAlertView.show(flag) {[weak self] index in
             guard let self = self else { return }
             if index == 1 {
-                let vc = YHOrderDetailViewController()
-                vc.model = oldModel
-                vc.backDate = { [weak self] model in
-                    guard let self = self else { return }
-                    self.model = model
-                    self.state = 0
-                    self.headIndex = 0
-                    self.isCanSelectStep = false
-                }
-                self.navigationController?.pushViewController(vc)
+                self.goToServiceProgressVC()
             } else {
                 if self.state == 1 {
                     let view = YHServiceOrderGuideTipsView.sheetView(serviceCenterMainReqVM.hasTTPS, model.product_type)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift

@@ -36,7 +36,7 @@ class YHCertificateEntryHeadView: UIView {
         return titleLable
     }()
     
-    let numFont = UIFont(name: "DINAlternate-Bold", size: 14)!
+    let numFont = UIFont(name: "DINAlternate-Bold", size: 17)!
     
     
     private lazy var statiticLable : UILabel = {
@@ -67,19 +67,19 @@ private extension YHCertificateEntryHeadView {
         }
         
         let a: ASAttributedString = .init("待上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let aa: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
+        let aa: ASAttributedString = .init(" 0 ", .font(numFont),.foreground(UIColor.warnColor))
         
         
         let b: ASAttributedString = .init("件，已驳回", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let bb: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
+        let bb: ASAttributedString = .init(" 0 ", .font(numFont),.foreground(UIColor.warnColor))
         
         
         let c: ASAttributedString = .init("件，审核中", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let cc: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
+        let cc: ASAttributedString = .init(" 0 ", .font(numFont),.foreground(UIColor.warnColor))
         
         
         let d: ASAttributedString = .init("件，已完成", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let dd: ASAttributedString = .init("0", .font(numFont),.foreground(UIColor.warnColor))
+        let dd: ASAttributedString = .init(" 0 ", .font(numFont),.foreground(UIColor.warnColor))
         
         
         let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
@@ -105,19 +105,19 @@ private extension YHCertificateEntryHeadView {
         nameLable.text = "您好," + tmp
         
         let a: ASAttributedString = .init("待上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let aa: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_submit_num)), .font(numFont),.foreground(UIColor.warnColor))
+        let aa: ASAttributedString = .init(NSAttributedString(string: " \(dataModel.to_be_submit_num) "), .font(numFont),.foreground(UIColor.warnColor))
         
         
         let b: ASAttributedString = .init("件，已驳回", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let bb: ASAttributedString = .init(NSAttributedString(string: String(dataModel.reject_num)), .font(numFont),.foreground(UIColor.warnColor))
+        let bb: ASAttributedString = .init(NSAttributedString(string: " \(dataModel.reject_num) "), .font(numFont),.foreground(UIColor.warnColor))
         
         
         let c: ASAttributedString = .init("件，审核中", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let cc: ASAttributedString = .init(NSAttributedString(string: String(dataModel.to_be_audit_num)), .font(numFont),.foreground(UIColor.warnColor))
+        let cc: ASAttributedString = .init(NSAttributedString(string: " \(dataModel.to_be_audit_num) "), .font(numFont),.foreground(UIColor.warnColor))
         
         
         let d: ASAttributedString = .init("件，已完成", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let dd: ASAttributedString = .init(NSAttributedString(string: String(dataModel.pass_num)), .font(numFont),.foreground(UIColor.warnColor))
+        let dd: ASAttributedString = .init(NSAttributedString(string: " \(dataModel.pass_num) "), .font(numFont),.foreground(UIColor.warnColor))
         
         
         let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyCertificates(我的证书)/V/YHCertificateSearchBar.swift

@@ -26,7 +26,6 @@ class YHCertificateSearchBar: UIView {
     private lazy var contentView = {
         let view = UIView()
         view.backgroundColor = .contentBkgColor
-        view.layer.cornerRadius = Self.height/2.0
         view.clipsToBounds = true
         return view
     }()
@@ -50,7 +49,6 @@ class YHCertificateSearchBar: UIView {
         btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor.brandMainColor
-        btn.layer.cornerRadius = Self.cancelBtnHeight/2.0
         btn.addTarget(self, action: #selector(searchBtnClicked), for: .touchUpInside)
         return btn
     }()

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

@@ -99,7 +99,7 @@ class YHCollegeSearchViewController: YHBaseViewController {
         let param:[String:Any] = ["order_id": orderId,
                                   "name":searchCollegeName ?? "",
                                   "page":1,
-                                  "page_size":15,
+                                  "page_size":100,
                                  ]
         self.educationRequest.searchCollegeInfoList(params: param) {
             [weak self] success, error in

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

@@ -245,6 +245,21 @@ class YHCollegeInfo: SmartCodable {
         return enName
     }
     
+    func getFullCollegeName() -> String {
+        var result = ""
+        if !zhName.isEmpty {
+            result += zhName
+        }
+        
+        if !enName.isEmpty {
+            if !result.isEmpty {
+                result += "/"
+            }
+            result += enName
+        }
+        return result
+    }
+    
     required init() {
         
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateUploadVC.swift

@@ -108,7 +108,7 @@ extension YHCertificateUploadVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 217
+        return 219
     }
 }
 

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

@@ -895,7 +895,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     }
     
     func setOwnCustody(_ val:Bool) {
-        self.custody = val ? 1 : 0
+        self.custody = val ? 1 : 2
     }
     
     // 是否是男性

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

@@ -146,8 +146,8 @@ class YHIdentityCardCell: UITableViewCell {
         centerView.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
-            make.top.equalTo(7)
-            make.bottom.equalTo(-16)
+            make.top.equalTo(16)
+            make.bottom.equalTo(0)
         }
         
         titleLabel = {
@@ -203,12 +203,6 @@ class YHIdentityCardCell: UITableViewCell {
             return label
         }()
         centerView.addSubview(frontLabel)
-        frontLabel.snp.makeConstraints { make in
-            make.left.equalTo(18)
-            make.right.equalTo(centerView.snp.centerX)
-            make.top.equalTo(64)
-            make.height.equalTo(20)
-        }
         
         backSurfaceLabel = {
             let label = UILabel()
@@ -218,12 +212,6 @@ class YHIdentityCardCell: UITableViewCell {
             return label
         }()
         centerView.addSubview(backSurfaceLabel)
-        backSurfaceLabel.snp.makeConstraints { make in
-            make.right.equalTo(-18)
-            make.left.equalTo(centerView.snp.centerX)
-            make.top.equalTo(64)
-            make.height.equalTo(20)
-        }
         
         frontImageButton = {
             let button = YHCardButton()
@@ -242,6 +230,13 @@ class YHIdentityCardCell: UITableViewCell {
             make.width.equalTo(147)
         }
         
+        frontLabel.snp.makeConstraints { make in
+            make.left.equalTo(18)
+            make.right.equalTo(frontImageButton.snp.right)
+            make.top.equalTo(64)
+            make.height.equalTo(20)
+        }
+        
         frontDeleteButton = {
             let button = UIButton(type: .custom)
             button.setBackgroundImage(UIImage(named: "service_card_delete"), for: .normal)
@@ -273,6 +268,12 @@ class YHIdentityCardCell: UITableViewCell {
             make.height.equalTo(91)
             make.width.equalTo(147)
         }
+        backSurfaceLabel.snp.makeConstraints { make in
+            make.right.equalTo(-18)
+            make.left.equalTo(backSurfaceImageButton.snp.left)
+            make.top.equalTo(64)
+            make.height.equalTo(20)
+        }
 
         backSurfaceDeleteButton = {
             let button = UIButton(type: .custom)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyCertificates(我的证书)/C/YHGCCertificateListContainerVC.swift

@@ -56,7 +56,8 @@ class YHGCCertificateListContainerVC: YHBaseViewController {
         //配置指示器
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
-        indicator.indicatorHeight = 4.0
+        indicator.indicatorHeight = 2.0
+        indicator.indicatorCornerRadius = 0.0
         indicator.indicatorColor = .brandMainColor
         segview.indicators = [indicator]
         segview.backgroundColor = .clear

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

+//
+//  YHGCCollegeSearchViewController.swift
+//  galaxy
+//
+//  Created by Dufet on 2025/1/6.
+//  Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHGCCollegeSearchViewController: YHBaseViewController {
+    
+    var orderId:Int = 0
+    var searchCollegeName:String?
+    var selectBlock:((String?, Int)->Void)?
+    var colleges:[YHCollegeInfo] = []
+    var isShowSureButton: Bool = true
+    let educationRequest:YHEducationRequestViewModel = YHEducationRequestViewModel()
+
+    lazy var searchBar: YHCollegeSearchBar = {
+        let bar = YHCollegeSearchBar.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 = .white
+        tableView.separatorStyle = .none
+        tableView.delegate = self
+        tableView.dataSource = self
+        tableView.register(UITableViewCell.self, forCellReuseIdentifier: "UITableViewCell")
+        tableView.register(YHCollegeNameCell.self, forCellReuseIdentifier: YHCollegeNameCell.cellReuseIdentifier)
+        tableView.backgroundView = emptyDataTipsView
+        return tableView
+    }()
+    
+    lazy var emptyDataTipsView: YHEmptyDataView = {
+        let view = YHEmptyDataView.createView("无搜索结果", kEmptySearchBgName)
+        view.topMargin = 130
+        view.isHidden = true
+        return view
+    }()
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        createUI()
+        if searchCollegeName != nil {
+            searchCollege()
+        }
+    }
+    
+    func createUI() {
+        
+        self.view.backgroundColor = .white
+        self.gk_navTitle = "学校名称".local
+
+        view.addSubview(tableView)
+        view.addSubview(searchBar)
+        searchBar.confirmBtn.isHidden = !isShowSureButton
+        if let searchCollegeName = searchCollegeName {
+            searchBar.textField.text = searchCollegeName
+        }
+        searchBar.textChange = {
+           [weak self]  text in
+            guard let self = self else { return }
+            searchCollegeName = text
+            self.searchCollege()
+        }
+        searchBar.confirmBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            if let selectBlock = selectBlock {
+                selectBlock(searchBar.textField.text, 0)
+                self.navigationController?.popViewController(animated: true)
+            }
+        }
+        
+        searchBar.snp.makeConstraints { make in
+            make.left.equalToSuperview().offset(16)
+            make.right.equalToSuperview().offset(-16)
+            make.height.equalTo(YHCollegeSearchBar.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()
+        }
+    }
+    
+    func searchCollege() {
+        
+        let param:[String:Any] = ["order_id": orderId,
+                                  "name":searchCollegeName ?? "",
+                                  "page":1,
+                                  "page_size":100,
+                                 ]
+        self.educationRequest.searchCollegeInfoList(params: param) {
+            [weak self] success, error in
+            guard let self = self else { return }
+            if success {
+                if let list = self.educationRequest.collegeList {
+                    colleges = list
+                } else {
+                    colleges = []
+                }
+                emptyDataTipsView.isHidden = colleges.count > 0
+            }
+            self.tableView.reloadData()
+        }
+    }
+}
+
+extension YHGCCollegeSearchViewController: UITableViewDelegate, UITableViewDataSource {
+    
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        return colleges.count
+    }
+    
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return UITableView.automaticDimension
+    }
+    
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell = tableView.dequeueReusableCell(withIdentifier: YHCollegeNameCell.cellReuseIdentifier, for: indexPath) as! YHCollegeNameCell
+        if indexPath.row < colleges.count {
+            let college:YHCollegeInfo = colleges[indexPath.row]
+            
+            var name = ""
+            if !isEmptyString(college.zhName) {
+                name += college.zhName
+            }
+            if !isEmptyString(college.zhName) && !isEmptyString(college.enName) {
+                name += "/"
+            }
+            if !isEmptyString(college.enName) {
+                name += college.enName
+            }
+            cell.titleLabel.text = name
+        }
+        return cell
+    }
+    
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+        if let selectBlock = selectBlock {
+            if indexPath.row < colleges.count {
+                let college:YHCollegeInfo = colleges[indexPath.row]
+                selectBlock(college.getFullCollegeName(), college.id)
+                self.navigationController?.popViewController(animated: true)
+            }
+            
+        }
+    }
+}
+

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

@@ -344,7 +344,7 @@ extension YHGCEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                     return
                }
 
-               let vc = YHCollegeSearchViewController()
+               let vc = YHGCCollegeSearchViewController()
                vc.isShowSureButton = false
                vc.orderId = self.orderId
                vc.searchCollegeName = detailInfo.college

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Certificates(证书上传和证书信息)/YHGCCertificateUploadVC.swift

@@ -106,7 +106,7 @@ extension YHGCCertificateUploadVC: UITableViewDelegate, UITableViewDataSource {
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return 217
+        return 219
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHGCPreviewViewModel.swift

@@ -1327,8 +1327,12 @@ private extension YHGCPreviewViewModel {
                         }
                         let tmp11 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer: title)
                         arr.append(tmp11)
+                        
                     }
                     
+                    let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
+                    arr.append(tmp133)
+                    
                     var answer = "--"
                     if let isResidence = model.isHavePermanentResidenceStatus() {
                         answer = isResidence ? "是" : "否"
@@ -1341,9 +1345,7 @@ private extension YHGCPreviewViewModel {
                         let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: title)
                         arr.append(tmp12)
                     }
-                    
-                    let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
-                    arr.append(tmp133)
+    
                     
                     let isHKIdCardHandled = model.isHaveHKIdentityCard()
                     let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
@@ -1611,6 +1613,9 @@ private extension YHGCPreviewViewModel {
                         }
                         let tmp11 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer: title)
                         arr.append(tmp11)
+                        
+                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
+                        arr.append(tmp133)
                     }
                     
                     var answer = "--"
@@ -1632,11 +1637,6 @@ private extension YHGCPreviewViewModel {
                         arr.append(tmp12)
                     }
                     
-                    if model.nows == 0 {
-                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
-                        arr.append(tmp133)
-                    }
-                    
                     let isHKIdCardHandled = model.isHaveHKIdentityCard()
                     let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
                     let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)
@@ -1713,6 +1713,9 @@ private extension YHGCPreviewViewModel {
                         }
                         let tmp11 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer: title)
                         arr.append(tmp11)
+                        
+                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
+                        arr.append(tmp133)
                     }
                     
                     var answer = "--"
@@ -1728,11 +1731,6 @@ private extension YHGCPreviewViewModel {
                         arr.append(tmp12)
                     }
                     
-                    if model.nows == 0 {
-                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
-                        arr.append(tmp133)
-                    }
-                    
                     let isHKIdCardHandled = model.isHaveHKIdentityCard()
                     let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
                     let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -19,8 +19,20 @@ class YHJsApi: NSObject {
 
 extension YHJsApi {
     
-    // 返回tab服务页
     
+    // 30、跳转到APP底部的服务Tab-再推出服务进度页面
+    @objc func goServiceProgressPage(_ tag : Any) {
+        
+        DispatchQueue.main.async {
+            UIViewController.current?.navigationController?.popToRootViewController(animated: false)
+            goTabBarBy(tabType: .service)
+            DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) {
+                NotificationCenter.default.post(name: YhConstant.YhNotification.didJumpToServiceProgressNotification, object: nil)
+            }
+        }
+    }
+    
+    // 29、返回tab服务页
     @objc func goAppTab(_ tag : Any) {
         DispatchQueue.main.async {
             if let tag = tag as? String {
@@ -676,14 +688,4 @@ extension YHJsApi {
             }
         }
     }
-    
-    @objc func goServiceProgressPage(_ dicData: String) {
-        UIViewController.current?.navigationController?.popToRootViewController(animated: false)
-        DispatchQueue.main.asyncAfter(deadline: .now() + 0.35) {
-            UIViewController.current?.tabBarController?.selectedIndex = 1
-            NotificationCenter.default.post(name: YhConstant.YhNotification.goToServiceListNotification, object: nil, userInfo: nil)
-        }
-    }
-
-    
 }

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -406,7 +406,7 @@ extension YhConstant {
         
         //关闭直播间弹出的分享界面
         public static let closeShareUIInLiveRoomNotifiction = Notification.Name(rawValue: "com.yinhe.app.close.share.ui")
-        public static let goToServiceListNotification = Notification.Name(rawValue: "com.yinhe.goToServiceListNotification")
-
+        // 跳转到服务Tab 中的 服务进度
+        public static let didJumpToServiceProgressNotification = Notification.Name(rawValue: "com.yinhe.service.tab.serviceprogress")
     }
 }