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

// 跟安卓显示逻辑保持一致

parent 93fc8107
...@@ -128,13 +128,10 @@ class YHFamilyMemberInfoModel: SmartCodable { ...@@ -128,13 +128,10 @@ class YHFamilyMemberInfoModel: SmartCodable {
} }
func getHistoryBirthNation() -> String { func getHistoryBirthNation() -> String {
if self.birthPlaceAboardHistory == "0" { if self.birthPlaceAboardHistory == "1" {
return "国内"
} else if self.birthPlaceAboardHistory == "1" {
return "国外" return "国外"
} }
return "" return "国内"
} }
private func getMarriageStatus(_ marrage: String) -> String { private func getMarriageStatus(_ marrage: String) -> String {
......
...@@ -269,10 +269,11 @@ extension YHFamilyInfoConfirmViewModel { ...@@ -269,10 +269,11 @@ extension YHFamilyInfoConfirmViewModel {
// //
var birthPlaceHistory = "" var birthPlaceHistory = ""
if model.info.birthPlaceAboardHistory == "0" { // 原出生国家是国内 if model.info.birthPlaceAboardHistory == "1" { // 原出生国家是国外
birthPlaceHistory = model.info.birthPlaceHistory.area.joined(separator: "")
} else {
birthPlaceHistory = model.info.birthPlaceHistory.foreign birthPlaceHistory = model.info.birthPlaceHistory.foreign
} else {
birthPlaceHistory = model.info.birthPlaceHistory.area.joined(separator: "")
} }
let birthPlaceInfo = YHFamilyInfoItem(id: birthPlaceId, let birthPlaceInfo = YHFamilyInfoItem(id: birthPlaceId,
......
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