Merge commit '8e0d1f12' into davidhuang

* commit '8e0d1f12':
  // 证书

galaxy/galaxy/AppDelegate.swift

@@ -127,7 +127,7 @@ extension AppDelegate {
                 
                 //4.
                 IQKeyboardManager.shared.enable = true
-                IQKeyboardManager.shared.enableAutoToolbar = false
+                IQKeyboardManager.shared.enableAutoToolbar = true
                 IQKeyboardManager.shared.resignOnTouchOutside = true // 控制点击背景是否收起键盘
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHBrotherInfoVC.swift

@@ -247,6 +247,25 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
 
+        if !(0..<items.count).contains(indexPath.section) { return }
+        let arr:[YHFormItemProtocol] = items[indexPath.section]
+        if !(0..<arr.count).contains(indexPath.row) {  return  }
+        let item = arr[indexPath.row]
+        
+        if item is YHFormDetailItem {
+            let detailItem = item as! YHFormDetailItem
+            if detailItem.type == .certificateValidDate ||
+               detailItem.type == .certificateSignDate { // 届满日期 签发日期
+     
+                self.view?.endEditing(true)
+                YHDatePickView.show(type: .yyyymmdd) { date in
+                    let dataArr = date.components(separatedBy: YHDatePickView.separator)
+                    print(date)
+                    
+                }
+            }
+            return
+        }
     }
         
     func createCorner(cell:UITableViewCell, arr:Array<Any>, indexPath:IndexPath) {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHCertificateViewController.swift

@@ -23,6 +23,7 @@ class YHCertificateViewController: YHBaseViewController {
         if #available(iOS 11.0, *) {
             tableView.contentInsetAdjustmentBehavior = .never
         }
+        
         tableView.showsVerticalScrollIndicator = false
         tableView.backgroundColor = .clear
         tableView.separatorStyle = .none
@@ -73,7 +74,9 @@ class YHCertificateViewController: YHBaseViewController {
         let item12 = YHFormDetailItem(type: .certificateSignPlace)
         let item13 = YHFormDetailItem(type: .certificateSignDate)
         let item14 = YHFormDetailItem(type: .certificateValidDate)
-        let arr1:[YHFormItemProtocol] = [title1, item10, item11, item12, item13, item14]
+        let item15 = YHFormDetailItem(type: .certificateSignPlace)
+        
+        let arr1:[YHFormItemProtocol] = [title1, item10, item11, item12, item13, item14, item15]
 
         items.append(contentsOf: [arr0, arr1])
         tableView.reloadData()
@@ -187,10 +190,9 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         
-        if indexPath.section >= items.count { return }
+        if !(0..<items.count).contains(indexPath.section) { return }
         let arr:[YHFormItemProtocol] = items[indexPath.section]
-        
-        if indexPath.row >= arr.count || indexPath.row < 0 {  return  }
+        if !(0..<arr.count).contains(indexPath.row) {  return  }
         let item = arr[indexPath.row]
         
         if item is YHFormTitleItem {
@@ -201,10 +203,11 @@ extension YHCertificateViewController : UITableViewDelegate, UITableViewDataSour
             if detailItem.type == .certificateValidDate ||
                detailItem.type == .certificateSignDate { // 届满日期 签发日期
      
+                self.view?.endEditing(true)
                 YHDatePickView.show(type: .yyyymmdd) { date in
-                    let arr = date.components(separatedBy: YHDatePickView.separator)
-                    // [yyyy, mm, dd] eg ["2024", "01", "20"]
-                    print(date)
+                    let dataArr = date.components(separatedBy: YHDatePickView.separator)
+                    print(dataArr)
+                    
                 }
             }
             return

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHChildBasicInfoVC.swift

@@ -36,8 +36,6 @@ class YHChildBasicInfoVC: YHBaseViewController {
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
         tableView.register(YHFormItemDegreeInfoCell.self, forCellReuseIdentifier: YHFormItemDegreeInfoCell.cellReuseIdentifier)
-        
-        
         return tableView
     }()
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember/C/YHFamilyMemberFormVC.swift

@@ -7,7 +7,6 @@
 //
 
 import UIKit
-import IQKeyboardManagerSwift
 
 enum YHFormTitleItemEditType:Int {
     case none = 1

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation/V/YHDatePickView.swift

@@ -177,6 +177,7 @@ class YHDatePickView: UIView {
         removeFromSuperview()
     }
     
+    
     @objc func sure() {
         guard let type = type else { return }
         var date = ""
@@ -191,6 +192,7 @@ class YHDatePickView: UIView {
         if self.backDate != nil {
             self.backDate!(date)
         }
+        dismiss()
     }
 }