Commit ed5345a9 authored by Steven杜宇's avatar Steven杜宇

// 证件

parent 5e89dad8
...@@ -84,7 +84,7 @@ class YHMyFileListCell: UITableViewCell { ...@@ -84,7 +84,7 @@ class YHMyFileListCell: UITableViewCell {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor.init(hex: 0xDEE5F1) view.backgroundColor = UIColor.init(hex: 0xDEE5F1)
view.layer.cornerRadius = 0 view.layer.cornerRadius = 0
view.layer.borderWidth = 1 view.layer.borderWidth = 0.5
view.layer.borderColor = UIColor.init(hex: 0xDEE5F1).cgColor view.layer.borderColor = UIColor.init(hex: 0xDEE5F1).cgColor
view.clipsToBounds = true view.clipsToBounds = true
return view return view
......
...@@ -486,14 +486,14 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour ...@@ -486,14 +486,14 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
} }
} else if detailItem.type == .certificateType { // 选择证件类别 } else if detailItem.type == .certificateType { // 选择证件类别
let type = self.familyMember?.certificates.passport.passPortType ?? 3 // let type = self.familyMember?.certificates.passport.passPortType ?? 3
YHSheetPickerView.show(type: .certificate, selectIndex:type) { // YHSheetPickerView.show(type: .certificate, selectIndex:type) {
[weak self] selectItem in // [weak self] selectItem in
guard let self = self else { return } // guard let self = self else { return }
self.familyMember?.certificates.passport.passPortType = selectItem.index // self.familyMember?.certificates.passport.passPortType = selectItem.index
self.loadInfo() // self.loadInfo()
self.save() // self.save()
} // }
} }
return return
} }
......
...@@ -273,7 +273,7 @@ class YHFormTitleItem : YHFormItemProtocol { ...@@ -273,7 +273,7 @@ class YHFormTitleItem : YHFormItemProtocol {
case .chinaIdCardInfo: case .chinaIdCardInfo:
return "中国身份证".local return "中国身份证".local
case .passPortOrTravelInfo: case .passPortOrTravelInfo:
return "护照及其他旅行证件".local return "护照".local
case .spouseInfo: case .spouseInfo:
return "配偶信息".local return "配偶信息".local
case .occupationInfo: case .occupationInfo:
...@@ -1145,7 +1145,6 @@ class YHCNIdentityCard: SmartCodable { ...@@ -1145,7 +1145,6 @@ class YHCNIdentityCard: SmartCodable {
var lastIssueDateEndAt: String = "" var lastIssueDateEndAt: String = ""
var imgFront: String = "" var imgFront: String = ""
var imgBack: String = "" var imgBack: String = ""
var passPortType: Int = 0
enum CodingKeys: String, CodingKey { enum CodingKeys: String, CodingKey {
case id = "id" case id = "id"
...@@ -1155,7 +1154,6 @@ class YHCNIdentityCard: SmartCodable { ...@@ -1155,7 +1154,6 @@ class YHCNIdentityCard: SmartCodable {
case issueDateEndAt = "issue_date_end_at" case issueDateEndAt = "issue_date_end_at"
case imgFront = "img_front" case imgFront = "img_front"
case imgBack = "img_back" case imgBack = "img_back"
case passPortType = "passport_type"
} }
required init() { required init() {
......
...@@ -118,7 +118,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol ...@@ -118,7 +118,7 @@ class YHGCCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol
is_live_oversea_year = mainApplicant.isOverSeasOver1Year() is_live_oversea_year = mainApplicant.isOverSeasOver1Year()
} }
if nationality == "中国-China" { // 中国国籍 if nationality.contains("中国") { // 中国国籍
let isLiveInChina = liveCountry.contains("中国".local) let isLiveInChina = liveCountry.contains("中国".local)
if isLiveInChina { // 居住国内 if isLiveInChina { // 居住国内
if familyMember.isHandled == 0 { // 没办理过港澳通行证 if familyMember.isHandled == 0 { // 没办理过港澳通行证
...@@ -506,14 +506,14 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo ...@@ -506,14 +506,14 @@ extension YHGCCertificateInfoController : UITableViewDelegate, UITableViewDataSo
} }
} else if detailItem.type == .certificateType { // 选择证件类别 } else if detailItem.type == .certificateType { // 选择证件类别
let type = self.familyMember?.certificates.passport.passPortType ?? 3 // let type = self.familyMember?.certificates.passport.passPortType ?? 3
YHSheetPickerView.show(type: .certificate, selectIndex:type) { // YHSheetPickerView.show(type: .certificate, selectIndex:type) {
[weak self] selectItem in // [weak self] selectItem in
guard let self = self else { return } // guard let self = self else { return }
self.familyMember?.certificates.passport.passPortType = selectItem.index // self.familyMember?.certificates.passport.passPortType = selectItem.index
self.loadInfo() // self.loadInfo()
self.save() // self.save()
} // }
} }
return return
} }
......
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