// 我的证书

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1158,6 +1158,7 @@
 		04AE20562D1943EF00891D24 /* YHGCMineCertificateEntryViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20552D1943EF00891D24 /* YHGCMineCertificateEntryViewController.swift */; };
 		04AE205A2D1944D600891D24 /* YHGCMyFileListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20592D1944D600891D24 /* YHGCMyFileListViewController.swift */; };
 		04AE20632D1ADA8100891D24 /* YHGCPreviewViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20622D1ADA8100891D24 /* YHGCPreviewViewModel.swift */; };
+		04AE20652D1BD9B500891D24 /* YHGCCertificateEntryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04AE20642D1BD9B500891D24 /* YHGCCertificateEntryCell.swift */; };
 		04EA376D2BEA06EF00DBAF64 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376C2BEA06EF00DBAF64 /* WebKit.framework */; };
 		04EA376F2BEA071600DBAF64 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 04EA376E2BEA070500DBAF64 /* libc++.tbd */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
@@ -2354,6 +2355,7 @@
 		04AE20552D1943EF00891D24 /* YHGCMineCertificateEntryViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMineCertificateEntryViewController.swift; sourceTree = "<group>"; };
 		04AE20592D1944D600891D24 /* YHGCMyFileListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMyFileListViewController.swift; sourceTree = "<group>"; };
 		04AE20622D1ADA8100891D24 /* YHGCPreviewViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCPreviewViewModel.swift; sourceTree = "<group>"; };
+		04AE20642D1BD9B500891D24 /* YHGCCertificateEntryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCCertificateEntryCell.swift; sourceTree = "<group>"; };
 		04EA376C2BEA06EF00DBAF64 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
 		04EA376E2BEA070500DBAF64 /* libc++.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = "libc++.tbd"; path = "usr/lib/libc++.tbd"; sourceTree = SDKROOT; };
 		04FA8B2D2C084C7E00ABE43F /* ATAuthSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = ATAuthSDK.bundle; path = "galaxy/Classes/Modules/AutoLogin(一键登录)/framework/ATAuthSDK_D.framework/ATAuthSDK.bundle"; sourceTree = "<group>"; };
@@ -6357,6 +6359,7 @@
 		04AE20482D19413F00891D24 /* V */ = {
 			isa = PBXGroup;
 			children = (
+				04AE20642D1BD9B500891D24 /* YHGCCertificateEntryCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -7574,6 +7577,7 @@
 				045C12DF2D12CA5F00BD2DC0 /* YHVisaRenewalPayStatusCell.swift in Sources */,
 				045C12E02D12CA5F00BD2DC0 /* YHCollegeNameCell.swift in Sources */,
 				045C12E12D12CA5F00BD2DC0 /* YHPreviewInfoIncomeTypeCell.swift in Sources */,
+				04AE20652D1BD9B500891D24 /* YHGCCertificateEntryCell.swift in Sources */,
 				045C12E22D12CA5F00BD2DC0 /* YHUploadCertificateVC.swift in Sources */,
 				045C12E32D12CA5F00BD2DC0 /* YHServiceTableFootView.swift in Sources */,
 				045C12E42D12CA5F00BD2DC0 /* YHMsgViewModel.swift in Sources */,

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

@@ -63,7 +63,7 @@ extension YHCertificateEntryCell {
             color = UIColor.warnColor
         } else if dataModel.checkStatus == 1 {
             title = "已完成"
-            color = UIColor.labelTextColor2
+            color = UIColor(hex: 0x3CC694)
             
         } else if dataModel.checkStatus == 2 {
             title = "已驳回"

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

@@ -36,6 +36,8 @@ class YHCertificateEntryHeadView: UIView {
         return titleLable
     }()
     
+    let numFont = UIFont(name: "DINAlternate-Bold", size: 14)!
+    
     
     private lazy var statiticLable : UILabel = {
         let titleLable = UILabel(text: "待上传0件，已驳回0件，审核中0件，已完成0件")
@@ -65,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(UIFont.PFSC_B(ofSize: 17)),.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(UIFont.PFSC_B(ofSize: 17)),.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(UIFont.PFSC_B(ofSize: 17)),.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(UIFont.PFSC_B(ofSize: 17)),.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))
@@ -103,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(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let aa: ASAttributedString = .init(NSAttributedString(string: 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(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let bb: ASAttributedString = .init(NSAttributedString(string: 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(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let cc: ASAttributedString = .init(NSAttributedString(string: 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(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let dd: ASAttributedString = .init(NSAttributedString(string: 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/YHCertificateInfoCell.swift

@@ -62,7 +62,7 @@ class YHCertificateInfoCell: UITableViewCell {
                 titleColor = .warnColor
                 title = "审核中".local
             case .finish:
-                titleColor = .labelTextColor2
+                titleColor = UIColor(hex: 0x3CC694)
                 title = "已完成".local
             case .all:
                 titleColor = .labelTextColor2
@@ -187,7 +187,7 @@ class YHCertificateInfoCell: UITableViewCell {
         nameTextView.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(10)
             make.top.equalToSuperview().offset(4)
-            make.right.equalTo(statusLabel.snp.left).offset(-26)
+            make.right.equalTo(statusLabel.snp.left).offset(-21)
         }
         
         infoLabel.snp.makeConstraints { make in

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

@@ -146,7 +146,7 @@ class YHGCCertificateListContainerVC: YHBaseViewController {
         view.addSubview(navBar)
         view.addSubview(segmentContainerView)
         segmentContainerView.addSubview(segmentedView)
-        segmentContainerView.addSubview(filterBtn)
+//        segmentContainerView.addSubview(filterBtn)
         view.addSubview(listContainerView)
         
         navBar.snp.makeConstraints { make in
@@ -162,15 +162,15 @@ class YHGCCertificateListContainerVC: YHBaseViewController {
         
         segmentedView.snp.makeConstraints { make in
             make.top.left.equalToSuperview()
-            make.right.equalToSuperview().offset(-21-18)
+            make.right.equalToSuperview()
             make.height.equalTo(Self.segmentHeight)
         }
         
-        filterBtn.snp.makeConstraints { make in
-            make.width.height.equalTo(YHCertificateFilterButton.width)
-            make.centerY.equalToSuperview().offset(-2)
-            make.right.equalToSuperview().offset(-18)
-        }
+//        filterBtn.snp.makeConstraints { make in
+//            make.width.height.equalTo(YHCertificateFilterButton.width)
+//            make.centerY.equalToSuperview().offset(-2)
+//            make.right.equalToSuperview().offset(-18)
+//        }
 
         listContainerView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()

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

@@ -50,7 +50,7 @@ class YHGCMineCertificateEntryViewController: YHBaseViewController {
         tableView.showsHorizontalScrollIndicator = false
         tableView.showsVerticalScrollIndicator = false
         tableView.rowHeight = UITableView.automaticDimension
-        tableView.register(YHCertificateEntryCell.self,forCellReuseIdentifier: YHCertificateEntryCell.cellReuseIdentifier)
+        tableView.register(YHGCCertificateEntryCell.self,forCellReuseIdentifier: YHGCCertificateEntryCell.cellReuseIdentifier)
         return tableView
     }()
     
@@ -168,11 +168,11 @@ extension YHGCMineCertificateEntryViewController : UITableViewDelegate,UITableVi
     
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return YHCertificateEntryCell.cellH
+        return YHGCCertificateEntryCell.cellH
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell0 = tableView.dequeueReusableCell(withClass: YHCertificateEntryCell.self)
+        let cell0 = tableView.dequeueReusableCell(withClass: YHGCCertificateEntryCell.self)
         cell0.selectionStyle = .none
         
         guard let model = certificateReqVM.certificateEntryModel else { return cell0 }

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

+//
+//  YHGCCertificateEntryCell.swift
+//  galaxy
+//
+//  Created by Dufet on 2024/12/25.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+import UIKit
+
+class YHGCCertificateEntryCell: UITableViewCell {
+    static let cellReuseIdentifier = "YHGCCertificateEntryCell"
+    static let cellH : CGFloat = 68.0
+    
+    
+    var dataModel : YHCategoryData? {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    lazy var contractNameLable = {
+        let lable = UILabel()
+        lable.textColor = UIColor.mainTextColor
+        lable.font = UIFont.PFSC_M(ofSize: 16)
+        lable.text = "主申请人（张三）"
+        return lable
+    }()
+    
+    lazy var contractIdLable = {
+        let lable = UILabel()
+        lable.textColor = UIColor(hex: 0x3CC694)
+        lable.font = UIFont.PFSC_R(ofSize: 14)
+        lable.text = "已完成"
+        lable.textAlignment = .right
+        return lable
+    }()
+}
+
+extension YHGCCertificateEntryCell {
+    func updateUI() {
+        guard let dataModel = dataModel else { return }
+        var name = ""
+        if dataModel.userName.isEmpty == false {
+            name = "(" + dataModel.userName + ")"
+        }
+        contractNameLable.text = dataModel.applicantName + name
+        
+        //0：未审核，1：通过 2：驳回,3：未提交',
+        var title = ""
+        var color : UIColor = .failColor
+        if dataModel.checkStatus == 0 {
+            title = "审核中"
+            color = UIColor.warnColor
+        } else if dataModel.checkStatus == 1 {
+            title = "已完成"
+            color = UIColor(hex: 0x3CC694)
+            
+        } else if dataModel.checkStatus == 2 {
+            title = "已驳回"
+            color = UIColor.failColor
+        } else if dataModel.checkStatus == 3 {
+            title = "待上传"
+            color = UIColor.brandMainColor
+        } else {
+            title = "--"
+            color = UIColor.brandMainColor
+        }
+        contractIdLable.text = title
+        contractIdLable.textColor = color
+    }
+    
+    func setupUI() {
+        let holdView = UIView()
+        holdView.backgroundColor = .white
+        holdView.layer.cornerRadius = kCornerRadius6
+        holdView.clipsToBounds = true
+        
+        backgroundColor = .clear
+        contentView.backgroundColor = .clear
+        
+        contentView.addSubview(holdView)
+        holdView.snp.makeConstraints { make in
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
+        }
+        
+        
+        let nextImgV = UIImageView()
+        nextImgV.image = UIImage(named: "service_center_right_next_icon")
+        nextImgV.contentMode = .scaleAspectFill
+        holdView.addSubview(nextImgV)
+        nextImgV.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-26)
+            make.width.height.equalTo(kMargin)
+        }
+        
+        holdView.addSubview(contractIdLable)
+        contractIdLable.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(nextImgV.snp.left).offset(-2)
+            make.width.equalTo(50)
+            make.height.equalTo(20)
+        }
+        
+        
+        holdView.addSubview(contractNameLable)
+        contractNameLable.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(21)
+            make.right.equalTo(contractIdLable.snp.left).offset(-10)
+            make.height.equalTo(24)
+        }
+    }
+}
+