Commit 71d2693a authored by pete谢兆麟's avatar pete谢兆麟

历史上传旅行证件逻辑修改

parent 8a6ad1ea
...@@ -350,6 +350,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl ...@@ -350,6 +350,7 @@ extension YHResignCertificateDetailHkViewController: UITableViewDelegate, UITabl
} else { } else {
self.dataModel.cert_info.img_back = "" self.dataModel.cert_info.img_back = ""
} }
self.updateData()
} }
cell.block = {[weak self] model in cell.block = {[weak self] model in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -277,6 +277,7 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate, ...@@ -277,6 +277,7 @@ extension YHResignCertificateDetailPassPortViewController: UITableViewDelegate,
if index == 0 { if index == 0 {
self.dataModel.cert_info.img_front = "" self.dataModel.cert_info.img_front = ""
} }
self.updateData()
} }
cell.block = {[weak self] model in cell.block = {[weak self] model in
guard let self = self else { return } guard let self = self else { return }
......
...@@ -70,16 +70,27 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -70,16 +70,27 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
var urls: [String]? { var urls: [String]? {
didSet { didSet {
guard let firstUrl = urls?.first, firstUrl.count != 0 else { guard let firstUrl = urls?.first, firstUrl.count != 0 else {
cerInfoLabel.isHidden = true guard let lastUrl = urls?.last, lastUrl.count != 0 else {
cerNumberView.isHidden = true cerInfoLabel.isHidden = true
cerSignPlaceView.isHidden = true cerNumberView.isHidden = true
cardLabel.isHidden = true cerSignPlaceView.isHidden = true
signLabel.isHidden = true cardLabel.isHidden = true
cardBeginView.isHidden = true signLabel.isHidden = true
cardEndView.isHidden = true cardBeginView.isHidden = true
signBeginView.isHidden = true cardEndView.isHidden = true
signEndView.isHidden = true signBeginView.isHidden = true
guard let lastUrl = urls?.last, lastUrl.count != 0 else { return } signEndView.isHidden = true
return
}
cerInfoLabel.isHidden = false
cerNumberView.isHidden = false
cerSignPlaceView.isHidden = false
cardLabel.isHidden = false
signLabel.isHidden = false
cardBeginView.isHidden = false
cardEndView.isHidden = false
signBeginView.isHidden = false
signEndView.isHidden = false
self.lastUrl = lastUrl self.lastUrl = lastUrl
self.viewModel.getPublicImageUrl(lastUrl) {[weak self] success, error in self.viewModel.getPublicImageUrl(lastUrl) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
...@@ -155,7 +166,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -155,7 +166,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) { if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
failString = "" failString = ""
} else { } else {
failString = "卡片有效期不足,需要为\(self.dataModel.valid_date)或以后" if item.message != "" {
failString = "卡片有效期不足,需要为\(self.dataModel.valid_date)或以后"
}
} }
} }
if item.id == .id3 { // 签注有效期开始时间 if item.id == .id3 { // 签注有效期开始时间
...@@ -189,7 +202,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell { ...@@ -189,7 +202,9 @@ class YHResignCertificateHKTableViewCell: UITableViewCell {
if failString == "卡片有效期不足,需要为\(self.dataModel.valid_date)或以后" { if failString == "卡片有效期不足,需要为\(self.dataModel.valid_date)或以后" {
} else { } else {
failString = "签注有效期不足,需要为\(self.dataModel.sign_valid_date)或以后" if item.message != "" {
failString = "签注有效期不足,需要为\(self.dataModel.sign_valid_date)或以后"
}
} }
} }
} }
......
...@@ -112,7 +112,9 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell { ...@@ -112,7 +112,9 @@ class YHResignCertificatePassportTableViewCell: UITableViewCell {
if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) { if self.compareDates(dateString1: item.message ?? "", dateString2: self.dataModel.valid_date) {
failString = "" failString = ""
} else { } else {
failString = "有效期不足,需要为\(self.dataModel.valid_date)或以后" if item.message != "" {
failString = "有效期不足,需要为\(self.dataModel.valid_date)或以后"
}
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment