Skip to content

G
galaxy-iOS
Commit 41424214 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into qmas-1130 

* 'qmas-1130' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 预览
  工作经验主申请人bug修复
  //  家庭
  主申请人校验逻辑修改
parents 163f57e5 86819178
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 96 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 41424214
...@@ -3294,9 +3294,9 @@ ...@@ -3294,9 +3294,9 @@
045EEE392B9F171A0022A143 /* Spouse(配偶) */ = { 045EEE392B9F171A0022A143 /* Spouse(配偶) */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
045EEE3C2B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift */,
045EEE3A2B9F171A0022A143 /* YHSpouseBasicInfoVC.swift */, 045EEE3A2B9F171A0022A143 /* YHSpouseBasicInfoVC.swift */,
045EEE3B2B9F171A0022A143 /* YHSpouseInfoContainerVC.swift */, 045EEE3B2B9F171A0022A143 /* YHSpouseInfoContainerVC.swift */,
045EEE3C2B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift */,
); );
path = "Spouse(配偶)"; path = "Spouse(配偶)";
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -6709,7 +6709,7 @@ ...@@ -6709,7 +6709,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -6854,7 +6854,7 @@ ...@@ -6854,7 +6854,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -7062,7 +7062,7 @@ ...@@ -7062,7 +7062,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
...@@ -7112,7 +7112,7 @@ ...@@ -7112,7 +7112,7 @@
CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual; CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3; CURRENT_PROJECT_VERSION = 6;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO; ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift
View file @ 41424214
...@@ -114,22 +114,25 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -114,22 +114,25 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
// 港澳通信证 // 港澳通信证
var isHiddenHK = true var isHiddenHK = true
// 国籍
let nationality = child.nationality
// 居住国家
var liveCountry = child.address.country
// 居住海外是否满一年
var isLiveOverseaYear = child.isOverSeasOver1Year()
if child.isLiveTother(), let mainApplicantInfo = mainApplicantInfo {
// 与主申请人同住需要用主申请人居住信息判断
liveCountry = mainApplicantInfo.applicant_address.country
isLiveOverseaYear = mainApplicantInfo.isOverSeasOver1Year()
}
if child.nationality.contains("中国") { // 中国国籍 if child.nationality.contains("中国") { // 中国国籍
if child.isLiveTother() { // 与主申请人同住 let isLiveInChina = liveCountry.contains("中国".local)
if let mainApplicantInfo = mainApplicantInfo { if isLiveInChina || (!isLiveInChina && !isLiveOverseaYear) {
let isLiveInChina = mainApplicantInfo.applicant_address.country.contains("中国".local) // 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
if isLiveInChina || (!isLiveInChina && !mainApplicantInfo.isOverSeasOver1Year()) { isHiddenHK = false
// 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
isHiddenHK = false
}
}
} else { // 不与主申请人同住
let isLiveInChina = child.address.country.contains("中国".local)
if isLiveInChina || (!isLiveInChina && !child.isOverSeasOver1Year()) {
// 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
isHiddenHK = false
}
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift
View file @ 41424214
...@@ -118,22 +118,25 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol { ...@@ -118,22 +118,25 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
// 港澳通信证 // 港澳通信证
var isHiddenHK = true var isHiddenHK = true
if spouse.nationality.contains("中国") { // 中国国籍 // 国籍
if spouse.isLiveTother() { // 与主申请人同住 let nationality = spouse.nationality
if let mainApplicantInfo = mainApplicantInfo { // 居住国家
let isLiveInChina = mainApplicantInfo.applicant_address.country.contains("中国".local) var liveCountry = spouse.address.country
if isLiveInChina || (!isLiveInChina && !mainApplicantInfo.isOverSeasOver1Year()) { // 居住海外是否满一年
// 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框 var isLiveOverseaYear = spouse.isOverSeasOver1Year()
isHiddenHK = false
} if spouse.isLiveTother(), let mainApplicantInfo = mainApplicantInfo {
} // 与主申请人同住需要用主申请人居住信息判断
liveCountry = mainApplicantInfo.applicant_address.country
} else { // 不与主申请人同住 isLiveOverseaYear = mainApplicantInfo.isOverSeasOver1Year()
let isLiveInChina = spouse.address.country.contains("中国".local)
if isLiveInChina || (!isLiveInChina && !spouse.isOverSeasOver1Year()) { }
// 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
isHiddenHK = false if nationality.contains("中国") { // 中国国籍
} let isLiveInChina = liveCountry.contains("中国".local)
if isLiveInChina || (!isLiveInChina && !isLiveOverseaYear) {
// 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
isHiddenHK = false
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift
View file @ 41424214
...@@ -24,8 +24,11 @@ class YHFamilyMemberViewModel : YHBaseViewModel{ ...@@ -24,8 +24,11 @@ class YHFamilyMemberViewModel : YHBaseViewModel{
let item2 = YHItemModel(id: .id7, isNeed: true, title: "护照(选填)", isUserKeyBoard: false, prompts: "请输入", message: nil, isShowPrompts: isShowPrompt) let item2 = YHItemModel(id: .id7, isNeed: true, title: "护照(选填)", isUserKeyBoard: false, prompts: "请输入", message: nil, isShowPrompts: isShowPrompt)
let section2 = YHSectionItemModel(title: "护照(选填)", models: [item2]) let section2 = YHSectionItemModel(title: "护照(选填)", models: [item2])
// 国籍
let nationality = familyMemberModel.nationality
// 居住国家
var addressCountry = familyMemberModel.address.country var addressCountry = familyMemberModel.address.country
var nationality = familyMemberModel.nationality // 居住海外是否满一年
var is_live_oversea_year = familyMemberModel.isOverSeasOver1Year() var is_live_oversea_year = familyMemberModel.isOverSeasOver1Year()
if familyMemberModel.isLiveTother(), let mainApplicant = mainApplicantInfo { // 与主申请人同住用主申请人的居住信息判断 if familyMemberModel.isLiveTother(), let mainApplicant = mainApplicantInfo { // 与主申请人同住用主申请人的居住信息判断
addressCountry = mainApplicant.applicant_address.country addressCountry = mainApplicant.applicant_address.country
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift
View file @ 41424214
...@@ -158,13 +158,13 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -158,13 +158,13 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
let addressCountry = mainModel.address.country let addressCountry = mainModel.address.country
let nationality = mainModel.nationality let nationality = mainModel.nationality
let is_live_oversea_year = mainModel.is_live_oversea_year let is_live_oversea_year = mainModel.is_live_oversea_year
if (nationality.contains("中国") && addressCountry.contains("中国")) || (nationality.contains("中国") && is_live_oversea_year == 0) { if (nationality.contains("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
if mainModel.is_handled == 1 { if mainModel.is_handled == 1 {
return [section, section1] return [section, section1]
} else { } else {
return [section] return [section]
} }
} else if nationality.contains("中国") && is_live_oversea_year == 1 { } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
return [section, section2] return [section, section2]
} else { } else {
return [section2] return [section2]
...@@ -619,19 +619,28 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel { ...@@ -619,19 +619,28 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
let passport_issue_date_end_at = mainModel.certificates.passport.issue_date_end_at let passport_issue_date_end_at = mainModel.certificates.passport.issue_date_end_at
let nationality = mainModel.nationality let nationality = mainModel.nationality
let is_live_oversea_year = mainModel.is_live_oversea_year let is_live_oversea_year = mainModel.is_live_oversea_year
if nationality.contains("中国-China") { let addressCountry = mainModel.address.country
if (nationality.contains("中国-China") && addressCountry.contains("中国-China")) || (nationality.contains("中国-China") && is_live_oversea_year == 0) {
guard cn_identity_card_number.count == 18 else { return false } guard cn_identity_card_number.count == 18 else { return false }
guard cn_identity_card_issue_at.count > 0 else { return false } guard cn_identity_card_issue_at.count > 0 else { return false }
guard cn_identity_card_issue_date_start_at.count > 0 else { return false } guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
guard cn_identity_card_issue_date_end_at.count > 0 else { return false } guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
} if mainModel.is_handled == 1 {
if self.mainModel.is_handled == 1 { guard hk_macao_pass_number.count > 0 else { return false }
guard hk_macao_pass_number.count > 0 else { return false } guard hk_macao_pass_issue_at.count > 0 else { return false }
guard hk_macao_pass_issue_at.count > 0 else { return false } guard hk_macao_pass_issue_date_start_at.count > 0 else { return false }
guard hk_macao_pass_issue_date_start_at.count > 0 else { return false } guard hk_macao_pass_issue_date_end_at.count > 0 else { return false }
guard hk_macao_pass_issue_date_end_at.count > 0 else { return false } }
} } else if nationality.contains("中国-China") && is_live_oversea_year == 1 {
if is_live_oversea_year == 1 || !nationality.contains("中国") { guard cn_identity_card_number.count == 18 else { return false }
guard cn_identity_card_issue_at.count > 0 else { return false }
guard cn_identity_card_issue_date_start_at.count > 0 else { return false }
guard cn_identity_card_issue_date_end_at.count > 0 else { return false }
guard passport_number.count > 0 else { return false }
guard passport_issue_at.count > 0 else { return false }
guard passport_issue_date_start_at.count > 0 else { return false }
guard passport_issue_date_end_at.count > 0 else { return false }
} else {
guard passport_number.count > 0 else { return false } guard passport_number.count > 0 else { return false }
guard passport_issue_at.count > 0 else { return false } guard passport_issue_at.count > 0 else { return false }
guard passport_issue_date_start_at.count > 0 else { return false } guard passport_issue_date_start_at.count > 0 else { return false }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 41424214
...@@ -1188,7 +1188,35 @@ private extension YHPreviewViewModel { ...@@ -1188,7 +1188,35 @@ private extension YHPreviewViewModel {
arrDataForFamilyInfo = arrDataForParents arrDataForFamilyInfo = arrDataForParents
} }
private func installDataForSpouseOp(model : YHFamilyMember) { func isNeedHiddenHKPassportInfo(familyMember: YHFamilyMember, applicant: YHMyMainApplicantInfoModel?) -> Bool {
// 港澳通信证
var isHiddenHK = true
// 国籍
let nationality = familyMember.nationality
// 居住国家
var liveCountry = familyMember.address.country
// 居住海外是否满一年
var isLiveOverseaYear = familyMember.isOverSeasOver1Year()
if familyMember.isLiveTother(), let mainApplicantInfo = applicant {
// 与主申请人同住需要用主申请人居住信息判断
liveCountry = mainApplicantInfo.applicant_address.country
isLiveOverseaYear = mainApplicantInfo.isOverSeasOver1Year()
}
if nationality.contains("中国") { // 中国国籍
let isLiveInChina = liveCountry.contains("中国".local)
if isLiveInChina || (!isLiveInChina && !isLiveOverseaYear) {
// 中国国籍&居住国内、中国国籍&居住国外不满一年 需展示“港澳通行证”询问框
isHiddenHK = false
}
}
return isHiddenHK
}
private func installDataForSpouseOp(model : YHFamilyMember, mainApplicant: YHMyMainApplicantInfoModel?) {
var arrTemp : [YHPreviewInfoSessionModel] = [] var arrTemp : [YHPreviewInfoSessionModel] = []
do { do {
...@@ -1196,10 +1224,20 @@ private extension YHPreviewViewModel { ...@@ -1196,10 +1224,20 @@ private extension YHPreviewViewModel {
do { do {
//随行信息 - 是 //随行信息 - 是
var arr = [YHPreviewQuestionAndAnswerModel]()
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "是") let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "是")
arr.append(tmp0)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.isHandled == 1 ? "已办理" : "未办理") arr.append(tmp1)
let arr = [tmp0,tmp1,tmp2]
if !isNeedHiddenHKPassportInfo(familyMember: model, applicant: mainApplicant) {
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.isHandled == 1 ? "已办理" : "未办理")
arr.append(tmp2)
}
let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息", cellData0: arr) let model1 = YHPreviewInfoSessionModel(cellType: .countryInfoType, cellTitle: "随行信息", cellData0: arr)
arrTemp.append(model1) arrTemp.append(model1)
} }
...@@ -1263,6 +1301,11 @@ private extension YHPreviewViewModel { ...@@ -1263,6 +1301,11 @@ private extension YHPreviewViewModel {
arr.append(tmp13) arr.append(tmp13)
let isHKIdCardHandled = model.isHaveHKIdentityCard()
let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
let tmp14 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)
arr.append(tmp14)
if let tmp = model.hkIdentityCard,tmp.isEmpty == false { if let tmp = model.hkIdentityCard,tmp.isEmpty == false {
let tmp17 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: tmp) let tmp17 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: tmp)
arr.append(tmp17) arr.append(tmp17)
...@@ -1299,6 +1342,12 @@ private extension YHPreviewViewModel { ...@@ -1299,6 +1342,12 @@ private extension YHPreviewViewModel {
var arr = [tmp0,tmp1,tmp2,tmp3,tmp4] var arr = [tmp0,tmp1,tmp2,tmp3,tmp4]
let isHKIdCardHandled = model.isHaveHKIdentityCard()
let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)
arr.append(tmp5)
if let card = model.hkIdentityCard,card.isEmpty == false { if let card = model.hkIdentityCard,card.isEmpty == false {
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: model.hkIdentityCard ?? "--") let tmp6 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: model.hkIdentityCard ?? "--")
arr.append(tmp6) arr.append(tmp6)
...@@ -1399,20 +1448,31 @@ private extension YHPreviewViewModel { ...@@ -1399,20 +1448,31 @@ private extension YHPreviewViewModel {
return return
} }
arrDataForSpouse.removeAll() arrDataForSpouse.removeAll()
installDataForSpouseOp(model: model) installDataForSpouseOp(model: model, mainApplicant: familyInfoPreviewModel?.applicant)
} }
private func installDataForChildOp(model : YHFamilyMember,childIndex : Int, totalChild : Int = 0) { private func installDataForChildOp(model : YHFamilyMember, mainApplicant:YHMyMainApplicantInfoModel?, childIndex : Int, totalChild : Int = 0) {
var arrTemp : [YHPreviewInfoSessionModel] = [] var arrTemp : [YHPreviewInfoSessionModel] = []
do { do {
if model.follow == 1 { if model.follow == 1 {
do { do {
//随行信息 - 是 //随行信息 - 是
var arr = [YHPreviewQuestionAndAnswerModel]()
let tmp00 = YHPreviewQuestionAndAnswerModel(question: "主申请人或现配偶是否拥有孩子护养权：", answer:model.custody == 1 ? "是" : "否") let tmp00 = YHPreviewQuestionAndAnswerModel(question: "主申请人或现配偶是否拥有孩子护养权：", answer:model.custody == 1 ? "是" : "否")
arr.append(tmp00)
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "该子女是否随行至香港：", answer: "是") let tmp0 = YHPreviewQuestionAndAnswerModel(question: "该子女是否随行至香港：", answer: "是")
arr.append(tmp0)
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality) let tmp1 = YHPreviewQuestionAndAnswerModel(question: "国家/国籍：", answer: model.nationality)
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.isHandled == 1 ? "已办理" : "未办理") arr.append(tmp1)
let arr = [tmp00,tmp0,tmp1,tmp2]
if !isNeedHiddenHKPassportInfo(familyMember: model, applicant: mainApplicant) {
let tmp2 = YHPreviewQuestionAndAnswerModel(question: "港澳通行证：", answer: model.isHandled == 1 ? "已办理" : "未办理")
arr.append(tmp2)
}
var title = "" var title = ""
if totalChild > 1 { if totalChild > 1 {
...@@ -1516,20 +1576,16 @@ private extension YHPreviewViewModel { ...@@ -1516,20 +1576,16 @@ private extension YHPreviewViewModel {
arr.append(contentsOf: [tmp14,tmp15]) arr.append(contentsOf: [tmp14,tmp15])
} }
let isHKIdCardHandled = model.isHaveHKIdentityCard()
let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)
arr.append(tmp16)
if let tmp = model.hkIdentityCard, tmp.isEmpty == false {
if let tmp = model.hkIdentityCard,tmp.isEmpty == false {
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "是")
arr.append(tmp16)
let tmp17 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: tmp) let tmp17 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: tmp)
arr.append(tmp17) arr.append(tmp17)
} else {
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "否")
arr.append(tmp16)
} }
var title = "" var title = ""
if totalChild > 1 { if totalChild > 1 {
title = String(childIndex + 1) title = String(childIndex + 1)
...@@ -1586,14 +1642,14 @@ private extension YHPreviewViewModel { ...@@ -1586,14 +1642,14 @@ private extension YHPreviewViewModel {
arr.append(tmp5) arr.append(tmp5)
} }
let isHKIdCardHandled = model.isHaveHKIdentityCard()
let isHKIdCardHandledString = isHKIdCardHandled ? "是" : "否"
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: isHKIdCardHandledString)
arr.append(tmp5)
if let card = model.hkIdentityCard,card.isEmpty == false { if let card = model.hkIdentityCard,card.isEmpty == false {
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "是")
let tmp6 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: model.hkIdentityCard ?? "--") let tmp6 = YHPreviewQuestionAndAnswerModel(question: "香港身份证号码：", answer: model.hkIdentityCard ?? "--")
arr.append(tmp5)
arr.append(tmp6) arr.append(tmp6)
} else {
let tmp5 = YHPreviewQuestionAndAnswerModel(question: "是否办理过香港身份证：", answer: "否")
arr.append(tmp5)
} }
...@@ -1730,7 +1786,7 @@ private extension YHPreviewViewModel { ...@@ -1730,7 +1786,7 @@ private extension YHPreviewViewModel {
} }
arrDataForChildren.removeAll() arrDataForChildren.removeAll()
for(index,model) in model1.enumerated() { for(index,model) in model1.enumerated() {
installDataForChildOp(model: model, childIndex:index,totalChild: model1.count) installDataForChildOp(model: model, mainApplicant: familyInfoPreviewModel?.applicant, childIndex:index,totalChild: model1.count)
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift
View file @ 41424214
...@@ -147,7 +147,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa ...@@ -147,7 +147,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
guard let self = self else { return } guard let self = self else { return }
let firstModel = self.dataSource?.first let firstModel = self.dataSource?.first
let vc = YHWorkExperienceViewController() let vc = YHWorkExperienceViewController()
vc.workExperienceID = "\(model.id ?? 0)" vc.workId = model.id ?? 0
vc.orderID = self.orderId vc.orderID = self.orderId
vc.isShowMessageSelect = true vc.isShowMessageSelect = true
if firstModel?.id == model.id { if firstModel?.id == model.id {
...@@ -173,7 +173,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa ...@@ -173,7 +173,7 @@ extension YHWorkExperienceListViewController: UITableViewDelegate, UITableViewDa
let vc = YHWorkExperienceViewController() let vc = YHWorkExperienceViewController()
vc.isShowMessageSelect = true vc.isShowMessageSelect = true
vc.orderID = self.orderId vc.orderID = self.orderId
vc.workExperienceID = "\(self.viewModel?.workId ?? 0)" vc.workId = self.viewModel?.workId ?? 0
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
}) })
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceCompanySelectView.swift
View file @ 41424214
...@@ -263,7 +263,11 @@ class YHCompanySelectFileCell: UITableViewCell { ...@@ -263,7 +263,11 @@ class YHCompanySelectFileCell: UITableViewCell {
typealias SelectBlock = (_ select: YHWorkExperienceCompanyModel) -> () typealias SelectBlock = (_ select: YHWorkExperienceCompanyModel) -> ()
var selectBlock: SelectBlock? var selectBlock: SelectBlock?
var selectItem: [Int] = [] var selectItem: [Int] = [] {
didSet {
updateAllViews()
}
}
var centerView: UIView! var centerView: UIView!
var titleLabel: UILabel! var titleLabel: UILabel!
var subTitleLabel: UILabel! var subTitleLabel: UILabel!
...@@ -271,22 +275,18 @@ class YHCompanySelectFileCell: UITableViewCell { ...@@ -271,22 +275,18 @@ class YHCompanySelectFileCell: UITableViewCell {
var model: YHWorkExperienceCompanyModel = YHWorkExperienceCompanyModel() { var model: YHWorkExperienceCompanyModel = YHWorkExperienceCompanyModel() {
didSet { didSet {
var i = 0 var i = 0
var temp = 5
for item in dataSource { for item in dataSource {
if item == model.company_location { if item == model.company_location {
selectData = [i] temp = i
return
} }
i += 1 i += 1
} }
selectData = [] selectItem = [temp]
} }
} }
var dataSource: [String] = ["内地", "香港", "澳门", "境外"] var dataSource: [String] = ["内地", "香港", "澳门", "境外"]
var selectData: [Int]? {
didSet {
updateAllViews()
}
}
var messageDataSource: [String] = ["公司是否为上市公司", "您目前是否拥有此公司10%以上股权", "您目前是否拥有此公司50%以上股权", "公司全年盈利达港币 500 万元或以上(或等值外币）", "请选择您的公司所在地："] var messageDataSource: [String] = ["公司是否为上市公司", "您目前是否拥有此公司10%以上股权", "您目前是否拥有此公司50%以上股权", "公司全年盈利达港币 500 万元或以上(或等值外币）", "请选择您的公司所在地："]
override func awakeFromNib() { override func awakeFromNib() {
...@@ -415,12 +415,12 @@ class YHCompanySelectFileCell: UITableViewCell { ...@@ -415,12 +415,12 @@ class YHCompanySelectFileCell: UITableViewCell {
let agreeButton = { let agreeButton = {
let button = UIImageView() let button = UIImageView()
button.image = UIImage(named: "login_privacy_disagree_glay") button.image = UIImage(named: "service_privacy_disagree_glay")
button.tag = 10000 + i button.tag = 10000 + i
if selectItem.contains(i) { if selectItem.contains(i) {
button.image = UIImage(named: "login_privacy_agree") button.image = UIImage(named: "service_privacy_agree")
} else { } else {
button.image = UIImage(named: "login_privacy_disagree_glay") button.image = UIImage(named: "service_privacy_disagree_glay")
} }
button.isUserInteractionEnabled = false button.isUserInteractionEnabled = false
...@@ -479,12 +479,12 @@ class YHCompanySelectFileCell: UITableViewCell { ...@@ -479,12 +479,12 @@ class YHCompanySelectFileCell: UITableViewCell {
if selectItem.contains(i) { if selectItem.contains(i) {
bgviewButton.layer.borderWidth = 1 bgviewButton.layer.borderWidth = 1
bgviewButton.backgroundColor = UIColor(hex: 0xebf0f9) bgviewButton.backgroundColor = UIColor(hex: 0xebf0f9)
agreeButton.image = UIImage(named: "login_privacy_agree") agreeButton.image = UIImage(named: "service_privacy_agree")
subTitleLabel.textColor = UIColor.mainTextColor subTitleLabel.textColor = UIColor.mainTextColor
} else { } else {
bgviewButton.layer.borderWidth = 0 bgviewButton.layer.borderWidth = 0
bgviewButton.backgroundColor = UIColor.contentBkgColor bgviewButton.backgroundColor = UIColor.contentBkgColor
agreeButton.image = UIImage(named: "login_privacy_disagree_glay") agreeButton.image = UIImage(named: "service_privacy_disagree_glay")
subTitleLabel.textColor = UIColor.mainTextColor subTitleLabel.textColor = UIColor.mainTextColor
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperiencePositionReasonTableViewCell.swift
View file @ 41424214
...@@ -147,12 +147,12 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell { ...@@ -147,12 +147,12 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell {
let agreeButton = { let agreeButton = {
let button = UIImageView() let button = UIImageView()
button.image = UIImage(named: "login_privacy_disagree_glay") button.image = UIImage(named: "service_privacy_disagree_glay")
button.tag = 10000 + i button.tag = 10000 + i
if selectItem.contains(i) { if selectItem.contains(i) {
button.image = UIImage(named: "login_privacy_agree") button.image = UIImage(named: "service_privacy_agree")
} else { } else {
button.image = UIImage(named: "login_privacy_disagree_glay") button.image = UIImage(named: "service_privacy_disagree_glay")
} }
button.isUserInteractionEnabled = false button.isUserInteractionEnabled = false
...@@ -208,13 +208,13 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell { ...@@ -208,13 +208,13 @@ class YHWorkExperiencePositionReasonTableViewCell: UITableViewCell {
view?.layer.borderWidth = 1 view?.layer.borderWidth = 1
view?.backgroundColor = UIColor(hex: 0xebf0f9) view?.backgroundColor = UIColor(hex: 0xebf0f9)
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_agree") subview.image = UIImage(named: "service_privacy_agree")
} else { } else {
let view = mainItemView.viewWithTag(i + 20000) let view = mainItemView.viewWithTag(i + 20000)
view?.layer.borderWidth = 0 view?.layer.borderWidth = 0
view?.backgroundColor = UIColor.contentBkgColor view?.backgroundColor = UIColor.contentBkgColor
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_disagree_glay") subview.image = UIImage(named: "service_privacy_disagree_glay")
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceSelectView.swift
View file @ 41424214
...@@ -103,12 +103,12 @@ class YHWorkExperienceSelectView: UIView { ...@@ -103,12 +103,12 @@ class YHWorkExperienceSelectView: UIView {
let agreeButton = { let agreeButton = {
let button = UIImageView() let button = UIImageView()
button.image = UIImage(named: "login_privacy_disagree_glay") button.image = UIImage(named: "service_privacy_disagree_glay")
button.tag = 10000 + i button.tag = 10000 + i
if selectItem.contains(i) { if selectItem.contains(i) {
button.image = UIImage(named: "login_privacy_agree") button.image = UIImage(named: "service_privacy_agree")
} else { } else {
button.image = UIImage(named: "login_privacy_disagree_glay") button.image = UIImage(named: "service_privacy_disagree_glay")
} }
button.isUserInteractionEnabled = false button.isUserInteractionEnabled = false
...@@ -161,13 +161,13 @@ class YHWorkExperienceSelectView: UIView { ...@@ -161,13 +161,13 @@ class YHWorkExperienceSelectView: UIView {
view?.layer.borderWidth = 1 view?.layer.borderWidth = 1
view?.backgroundColor = UIColor(hex: 0xebf0f9) view?.backgroundColor = UIColor(hex: 0xebf0f9)
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_agree") subview.image = UIImage(named: "service_privacy_agree")
} else { } else {
let view = mainItemView.viewWithTag(i + 20000) let view = mainItemView.viewWithTag(i + 20000)
view?.layer.borderWidth = 0 view?.layer.borderWidth = 0
view?.backgroundColor = UIColor.contentBkgColor view?.backgroundColor = UIColor.contentBkgColor
let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView let subview = mainItemView.viewWithTag(i + 10000) as! UIImageView
subview.image = UIImage(named: "login_privacy_disagree_glay") subview.image = UIImage(named: "service_privacy_disagree_glay")
} }
} }
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_privacy_agree.imageset/Contents.json 0 → 100644
View file @ 41424214
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "service_privacy_agree@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_privacy_agree@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_privacy_disagree_glay.imageset/Contents.json 0 → 100644
View file @ 41424214
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "service_privacy_disagree_glay@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_privacy_disagree_glay@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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