图片上传逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdoptedChinaTravelViewController.swift

@@ -122,6 +122,10 @@ extension YHAdoptedChinaTravelViewController: UITableViewDelegate, UITableViewDa
                 guard let self = self else { return }
                 self.urls[index] = url
             }
+            cell.deleteBlock = { [weak self] url, index in
+                guard let self = self else { return }
+                self.urls[index] = url
+            }
             return cell
         }
  

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterBirthViewController.swift

@@ -133,6 +133,10 @@ extension YHAdopterBirthViewController: UITableViewDelegate, UITableViewDataSour
                 guard let self = self else { return }
                 self.urls[index] = url
             }
+            cell.deleteBlock = { [weak self] url, index in
+                guard let self = self else { return }
+                self.urls[index] = url
+            }
             return cell
         }
  

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterChinaLifeViewController.swift

@@ -122,6 +122,10 @@ extension YHAdopterChinaLifeViewController: UITableViewDelegate, UITableViewData
                 guard let self = self else { return }
                 self.urls[index] = url
             }
+            cell.deleteBlock = { [weak self] url, index in
+                guard let self = self else { return }
+                self.urls[index] = url
+            }
             return cell
         }
  

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterChinaViewController.swift

@@ -155,11 +155,15 @@ extension YHAdopterChinaViewController: UITableViewDelegate, UITableViewDataSour
                         guard let url = success else { return }
                         self.viewModel.requestCnIDCardMessage(url, isBack: 0) {[weak self] success, error in
                             guard let self = self else { return }
-                            self.data = viewModel.getBaseDataSource(isShowPrompt)
+                            self.data = viewModel.getChinaDataSource(isShowPrompt)
                             self.tableView.reloadData()
                         }
                     }
                 }
+                cell.deleteBlock = { [weak self] url, index in
+                    guard let self = self else { return }
+                    self.urls[index] = url
+                }
                 return cell
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterIdCardViewController.swift

@@ -123,6 +123,10 @@ extension YHAdopterIdCardViewController: UITableViewDelegate, UITableViewDataSou
                 guard let self = self else { return }
                 self.urls[index] = url
             }
+            cell.deleteBlock = { [weak self] url, index in
+                guard let self = self else { return }
+                self.urls[index] = url
+            }
             return cell
         }
  

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterMarryViewController.swift

@@ -131,6 +131,10 @@ extension YHAdopterMarryViewController: UITableViewDelegate, UITableViewDataSour
                 guard let self = self else { return }
                 self.urls[index] = url
             }
+            cell.deleteBlock = { [weak self] url, index in
+                guard let self = self else { return }
+                self.urls[index] = url
+            }
             return cell
         }
  

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterResidentViewController.swift

@@ -133,6 +133,10 @@ extension YHAdopterResidentViewController: UITableViewDelegate, UITableViewDataS
                 guard let self = self else { return }
                 self.urls[index] = url
             }
+            cell.deleteBlock = { [weak self] url, index in
+                guard let self = self else { return }
+                self.urls[index] = url
+            }
             return cell
         }
  

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/C/YHAdopterTravelViewController.swift

@@ -108,16 +108,18 @@ class YHAdopterTravelViewController: YHBaseViewController {
         }
     }
     
-    func isOneYearAfter(_ dateString: String, from baseDate: Date = Date()) -> Bool {
+    func isOneYearAfter(_ dateString: String) -> Bool {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd"
         
-        guard let date = dateFormatter.date(from: dateString) else { return false }
+        guard let inputDate = dateFormatter.date(from: dateString) else {
+            return false // 输入格式不正确
+        }
         
-        let calendar = Calendar.current
-        let components = calendar.dateComponents([.year], from: date, to: baseDate)
+        let currentDate = Date()
+        let oneYearFromNow = Calendar.current.date(byAdding: .year, value: 1, to: currentDate)!
         
-        return components.year ?? 0 >= 1
+        return inputDate < oneYearFromNow
     }
 }
 
@@ -161,6 +163,10 @@ extension YHAdopterTravelViewController: UITableViewDelegate, UITableViewDataSou
                         }
                     }
                 }
+                cell.deleteBlock = { [weak self] url, index in
+                    guard let self = self else { return }
+                    self.urls[index] = url
+                }
                 return cell
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterCardExampleView.swift

@@ -57,7 +57,7 @@ class YHAdopterCardExampleView: UIView {
                 data = ["service_adopter_example_other1", "service_adopter_example_other2","service_adopter_example_other3","service_adopter_example_other4"]
                 centerView.snp.remakeConstraints { make in
                     make.left.right.bottom.equalToSuperview()
-                    make.height.equalTo(801.fix)
+                    make.height.equalTo(701.fix)
                 }
             }
             

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterIncomeTitleTableViewCell.swift

