// 续签信息确认

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

@@ -58,6 +58,7 @@ class YHResignFamilyInfoItem {
     var options:[YHResignFamilyInfoOption] = []
     var isEditMode: Bool = false
     var isShowPreviousInfo: Bool = false
+    var valueIndex: Int = -1
     
     var tips: String {
         get {
@@ -71,6 +72,16 @@ class YHResignFamilyInfoItem {
             if self.id == .hongKongId, !self.value.isHKIdentityCardNumber() {
                 return "请输入正确的香港身份证号"
             }
+            if self.id == .marriage {
+                if let marriageOptions = YHSheetPickerView.dataSource[.marriage1] {
+                    let options =  marriageOptions.map {
+                        return "\($0.index)"
+                    }
+                    if !options.contains("\(self.valueIndex)") {
+                        return "请选择婚姻状况"
+                    }
+               }
+            }
             return ""
         }
         
@@ -105,6 +116,9 @@ class YHResignFamilyInfoItem {
         
         } else if self.id == .hongkongAddress {
             return "请输入香港住址"
+        
+        } else if self.id == .marriage {
+            return "请选择婚姻状况"
         }
         return ""
     }

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

@@ -207,6 +207,7 @@ extension YHResignInfoConfirmViewModel {
                                                     previousValue: model.getHistoryMarriageState(),
                                                     isEditMode: isEditMode,
                                                     isShowPreviousInfo: !isEditMode && !model.getHistoryMarriageState().isEmpty)
+        marriageInfo.valueIndex = Int(model.married) ?? -1
         resultArr.append(marriageInfo)
         
         // 申报国籍