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

// 家庭信息确认

parent d6fe612b
......@@ -118,13 +118,10 @@ class YHFamilyMemberInfoModel: SmartCodable {
}
func getBirthNation() -> String {
if self.birthPlaceAboard == "0" {
return "国内"
} else if self.birthPlaceAboard == "1" {
if self.birthPlaceAboard == "1" {
return "国外"
}
return ""
return "国内"
}
func getHistoryBirthNation() -> String {
......
......@@ -264,7 +264,7 @@ class YHIFamilyInfoListCell: UITableViewCell {
guard let self = self else { return }
if item.id == .birthNation {
familyInfo.birthPlaceAboard = "\(selectItem.index)"
self.selectBirthNation?(familyInfo.birthPlaceAboard == "0")
self.selectBirthNation?(familyInfo.birthPlaceAboard != "1")
}
}
itemsContentView.addSubview(itemView)
......
......@@ -238,8 +238,8 @@ extension YHFamilyInfoConfirmViewModel {
// 出生国家/地区
let birthNation = model.info.getBirthNation()
let historyBirthNation = model.info.getHistoryBirthNation()
let options = [YHFamilyInfoOption(index: 0, value: "国内", isSelect: model.info.birthPlaceAboard == "0"),
YHFamilyInfoOption(index: 1, value: "国外", isSelect: model.info.birthPlaceAboard != "0")]
let options = [YHFamilyInfoOption(index: 0, value: "国内", isSelect: model.info.birthPlaceAboard != "1"),
YHFamilyInfoOption(index: 1, value: "国外", isSelect: model.info.birthPlaceAboard == "1")]
let birthNationInfo = YHFamilyInfoItem(id: .birthNation,
action: .choice,
......@@ -257,14 +257,15 @@ extension YHFamilyInfoConfirmViewModel {
var birthPlaceActionType = YHFamilyInfoActionType.select
// 出生地
var birthPlace = ""
if model.info.birthPlaceAboard == "0" { // 当前出生国家是国内
birthPlaceId = .birthPlaceInChina
birthPlaceActionType = .select
birthPlace = model.info.birthPlace.area.joined(separator: "")
} else {
if model.info.birthPlaceAboard == "1" { // 当前出生国家是国外
birthPlaceId = .birthPlaceAboard
birthPlaceActionType = .edit
birthPlace = model.info.birthPlace.foreign
} else {
birthPlaceId = .birthPlaceInChina
birthPlaceActionType = .select
birthPlace = model.info.birthPlace.area.joined(separator: "")
}
//
......
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