@@ -210,15 +210,17 @@ class YHAdopterIncomeTitleTableViewCell: UITableViewCell {
         }
     }
     
-    func isOneYearAfter(_ dateString: String, from baseDate: Date = Date()) -> Bool {
+    func isOneYearAfter(_ dateString: String) -> Bool {
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM-dd"
         
-        guard let date = dateFormatter.date(from: dateString) else { return false }
+        guard let inputDate = dateFormatter.date(from: dateString) else {
+            return false // 输入格式不正确
+        }
         
-        let calendar = Calendar.current
-        let components = calendar.dateComponents([.year], from: date, to: baseDate)
+        let currentDate = Date()
+        let oneYearFromNow = Calendar.current.date(byAdding: .year, value: 1, to: currentDate)!
         
-        return components.year ?? 0 >= 1
+        return inputDate < oneYearFromNow
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterMarryCardTableViewCell.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHAdopterMarryCardTableViewCell: UITableViewCell {
     typealias UrlBlock = (_ url: String, _ index: Int) -> ()
     var urlBlock: UrlBlock?
+    var deleteBlock: UrlBlock?
     var frontLabel: UILabel!
     var backSurfaceLabel: UILabel!
     var thirdLabel: UILabel!
@@ -354,20 +355,32 @@ class YHAdopterMarryCardTableViewCell: UITableViewCell {
     }
     
     @objc func frontDeleteClick() {
+        firstUrl = ""
         frontDeleteButton.isHidden = true
         frontImageButton.setBackgroundImage(UIImage(named: "service_adopter_card_marry_front"), for: .normal)
         frontImageButton.setContent("card_upload", "点击上传")
+        if let block = self.deleteBlock {
+            block("", 0)
+        }
     }
     
     @objc func backSurfaceDeleteClick() {
+        secondUrl = ""
         backSurfaceDeleteButton.isHidden = true
         backSurfaceImageButton.setBackgroundImage(UIImage(named: "service_adopter_card_marry_second"), for: .normal)
         backSurfaceImageButton.setContent("card_upload", "点击上传")
+        if let block = self.deleteBlock {
+            block("", 1)
+        }
     }
     
     @objc func thirdDeleteClick() {
+        lastUrl = ""
         thirdDeleteButton.isHidden = true
         thirdImageButton.setBackgroundImage(UIImage(named: "service_adopter_card_marry_back"), for: .normal)
         thirdImageButton.setContent("card_upload", "点击上传")
+        if let block = self.deleteBlock {
+            block("", 2)
+        }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterResidentTableViewCell.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHAdopterResidentTableViewCell: UITableViewCell {
     typealias UrlBlock = (_ url: String, _ index: Int) -> ()
     var urlBlock: UrlBlock?
+    var deleteBlock: UrlBlock?
     var frontLabel: UILabel!
     var frontImageButton: YHCardButton!
     var frontDeleteButton: UIButton!
@@ -179,9 +180,13 @@ class YHAdopterResidentTableViewCell: UITableViewCell {
     }
     
     @objc func frontDeleteClick() {
+        firstUrl = ""
         frontDeleteButton.isHidden = true
         frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
         frontImageButton.setContent("card_upload", "点击上传")
+        if let block = self.deleteBlock {
+            block("", 0)
+        }
     }
     
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/AddAdopters(2新增受养人)/V/YHAdopterTravelCardTableViewCell.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHAdopterTravelCardTableViewCell: UITableViewCell {
     typealias UrlBlock = (_ url: String, _ index: Int) -> ()
     var urlBlock: UrlBlock?
+    var deleteBlock: UrlBlock?
     var frontLabel: UILabel!
     var backSurfaceLabel: UILabel!
     var frontImageButton: YHCardButton!
@@ -283,14 +284,22 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
     }
     
     @objc func frontDeleteClick() {
+        firstUrl = ""
         frontDeleteButton.isHidden = true
         frontImageButton.setBackgroundImage(UIImage(named: firstImageName), for: .normal)
         frontImageButton.setContent("card_upload", "点击上传")
+        if let block = self.deleteBlock {
+            block("", 0)
+        }
     }
     
     @objc func backSurfaceDeleteClick() {
+        lastUrl = ""
         backSurfaceDeleteButton.isHidden = true
         backSurfaceImageButton.setBackgroundImage(UIImage(named: lastImageName), for: .normal)
         backSurfaceImageButton.setContent("card_upload", "点击上传")
+        if let block = self.deleteBlock {
+            block("", 1)
+        }
     }
 }