// 预览

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -1498,7 +1498,6 @@ private extension YHPreviewViewModel {
                 }
                 do {
                     //子女信息
-                    var arr = [YHPreviewQuestionAndAnswerModel]()
                     let tmp0 = YHPreviewQuestionAndAnswerModel(question: "子女姓名：", answer: model.subsetName)
                     let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.defaultStringIfEmpty())
@@ -1508,11 +1507,8 @@ private extension YHPreviewViewModel {
                     var city = ""
                     if model.birthPlaceAboard == 0 {
                         //国内
-                        if model.birthPlace.area.count > 1 {
-                            city = "国内 " + model.birthPlace.area[0] + "/" + model.birthPlace.area[1]
-                        } else {
-                            city = "国内 --"
-                        }
+                        city = "国内 " + model.birthPlace.details
+                        
                     } else {
                         //国外
                         city = "国外 " + model.birthPlace.foreign
@@ -1520,7 +1516,8 @@ private extension YHPreviewViewModel {
                     let tmp4 = YHPreviewQuestionAndAnswerModel(question: "出生城市：", answer: city)
                     
                     let tmp5 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: model.married)
-                    
+                    var arr:[YHPreviewQuestionAndAnswerModel] = [tmp0, tmp1, tmp2, tmp3, tmp4, tmp5]
+
                     let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否和主申请人同住：", answer: model.nows == 1 ? "是" : "否")
                     arr.append(tmp10)
                     
@@ -1601,7 +1598,7 @@ private extension YHPreviewViewModel {
                 
                 do {
                     //配偶信息-否
-                    let tmp0 = YHPreviewQuestionAndAnswerModel(question: "配偶姓名：", answer: model.subsetName)
+                    let tmp0 = YHPreviewQuestionAndAnswerModel(question: "子女姓名：", answer: model.subsetName)
                     let tmp1 = YHPreviewQuestionAndAnswerModel(question: "曾用名：", answer: model.usedName.defaultStringIfEmpty())
                     let tmp2 = YHPreviewQuestionAndAnswerModel(question: "婚前姓氏：", answer: model.surname.defaultStringIfEmpty())
                     let sexStr = YHConstantArrayData.getShowNameBy(indexStr: String(model.sex), type: .sex)
@@ -1609,11 +1606,8 @@ private extension YHPreviewViewModel {
                     var city = ""
                     if model.birthPlaceAboard == 0 {
                         //国内
-                        if model.birthPlace.area.count > 1 {
-                            city = "国内 " + model.birthPlace.area[0] + "/" + model.birthPlace.area[1]
-                        } else {
-                            city = "国内 --"
-                        }
+                        city = "国内 " + model.birthPlace.details
+                        
                     } else {
                         //国外
                         city = "国外 " + model.birthPlace.foreign
@@ -1622,6 +1616,50 @@ private extension YHPreviewViewModel {
                     let tmp44 = YHPreviewQuestionAndAnswerModel(question: "婚姻状况：", answer: model.married.defaultStringIfEmpty())
                     var arr = [tmp0,tmp1,tmp2,tmp3,tmp4,tmp44]
                     
+                    let tmp10 = YHPreviewQuestionAndAnswerModel(question: "是否和主申请人同住：", answer: model.nows == 1 ? "是" : "否")
+                    arr.append(tmp10)
+                    
+                    var liveAbord = false //海外
+                    var address = ""
+                    if model.nows == 0 {
+                        var title = ""
+                        if model.address.country.contains("中国") {
+                            //国内
+                            title = "国内 "
+                            if model.address.area.count > 1 {
+                                title = title + model.address.area[0] + "/" + model.address.area[1]
+                            } else {
+                                title = "国内 --"
+                            }
+                            address = model.address.details
+                        } else {
+                            //国外
+                            title = model.address.country
+                            liveAbord = true
+                            
+                            address = model.address.foreign
+                        }
+                        let tmp11 = YHPreviewQuestionAndAnswerModel(question: "现居住地址：", answer: title)
+                        arr.append(tmp11)
+                    }
+                    
+                    if liveAbord == true {
+                        let title = model.isLiveOverseaYear == 1 ? "是" : "否"
+                        let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否在海外居住满1年及以上：", answer: title)
+                        arr.append(tmp12)
+                    }
+                    
+                    if true {
+                        let title = model.isPreviousMarriageChild() ? "是" : "否"
+                        let tmp12 = YHPreviewQuestionAndAnswerModel(question: "是否为前次婚姻的子女", answer: title)
+                        arr.append(tmp12)
+                    }
+                    
+                    if model.nows == 0 {
+                        let tmp133 = YHPreviewQuestionAndAnswerModel(question: "详细地址：", answer: address.defaultStringIfEmpty())
+                        arr.append(tmp133)
+                    }
+                    
                     let isHKIdCardHandled = model.isHaveHKIdentityCard()
                     let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
                     let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)