身份证 检查

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHItemView.swift

@@ -273,6 +273,14 @@ class YHItemView: UIView {
         if dataSource.isShowPrompts ?? false {
             if dataSource.message?.count != 0 {
                 showPromptLabel.isHidden = true
+                
+                //特殊处理身份证
+                if dataSource.id == .id8 {
+                    if let message = dataSource.message,message.count == 18 {
+                    } else {
+                        showPromptLabel.isHidden = false
+                    }
+                }
             } else {
                 showPromptLabel.isHidden = false
             }
@@ -280,6 +288,7 @@ class YHItemView: UIView {
             showPromptLabel.isHidden = true
         }
         
+        
         if dataSource.id == .id11 || dataSource.id == .id15 || dataSource.id == .id20 {
             longTimeButton.isHidden = false
             nextStepImageView.isHidden = true
@@ -489,7 +498,7 @@ extension YHItemView: UITextFieldDelegate {
             return false
         }
         
-        if (dataSource?.id == .id8) && newText.count > 20 {
+        if (dataSource?.id == .id8) && newText.count > 18 {
             return false
         }
             
@@ -498,7 +507,9 @@ extension YHItemView: UITextFieldDelegate {
         }
         
         if dataSource?.id == .id23 {
-            newText = newText.uppercased()
+            let regex = "[^A-Za-z]+"
+            textField.limitInputWithPattern(pattern:regex, 30)
+            newText = textField.text!.uppercased()
         }
         
         var data = dataSource ?? YHItemModel()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -472,6 +472,8 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             let passport_issue_date_start_at = mainModel.certificates.passport.issue_date_start_at
             let passport_issue_date_end_at = mainModel.certificates.passport.issue_date_end_at
             let nationality = mainModel.nationality
+            
+            
             if self.mainModel.is_handled == 1 {
                 guard hk_macao_pass_number.count > 0 else { return false }
                 guard hk_macao_pass_issue_at.count > 0 else { return false }
@@ -479,7 +481,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
                 guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
             }
             if nationality.contains("中国") {
-                guard cn_identity_card_number.count > 0 else { return false }
+                guard cn_identity_card_number.count == 18 else { return false }
                 guard cn_identity_card_issue_at.count > 0 else { return false }
                 guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
                 guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
@@ -498,7 +500,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
             let birth_place_area = mainModel.birth_place.area
             let birth_place_foreign = mainModel.birth_place.foreign
             let sex = mainModel.sex 
-            let married = mainModel.married 
+            _ = mainModel.married 
             let mobile = mainModel.mobile 
             let email = mainModel.email 
             let has_hk_id = mainModel.has_hk_id