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/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -326,7 +326,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 }
             } else if detailItem.type == .certificateType { // 选择证件类别
                 
-                let type = self.familyMember?.certificates.passport.passPortType ?? 0
+                let type = self.familyMember?.certificates.passport.passPortType ?? 3
                 YHSheetPickerView.show(type: .certificate, selectIndex:type) {
                     [weak self] selectItem in
                     guard let self = self else { return }
@@ -404,7 +404,7 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                 || familyMember.certificates.passport.issueAt.count <= 0
                 || familyMember.certificates.passport.issueDateStartAt.count <= 0
                 || familyMember.certificates.passport.issueDateEndAt.count <= 0
-                || familyMember.certificates.passport.passPortType == -1
+                || familyMember.certificates.passport.passPortType == 0
             {
                 return false
             }

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

@@ -246,7 +246,7 @@ extension YHChildInfoContainerVC {
         
         let dict:[String: Any] = ["order_id":child.orderId,
                                   "relation":child.relation,
-                                  "step":isSubmit ? currentStep : 0,
+                                  "step":currentStep,
                                   "next":isSubmit,
                                   "info":info]
         

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

@@ -209,7 +209,7 @@ extension YHSpouseInfoContainerVC {
         
         let dict:[String: Any] = ["order_id":orderId,
                                   "relation":spouse.relation,
-                                  "step":isSubmit ? currentStep : 0,
+                                  "step":currentStep,
                                   "next":isSubmit,
                                   "info":info]
         

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

@@ -295,11 +295,11 @@ extension YHFamilyMemberInfoListVC {
         self.familyRequest.submitAllFamilyInfo(orderId: self.orderId) {
             success, error in
             if success {
-                YHHUD.flash(message: "保存成功")
+                YHHUD.flash(message: "提交成功")
                 self.navigationController?.popViewController()
 
             } else {
-                var errorMsg = "保存失败"
+                var errorMsg = "提交失败"
                 if let errMsg = error?.errorMsg, errMsg.count > 0 {
                     errorMsg = errMsg
                 }

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

@@ -670,6 +670,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
             sex = 1
         }
         
+                
         return self
     }
 
@@ -1077,7 +1078,7 @@ class YHCNIdentityCard: SmartCodable {
     var issueDateEndAt: String = ""
     var imgFront: String = ""
     var imgBack: String = ""
-    var passPortType: Int = -1
+    var passPortType: Int = 0
 
     enum CodingKeys: String, CodingKey {
         case id = "id"