Skip to content

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

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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  家庭
  //  家庭
parents 26b03d7b c31cca69
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 83 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 2d5b2929
......@@ -62,6 +62,16 @@
04256DFC2C742C7D00A37BA4 /* YHFamilyInfoConfirmViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256DFB2C742C7D00A37BA4 /* YHFamilyInfoConfirmViewModel.swift */; };
04256DFE2C743CB700A37BA4 /* YHCertificateInfoPhotoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256DFD2C743CB700A37BA4 /* YHCertificateInfoPhotoCell.swift */; };
04256E002C7440A500A37BA4 /* YHFamilyWarmTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256DFF2C7440A500A37BA4 /* YHFamilyWarmTipsCell.swift */; };
04256E102C75BD2700A37BA4 /* YHVisaPaymentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E012C75BD2400A37BA4 /* YHVisaPaymentVC.swift */; };
04256E112C75BD2700A37BA4 /* YHVisaPaymentListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E032C75BD2400A37BA4 /* YHVisaPaymentListModel.swift */; };
04256E122C75BD2700A37BA4 /* YHPayMemberContentItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E052C75BD2400A37BA4 /* YHPayMemberContentItem.swift */; };
04256E132C75BD2700A37BA4 /* YHPayMemberContentItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E062C75BD2400A37BA4 /* YHPayMemberContentItems.swift */; };
04256E142C75BD2700A37BA4 /* YHPayMemberItemsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E072C75BD2400A37BA4 /* YHPayMemberItemsView.swift */; };
04256E152C75BD2700A37BA4 /* YHPayMembersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E082C75BD2400A37BA4 /* YHPayMembersCell.swift */; };
04256E162C75BD2700A37BA4 /* YHPayMemberSectionItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E092C75BD2400A37BA4 /* YHPayMemberSectionItem.swift */; };
04256E172C75BD2700A37BA4 /* YHVisaPaymentTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E0A2C75BD2400A37BA4 /* YHVisaPaymentTipsCell.swift */; };
04256E182C75BD2700A37BA4 /* YHVisaPayTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E0B2C75BD2400A37BA4 /* YHVisaPayTypeCell.swift */; };
04256E192C75BD2700A37BA4 /* YHUploadCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04256E0D2C75BD2400A37BA4 /* YHUploadCertificateViewModel.swift */; };
0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */; };
0425E6402BA9357D00A5E763 /* YHScemeItemModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */; };
0425E6422BA95B1B00A5E763 /* YHSchemeTableFooterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0425E6412BA95B1B00A5E763 /* YHSchemeTableFooterView.swift */; };
......@@ -564,14 +574,6 @@
A567E5B72BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5902BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift */; };
A567E5B82BD7643D00D5D5A0 /* YHSearchItemLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */; };
A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */; };
A57BFDE42C732AEF00A78E51 /* YHVisaPaymentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDE32C732AEF00A78E51 /* YHVisaPaymentVC.swift */; };
A57BFDE62C73332E00A78E51 /* YHVisaPaymentTipsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDE52C73332E00A78E51 /* YHVisaPaymentTipsCell.swift */; };
A57BFDE82C73371300A78E51 /* YHVisaPayTypeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDE72C73371300A78E51 /* YHVisaPayTypeCell.swift */; };
A57BFDEA2C73518700A78E51 /* YHPayMembersCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDE92C73518700A78E51 /* YHPayMembersCell.swift */; };
A57BFDEC2C73629100A78E51 /* YHPayMemberItemsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDEB2C73629100A78E51 /* YHPayMemberItemsView.swift */; };
A57BFDEE2C73640700A78E51 /* YHPayMemberSectionItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDED2C73640700A78E51 /* YHPayMemberSectionItem.swift */; };
A57BFDF02C73666400A78E51 /* YHPayMemberContentItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDEF2C73666400A78E51 /* YHPayMemberContentItems.swift */; };
A57BFDF22C73703900A78E51 /* YHPayMemberContentItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A57BFDF12C73703900A78E51 /* YHPayMemberContentItem.swift */; };
A580371E2BAD784B0031C312 /* YHMySchemeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */; };
A58037212BAD7B2A0031C312 /* YHMySchemeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */; };
A582B23D2BB944ED009D098C /* YHHKPlanDoctumentVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */; };
......@@ -655,8 +657,6 @@
A5CA3F582C749E0100EB22F5 /* YHUploadCertificateDateItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA3F572C749E0100EB22F5 /* YHUploadCertificateDateItem.swift */; };
A5CA3F5A2C74B64A00EB22F5 /* YHSmallWhiteNoteTemplateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA3F592C74B64A00EB22F5 /* YHSmallWhiteNoteTemplateView.swift */; };
A5CA3F5C2C74C4C200EB22F5 /* YHHKCardTemplateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA3F5B2C74C4C200EB22F5 /* YHHKCardTemplateView.swift */; };
A5CA3F5F2C74D59B00EB22F5 /* YHUploadCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA3F5E2C74D59B00EB22F5 /* YHUploadCertificateViewModel.swift */; };
A5CA3F622C74D8BD00EB22F5 /* YHVisaPaymentListModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5CA3F612C74D8BD00EB22F5 /* YHVisaPaymentListModel.swift */; };
A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */; };
A5D0012A2BABC84A001F003C /* YHFileListHeaerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */; };
A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001292BABC84A001F003C /* YHFileListBottomView.swift */; };
......@@ -786,6 +786,16 @@
04256DFB2C742C7D00A37BA4 /* YHFamilyInfoConfirmViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyInfoConfirmViewModel.swift; sourceTree = "<group>"; };
04256DFD2C743CB700A37BA4 /* YHCertificateInfoPhotoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateInfoPhotoCell.swift; sourceTree = "<group>"; };
04256DFF2C7440A500A37BA4 /* YHFamilyWarmTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyWarmTipsCell.swift; sourceTree = "<group>"; };
04256E012C75BD2400A37BA4 /* YHVisaPaymentVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHVisaPaymentVC.swift; sourceTree = "<group>"; };
04256E032C75BD2400A37BA4 /* YHVisaPaymentListModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHVisaPaymentListModel.swift; sourceTree = "<group>"; };
04256E052C75BD2400A37BA4 /* YHPayMemberContentItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPayMemberContentItem.swift; sourceTree = "<group>"; };
04256E062C75BD2400A37BA4 /* YHPayMemberContentItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPayMemberContentItems.swift; sourceTree = "<group>"; };
04256E072C75BD2400A37BA4 /* YHPayMemberItemsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPayMemberItemsView.swift; sourceTree = "<group>"; };
04256E082C75BD2400A37BA4 /* YHPayMembersCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPayMembersCell.swift; sourceTree = "<group>"; };
04256E092C75BD2400A37BA4 /* YHPayMemberSectionItem.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHPayMemberSectionItem.swift; sourceTree = "<group>"; };
04256E0A2C75BD2400A37BA4 /* YHVisaPaymentTipsCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHVisaPaymentTipsCell.swift; sourceTree = "<group>"; };
04256E0B2C75BD2400A37BA4 /* YHVisaPayTypeCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHVisaPayTypeCell.swift; sourceTree = "<group>"; };
04256E0D2C75BD2400A37BA4 /* YHUploadCertificateViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHUploadCertificateViewModel.swift; sourceTree = "<group>"; };
0425E63C2BA9345200A5E763 /* YHSchemeTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableViewCell.swift; sourceTree = "<group>"; };
0425E63F2BA9357D00A5E763 /* YHScemeItemModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHScemeItemModel.swift; sourceTree = "<group>"; };
0425E6412BA95B1B00A5E763 /* YHSchemeTableFooterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSchemeTableFooterView.swift; sourceTree = "<group>"; };
......@@ -1297,14 +1307,6 @@
A567E5902BD7643D00D5D5A0 /* YHHkLifeAndIdItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHHkLifeAndIdItemView.swift; sourceTree = "<group>"; };
A567E5912BD7643D00D5D5A0 /* YHSearchItemLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSearchItemLayout.swift; sourceTree = "<group>"; };
A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
A57BFDE32C732AEF00A78E51 /* YHVisaPaymentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaPaymentVC.swift; sourceTree = "<group>"; };
A57BFDE52C73332E00A78E51 /* YHVisaPaymentTipsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaPaymentTipsCell.swift; sourceTree = "<group>"; };
A57BFDE72C73371300A78E51 /* YHVisaPayTypeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaPayTypeCell.swift; sourceTree = "<group>"; };
A57BFDE92C73518700A78E51 /* YHPayMembersCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPayMembersCell.swift; sourceTree = "<group>"; };
A57BFDEB2C73629100A78E51 /* YHPayMemberItemsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPayMemberItemsView.swift; sourceTree = "<group>"; };
A57BFDED2C73640700A78E51 /* YHPayMemberSectionItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPayMemberSectionItem.swift; sourceTree = "<group>"; };
A57BFDEF2C73666400A78E51 /* YHPayMemberContentItems.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPayMemberContentItems.swift; sourceTree = "<group>"; };
A57BFDF12C73703900A78E51 /* YHPayMemberContentItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPayMemberContentItem.swift; sourceTree = "<group>"; };
A580371D2BAD784B0031C312 /* YHMySchemeViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeViewModel.swift; sourceTree = "<group>"; };
A58037202BAD7B2A0031C312 /* YHMySchemeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySchemeModel.swift; sourceTree = "<group>"; };
A582B23C2BB944ED009D098C /* YHHKPlanDoctumentVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKPlanDoctumentVC.swift; sourceTree = "<group>"; };
......@@ -1389,8 +1391,6 @@
A5CA3F572C749E0100EB22F5 /* YHUploadCertificateDateItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUploadCertificateDateItem.swift; sourceTree = "<group>"; };
A5CA3F592C74B64A00EB22F5 /* YHSmallWhiteNoteTemplateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSmallWhiteNoteTemplateView.swift; sourceTree = "<group>"; };
A5CA3F5B2C74C4C200EB22F5 /* YHHKCardTemplateView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKCardTemplateView.swift; sourceTree = "<group>"; };
A5CA3F5E2C74D59B00EB22F5 /* YHUploadCertificateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUploadCertificateViewModel.swift; sourceTree = "<group>"; };
A5CA3F612C74D8BD00EB22F5 /* YHVisaPaymentListModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaPaymentListModel.swift; sourceTree = "<group>"; };
A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChoiceButtonHoldView.swift; sourceTree = "<group>"; };
A5D001272BABC84A001F003C /* YHFileListHeaerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListHeaerView.swift; sourceTree = "<group>"; };
A5D001292BABC84A001F003C /* YHFileListBottomView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListBottomView.swift; sourceTree = "<group>"; };
......@@ -1627,6 +1627,55 @@
path = C;
sourceTree = "<group>";
};
04256E022C75BD2400A37BA4 /* C */ = {
isa = PBXGroup;
children = (
04256E012C75BD2400A37BA4 /* YHVisaPaymentVC.swift */,
);
path = C;
sourceTree = "<group>";
};
04256E042C75BD2400A37BA4 /* M */ = {
isa = PBXGroup;
children = (
04256E032C75BD2400A37BA4 /* YHVisaPaymentListModel.swift */,
);
path = M;
sourceTree = "<group>";
};
04256E0C2C75BD2400A37BA4 /* V */ = {
isa = PBXGroup;
children = (
04256E052C75BD2400A37BA4 /* YHPayMemberContentItem.swift */,
04256E062C75BD2400A37BA4 /* YHPayMemberContentItems.swift */,
04256E072C75BD2400A37BA4 /* YHPayMemberItemsView.swift */,
04256E082C75BD2400A37BA4 /* YHPayMembersCell.swift */,
04256E092C75BD2400A37BA4 /* YHPayMemberSectionItem.swift */,
04256E0A2C75BD2400A37BA4 /* YHVisaPaymentTipsCell.swift */,
04256E0B2C75BD2400A37BA4 /* YHVisaPayTypeCell.swift */,
);
path = V;
sourceTree = "<group>";
};
04256E0E2C75BD2400A37BA4 /* VM */ = {
isa = PBXGroup;
children = (
04256E0D2C75BD2400A37BA4 /* YHUploadCertificateViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
04256E0F2C75BD2400A37BA4 /* VisaPayment(4电子签字缴费) */ = {
isa = PBXGroup;
children = (
04256E022C75BD2400A37BA4 /* C */,
04256E042C75BD2400A37BA4 /* M */,
04256E0C2C75BD2400A37BA4 /* V */,
04256E0E2C75BD2400A37BA4 /* VM */,
);
path = "VisaPayment(4电子签字缴费)";
sourceTree = "<group>";
};
0425E63B2BA931B300A5E763 /* View */ = {
isa = PBXGroup;
children = (
......@@ -2479,8 +2528,8 @@
046A952B2C6EFA710059326A /* Certificate(办证段) */ = {
isa = PBXGroup;
children = (
04256E0F2C75BD2400A37BA4 /* VisaPayment(4电子签字缴费) */,
A5CA3F4C2C74471C00EB22F5 /* UploadCertificate(7上传过关证件) */,
A57BFDE02C732A4700A78E51 /* VisaPayment(4电子签字缴费) */,
0430E63C2C72DB48000511E2 /* AddAdopters */,
04256DD72C72D9C200A37BA4 /* AppointCertificate(3 赴港办证预约) */,
049D62C32C6F259D00E811A1 /* FamilyInfoConfirm(1 家庭信息确认) */,
......@@ -3247,39 +3296,6 @@
path = V;
sourceTree = "<group>";
};
A57BFDE02C732A4700A78E51 /* VisaPayment(4电子签字缴费) */ = {
isa = PBXGroup;
children = (
A5CA3F642C7586C500EB22F5 /* M */,
A5CA3F632C7586BE00EB22F5 /* VM */,
A57BFDE22C732AA700A78E51 /* V */,
A57BFDE12C732A8300A78E51 /* C */,
);
path = "VisaPayment(4电子签字缴费)";
sourceTree = "<group>";
};
A57BFDE12C732A8300A78E51 /* C */ = {
isa = PBXGroup;
children = (
A57BFDE32C732AEF00A78E51 /* YHVisaPaymentVC.swift */,
);
path = C;
sourceTree = "<group>";
};
A57BFDE22C732AA700A78E51 /* V */ = {
isa = PBXGroup;
children = (
A57BFDE52C73332E00A78E51 /* YHVisaPaymentTipsCell.swift */,
A57BFDE72C73371300A78E51 /* YHVisaPayTypeCell.swift */,
A57BFDE92C73518700A78E51 /* YHPayMembersCell.swift */,
A57BFDEB2C73629100A78E51 /* YHPayMemberItemsView.swift */,
A57BFDED2C73640700A78E51 /* YHPayMemberSectionItem.swift */,
A57BFDF12C73703900A78E51 /* YHPayMemberContentItem.swift */,
A57BFDEF2C73666400A78E51 /* YHPayMemberContentItems.swift */,
);
path = V;
sourceTree = "<group>";
};
A580371C2BAD77DB0031C312 /* VM */ = {
isa = PBXGroup;
children = (
......@@ -3696,22 +3712,6 @@
path = M;
sourceTree = "<group>";
};
A5CA3F632C7586BE00EB22F5 /* VM */ = {
isa = PBXGroup;
children = (
A5CA3F5E2C74D59B00EB22F5 /* YHUploadCertificateViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
A5CA3F642C7586C500EB22F5 /* M */ = {
isa = PBXGroup;
children = (
A5CA3F612C74D8BD00EB22F5 /* YHVisaPaymentListModel.swift */,
);
path = M;
sourceTree = "<group>";
};
A5D001262BABC84A001F003C /* V */ = {
isa = PBXGroup;
children = (
......@@ -4154,7 +4154,6 @@
045EEEB32B9F171A0022A143 /* YHWorkFileSyncTableViewCell.swift in Sources */,
045EEEF12B9F171A0022A143 /* YHChildInfoContainerVC.swift in Sources */,
045EEF0B2B9F171A0022A143 /* YHBasicInfoFillViewController.swift in Sources */,
A57BFDE42C732AEF00A78E51 /* YHVisaPaymentVC.swift in Sources */,
04F5F8682C198372004A463C /* YHHKClassListViewController.swift in Sources */,
0430E6582C7434F2000511E2 /* YHAdopterNewPeopleViewController.swift in Sources */,
A582B2452BBA4CF9009D098C /* YHHKPlanDocModel.swift in Sources */,
......@@ -4200,7 +4199,6 @@
048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */,
A567E5AC2BD7643D00D5D5A0 /* YHAgreementAlertView.swift in Sources */,
04CE1ADD2C2AD91F001CB80A /* YHActivityDetailCell.swift in Sources */,
A57BFDE62C73332E00A78E51 /* YHVisaPaymentTipsCell.swift in Sources */,
04AA19FD2BB40D5C00C1CBBD /* Applegate(JPush).swift in Sources */,
A567E5972BD7643D00D5D5A0 /* YHHomeModel.swift in Sources */,
04AF82D82C291E960028CE2A /* YHMatchUserViewModel.swift in Sources */,
......@@ -4209,7 +4207,6 @@
045EEE992B9F171A0022A143 /* YHPreviewInfoHoldView.swift in Sources */,
045EEE7E2B9F171A0022A143 /* YHPersonInfoCellModel1.swift in Sources */,
047AA3DD2C4A6126009C4554 /* YHLifeViewController.swift in Sources */,
A5CA3F5F2C74D59B00EB22F5 /* YHUploadCertificateViewModel.swift in Sources */,
04FD856C2C2153F000BEF9C5 /* YHMyEducationCell.swift in Sources */,
A5DE0D3C2BB9016200976FE1 /* YHEmailInputAlertView.swift in Sources */,
04256DE42C72E3FA00A37BA4 /* YHInfoItemOptionView.swift in Sources */,
......@@ -4260,7 +4257,6 @@
04D144762C0452E200EE3758 /* YHOneKeyLoginManager.swift in Sources */,
A5551FFE2B4C26CE00510980 /* YHBaseViewModel.swift in Sources */,
04B360F72C646B4F001EB053 /* YHPrincipleEnvelopeModel.swift in Sources */,
A57BFDF02C73666400A78E51 /* YHPayMemberContentItems.swift in Sources */,
048B2A4A2BC7D9DC00A93BF0 /* YHMyLikeViewController.swift in Sources */,
A567E5AE2BD7643D00D5D5A0 /* YHHomeKingKongBlockItem.swift in Sources */,
045EEED92B9F171A0022A143 /* YHEducationDetailVC.swift in Sources */,
......@@ -4278,6 +4274,7 @@
A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */,
045EEEB92B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift in Sources */,
04FA8B302C0874CA00ABE43F /* YHOneKeyLoginViewModel.swift in Sources */,
04256E112C75BD2700A37BA4 /* YHVisaPaymentListModel.swift in Sources */,
04A7BD0F2BA41C9800BD35A2 /* YHMyDocumentsModel.swift in Sources */,
04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */,
0472E25E2C534723008EAB6E /* YHLifeDetailViewController.swift in Sources */,
......@@ -4290,11 +4287,11 @@
04CE1AD82C2AD91F001CB80A /* YHActivityListViewController.swift in Sources */,
A5ACE94E2B4564F7002C94D2 /* AlignedCollectionViewFlowLayout.swift in Sources */,
A567E5B32BD7643D00D5D5A0 /* YHServiceOrderAlertView.swift in Sources */,
A57BFDF22C73703900A78E51 /* YHPayMemberContentItem.swift in Sources */,
A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */,
A5ACE93B2B4564F7002C94D2 /* UIFont+Extension.swift in Sources */,
A567E5A92BD7643D00D5D5A0 /* YHSearchInfoHistoryView.swift in Sources */,
045EEE802B9F171A0022A143 /* YHAcademicPreviewModel.swift in Sources */,
04256E122C75BD2700A37BA4 /* YHPayMemberContentItem.swift in Sources */,
04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */,
A5FD63C92B63A35B00D1D9DA /* YHInformationFillTipsAlertView.swift in Sources */,
04174D762BCD5B74000BA46D /* YHMsgListModel.swift in Sources */,
......@@ -4302,6 +4299,7 @@
04FB01D22C23FCDD0040115D /* YHMatchCardUsageGuideView.swift in Sources */,
A5EB6C702C69FB9A0081FB6C /* YHOfficialApprovalResultVC.swift in Sources */,
049AC4C62BC3E55300F857F4 /* YHServiceSectionView.swift in Sources */,
04256E152C75BD2700A37BA4 /* YHPayMembersCell.swift in Sources */,
0408C3632BEC7C6900DB1E25 /* YHVideoPlayerControlView.swift in Sources */,
A567E5B12BD7643D00D5D5A0 /* YHHomeCollectionViewCell.swift in Sources */,
A582B2432BB95E20009D098C /* YHHKPlanCell.swift in Sources */,
......@@ -4309,7 +4307,6 @@
04CE1AE22C2AD91F001CB80A /* YHActivityApplyInfoItemView.swift in Sources */,
045EEEC52B9F171A0022A143 /* YHOtherPickerView.swift in Sources */,
045EEE842B9F171A0022A143 /* YHPreviewBasiceInformationViewController.swift in Sources */,
A57BFDEA2C73518700A78E51 /* YHPayMembersCell.swift in Sources */,
A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */,
0499E3002C056EE30037E646 /* YHOneKeyLoginView.swift in Sources */,
0430E6622C7473A7000511E2 /* YHAdopterTravelCardTableViewCell.swift in Sources */,
......@@ -4365,6 +4362,7 @@
045EEE9F2B9F171A0022A143 /* YHWorkExperienceModel.swift in Sources */,
A5FF0F3C2C32F2460069852B /* YHActivityDetailCell1.swift in Sources */,
045EEF232B9F171A0022A143 /* YHItemView.swift in Sources */,
04256E192C75BD2700A37BA4 /* YHUploadCertificateViewModel.swift in Sources */,
04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */,
04256DD02C7041C700A37BA4 /* YHInfoItemView.swift in Sources */,
A5ACE9312B4564F7002C94D2 /* YHPersonalCenterCell.swift in Sources */,
......@@ -4497,7 +4495,6 @@
0477E17C2BA4238400436346 /* YHCertificateListContainerVC.swift in Sources */,
A517A4DF2BB53BE8000DEECD /* YHDocListBottomView.swift in Sources */,
A567E5AB2BD7643D00D5D5A0 /* YHHomeHeadView.swift in Sources */,
A57BFDEE2C73640700A78E51 /* YHPayMemberSectionItem.swift in Sources */,
04FD856E2C215DC900BEF9C5 /* YHMyWorkExperienceCell.swift in Sources */,
0414BDAB2BC7E9C200225367 /* YHMyPermissionCell.swift in Sources */,
04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */,
......@@ -4520,6 +4517,7 @@
045EEECB2B9F171A0022A143 /* YHScoreResultBaseModel.swift in Sources */,
A59B43CD2C4A36DF00B28379 /* YHStatusAdvantageBottomView.swift in Sources */,
049AB5F02C0F339200155DDF /* YHVideoPlaySettingVC.swift in Sources */,
04256E182C75BD2700A37BA4 /* YHVisaPayTypeCell.swift in Sources */,
0430E6642C7482DD000511E2 /* YHYHAdopterTravelViewModel.swift in Sources */,
A5CA3F502C7447FB00EB22F5 /* YHUploadCertificateVC.swift in Sources */,
04A7BD192BA441D400BD35A2 /* YHMyDocumentsUrlModel.swift in Sources */,
......@@ -4566,7 +4564,6 @@
043BA8752C241B38006EF02D /* YHAddFriendCardCell.swift in Sources */,
A5C382CF2B5F9A9100C5E65C /* YHServiceCenterMainViewModel.swift in Sources */,
045EEEA52B9F171A0022A143 /* YHImageViewController.swift in Sources */,
A5CA3F622C74D8BD00EB22F5 /* YHVisaPaymentListModel.swift in Sources */,
045EEEF32B9F171A0022A143 /* YHFamilyMemberInfoListVC.swift in Sources */,
F8BAADA52C4FCE9C0074D6C3 /* YHUatHelperViewModel.swift in Sources */,
0445E6B42BEA15C4003C52F9 /* YHAppVersionManager.swift in Sources */,
......@@ -4587,7 +4584,9 @@
04256DFA2C742A1500A37BA4 /* YHFamilyGroupModel.swift in Sources */,
045EEF162B9F171A0022A143 /* YHMainApplicantInformationViewController.swift in Sources */,
048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */,
04256E172C75BD2700A37BA4 /* YHVisaPaymentTipsCell.swift in Sources */,
045EEEAA2B9F171A0022A143 /* YHWorkExampleViewController.swift in Sources */,
04256E132C75BD2700A37BA4 /* YHPayMemberContentItems.swift in Sources */,
A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */,
A567E5A62BD7643D00D5D5A0 /* YHHomeSearchView.swift in Sources */,
045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */,
......@@ -4614,6 +4613,7 @@
0480976D2BA158A1000B9DCA /* YHCertificateListVC.swift in Sources */,
0430E6522C733D82000511E2 /* YHAdopterIncomeFileTableViewCell.swift in Sources */,
045EEE8B2B9F171A0022A143 /* YHPreviewMainApplicantInfoViewController.swift in Sources */,
04256E162C75BD2700A37BA4 /* YHPayMemberSectionItem.swift in Sources */,
045EEE922B9F171A0022A143 /* YHPreviewInfoNameAndSubNameItemView.swift in Sources */,
0430E6482C731B0A000511E2 /* YHAdopterAddNewTableViewCell.swift in Sources */,
A5EB6C742C69FB9A0081FB6C /* YHOfficailLetterColledtionCell.swift in Sources */,
......@@ -4647,24 +4647,24 @@
045EEF172B9F171A0022A143 /* YHSelectCountryViewController.swift in Sources */,
044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */,
04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */,
04256E102C75BD2700A37BA4 /* YHVisaPaymentVC.swift in Sources */,
A5ACE9562B4564F7002C94D2 /* YHBouncesContentView.swift in Sources */,
A554A5122B99715000EA5973 /* YHConstantArrayData.swift in Sources */,
045EEE962B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemsView.swift in Sources */,
04256DDE2C72DA3B00A37BA4 /* YHCertificateAppointViewController.swift in Sources */,
A592FE912BA6CC010062FACA /* YHCertificateEntryHeadView.swift in Sources */,
A57BFDE82C73371300A78E51 /* YHVisaPayTypeCell.swift in Sources */,
0425E63D2BA9345200A5E763 /* YHSchemeTableViewCell.swift in Sources */,
047AA3FC2C61EE7F009C4554 /* YHSignAppendStepView.swift in Sources */,
044D0C1E2C22CFBF00C5CF5E /* YHEditWorkViewController.swift in Sources */,
A5ACE9302B4564F7002C94D2 /* Algorithm.swift in Sources */,
045EEED52B9F171A0022A143 /* YHEducationRequestViewModel.swift in Sources */,
04256DE22C72E1EA00A37BA4 /* YHCertificateAppointOptionCell.swift in Sources */,
A57BFDEC2C73629100A78E51 /* YHPayMemberItemsView.swift in Sources */,
0430E6702C749BCF000511E2 /* YHAdopterResidentTableViewCell.swift in Sources */,
045EEEB62B9F171A0022A143 /* YHWorkExperienceItemView.swift in Sources */,
047AA3E42C4A6ADC009C4554 /* YHLifeHeadView.swift in Sources */,
A58A8C942BA6C7C600632765 /* YHCertificateEntryModel.swift in Sources */,
045EEEB82B9F171A0022A143 /* YHWorkExampleMessageView.swift in Sources */,
04256E142C75BD2700A37BA4 /* YHPayMemberItemsView.swift in Sources */,
04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */,
045EEEA22B9F171A0022A143 /* YHWorkExperienceProjectModel.swift in Sources */,
04213B332C4A084600797900 /* YHHomeInfoClassifyModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/M/YHFamilyGroupModel.swift
View file @ 2d5b2929
......@@ -134,7 +134,7 @@ class YHFamilyMemberInfoModel: SmartCodable {
} else if self.birthPlaceAboardHistory == "1" {
return "国外"
}
return "未知"
return ""
}
private func getMarriageStatus(_ marrage: String) -> String {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/VM/YHFamilyInfoConfirmViewModel.swift
View file @ 2d5b2929
......@@ -230,7 +230,7 @@ extension YHFamilyInfoConfirmViewModel {
previousTitle: "原婚姻状况",
previousValue: model.info.getHistoryMarriageState(),
isEditMode: isEditMode,
isShowPreviousInfo: !isEditMode && !model.info.marriedHistory.isEmpty)
isShowPreviousInfo: !isEditMode && !model.info.getHistoryMarriageState().isEmpty)
resultArr.append(marriageInfo)
}
......@@ -249,7 +249,7 @@ extension YHFamilyInfoConfirmViewModel {
previousValue: historyBirthNation,
options: options,
isEditMode: isEditMode,
isShowPreviousInfo: !isEditMode && !birthNation.isEmpty)
isShowPreviousInfo: !isEditMode && !historyBirthNation.isEmpty)
resultArr.append(birthNationInfo)
// 出生地
......
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