Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 子女和配偶

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

@@ -171,7 +171,6 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             guard let self = self else { return }
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
-                child.step = targetStep
             }
             print("index:\(index)")
         }
@@ -196,10 +195,10 @@ class YHChildInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
                         
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
-                            child?.step = item.step
                             if cur+1 > stepView.maxIndex {
                                 stepView.maxIndex = cur+1
-                            }                        }
+                            }
+                        }
                         print("currentIndex:\(currentStep)")
                     }
                 }
@@ -247,7 +246,7 @@ extension YHChildInfoContainerVC {
         
         let dict:[String: Any] = ["order_id":child.orderId,
                                   "relation":child.relation,
-                                  "step":child.step,
+                                  "step":isSubmit ? currentStep : 0,
                                   "next":isSubmit,
                                   "info":info]
         

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

@@ -189,7 +189,6 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             guard let self = self else { return }
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
-                spouse.step = targetStep
             }
             print("index:\(index)")
         }
@@ -210,7 +209,7 @@ extension YHSpouseInfoContainerVC {
         
         let dict:[String: Any] = ["order_id":spouse.orderId,
                                   "relation":spouse.relation,
-                                  "step":spouse.step,
+                                  "step":isSubmit ? currentStep : 0,
                                   "next":isSubmit,
                                   "info":info]
         
@@ -245,7 +244,6 @@ extension YHSpouseInfoContainerVC {
                         
                         if let cur = getArrayIndexOfCurrentStep(), let item = stepVCs[safe:cur+1] {
                             currentStep = item.step
-                            spouse?.step = item.step
                             if cur+1 > stepView.maxIndex {
                                 stepView.maxIndex = cur+1
                             }