// 家庭成员

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoUpdateViewController.swift

@@ -160,15 +160,14 @@ class YHFamilyInfoUpdateViewController: YHBaseViewController {
         
         // arr1 信息核实
         let arr1 = viewModel.getInfoConfirm(self.detailMember, isEditMode: self.isInfoEditing)
-        
-        // arr2 递交证件信息
-        let arr2 = viewModel.getCertificateInfo(self.detailMember)
-        
-        // 信息核实
         items.append(arr1)
-        // 递交证件信息
-        items.append(arr2)
         
+        // arr2 递交证件信息
+        if let cer = self.detailMember.info.identity {
+            let arr2 = viewModel.getCertificateInfo(self.detailMember)
+            items.append(arr2)
+        }
+                
         self.tableView.reloadData()
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift

@@ -86,7 +86,7 @@ class YHFamilyMemberInfoModel: SmartCodable {
     var nationalityHistory: String = ""
     var hkIdentityid: String = ""
     var hkIdentityidHistory: String = ""
-    var identity: YHApplicantIdentityModel = YHApplicantIdentityModel()
+    var identity: YHApplicantIdentityModel?
     var occupationName: String = ""
     var occupationNameHistory: String = ""
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHIFamilyInfoListCell.swift

@@ -73,6 +73,11 @@ class YHFamilyInfoItem {
             return ""
         }
         
+        if self.isMust == false { // 非必填
+            return ""
+        }
+        
+        // 必填
         // value 为空的情况
         if self.id == .mainApplicantName {
             return "请输入主申请人姓名"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHInfoItemView.swift

@@ -391,7 +391,7 @@ extension YHInfoItemView: UITextFieldDelegate {
             self.faimilyInfo.hkIdentityid = newText
             
         } else if self.item.id == .birthPlaceAboard {
-            self.faimilyInfo.birthPlace.details = newText
+            self.faimilyInfo.birthPlace.foreign = newText
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift

@@ -272,11 +272,11 @@ extension YHFamilyInfoConfirmViewModel {
                                                    action: .edit,
                                                    isMust: true,
                                                    title: "出生地",
-                                                   value: model.info.birthPlace.details,
+                                                   value: model.info.birthPlace.foreign,
                                                    previousTitle: "原出生地",
-                                                   previousValue: model.info.birthPlaceHistory.details,
+                                                   previousValue: model.info.birthPlaceHistory.foreign,
                                                    isEditMode: isEditMode,
-                                                   isShowPreviousInfo: !isEditMode && !model.info.birthPlaceHistory.details.isEmpty)
+                                                   isShowPreviousInfo: !isEditMode && !model.info.birthPlaceHistory.foreign.isEmpty)
             resultArr.append(birthPlaceInfo)
         }
         
@@ -308,7 +308,7 @@ extension YHFamilyInfoConfirmViewModel {
         // 香港身份证号
         let hongkongIdInfo =  YHFamilyInfoItem(id: .hongKongId,
                                                action: .edit,
-                                               isMust: true,
+                                               isMust: false,
                                                title: "香港身份证号",
                                                value: model.info.hkIdentityid,
                                                previousTitle: "原香港身份证号",
@@ -326,11 +326,11 @@ extension YHFamilyInfoConfirmViewModel {
         var resultArr = [YHFamilyInfoItem]()
         let travelCerInfo = YHFamilyInfoItem(id: .travelCertificateType,
                                                action: .select,
-                                               isMust: true,
+                                               isMust: false,
                                                title: "申报旅行证件",
-                                               value: model.info.identity.name,
+                                               value: model.info.identity?.name ?? "",
                                                previousTitle: "原申报旅行证件",
-                                               previousValue: model.info.identity.name,
+                                               previousValue: model.info.identity?.name ?? "",
                                                isEditMode: false,
                                                isShowPreviousInfo: false)
         resultArr.append(travelCerInfo)
@@ -338,11 +338,11 @@ extension YHFamilyInfoConfirmViewModel {
         // 证件号
         let cerIdInfo = YHFamilyInfoItem(id: .travelCertificateId,
                                          action: .edit,
-                                         isMust: true,
+                                         isMust: false,
                                          title: "证件号",
-                                         value: model.info.identity.number,
+                                         value: model.info.identity?.number ?? "",
                                          previousTitle: "原证件号",
-                                         previousValue: model.info.identity.number,
+                                         previousValue: model.info.identity?.number ?? "",
                                          isEditMode: false,
                                          isShowPreviousInfo: false)
         resultArr.append(cerIdInfo)