// 家庭成员

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

@@ -152,7 +152,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 cell.placeHolder = detailItem.placeHolder
                 cell.title = detailItem.getTitle()
                 cell.text = detailItem.value
-                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isNeed && detailItem.isShowTips)
                 cell.textInputCondtion = {
                     textField in
                     
@@ -212,7 +212,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
                 cell.detail = detailItem.value
-                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isNeed && detailItem.isShowTips)
                 return cell
             }
             
@@ -233,7 +233,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                             save()
                         }
                     }
-                    cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+                    cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isNeed && detailItem.isShowTips)
                     return cell
                     
                 }

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

@@ -452,14 +452,19 @@ extension YHChildPrimaryInfoVC {
         if isEmptyString(child.nationality) {
             return false
         }
-        if isEmptyString(child.address.country) {
-            return false
-        }
-        if isEmptyString(child.address.details) {
-            return false
-        }
-        if child.isBirthOverSeas(), isEmptyArray(child.address.area) {
-            return false
+        if !child.isLiveTother() { // 没有与主申请人同住
+            if isEmptyString(child.address.country) {
+                return false
+            }
+            if isEmptyString(child.address.details) {
+                return false
+            }
+            
+            if child.address.isInChina() {
+                if isEmptyArray(child.address.area) {
+                    return false
+                }
+            }
         }
         return true
     }