Commit 269163df authored by pete谢兆麟's avatar pete谢兆麟

新增受养人bug修复

parent b47eb5ef
...@@ -90,10 +90,14 @@ class YHAdopterIncomeDetailViewController: YHBaseViewController { ...@@ -90,10 +90,14 @@ class YHAdopterIncomeDetailViewController: YHBaseViewController {
} }
@objc func nextStep() { @objc func nextStep() {
if file.count != 0 {
viewModel.postDepositUpload(file: file, orderId: orderId) {[weak self] success, error in viewModel.postDepositUpload(file: file, orderId: orderId) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.navigationController?.popViewController(animated: true) self.navigationController?.popViewController(animated: true)
} }
} else {
YHHUD.flash(message: "请上传证明文件")
}
} }
func getFileNameWithoutSuffix(_ string: String) -> String { func getFileNameWithoutSuffix(_ string: String) -> String {
......
...@@ -39,7 +39,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell { ...@@ -39,7 +39,7 @@ class YHAdopterTravelCardTableViewCell: UITableViewCell {
} }
var lastLabelName: String = "" { var lastLabelName: String = "" {
didSet { didSet {
backSurfaceLabel.text = firstLabelName backSurfaceLabel.text = lastLabelName
} }
} }
var urls: [String]? { var urls: [String]? {
......
...@@ -18,8 +18,16 @@ class YHCardUploadView: UIView { ...@@ -18,8 +18,16 @@ class YHCardUploadView: UIView {
var frontDeleteButton: UIButton! var frontDeleteButton: UIButton!
var viewModel: YHBaseViewModel = YHBaseViewModel() var viewModel: YHBaseViewModel = YHBaseViewModel()
var firstUrl: String = "" var firstUrl: String = ""
var defaultImageName: String = "service_adopter_card_other_front" var defaultImageName: String = "service_adopter_card_other_front" {
var defaultName: String = "相关证件1" didSet {
frontImageButton.setBackgroundImage(UIImage(named: defaultImageName), for: .normal)
}
}
var defaultName: String = "相关证件1" {
didSet {
frontLabel.text = defaultName
}
}
var url: String? { var url: String? {
didSet { didSet {
guard let firstUrl = url, firstUrl.count != 0 else { guard let firstUrl = url, firstUrl.count != 0 else {
...@@ -133,8 +141,8 @@ class YHCardUploadView: UIView { ...@@ -133,8 +141,8 @@ class YHCardUploadView: UIView {
guard let self = self else { return } guard let self = self else { return }
self.frontImageButton.stopRotationAnimation() self.frontImageButton.stopRotationAnimation()
self.frontImageButton.setContent("", "") self.frontImageButton.setContent("", "")
guard let url = success else { return } guard let url = success else { return }
self.firstUrl = url
self.frontImageButton.setBackgroundImage(image, for: .normal) self.frontImageButton.setBackgroundImage(image, for: .normal)
self.frontDeleteButton.isHidden = false self.frontDeleteButton.isHidden = false
if let block = self.urlBlock { if let block = self.urlBlock {
......
...@@ -102,9 +102,9 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel { ...@@ -102,9 +102,9 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
} }
if model.gender.count != 0 { if model.gender.count != 0 {
if model.gender == "女" { if model.gender == "女" {
mainModel.certificates_info.gender = 1 mainModel.certificates_info.gender = 2
} else { } else {
mainModel.certificates_info.gender = 0 mainModel.certificates_info.gender = 1
} }
} }
// if model.term_begins.count != 0 { // if model.term_begins.count != 0 {
...@@ -113,8 +113,8 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel { ...@@ -113,8 +113,8 @@ class YHYHAdopterTravelViewModel: YHBaseViewModel {
// if model.end_of_term.count != 0 { // if model.end_of_term.count != 0 {
// mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term // mainModel.certificates.cn_identity_card.issue_date_end_at = model.end_of_term
// } // }
if model.issuing_authority.count != 0 { if model.address.count != 0 {
mainModel.certificates_info.birth_place = model.issuing_authority mainModel.certificates_info.birth_place = model.address
} }
if model.card_num.count != 0 { if model.card_num.count != 0 {
mainModel.certificates_info.id_card = model.card_num mainModel.certificates_info.id_card = model.card_num
......
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