// 家庭成员

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseInfoContainerVC.swift

@@ -94,8 +94,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     func createUI() {
         
         guard let spouse = spouse else { return }
-        
-        
+    
         primaryInfoVC.delegate = self
         certificateVC.delegate = self
         basicInfoVC.delegate = self

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -355,14 +355,20 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
         if isEmptyString(spouse.nationality) {
             return false
         }
-        if isEmptyString(spouse.address.country) {
-            return false
-        }
-        if isEmptyString(spouse.address.details) {
-            return false
-        }
-        if spouse.isBirthOverSeas(), isEmptyArray(spouse.address.area) {
-            return false
+        
+        if !spouse.isLiveTother() { // 没有与主申请人同住
+            if isEmptyString(spouse.address.country) {
+                return false
+            }
+            if isEmptyString(spouse.address.details) {
+                return false
+            }
+            
+            if spouse.address.isInChina() {
+                if isEmptyArray(spouse.address.area) {
+                    return false
+                }
+            }
         }
         return true
     }

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

@@ -208,8 +208,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                         [weak self] isLongTime in
                         guard let self = self else { return }
                         if title.type == .chinaIdCardInfo {
-                            let issueAt = self.familyMember?.certificates.cnIdentityCard.issueAt
-                            self.familyMember?.certificates.cnIdentityCard.issueDateEndAt = ((isLongTime ? YHCNIdentityCard.longTime : issueAt)!)
+                            self.familyMember?.certificates.cnIdentityCard.issueDateEndAt = (isLongTime ? YHCNIdentityCard.longTime : "")
                             loadInfo()
                             save()
                         }

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

@@ -1186,6 +1186,16 @@ class YHAddress: SmartCodable {
     required init() {
         
     }
+    
+    // 是否在中国
+    func isInChina() ->Bool {
+        // 默认在中国
+        if isEmptyString(country) { return true }
+        if country.contains("中国") {
+            return true
+        }
+        return false
+    }
 }
 
 // MARK: - YHChildStepchildClass

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -50,11 +50,9 @@ class YHAllApiName {
     
     struct Family {
         // 获取家庭成员信息 添加家庭成员也用这个
-//        static let familyInfoApi = "frontend/order/information/family"
         static let familyInfoApi = "infoflow/information/family"
         // 删除家庭成员信息
         static let deleteFamilyMemberApi = "infoflow/family/delete"
-       
         // 提交家庭成员信息
         static let submitAllFamilyInfoApi = "family/submit"
     }
@@ -62,19 +60,14 @@ class YHAllApiName {
     struct Education {
         // 获取教育和专业资格列表
         static let getEducationAndQulificationInfoListApi = "infoflow/getEducationList"
-
         // 获取学历详情信息
         static let getEducationDetailInfoApi = "infoflow/getEducationDetail"
-
         // 保存学历信息
         static let saveEducationInfoApi = "infoflow/saveEducationData"
-
         // 删除学历
         static let deleteEducationInfoApi = "infoflow/delEducationData"
-
         // 保存所有信息
         static let saveAllEduAndQuaInfoApi = "infoflow/submitEducert"
-        
         // 搜索大学名称
         static let searchCollegeNameApi = "infoflow/getSchools"