Skip to content

G
galaxy-iOS
Commit 09d5851f 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:
  续签补件部分接口逻辑 未通
  //  预约
  // 预约
  //  预约

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
parents 61fbdeb6 b91c09f8
Show whitespace changes
Inline Side-by-side
Showing with 571 additions and 87 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 09d5851f
......@@ -468,7 +468,7 @@
04912F602CB6697300CC3105 /* YHResignRiskWarningAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F5F2CB6697300CC3105 /* YHResignRiskWarningAlertView.swift */; };
04912F622CB66E6300CC3105 /* YHResignInfoConfirmViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F612CB66E6300CC3105 /* YHResignInfoConfirmViewController.swift */; };
04912F642CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F632CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift */; };
04912F6E2CB6A64700CC3105 /* YHResignAppointTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6D2CB6A64700CC3105 /* YHResignAppointTipsView.swift */; };
04912F6E2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6D2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift */; };
04912F702CB765FE00CC3105 /* YHResignAppointTimeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */; };
04912F722CB7714300CC3105 /* YHResignAppointTimeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */; };
04912F742CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04912F732CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift */; };
......@@ -559,6 +559,8 @@
04CA2BFF2CB7C9A000F36DE7 /* YHResignUploadSuccessDocListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CA2BFE2CB7C9A000F36DE7 /* YHResignUploadSuccessDocListCell.swift */; };
04CA2C012CB7CEDC00F36DE7 /* YHResignUploadDocDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CA2C002CB7CEDC00F36DE7 /* YHResignUploadDocDetailViewController.swift */; };
04CA2C032CB7D3C200F36DE7 /* YHFileExplainReasonInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CA2C022CB7D3C200F36DE7 /* YHFileExplainReasonInputView.swift */; };
04CA2C052CB8F75700F36DE7 /* YHResignUploadDocListViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CA2C042CB8F75700F36DE7 /* YHResignUploadDocListViewModel.swift */; };
04CA2C072CB8F9C800F36DE7 /* YHResignUploadDocListProgressModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CA2C062CB8F9C800F36DE7 /* YHResignUploadDocListProgressModel.swift */; };
04CC2EF02BC3DDB2000305DD /* YHServiceBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */; };
04CCEDF72CA0FCB10026EA70 /* YHHKImmigrationRecordsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CCEDF62CA0FCB10026EA70 /* YHHKImmigrationRecordsViewModel.swift */; };
04CCEDF92CA0FD5F0026EA70 /* YHHKImmigrationRecordsSummaryModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CCEDF82CA0FD5F0026EA70 /* YHHKImmigrationRecordsSummaryModel.swift */; };
......@@ -643,6 +645,9 @@
04F243702C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F2436F2C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift */; };
04F243742CA07C6C00DF2C74 /* YHCollectionViewLeftAlignedFlowLayout.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F243732CA07C6C00DF2C74 /* YHCollectionViewLeftAlignedFlowLayout.swift */; };
04F316442C3568F000024164 /* YHAboutGalaxyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */; };
04F4A5282CB8D4270026D469 /* YHResignAppointSubmitScheduleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4A5272CB8D4270026D469 /* YHResignAppointSubmitScheduleViewController.swift */; };
04F4A52A2CB8D5FA0026D469 /* YHForwardArriveHKAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4A5292CB8D5FA0026D469 /* YHForwardArriveHKAlertView.swift */; };
04F4A52C2CB8F8190026D469 /* YHResignAppointedScheduleRiskTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4A52B2CB8F8190026D469 /* YHResignAppointedScheduleRiskTipsView.swift */; };
04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
04F5F86A2C1A95BB004A463C /* YHOtherServiceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */; };
04F5F86C2C1A9B52004A463C /* YHOtherServiceListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F5F86B2C1A9B52004A463C /* YHOtherServiceListViewController.swift */; };
......@@ -1362,7 +1367,7 @@
04912F5F2CB6697300CC3105 /* YHResignRiskWarningAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignRiskWarningAlertView.swift; sourceTree = "<group>"; };
04912F612CB66E6300CC3105 /* YHResignInfoConfirmViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignInfoConfirmViewController.swift; sourceTree = "<group>"; };
04912F632CB6885D00CC3105 /* YHResignFamilyMemberInfoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignFamilyMemberInfoCell.swift; sourceTree = "<group>"; };
04912F6D2CB6A64700CC3105 /* YHResignAppointTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTipsView.swift; sourceTree = "<group>"; };
04912F6D2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointSubmitTipsView.swift; sourceTree = "<group>"; };
04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeViewController.swift; sourceTree = "<group>"; };
04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointTimeCell.swift; sourceTree = "<group>"; };
04912F732CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointSelectTimeItemView.swift; sourceTree = "<group>"; };
......@@ -1453,6 +1458,8 @@
04CA2BFE2CB7C9A000F36DE7 /* YHResignUploadSuccessDocListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignUploadSuccessDocListCell.swift; sourceTree = "<group>"; };
04CA2C002CB7CEDC00F36DE7 /* YHResignUploadDocDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignUploadDocDetailViewController.swift; sourceTree = "<group>"; };
04CA2C022CB7D3C200F36DE7 /* YHFileExplainReasonInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileExplainReasonInputView.swift; sourceTree = "<group>"; };
04CA2C042CB8F75700F36DE7 /* YHResignUploadDocListViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignUploadDocListViewModel.swift; sourceTree = "<group>"; };
04CA2C062CB8F9C800F36DE7 /* YHResignUploadDocListProgressModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignUploadDocListProgressModel.swift; sourceTree = "<group>"; };
04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceBannerView.swift; sourceTree = "<group>"; };
04CCEDF62CA0FCB10026EA70 /* YHHKImmigrationRecordsViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKImmigrationRecordsViewModel.swift; sourceTree = "<group>"; };
04CCEDF82CA0FD5F0026EA70 /* YHHKImmigrationRecordsSummaryModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKImmigrationRecordsSummaryModel.swift; sourceTree = "<group>"; };
......@@ -1537,6 +1544,9 @@
04F2436F2C9E788200DF2C74 /* YHResignDocumentPreviewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignDocumentPreviewModel.swift; sourceTree = "<group>"; };
04F243732CA07C6C00DF2C74 /* YHCollectionViewLeftAlignedFlowLayout.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCollectionViewLeftAlignedFlowLayout.swift; sourceTree = "<group>"; };
04F316432C3568F000024164 /* YHAboutGalaxyViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutGalaxyViewController.swift; sourceTree = "<group>"; };
04F4A5272CB8D4270026D469 /* YHResignAppointSubmitScheduleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointSubmitScheduleViewController.swift; sourceTree = "<group>"; };
04F4A5292CB8D5FA0026D469 /* YHForwardArriveHKAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHForwardArriveHKAlertView.swift; sourceTree = "<group>"; };
04F4A52B2CB8F8190026D469 /* YHResignAppointedScheduleRiskTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResignAppointedScheduleRiskTipsView.swift; sourceTree = "<group>"; };
04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateSheetView.swift; sourceTree = "<group>"; };
04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherServiceViewController.swift; sourceTree = "<group>"; };
04F5F86B2C1A9B52004A463C /* YHOtherServiceListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOtherServiceListViewController.swift; sourceTree = "<group>"; };
......@@ -3442,6 +3452,7 @@
isa = PBXGroup;
children = (
04912F6F2CB765FE00CC3105 /* YHResignAppointTimeViewController.swift */,
04F4A5272CB8D4270026D469 /* YHResignAppointSubmitScheduleViewController.swift */,
);
path = C;
sourceTree = "<group>";
......@@ -3449,12 +3460,14 @@
04912F672CB6A59C00CC3105 /* V */ = {
isa = PBXGroup;
children = (
04912F6D2CB6A64700CC3105 /* YHResignAppointTipsView.swift */,
04912F6D2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift */,
04912F732CB7743900CC3105 /* YHResignAppointSelectTimeItemView.swift */,
04912F7B2CB7A7EE00CC3105 /* YHResignAppointShowTimeItemView.swift */,
04912F752CB77F4500CC3105 /* YHResignLeaveHKSwitchItemView.swift */,
04912F7F2CB7CC0000CC3105 /* YHResignAppointedScheduleItemView.swift */,
04912F812CB7CFAE00CC3105 /* YHResignAppointedScheduleLineView.swift */,
04F4A5292CB8D5FA0026D469 /* YHForwardArriveHKAlertView.swift */,
04F4A52B2CB8F8190026D469 /* YHResignAppointedScheduleRiskTipsView.swift */,
04912F712CB7714300CC3105 /* YHResignAppointTimeCell.swift */,
04912F772CB7A11700CC3105 /* YHResignAppointOptionCell.swift */,
04912F792CB7A5F400CC3105 /* YHResignAppointApplicantInfoCell.swift */,
......@@ -3730,6 +3743,7 @@
04CA2BF82CB7BAA100F36DE7 /* M */ = {
isa = PBXGroup;
children = (
04CA2C062CB8F9C800F36DE7 /* YHResignUploadDocListProgressModel.swift */,
);
path = M;
sourceTree = "<group>";
......@@ -3737,6 +3751,7 @@
04CA2BF92CB7BAA800F36DE7 /* VM */ = {
isa = PBXGroup;
children = (
04CA2C042CB8F75700F36DE7 /* YHResignUploadDocListViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
......@@ -5214,6 +5229,7 @@
044D0BFC2C21635B00C5CF5E /* YHInformationAuthorizationStepOneViewController.swift in Sources */,
045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
04F4A5282CB8D4270026D469 /* YHResignAppointSubmitScheduleViewController.swift in Sources */,
A598E9E22C7CB32D00F84739 /* YHTravelDocsPreparationListModel.swift in Sources */,
A598E9D72C7C9EF300F84739 /* YHTravelDocsPreparationListViewController.swift in Sources */,
A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */,
......@@ -5270,6 +5286,7 @@
0418922A2C91CB2500B9FB94 /* YHResignDocumentStatus.swift in Sources */,
04256DE42C72E3FA00A37BA4 /* YHInfoItemOptionView.swift in Sources */,
04256DF22C734E7E00A37BA4 /* YHGrabFileCell.swift in Sources */,
04CA2C052CB8F75700F36DE7 /* YHResignUploadDocListViewModel.swift in Sources */,
A5ACE9512B4564F7002C94D2 /* YhConstant.swift in Sources */,
04FD85662C2124AF00BEF9C5 /* YHNameCardViewController.swift in Sources */,
0430E63B2C6DA106000511E2 /* CGFloat+Extention.swift in Sources */,
......@@ -5291,6 +5308,7 @@
04B360F32C636525001EB053 /* YHPrincipleWaitResultViewController.swift in Sources */,
04358E0A2C7835B000811928 /* YHMakeCertificatePlaceModel.swift in Sources */,
A582B2412BB95998009D098C /* YHHKPlanTipsCell.swift in Sources */,
04CA2C072CB8F9C800F36DE7 /* YHResignUploadDocListProgressModel.swift in Sources */,
04F243552C9C435A00DF2C74 /* YHHKRecordsInfoItemCell.swift in Sources */,
A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */,
0485DFDC2C670C7200B50293 /* YHPrincipleSendMailView.swift in Sources */,
......@@ -5391,6 +5409,7 @@
04CA2C032CB7D3C200F36DE7 /* YHFileExplainReasonInputView.swift in Sources */,
04213B292C48EF5300797900 /* YHHomeInformationViewController.swift in Sources */,
A5DF9C692C78BE6000CE48E6 /* YHUploadCertificateDetailModel.swift in Sources */,
04F4A52A2CB8D5FA0026D469 /* YHForwardArriveHKAlertView.swift in Sources */,
044EE2442C92F48200A2FE3A /* YHResignCertificateEvisaTableViewCell.swift in Sources */,
048B2A4D2BC7DAE800A93BF0 /* YHMyLikeViewModel.swift in Sources */,
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */,
......@@ -5398,7 +5417,7 @@
04F2432F2C94704200DF2C74 /* YHPaddedLabel.swift in Sources */,
A5ACE9342B4564F7002C94D2 /* YHAllApiName.swift in Sources */,
04AF82D62C25542D0028CE2A /* YHInterestTopicLayout.swift in Sources */,
04912F6E2CB6A64700CC3105 /* YHResignAppointTipsView.swift in Sources */,
04912F6E2CB6A64700CC3105 /* YHResignAppointSubmitTipsView.swift in Sources */,
045EEE902B9F171A0022A143 /* YHPreviewInfoNameAndSubNameItemsView.swift in Sources */,
A5ACE9502B4564F7002C94D2 /* YhCacheTool.swift in Sources */,
04F957452C1FEC4A003C631C /* YHMessageBellView.swift in Sources */,
......@@ -5660,6 +5679,7 @@
04A7BD132BA42F4200BD35A2 /* YHMyDocumentsDetailViewController.swift in Sources */,
04CA2C012CB7CEDC00F36DE7 /* YHResignUploadDocDetailViewController.swift in Sources */,
04A671622BA058DE00C1FB91 /* YHCertificateEditSheetView.swift in Sources */,
04F4A52C2CB8F8190026D469 /* YHResignAppointedScheduleRiskTipsView.swift in Sources */,
04AD317D2C295AE800DF5655 /* YHUserInfoSettingViewModel.swift in Sources */,
045A08C22C37EB8B00BCBABA /* YHMyFileListNoneCell.swift in Sources */,
04F2435F2C9D1C0600DF2C74 /* YHHKRecordsStayingPersonnelCell.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ 09d5851f
......@@ -205,7 +205,10 @@ class YHServiceOrderListView: YHBaseViewController {
} else if type == 36 {
//续签补件
let vc = YHResignUploadDocListViewController()
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 37 {
//在港签证缴费
......@@ -416,6 +419,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = self.arrDataForSeviceCenterProgress[indexPath.row]
if model.status == 1 || model.status == 4 {
YHServiceOrderListView.jumpToMessageController(type: model.type, orderId: orderID, stepID)
return
} else {
YHServiceOrderListView.jumpToMessageController(type: model.type, orderId: orderID, stepID)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointSubmitScheduleViewController.swift 0 → 100644
View file @ 09d5851f
//
// YHResignAppointSubmitScheduleViewController.swift
// galaxy
//
// Created by edy on 2024/10/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHResignAppointSubmitScheduleViewController: YHBaseViewController {
override func viewDidLoad() {
super.viewDidLoad()
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHForwardArriveHKAlertView.swift 0 → 100644
View file @ 09d5851f
//
// YHForwardArriveHKAlertView.swift
// galaxy
//
// Created by edy on 2024/10/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHForwardArriveHKAlertView: UIView {
var confirmBlock: ((Bool)->())?
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = UIColor.init(hex: 0x000000, alpha: 0.68)
return view
}()
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius6
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.textAlignment = .center
label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.mainTextColor
label.text = "提前到港"
return label
}()
lazy var lineView: UIView = {
let view = UIView()
view.backgroundColor = .separatorColor
return view
}()
lazy var messageLabel: UILabel = {
let label = UILabel()
label.numberOfLines = 0
let a = ASAttributedString.init("若申请人已提前到达香港，", .font(UIFont.PFSC_R(ofSize:15)), .foreground(UIColor.mainTextColor70))
let b = ASAttributedString.init("需先修改预约递交时间后再【确认在港】", .font(UIFont.PFSC_B(ofSize:15)),.foreground(UIColor.brandMainColor))
let c = ASAttributedString.init("，请确认是否提前到港？", .font(UIFont.PFSC_R(ofSize:15)), .foreground(UIColor.mainTextColor70))
label.attributed.text = a+b+c
return label
}()
lazy var falseBtn: UIButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.setTitle("否".local, for: .normal)
button.setTitleColor(UIColor.white, for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
return button
}()
lazy var sureBtn: UIButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.white
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
button.setTitle("是".local, for: .normal)
button.setTitleColor( UIColor.brandMainColor, for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.layer.borderWidth = 1
button.layer.borderColor = UIColor.brandMainColor.cgColor
button.addTarget(self, action: #selector(agree), for: .touchUpInside)
return button
}()
static func alertView() -> YHForwardArriveHKAlertView {
let view = YHForwardArriveHKAlertView(frame: UIScreen.main.bounds)
return view
}
func show() {
UIApplication.shared.yhKeyWindow()?.addSubview(self)
}
func dismiss() {
self.removeFromSuperview()
}
@objc func agree() {
confirmBlock?(true)
dismiss()
}
@objc func disagree() {
confirmBlock?(false)
dismiss()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
createUI()
}
func createUI() {
self.addSubview(blackMaskView)
self.addSubview(whiteContentView)
whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(lineView)
whiteContentView.addSubview(messageLabel)
whiteContentView.addSubview(sureBtn)
whiteContentView.addSubview(falseBtn)
blackMaskView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(38)
make.right.equalTo(-38)
make.centerY.equalToSuperview()
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(16)
make.height.equalTo(24)
make.left.equalTo(21)
make.right.equalTo(-21)
}
lineView.snp.makeConstraints { make in
make.left.right.equalTo(0)
make.height.equalTo(0.5)
make.top.equalTo(titleLabel.snp.bottom).offset(12)
}
messageLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.right.equalTo(-21)
make.top.equalTo(lineView.snp.bottom).offset(16)
}
sureBtn.snp.makeConstraints { make in
make.left.equalTo(21)
make.top.equalTo(messageLabel.snp.bottom).offset(21)
make.height.equalTo(45)
make.width.equalTo(falseBtn.snp.width)
make.right.equalTo(falseBtn.snp.left).offset(-10)
make.bottom.equalTo(-16)
}
falseBtn.snp.makeConstraints { make in
make.right.equalTo(-21)
make.centerY.equalTo(sureBtn)
make.height.equalTo(45)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointTipsView.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointSubmitTipsView.swift
View file @ 09d5851f
......@@ -8,7 +8,7 @@
import UIKit
class YHResignAppointTipsView: UIView {
class YHResignAppointSubmitTipsView: UIView {
var confirmBlock:(()->())?
......@@ -56,8 +56,8 @@ class YHResignAppointTipsView: UIView {
return button
}()
static func alertView() -> YHResignAppointTipsView {
let view = YHResignAppointTipsView(frame: UIScreen.main.bounds)
static func alertView() -> YHResignAppointSubmitTipsView {
let view = YHResignAppointSubmitTipsView(frame: UIScreen.main.bounds)
return view
}
......@@ -130,6 +130,8 @@ class YHResignAppointTipsView: UIView {
make.bottom.equalTo(-16)
make.height.equalTo(45)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleLineCell.swift
View file @ 09d5851f
......@@ -25,7 +25,7 @@ class YHResignAppointedScheduleLineCell: UICollectionViewCell {
lazy var titleLabel: UILabel = {
var label = UILabel()
label.font = .PFSC_R(ofSize: 12)
label.font = .PFSC_R(ofSize: 11)
label.textAlignment = .left
label.textColor = UIColor.mainTextColor
return label
......@@ -33,32 +33,22 @@ class YHResignAppointedScheduleLineCell: UICollectionViewCell {
lazy var timeLabel: UILabel = {
var label = UILabel()
label.font = .PFSC_R(ofSize: 12)
label.font = .PFSC_R(ofSize: 11)
label.textAlignment = .left
label.textColor = UIColor.mainTextColor
label.textColor = UIColor.mainTextColor(alpha: 0.3)
return label
}()
lazy var leftDotView: UIView = {
let view = UIView()
lazy var leftDotView: YHDashLineView = {
let view = YHDashLineView(strokeColor: UIColor.init(hex: 0x121A26, alpha: 0.12).cgColor, lineWidth: 0.8, lineDashPattern: [3, 3])
return view
}()
lazy var rightDotView: UIView = {
let view = UIView()
lazy var rightDotView: YHDashLineView = {
let view = YHDashLineView(strokeColor: UIColor.init(hex: 0x121A26, alpha: 0.12).cgColor, lineWidth: 0.8, lineDashPattern: [3, 3])
return view
}()
lazy var leftDotLayer: CAShapeLayer = {
let layer = self.createDotLine(frame: leftDotView.bounds)
return layer
}()
lazy var rightDotLayer: CAShapeLayer = {
let layer = self.createDotLine(frame: leftDotView.bounds)
return layer
}()
required init?(coder: NSCoder) {
super.init(coder: coder)
}
......@@ -115,25 +105,9 @@ class YHResignAppointedScheduleLineCell: UICollectionViewCell {
titleLabel.text = model.title
timeLabel.text = model.time
leftDotLayer.removeFromSuperlayer()
rightDotLayer.removeFromSuperlayer()
leftDotLayer = createDotLine(frame: leftDotView.bounds)
rightDotLayer = createDotLine(frame: rightDotView.bounds)
leftDotView.layer.addSublayer(leftDotLayer)
rightDotView.layer.addSublayer(rightDotLayer)
}
numLabel.textColor = model.isNeedUserAction ? UIColor.mainTextColor(alpha: 0.7) : UIColor.mainTextColor(alpha: 0.18)
titleLabel.textColor = model.isNeedUserAction ? UIColor.mainTextColor(alpha: 0.7) : UIColor.mainTextColor(alpha: 0.3)
timeLabel.textColor = model.isNeedUserAction ? UIColor.mainTextColor(alpha: 0.3) : UIColor.mainTextColor(alpha: 0.18)
func createDotLine(frame:CGRect) -> CAShapeLayer {
let borderLayer = CAShapeLayer()
borderLayer.path = UIBezierPath(roundedRect: frame, cornerRadius: 0.0).cgPath
borderLayer.lineWidth = 0.8
//[数组第一个数字表示单个虚线长度，第二个数字表示间隔]
borderLayer.lineDashPattern = [3,3] as [NSNumber]?
//前边是虚线的长度，后边是虚线之间空隙的长度
borderLayer.lineDashPhase = 0.1
//实线边框
borderLayer.fillColor = UIColor.clear.cgColor
borderLayer.strokeColor = UIColor.init(hex: 0x121A26, alpha: 0.12).cgColor
return borderLayer
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleLineView.swift
View file @ 09d5851f
......@@ -13,9 +13,12 @@ class YHScheduleLineStepModel {
var index: Int = 0
var title: String = ""
var time: String = ""
init(title: String, time: String) {
var isNeedUserAction: Bool = true // 该步骤是否需要用户操作
init(title: String, time: String, isNeedUserAction: Bool = true) {
self.title = title
self.time = time
self.isNeedUserAction = isNeedUserAction
}
}
......@@ -24,7 +27,7 @@ class YHResignAppointedScheduleLineView: UIView {
var steps:[YHScheduleLineStepModel] = {
let model1 = YHScheduleLineStepModel(title: "入境香港准备", time: "")
let model2 = YHScheduleLineStepModel(title: "已确认在港", time: "2024-03-14")
let model3 = YHScheduleLineStepModel(title: "银河递交续签资料", time: "2024-03-14")
let model3 = YHScheduleLineStepModel(title: "银河递交续签资料", time: "2024-03-14", isNeedUserAction: false)
let model4 = YHScheduleLineStepModel(title: "查看递交回执", time: "2024-03-14")
let model5 = YHScheduleLineStepModel(title: "在港等待获批/离港", time: "")
let model6 = YHScheduleLineStepModel(title: "在港等缴费领取新签证", time: "")
......@@ -85,7 +88,7 @@ extension YHResignAppointedScheduleLineView: UICollectionViewDelegate, UICollect
if width < 65.0 {
width = 65.0
}
width += 9.0*2
width += 18.0
return CGSize(width: width, height: 84.0)
}
return .zero
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleRiskTipsView.swift 0 → 100644
View file @ 09d5851f
//
// YHResignAppointedRiskTipsView.swift
// galaxy
//
// Created by edy on 2024/10/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHResignAppointedScheduleRiskTipsView: UIView {
var confirmBlock:(()->())?
lazy var blackMaskView: UIView = {
let view = UIView()
view.backgroundColor = UIColor.init(hex: 0x000000, alpha: 0.68)
return view
}()
lazy var whiteContentView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius6
return view
}()
lazy var iconImgView: UIImageView = {
let view = UIImageView(image: UIImage(named: "cs_family_risk"))
return view
}()
lazy var titleLabel: UILabel = {
let label = UILabel()
label.textAlignment = .center
label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.mainTextColor
label.text = "风险提示"
return label
}()
lazy var firstDetailLabel: UILabel = {
var label = UILabel()
label.numberOfLines = 0
let a: ASAttributedString = .init("请申请人", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
let b: ASAttributedString = .init("务必已进入到香港境内后，再进行确认", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
let c: ASAttributedString = .init("，收到递交回执后，再离境！避免递交无效！", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
label.attributed.text = a+b+c
return label
}()
lazy var secondDetailLabel: UILabel = {
var label = UILabel()
label.numberOfLines = 0
let a: ASAttributedString = .init("建议入境香港后，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
let b: ASAttributedString = .init("远离海关，并延迟20分钟后再进行确认", .font(UIFont.PFSC_B(ofSize: 14)),.foreground(UIColor.brandMainColor))
let c: ASAttributedString = .init("，避免香港海关系统还未识别到已入境!", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor(alpha: 0.7)))
label.attributed.text = a+b+c
return label
}()
lazy var confirmBtn: UIButton = {
let button = UIButton()
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
button.setTitle("我已知悉，确认", for: .normal)
button.setTitleColor(UIColor.white, for: .normal)
button.backgroundColor = .brandMainColor
button.addTarget(self, action: #selector(didConfirmBtnClicked), for: .touchUpInside)
button.layer.cornerRadius = kCornerRadius3
return button
}()
static func alertView() -> YHResignAppointedScheduleRiskTipsView {
let view = YHResignAppointedScheduleRiskTipsView(frame: UIScreen.main.bounds)
return view
}
@objc func show() {
UIApplication.shared.yhKeyWindow()?.addSubview(self)
}
@objc func dismiss() {
self.removeFromSuperview()
}
@objc func didConfirmBtnClicked() {
confirmBlock?()
self.dismiss()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
override init(frame: CGRect) {
super.init(frame: frame)
createUI()
}
func createUI() {
self.addSubview(blackMaskView)
self.addSubview(whiteContentView)
whiteContentView.addSubview(iconImgView)
whiteContentView.addSubview(titleLabel)
whiteContentView.addSubview(firstDetailLabel)
whiteContentView.addSubview(secondDetailLabel)
whiteContentView.addSubview(confirmBtn)
blackMaskView.snp.makeConstraints { make in
make.edges.equalToSuperview()
}
whiteContentView.snp.makeConstraints { make in
make.left.equalTo(38)
make.right.equalTo(-38)
make.centerY.equalToSuperview()
}
iconImgView.snp.makeConstraints { make in
make.width.height.equalTo(53)
make.top.equalTo(30)
make.centerX.equalToSuperview()
}
titleLabel.snp.makeConstraints { make in
make.top.equalTo(iconImgView.snp.bottom).offset(16)
make.height.equalTo(24)
make.left.equalTo(21)
make.right.equalTo(-21)
}
firstDetailLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.right.equalTo(-21)
make.top.equalTo(titleLabel.snp.bottom).offset(8)
}
secondDetailLabel.snp.makeConstraints { make in
make.left.equalTo(21)
make.right.equalTo(-21)
make.top.equalTo(firstDetailLabel.snp.bottom).offset(8)
}
confirmBtn.snp.makeConstraints { make in
make.top.equalTo(secondDetailLabel.snp.bottom).offset(21)
make.left.equalTo(16)
make.right.equalTo(-16)
make.bottom.equalTo(-16)
make.height.equalTo(45)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/C/YHResignUploadDocListViewController.swift
View file @ 09d5851f
......@@ -11,8 +11,10 @@ import AttributedString
class YHResignUploadDocListViewController: YHBaseViewController {
var orderId: Int = 0
lazy var viewModel: YHTravelDocsPreparationViewModel = {
let vm = YHTravelDocsPreparationViewModel()
// 批次id
var batchId: Int = 0
lazy var viewModel: YHResignUploadDocListViewModel = {
let vm = YHResignUploadDocListViewModel()
return vm
}()
......@@ -85,23 +87,16 @@ class YHResignUploadDocListViewController: YHBaseViewController {
private extension YHResignUploadDocListViewController {
func loadData() {
let params: [String : Any] = ["order_id": orderId]
YHHUD.show(.progress(message: "加载中..."))
viewModel.getTravelDocsList(param: params){ success, error in
YHHUD.hide()
if success {
} else {
// let msg = error?.errorMsg ?? "获取数据出错"
// YHHUD.flash(message: msg)
// DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) {
// self.navigationController?.popViewController()
// }
}
viewModel.getUploadDocProgress(orderID: orderId, stepID: batchId) {[weak self] success, err in
guard let self = self else { return }
viewModel.getUploadDocList(orderID: orderId, stepID: batchId) {[weak self] success, err in
guard let self = self else { return }
self.tableView.reloadData()
}
}
}
func setupUI() {
gk_navTitle = "续签补件"
view.backgroundColor = UIColor.contentBkgColor
......@@ -180,6 +175,22 @@ extension YHResignUploadDocListViewController: UITableViewDelegate, UITableViewD
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let approveCell = tableView.dequeueReusableCell(withIdentifier: YHResignUploadDocListCell.cellReuseIdentifier, for: indexPath) as! YHResignUploadDocListCell
approveCell.section = indexPath.section
if indexPath.section == 0 {
approveCell.title = "资料上传"
approveCell.dataSource = self.viewModel.mainModel.upload_list
} else {
approveCell.title = "文书确认"
approveCell.dataSource = self.viewModel.mainModel.doc_list
}
approveCell.clickBlock = { [weak self] model, section in
guard let self = self else { return }
if section == 0 {
// 跳转文件上传
} else {
// 跳转列表
}
}
return approveCell
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/M/YHResignUploadDocListProgressModel.swift 0 → 100644
View file @ 09d5851f
//
// YHResignUploadDocListProgressModel.swift
// galaxy
//
// Created by EDY on 2024/10/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import SmartCodable
class YHResignUploadDocListProgressModel: SmartCodable {
var progress : Int = -1 //电子签证有效期
var is_need_supplement : Bool = true
required init() {
}
}
class YHResignUploadDocListModel: SmartCodable {
var supplement_voucher_url : String = ""
var supplement_deadline : String = ""
var upload_list : [YHResignUploadDocModel] = []
var doc_list : [YHResignUploadDocModel] = []
required init() {
}
}
class YHResignUploadDocModel: SmartCodable {
var name : String = ""
var status : Int = 0
var id : Int = 0
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/V/YHResignUploadDocListCell.swift
View file @ 09d5851f
......@@ -11,13 +11,19 @@ import UIKit
class YHResignUploadDocListCell: UITableViewCell {
static let cellReuseIdentifier = "YHResignUploadDocListCell"
typealias ExperienceListBlock = (_ model: YHAdopterDependentModel) -> ()
typealias ExperienceListBlock = (_ model: YHResignUploadDocModel, _ section: Int) -> ()
var clickBlock: ExperienceListBlock?
var centerView: UIView!
var titleLabel: UILabel!
var mainItemView: UIView!
var lineView: UIView!
var dataSource: [YHAdopterDependentModel]? {
var title: String = "" {
didSet {
titleLabel.text = title
}
}
var section : Int = 0
var dataSource: [YHResignUploadDocModel]? {
didSet {
updateAllViews()
}
......@@ -123,13 +129,17 @@ class YHResignUploadDocListCell: UITableViewCell {
itemView.clickBlock = {[weak self] model in
guard let self = self else { return }
if let block = self.clickBlock {
block(model)
block(model, self.section)
}
}
let model = dataSource[i]
itemView.tag = 4000 + i
if section == 0 {
itemView.dataSource = dataSource[i]
} else {
itemView.docDataSource = dataSource[i]
}
mainItemView.addSubview(itemView)
itemView.snp.makeConstraints { make in
make.left.equalTo(18)
......@@ -145,7 +155,7 @@ class YHResignUploadDocListCell: UITableViewCell {
class YHResignUploadDocItemView: UIView {
typealias ItemBlock = (_ model: YHAdopterDependentModel) -> ()
typealias ItemBlock = (_ model: YHResignUploadDocModel) -> ()
var clickBlock: ItemBlock?
var deleteBlock: ItemBlock?
var titleLabel: UILabel!
......@@ -153,11 +163,16 @@ class YHResignUploadDocItemView: UIView {
var nextStepImageView: UIImageView!
var centerButton: UIButton!
var dataSource: YHAdopterDependentModel? {
var dataSource: YHResignUploadDocModel? {
didSet {
updateAllViews()
}
}
var docDataSource: YHResignUploadDocModel? {
didSet {
updateDocAllViews()
}
}
override init(frame: CGRect) {
super.init(frame: frame)
backgroundColor = .white
......@@ -224,21 +239,13 @@ class YHResignUploadDocItemView: UIView {
func updateAllViews() {
guard let dataSource = dataSource else { return }
var spouse = "子女"
if dataSource.is_spouse == 1 {
spouse = "配偶"
}
if dataSource.dep_name.count != 0 {
titleLabel.text = spouse + "(\(dataSource.dep_name))"
} else {
titleLabel.text = spouse
}
if dataSource.status == 0 {
titleLabel.text = dataSource.name
if dataSource.status == 3 {
explainLabel.text = "待上传"
explainLabel.textColor = UIColor.brandMainColor
nextStepImageView.image = UIImage(named: "service_adopter_income_start")
}
if dataSource.status == 1 {
if dataSource.status == 0 {
explainLabel.text = "审核中"
explainLabel.textColor = UIColor(hex: 0xff8000)
nextStepImageView.image = UIImage(named: "service_adopter_income_wait")
......@@ -248,32 +255,46 @@ class YHResignUploadDocItemView: UIView {
explainLabel.textColor = UIColor.failColor
nextStepImageView.image = UIImage(named: "service_adopter_income_fail")
}
if dataSource.status == 3 {
if dataSource.status == 1 {
explainLabel.text = "已完成"
explainLabel.textColor = UIColor(hex: 0x3cc694)
nextStepImageView.image = UIImage(named: "service_adopter_income_success")
}
}
func updateDocAllViews() {
guard let dataSource = dataSource else { return }
if dataSource.status == 0 {
explainLabel.text = "待确认"// “待签字”
titleLabel.text = dataSource.name
if dataSource.status == 1 {
explainLabel.textColor = UIColor.brandMainColor
nextStepImageView.image = UIImage(named: "service_adopter_income_start")
}
if dataSource.status == 1 {
explainLabel.text = "写作中"// 定稿中 审核中
if dataSource.status == 4 {
explainLabel.text = "待签字"
explainLabel.textColor = UIColor.brandMainColor
nextStepImageView.image = UIImage(named: "service_adopter_income_start")
}
if dataSource.status == 0 {
explainLabel.text = "写作中"//
explainLabel.textColor = UIColor(hex: 0xff8000)
nextStepImageView.image = UIImage(named: "service_adopter_income_wait")
}
if dataSource.status == 2 {
explainLabel.text = "定稿中"// 定稿中 审核中
explainLabel.textColor = UIColor(hex: 0xff8000)
nextStepImageView.image = UIImage(named: "service_adopter_income_wait")
}
if dataSource.status == 3 {
explainLabel.text = "审核中"// 定稿中 审核中
explainLabel.textColor = UIColor(hex: 0xff8000)
nextStepImageView.image = UIImage(named: "service_adopter_income_wait")
}
if dataSource.status == 6 {
explainLabel.text = "已驳回"
explainLabel.textColor = UIColor.failColor
nextStepImageView.image = UIImage(named: "service_adopter_income_fail")
}
if dataSource.status == 3 {
if dataSource.status == 5 {
explainLabel.text = "已完成"
explainLabel.textColor = UIColor(hex: 0x3cc694)
nextStepImageView.image = UIImage(named: "service_adopter_income_success")
......@@ -284,7 +305,7 @@ class YHResignUploadDocItemView: UIView {
@objc func centerClick() {
if let block = clickBlock {
block(self.dataSource ?? YHAdopterDependentModel())
block(self.dataSource ?? YHResignUploadDocModel())
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignUploadDoc(续签补件)/VM/YHResignUploadDocListViewModel.swift 0 → 100644
View file @ 09d5851f
//
// YHResignUploadDocListViewModel.swift
// galaxy
//
// Created by EDY on 2024/10/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHResignUploadDocListViewModel: YHBaseViewModel {
var progressModel : YHResignUploadDocListProgressModel = YHResignUploadDocListProgressModel()
//列表信息
var mainModel : YHResignUploadDocListModel = YHResignUploadDocListModel()
}
extension YHResignUploadDocListViewModel {
func getUploadDocProgress(orderID: Int, stepID: Int, callBackBlock:@escaping (_ success: Bool,_ err:YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderID, "renewal_id": stepID]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignUploadDoc.progress
let _ = YHNetRequest.getRequest(url: strUrl, params:params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHResignUploadDocListProgressModel.deserialize(from: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false, err)
return
}
self.progressModel = resultModel
callBackBlock(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
callBackBlock(false,err)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
func getUploadDocList(orderID: Int, stepID: Int, callBackBlock:@escaping (_ success: Bool,_ err:YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderID, "renewal_id": stepID]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignUploadDoc.list
let _ = YHNetRequest.getRequest(url: strUrl, params:params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHResignUploadDocListModel.deserialize(from: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(false, err)
return
}
self.mainModel = resultModel
callBackBlock(true, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
callBackBlock(false,err)
}
} failBlock: { err in
callBackBlock(false,err)
}
}
}
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 09d5851f
......@@ -349,7 +349,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
//// self.navigationController?.pushViewController(vc)
// return
// }
let item: PersonalModuleItem = items[indexPath.row]
switch item.type {
case .myCard://我的名片
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 09d5851f
......@@ -563,4 +563,11 @@ class YHAllApiName {
// 在港记录-家庭成员列表
static let stayInHKRecordFamilyMembers = "super-app/stay-in-hk-record/family-members"
}
//续签段 - 10续签补件
struct ResignUploadDoc {
static let progress = "super-app/renewal/supplement/progress"
static let list = "super-app/renewal/supplement/list"
}
}
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