Skip to content

G
galaxy-iOS
Commit d19e8dd7 authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

续签证件旅行UI

parent d04a5c24
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 1 deletion
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ d19e8dd7
......@@ -205,6 +205,10 @@
044EE2402C92E6C000A2FE3A /* YHResignCertificateDetailViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE23F2C92E6C000A2FE3A /* YHResignCertificateDetailViewModel.swift */; };
044EE2422C92EF0C00A2FE3A /* YHResignCertificateDetailEVisaViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE2412C92EF0C00A2FE3A /* YHResignCertificateDetailEVisaViewController.swift */; };
044EE2442C92F48200A2FE3A /* YHResignCertificateEvisaTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE2432C92F48200A2FE3A /* YHResignCertificateEvisaTableViewCell.swift */; };
044EE2462C93E22E00A2FE3A /* YHResignCertificateDetailHkViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE2452C93E22E00A2FE3A /* YHResignCertificateDetailHkViewController.swift */; };
044EE2482C93E49C00A2FE3A /* YHResignCertificateHKTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE2472C93E49C00A2FE3A /* YHResignCertificateHKTableViewCell.swift */; };
044EE24A2C9434D400A2FE3A /* YHResignCertificateDetailPassPortViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE2492C9434D400A2FE3A /* YHResignCertificateDetailPassPortViewController.swift */; };
044EE24C2C94396E00A2FE3A /* YHResignCertificatePassportTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044EE24B2C94396D00A2FE3A /* YHResignCertificatePassportTableViewCell.swift */; };
04506F552C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */; };
045A08C02C37ABF500BCBABA /* YHSegmentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A08BF2C37ABF500BCBABA /* YHSegmentView.swift */; };
045A08C22C37EB8B00BCBABA /* YHMyFileListNoneCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045A08C12C37EB8B00BCBABA /* YHMyFileListNoneCell.swift */; };
......@@ -1003,6 +1007,10 @@
044EE23F2C92E6C000A2FE3A /* YHResignCertificateDetailViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificateDetailViewModel.swift; sourceTree = "<group>"; };
044EE2412C92EF0C00A2FE3A /* YHResignCertificateDetailEVisaViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificateDetailEVisaViewController.swift; sourceTree = "<group>"; };
044EE2432C92F48200A2FE3A /* YHResignCertificateEvisaTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificateEvisaTableViewCell.swift; sourceTree = "<group>"; };
044EE2452C93E22E00A2FE3A /* YHResignCertificateDetailHkViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificateDetailHkViewController.swift; sourceTree = "<group>"; };
044EE2472C93E49C00A2FE3A /* YHResignCertificateHKTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificateHKTableViewCell.swift; sourceTree = "<group>"; };
044EE2492C9434D400A2FE3A /* YHResignCertificateDetailPassPortViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificateDetailPassPortViewController.swift; sourceTree = "<group>"; };
044EE24B2C94396D00A2FE3A /* YHResignCertificatePassportTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignCertificatePassportTableViewCell.swift; sourceTree = "<group>"; };
04506F542C6F57E600738EA1 /* YHFamilyMemberInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFamilyMemberInfoCell.swift; sourceTree = "<group>"; };
045A08BF2C37ABF500BCBABA /* YHSegmentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSegmentView.swift; sourceTree = "<group>"; };
045A08C12C37EB8B00BCBABA /* YHMyFileListNoneCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMyFileListNoneCell.swift; sourceTree = "<group>"; };
......@@ -2186,6 +2194,8 @@
children = (
044EE2372C92BBC500A2FE3A /* YHResignCertificateListTableViewCell.swift */,
044EE2432C92F48200A2FE3A /* YHResignCertificateEvisaTableViewCell.swift */,
044EE2472C93E49C00A2FE3A /* YHResignCertificateHKTableViewCell.swift */,
044EE24B2C94396D00A2FE3A /* YHResignCertificatePassportTableViewCell.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -2204,6 +2214,8 @@
044EE2352C92916600A2FE3A /* YHResignCertificateListViewController.swift */,
044EE23D2C92E27500A2FE3A /* YHResignCertificateDetailViewController.swift */,
044EE2412C92EF0C00A2FE3A /* YHResignCertificateDetailEVisaViewController.swift */,
044EE2452C93E22E00A2FE3A /* YHResignCertificateDetailHkViewController.swift */,
044EE2492C9434D400A2FE3A /* YHResignCertificateDetailPassPortViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -4514,6 +4526,7 @@
044D0C182C22AB7300C5CF5E /* YHEditBaseInfoFootView.swift in Sources */,
047AA3F42C50E5C7009C4554 /* YHInvitationWithGiftsViewModel.swift in Sources */,
04CE1AD52C2AD91F001CB80A /* YHActivityTravelViewController.swift in Sources */,
044EE2482C93E49C00A2FE3A /* YHResignCertificateHKTableViewCell.swift in Sources */,
A5EF21372BA6E2D1005027E6 /* YHQuestionAndAnswerModel.swift in Sources */,
A567E5A52BD7643D00D5D5A0 /* YHHomeCollectionLayout.swift in Sources */,
04A6715C2B9FE9EA00C1FB91 /* YHCertificateUploadContentListVC.swift in Sources */,
......@@ -4640,6 +4653,7 @@
04C85DE52C369AB5008B20D6 /* YHMyFileListCell.swift in Sources */,
045EEF132B9F171A0022A143 /* YHCountryMessage.swift in Sources */,
04EC2F812C22888E002907D7 /* YHFriendRequestView.swift in Sources */,
044EE24C2C94396E00A2FE3A /* YHResignCertificatePassportTableViewCell.swift in Sources */,
041892242C91BCF100B9FB94 /* YHResignRoundCellType.swift in Sources */,
0430E6722C749E74000511E2 /* YHAdopterBirthViewController.swift in Sources */,
048058392C7F289700502CAA /* YHTravelCertificateItemView.swift in Sources */,
......@@ -4738,12 +4752,14 @@
045EEEDF2B9F171A0022A143 /* YHCollegeSearchBar.swift in Sources */,
044D0BEE2C2019C100C5CF5E /* YHCommunityViewController.swift in Sources */,
A567E5B52BD7643D00D5D5A0 /* YHSearchInfoBar.swift in Sources */,
044EE2462C93E22E00A2FE3A /* YHResignCertificateDetailHkViewController.swift in Sources */,
A5ACE94B2B4564F7002C94D2 /* YHHUDRotatingImageView.swift in Sources */,
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 */,
044EE24A2C9434D400A2FE3A /* YHResignCertificateDetailPassPortViewController.swift in Sources */,
0449EEF02C902A4100A397FD /* YHResignMaterialUploadVC.swift in Sources */,
04174D642BCD52BD000BA46D /* YHDeviceInfoViewController.swift in Sources */,
0472E25E2C534723008EAB6E /* YHLifeDetailViewController.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateListViewController.swift
View file @ d19e8dd7
......@@ -85,7 +85,15 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie
cell.clickBlock = { [weak self] model in
guard let self = self else { return }
if indexPath.row == 0 {
if model.cert_type == "PASS_PORT" {
let vc = YHResignCertificateDetailPassPortViewController()
vc.dataModel = model
self.navigationController?.pushViewController(vc)
} else {
let vc = YHResignCertificateDetailHkViewController()
vc.dataModel = model
self.navigationController?.pushViewController(vc)
}
}
if indexPath.row == 1 {
let vc = YHResignCertificateDetailEVisaViewController()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/VM/YHResignCertificateDetailViewModel.swift
View file @ d19e8dd7
......@@ -9,6 +9,8 @@
import UIKit
class YHResignCertificateDetailViewModel: YHBaseViewModel {
var dataModel : YHResignCertificateModel = YHResignCertificateModel()
func submitResignCertificateUpdate(_ params: [String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignCertificate.update
let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
......@@ -26,4 +28,18 @@ class YHResignCertificateDetailViewModel: YHBaseViewModel {
callBackBlock(false,err)
}
}
func getBaseDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
let item1 = YHItemModel(id: .id1, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_start, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
let item2 = YHItemModel(id: .id2, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_end, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
let item3 = YHItemModel(id: .id3, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_start, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
let item4 = YHItemModel(id: .id4, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_end, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
return [item1, item2, item3, item4]
}
func getPassPortDataSource(_ isShowPrompt: Bool) -> [YHItemModel] {
let item1 = YHItemModel(id: .id1, isNeed: true, title: "开始时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_start, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择开始时间")
let item2 = YHItemModel(id: .id2, isNeed: true, title: "到期时间", isUserKeyBoard: false, prompts: "请选择", message: dataModel.cert_info.issue_end, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择到期时间")
return [item1, item2]
}
}
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