Commit 46bf2e4d authored by Steven杜宇's avatar Steven杜宇

// 预览

parent 7c8d9042
...@@ -1368,6 +1368,9 @@ private extension YHPreviewViewModel { ...@@ -1368,6 +1368,9 @@ private extension YHPreviewViewModel {
} }
} }
if model.follow == 1 { // 随行 才显示证件信息和证件照片
// 证件信息显示逻辑 // 证件信息显示逻辑
var cerInfoArr = [YHPersonInfoCellModel1]() var cerInfoArr = [YHPersonInfoCellModel1]()
let a = showCerInfoLogic(familyMember: model, mainApplicantInfo: mainApplicant) let a = showCerInfoLogic(familyMember: model, mainApplicantInfo: mainApplicant)
...@@ -1452,6 +1455,7 @@ private extension YHPreviewViewModel { ...@@ -1452,6 +1455,7 @@ private extension YHPreviewViewModel {
let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: photoArr) let model4 = YHPreviewInfoSessionModel(cellType: .idPictureType, cellTitle: "证件照片", cellData2: photoArr)
arrTemp.append(model4) arrTemp.append(model4)
}
arrDataForSpouse = arrTemp arrDataForSpouse = arrTemp
} }
...@@ -1615,9 +1619,6 @@ private extension YHPreviewViewModel { ...@@ -1615,9 +1619,6 @@ private extension YHPreviewViewModel {
let tmp44 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况:", answer: model.married.defaultStringIfEmpty()) let tmp44 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况:", answer: model.married.defaultStringIfEmpty())
var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp44] var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp44]
let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否和主申请人同住:", answer: model.nows == 1 ? "是" : "否")
arr.append(tmp10)
var liveAbord = false //海外 var liveAbord = false //海外
var address = "" var address = ""
if model.nows == 0 { if model.nows == 0 {
...@@ -1648,12 +1649,6 @@ private extension YHPreviewViewModel { ...@@ -1648,12 +1649,6 @@ private extension YHPreviewViewModel {
arr.append(tmp12) arr.append(tmp12)
} }
if true {
let title = model.isPreviousMarriageChild() ? "是" : "否"
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否为前次婚姻的子女", answer: title)
arr.append(tmp12)
}
if model.nows == 0 { if model.nows == 0 {
let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址:", answer: address.defaultStringIfEmpty()) let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址:", answer: address.defaultStringIfEmpty())
arr.append(tmp133) arr.append(tmp133)
...@@ -1680,6 +1675,7 @@ private extension YHPreviewViewModel { ...@@ -1680,6 +1675,7 @@ private extension YHPreviewViewModel {
} }
} }
if model.follow == 1 { // 随行 才显示证件信息和证件照片
// 证件信息显示逻辑 // 证件信息显示逻辑
var cerInfoArr = [YHPersonInfoCellModel1]() var cerInfoArr = [YHPersonInfoCellModel1]()
let a = showCerInfoLogic(familyMember: model, mainApplicantInfo: mainApplicant) let a = showCerInfoLogic(familyMember: model, mainApplicantInfo: mainApplicant)
...@@ -1766,6 +1762,7 @@ private extension YHPreviewViewModel { ...@@ -1766,6 +1762,7 @@ private extension YHPreviewViewModel {
arrTemp.append(model4) arrTemp.append(model4)
arrDataForChildren.append(contentsOf: arrTemp) arrDataForChildren.append(contentsOf: arrTemp)
} }
}
//子女 数据 //子女 数据
func installDataForChildren() { func installDataForChildren() {
......
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