// 高才

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

@@ -8,8 +8,15 @@
 
 import UIKit
 
+enum YHCInfoType: Int {
+    case none = 0
+    case spouse = 1
+    case child = 2
+}
+
 class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
 
+    var infoType: YHCInfoType = .none
     var familyMember:YHFamilyMember?
     var mainApplicantInfo: YHMyMainApplicantInfoModel?
 
@@ -164,7 +171,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
         
 //
         if familyMember.nationality == "中国-China" {
-            var isChinaIdCardMust = true
+            var isChinaIdCardMust = infoType == .child ? false : true
             let title1 = YHFormTitleItem(type: .chinaIdCardInfo)
             let item10 = YHFormDetailItem(type: .chinaIdentityCardNumber, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.number, tips:"请输入证件号码".local)
             let item11 = YHFormDetailItem(type: .certificateSignPlace, isNeed:isChinaIdCardMust, value: familyMember.certificates.cnIdentityCard.issueAt, tips:"请输入签发地".local)
@@ -555,17 +562,18 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
         let showPassport = a.showPassport
         let isPassportMust = a.isPassportMust
         
-        if familyMember.nationality == "中国-China" {
-            if familyMember.certificates.cnIdentityCard.number.count <= 0
-                || familyMember.certificates.cnIdentityCard.issueAt.count <= 0
-                || familyMember.certificates.cnIdentityCard.issueDateStartAt.count <= 0
-                || familyMember.certificates.cnIdentityCard.issueDateEndAt.count <= 0
-            {
-                return false
+        if infoType != .child {
+            if familyMember.nationality == "中国-China" {
+                if familyMember.certificates.cnIdentityCard.number.count <= 0
+                    || familyMember.certificates.cnIdentityCard.issueAt.count <= 0
+                    || familyMember.certificates.cnIdentityCard.issueDateStartAt.count <= 0
+                    || familyMember.certificates.cnIdentityCard.issueDateEndAt.count <= 0
+                {
+                    return false
+                }
             }
         }
         
-        
         if showHK, isHKMust {
             
             if familyMember.certificates.hkMacaoPass.number.count <= 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员)/C/Child(子女)/YHGCChildInfoContainerVC.swift

@@ -82,7 +82,11 @@ class YHGCChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
         
     let primaryInfoVC =  YHGCChildPrimaryInfoVC()
     let uploadVC = YHGCCertificateUploadVC()
-    let certificateVC = YHGCCertificateInfoController()
+    lazy var certificateVC = {
+       let vc = YHGCCertificateInfoController()
+       vc.infoType = .child
+       return vc
+    }
     let basicInfoVC = YHGCChildBasicInfoVC()
 
     override func viewDidLoad() {