我的证件 的入口

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -237,6 +237,7 @@
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
 		A510441A2B495DD0006B60BB /* UIView+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = A51044192B495DD0006B60BB /* UIView+Extension.swift */; };
 		A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
+		A525D2302BA83B87001A84F5 /* YHFileListBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A525D22F2BA83B87001A84F5 /* YHFileListBottomView.swift */; };
 		A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
 		A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A5112B99715000EA5973 /* YHConstantArrayData.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
@@ -605,6 +606,7 @@
 		A51044172B493675006B60BB /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
 		A51044192B495DD0006B60BB /* UIView+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
 		A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
+		A525D22F2BA83B87001A84F5 /* YHFileListBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListBottomView.swift; sourceTree = "<group>"; };
 		A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
 		A554A5112B99715000EA5973 /* YHConstantArrayData.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHConstantArrayData.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
@@ -1522,6 +1524,7 @@
 		A525D22C2BA837C5001A84F5 /* FileList(文件清单) */ = {
 			isa = PBXGroup;
 			children = (
+				A525D22E2BA83B58001A84F5 /* V */,
 				A525D22D2BA837DF001A84F5 /* C */,
 			);
 			path = "FileList(文件清单)";
@@ -1535,6 +1538,14 @@
 			path = C;
 			sourceTree = "<group>";
 		};
+		A525D22E2BA83B58001A84F5 /* V */ = {
+			isa = PBXGroup;
+			children = (
+				A525D22F2BA83B87001A84F5 /* YHFileListBottomView.swift */,
+			);
+			path = V;
+			sourceTree = "<group>";
+		};
 		A5573EC52B317BFF00D98EC0 = {
 			isa = PBXGroup;
 			children = (
@@ -2321,6 +2332,7 @@
 				045EEE8A2B9F171A0022A143 /* YHPreviewOtherInformationViewController.swift in Sources */,
 				A5FD63C72B638CA000D1D9DA /* YHSubmintAllInfoSuccessTipView.swift in Sources */,
 				A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,
+				A525D2302BA83B87001A84F5 /* YHFileListBottomView.swift in Sources */,
 				045EEEE42B9F171A0022A143 /* YHMySignatureDetailModel.swift in Sources */,
 				A58A8C8F2BA6978100632765 /* YHMineCertificateEntryViewController.swift in Sources */,
 				045EEF1B2B9F171A0022A143 /* YHAddressPickViewTableViewCell.swift in Sources */,
@@ -2611,7 +2623,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2631,7 +2643,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.1;
+				MARKETING_VERSION = 0.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2653,7 +2665,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2673,7 +2685,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.2.1;
+				MARKETING_VERSION = 0.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -25,7 +25,9 @@ class YHFileListViewController: YHBaseViewController {
     }()
     
     
-    let bottomView : YHCertificateEntryBottomView = YHCertificateEntryBottomView()
+    
+    
+    let bottomView : YHFileListBottomView = YHFileListBottomView()
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -63,14 +65,23 @@ extension YHFileListViewController {
         
         view.addSubview(topBkg)
         topBkg.snp.makeConstraints { make in
-            make.top.left.right.equalToSuperview()
+            make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
+            make.left.right.equalToSuperview()
             make.height.equalTo(312)
         }
         
+        
+        
+        
         view.addSubview(bottomView)
         bottomView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(YHCertificateEntryBottomView.viewH)
+            make.height.equalTo(YHFileListBottomView.viewH)
+        }
+        bottomView.block = { flag in
+            if flag == 1 {
+                
+            }
         }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListBottomView.swift

+//
+//  YHFileListBottomView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/18.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFileListBottomView: UIView {
+    static let viewH : CGFloat = 98.0
+    
+    override init(frame: CGRect) {
+        super.init(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: YHBasicInfoFillBottomView.viewH))
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    
+    
+    typealias Block = (Int) -> ()
+    var block: Block?
+    var saveButton: UIButton!
+    var nextButton: UIButton!
+}
+
+private extension YHFileListBottomView {
+    func setupUI() {
+        
+        backgroundColor = .white
+        
+//        saveButton = {
+//            let button = UIButton(type: .custom)
+//            button.backgroundColor =  UIColor.contentBkgColor
+//            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+//            button.contentHorizontalAlignment = .center
+//            button.setTitle("问题答疑", for: .normal)
+//            button.setTitleColor(UIColor.mainTextColor, for: .normal)
+//            button.layer.cornerRadius = kCornerRadius6
+//            button.addTarget(self, action: #selector(save), for: .touchUpInside)
+//            return button
+//        }()
+//        addSubview(saveButton)
+//        saveButton.snp.makeConstraints { make in
+//            make.left.equalTo(kMargin)
+//            make.top.equalTo(12)
+//            make.height.equalTo(44)
+//            make.width.equalTo(86)
+//        }
+        
+        nextButton = {
+            let button = UIButton(type: .custom)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("生成清单", for: .normal)
+            button.setTitleColor(.white, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
+            button.addTarget(self, action: #selector(submit), for: .touchUpInside)
+            return button
+        }()
+        addSubview(nextButton)
+        nextButton.snp.makeConstraints { make in
+            make.right.equalTo(-kMargin)
+            make.top.equalTo(8)
+            make.height.equalTo(44)
+            make.left.equalTo(kMargin)
+        }
+        
+        nextButton.layoutIfNeeded()
+        nextButton.addYinHeGradualLayer()
+    }
+    
+    @objc func save() {
+        block?(0)
+    }
+    @objc func submit() {
+        block?(1)
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHMineCertificateEntryViewController.swift

@@ -118,9 +118,8 @@ extension YHMineCertificateEntryViewController {
 // MARK: - UITableViewDelegate 和 UITableViewDataSource
 extension YHMineCertificateEntryViewController : UITableViewDelegate,UITableViewDataSource {
     func numberOfSections(in tableView: UITableView) -> Int {
-//        guard let model = certificateReqVM.certificateEntryModel else { return 0 }
-//        return model.category_data.count
-        return 3
+        guard let model = certificateReqVM.certificateEntryModel else { return 0 }
+        return model.category_data.count
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -153,9 +152,11 @@ extension YHMineCertificateEntryViewController : UITableViewDelegate,UITableView
         let cell0 = tableView.dequeueReusableCell(withClass: YHCertificateEntryCell.self)
         cell0.selectionStyle = .none
         
-//        if indexPath.section < self.serviceCenterMainReqVM.arrContactList.count {
-//            cell0.dataModel = self.serviceCenterMainReqVM.arrContactList[indexPath.section]
-//        }
+        guard let model = certificateReqVM.certificateEntryModel else { return cell0 }
+        
+        if indexPath.section < model.category_data.count {
+            cell0.dataModel = model.category_data[indexPath.section]
+        }
         return cell0
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/M/YHCertificateModel.swift

@@ -33,11 +33,16 @@ class YHCategoryData: SmartCodable {
     var applicantName: String = ""
     var categoryId: Int = 0
     var checkStatus: Int = 0
-
+    
+    var sex: String = ""
+    var userName: String = ""
+    
     enum CodingKeys: String, CodingKey {
         case applicantName = "applicant_name"
         case categoryId = "category_id"
         case checkStatus = "check_status"
+        case sex = "sex"
+        case userName = "User_name"
     }
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -66,6 +66,7 @@ class YHCertificateViewModel: YHBaseViewModel {
                     return
                 }
                 self.certificateEntryModel = resultModel
+                callBackBlock(true,nil)
             } else {
                 
                 let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)