主申请人信息 预览逻辑

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -156,6 +156,7 @@
 		A5234E372B70802400A33433 /* YHBasicInfoCellModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E362B70802300A33433 /* YHBasicInfoCellModel.swift */; };
 		A5234E3E2B7235F000A33433 /* YHOtherInfoFillViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5234E3D2B7235F000A33433 /* YHOtherInfoFillViewController.swift */; };
 		A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
+		A554A5002B95FB9100EA5973 /* YHMainInfoPreviewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A554A4FF2B95FB9100EA5973 /* YHMainInfoPreviewModel.swift */; };
 		A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */; };
 		A5573ED22B317BFF00D98EC0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */; };
 		A5573EDB2B317C0000D98EC0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = A5573EDA2B317C0000D98EC0 /* Assets.xcassets */; };
@@ -460,6 +461,7 @@
 		A5234E362B70802300A33433 /* YHBasicInfoCellModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBasicInfoCellModel.swift; sourceTree = "<group>"; };
 		A5234E3D2B7235F000A33433 /* YHOtherInfoFillViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherInfoFillViewController.swift; sourceTree = "<group>"; };
 		A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
+		A554A4FF2B95FB9100EA5973 /* YHMainInfoPreviewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMainInfoPreviewModel.swift; sourceTree = "<group>"; };
 		A5551FFD2B4C26CE00510980 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
 		A5573ECE2B317BFF00D98EC0 /* galaxy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = galaxy.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		A5573ED12B317BFF00D98EC0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -1047,6 +1049,7 @@
 				A5FD63F92B68D95700D1D9DA /* YHPersonInfoIdentityCardModel.swift */,
 				A5191F612B89E748001069F7 /* YHPreviewQuestionAndAnswerModel.swift */,
 				A5B4A5842B9455F7003EFF8F /* YHPreviewForOtherInfoModel.swift */,
+				A554A4FF2B95FB9100EA5973 /* YHMainInfoPreviewModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -1812,6 +1815,7 @@
 				0413A6D82B8C76290006D154 /* YHCertificateUploadVC.swift in Sources */,
 				A5ACE93A2B4564F7002C94D2 /* NSAttributedString+Extension.swift in Sources */,
 				04E86E662B86EB6F00A35F4B /* YHLoginManager.swift in Sources */,
+				A554A5002B95FB9100EA5973 /* YHMainInfoPreviewModel.swift in Sources */,
 				042F888B2B8477C6008B60BD /* YHEducationInfo.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
 				042FBBBF2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift in Sources */,

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

@@ -1218,10 +1218,12 @@ class YHAddress: SmartCodable {
 class YHChildStepchildClass: SmartCodable {
     var has: String = ""
     var info: String = ""
+    var number: String = ""
 
     enum CodingKeys: String, CodingKey {
         case has = "has"
         case info = "info"
+        case number = "number"
     }
 
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MyScore(我的评分)/C/YHScoreDetailViewController.swift

@@ -50,10 +50,6 @@ class YHScoreDetailViewController: YHBaseViewController {
         
         //2.0
         loadData()
-        
-        //3.保存orderId 提供给后续UI使用
-        UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
-        UserDefaults.standard.synchronize()
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/M/YHMainInfoPreviewModel.swift

+//
+//  YHMainInfoPreviewModel.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/4.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+class YHMainInfoPreviewModel: SmartCodable {
+    var username: String  = ""
+    var used_name: String  = ""
+    var username_pinyin : String = ""
+    var sex : String = ""
+    var birthday: String  = ""
+    var birth_place: String  = ""
+    var mobile: String  = ""
+    var email: String  = ""
+    var married: String  = ""
+    var nationality: String  = ""
+    var live_address: String = ""
+    var surname: String  = ""
+    var birth_place_details : String  = ""
+    var live_address_detail : String  = ""
+    var is_handled: Int  = 0
+    var is_live_oversea_year: Int  = 0
+    
+    var hk_id : YHChildStepchildClass?
+    var certificates:YHCertificatesPreviewModel?
+    
+    required init() {
+        
+    }
+}
+
+
+class YHCertificatesPreviewModel: SmartCodable {
+    
+    var cnIdentityCard: YHCNIdentityCardPreviewModel = YHCNIdentityCardPreviewModel()
+    var passport: YHCNIdentityCardPreviewModel = YHCNIdentityCardPreviewModel()
+    var hkMacaoPass: YHCNIdentityCardPreviewModel = YHCNIdentityCardPreviewModel()
+
+    enum CodingKeys: String, CodingKey {
+        case cnIdentityCard = "cn_identity_card"
+        case passport = "passport"
+        case hkMacaoPass = "hk_macao_pass"
+    }
+        
+    required init() {
+        
+    }
+}
+
+
+class YHCNIdentityCardPreviewModel: SmartCodable {
+    
+    static let longTime = "8888-01-01"
+    var id: Int = 0
+    var number: String = ""
+    var issueAt: String = ""
+    var issueDateStartAt: String = ""
+    var issueDateEndAt: String = ""
+    var imgFront: String = ""
+    var imgBack: String = ""
+    var passport_type: Int = -1
+    var type: String = ""
+
+    enum CodingKeys: String, CodingKey {
+        case id = "id"
+        case number = "number"
+        case issueAt = "issue_at"
+        case issueDateStartAt = "issue_date_start_at"
+        case issueDateEndAt = "issue_date_end_at"
+        case imgFront = "img_front"
+        case imgBack = "img_back"
+        case passport_type = "passport_type"
+        case type = "type"
+    }
+    
+    required init() {
+        
+    }
+}

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -95,7 +95,7 @@ class YHNetRequest: NSObject {
         
         requestHeader.add(name:"sign",value:sign)
         requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
-//        testToken(&requestHeader) //for test hjl 使用测试token
+        testToken(&requestHeader) //for test hjl 使用测试token
         headers = requestHeader
     }