// 家庭信息

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

@@ -161,16 +161,16 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     func submit() {
         if let targetVC = getCurrentStepViewController() {
             if targetVC.nextStep() {
-               
-                // 当前步骤已是最后一步
-                if let vc = stepVCs.last, vc.step == currentStep {
-                    YHHUD.flash(message: "已经是最后一步！")
-                    return
-                }
                 saveInfo(isSubmit: true, isShowLoading: true) {
                     [weak self] success, error in
                     guard let self = self else { return }
                     if success {
+                        // 当前步骤已是最后一步
+                        if let vc = stepVCs.last, vc.step == currentStep {
+                            self.navigationController?.popViewController()
+                            return
+                        }
+                        
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
                         }

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

@@ -218,14 +218,13 @@ extension YHSpouseInfoContainerVC {
     func submit() {
         if let targetVC = getCurrentStepViewController() {
             if targetVC.nextStep() {
-                
                 saveInfo(isSubmit: true, isLoading: true) {
                     [weak self] success, tips in
                     guard let self = self else { return }
                     if success {
                         // 当前步骤已是最后一步
                         if let vc = stepVCs.last, vc.step == currentStep {
-                            YHHUD.flash(message: "已经是最后一步！")
+                            self.navigationController?.popViewController()
                             return
                         }
                         

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

@@ -19,7 +19,8 @@ class YHBrotherInfoVC: YHBaseViewController {
     
     var bottomView: YHSaveAndSubmitView = {
         let view = YHSaveAndSubmitView.createView()
-        view.isHiddenSubmit = true
+        view.isHiddenSave = true
+        view.changeRightBtnTitle("保存")
         return view
     }()
     
@@ -478,6 +479,46 @@ extension YHBrotherInfoVC {
     
     // 检查填写信息完整性
     func checkIntegrity() -> Bool {
+        
+        guard let brotherInfo = brotherInfo else { return false }
+
+        if isEmptyString(brotherInfo.subsetName) || isEmptyString(brotherInfo.birthday) || isEmptyString(brotherInfo.married) || isEmptyString(brotherInfo.occupation) {
+            
+            return false
+        }
+        
+    
+        if brotherInfo.isBirthOverSeas() {
+            if isEmptyString(brotherInfo.birthPlace.foreign) {
+                return false
+            }
+        } else {
+            if isEmptyArray(brotherInfo.birthPlace.area) {
+                return false
+            }
+        }
+        
+        if brotherInfo.sex == 0 {
+            return false
+        }
+        
+        if brotherInfo.isNowHaveJob()  {
+            if isEmptyString(brotherInfo.occupationName) {
+                return false
+            }
+        }
+        
+        if brotherInfo.isHaveHKIdentityCard() { // 办理过香港身份证才显示证号
+            
+            if isEmptyString(brotherInfo.hkIdentityCard) {
+                return false
+            }
+            
+            if let hkIdCard = brotherInfo.hkIdentityCard, !hkIdCard.isHKIdentityCardNumber() {
+                return false
+            }
+        }
+        
         return true
     }
     

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

@@ -20,6 +20,7 @@ class YHParentInfoVC: YHBaseViewController {
     var bottomView: YHSaveAndSubmitView = {
         let view = YHSaveAndSubmitView.createView()
         view.isHiddenSave = true
+        view.changeRightBtnTitle("保存")
         return view
     }()