// 确认

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/M/YHResignInfoConfirmInfoListModel.swift

@@ -129,7 +129,7 @@ class YHResignInfoConfirmFamilyModel: SmartCodable {
     }
     
     func getMarriageStatus(_ marrage: String) -> String {
-        let arr = YHSheetPickerView.dataSource[.marriage1]!
+        let arr = YHSheetPickerView.dataSource[.marriage2]!
         for item in arr {
             if item.index == Int(marrage) {
                 return item.title

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/V/YHResignInfoItemView.swift

@@ -199,7 +199,7 @@ class YHResignInfoItemView: UIView {
             UIApplication.shared.yhKeyWindow()?.endEditing(true)
             
             if item.id == .marriage { // 婚姻状况
-                YHSheetPickerView.show(type:.marriage1, selectTitle: self.faimilyInfo.getMarriageState()) {
+                YHSheetPickerView.show(type:.marriage2, selectTitle: self.faimilyInfo.getMarriageState()) {
                     [weak self]  item in
                     guard let self = self else { return }
                     self.item.value = item.title

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/VM/YHResignInfoConfirmIViewModel.swift

@@ -249,7 +249,7 @@ extension YHResignInfoConfirmViewModel {
         if model.relation != YHFamilyMemberRelationType.child.rawValue &&
             model.relation != YHFamilyMemberRelationType.spouse.rawValue { // 子女\配偶无香港住址一栏
             
-            let hongkongAddressInfo =  YHResignFamilyInfoItem(id: .hongKongId,
+            let hongkongAddressInfo =  YHResignFamilyInfoItem(id: .hongkongAddress,
                                                            action: .edit,
                                                            isMust: false,
                                                            title: "香港住址",
@@ -259,7 +259,7 @@ extension YHResignInfoConfirmViewModel {
                                                            isEditMode: isEditMode,
                                                            isShowPreviousInfo: !isEditMode && !model.hkAddressHistory.isEmpty)
             
-            resultArr.append(hongkongIdInfo)
+            resultArr.append(hongkongAddressInfo)
 
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerView.swift

@@ -211,6 +211,15 @@ class YHSheetPickerView: UIView {
                  YHSheetPickerViewItem(title:"已婚(再婚)".local, index:6),
 
                 ],
+            
+            // 婚姻
+            .marriage2:
+                [YHSheetPickerViewItem(title:"已婚".local, index:1),
+                 YHSheetPickerViewItem(title:"未婚".local, index:2),
+                 YHSheetPickerViewItem(title:"离婚".local, index:3),
+                 YHSheetPickerViewItem(title:"分居".local, index:4),
+                 YHSheetPickerViewItem(title:"丧偶".local, index:5),
+                ],
                 
     
             // 教育
@@ -405,6 +414,8 @@ extension YHSheetPickerView {
             return "选择婚姻状况"
         case .marriage1:
             return "选择婚姻状况"
+        case .marriage2:
+            return "选择婚姻状况"
         case .educationStyle:
             return "选择授课形式"
         case .occupation:

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/PickerView/YHSheetPickerViewType.swift

@@ -20,8 +20,10 @@ enum YHSheetPickerViewType: Int {
     case ownDegree
     // 婚姻(文字有效)
     case marriageText
-    // 婚姻(index有效)
+    // 婚姻(index有效) 有再婚选项
     case marriage1
+    // 婚姻(index有效) 无再婚选项
+    case marriage2
     
     // 授课形式
     case educationStyle