签注有效期添加

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateDetailHkViewController.swift

@@ -246,9 +246,9 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
         cell.lastImageName = "service_adopter_card_travel_back"
         cell.firstLabelName = "港澳通行证正面"
         cell.lastLabelName = "港澳通行证倍面"
+        cell.dataModel = dataModel
         cell.failString = failString
         cell.data = data
-        cell.dataModel = dataModel
         cell.urls = urls
         cell.urlBlock = { [weak self] url, index in
             guard let self = self else { return }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateHKTableViewCell.swift

@@ -163,9 +163,15 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
                         }
                     }
                     if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
-                        failString = ""
+                        if failString == "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后" {
+                            failString = ""
+                        }
                     } else {
-                        failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
+                        if failString == "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后" {
+                            
+                        } else {
+                            failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
+                        }
                     }
                 }
             }
@@ -429,7 +435,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.valid_date) {
-                    failString = ""
+                    if failString == "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后" {
+                        failString = ""
+                    }
                 } else {
                     failString = "卡片有效期不足，需要为\(self.dataModel.valid_date)或以后"
                 }
@@ -485,9 +493,11 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
             if let block = self.block {
                 block(model)
                 if self.compareDates(dateString1: model.message ?? "", dateString2: self.dataModel.sign_valid_date) {
-                    failString = ""
+                    if failString == "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后" {
+                        failString = ""
+                    }
                 } else {
-                    failString = "签注卡片有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
+                    failString = "签注有效期不足，需要为\(self.dataModel.sign_valid_date)或以后"
                 }
             }
         }