Skip to content

G
galaxy-iOS
Commit e19b7757 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 1472d715 10e77180
Hide whitespace changes
Inline Side-by-side
Showing with 184 additions and 67 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ e19b7757
...@@ -40,7 +40,13 @@ extension YHServiceOrderListView { ...@@ -40,7 +40,13 @@ extension YHServiceOrderListView {
if YHLoginManager.shared.isLogin() { if YHLoginManager.shared.isLogin() {
viewModel.getStageInformation(params: ["orderId":orderID]) {[weak self] success, error in viewModel.getStageInformation(params: ["orderId":orderID]) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
viewModel.getNewServiceCenterProgressList(orderID, type, orderType: self.viewModel.personInfoModel.type) {[weak self] success, error in var state = 1
if self.viewModel.personInfoModel.type == 1 {
state = 1
} else {
state = 2
}
viewModel.getNewServiceCenterProgressList(orderID, type, orderType: state) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if (self.homeTableView != nil) { if (self.homeTableView != nil) {
if self.viewModel.arrDataForSeviceCenterProgress.count == 0 { if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
...@@ -158,6 +164,10 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -158,6 +164,10 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section]
if model.type == 27 {
return 146
}
return 128 return 128
} }
...@@ -173,71 +183,83 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -173,71 +183,83 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section] let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section]
let vc = YHAddAdoptersViewController() if model.status == 1 || model.status == 4 {
vc.orderId = orderID return
navigationController?.pushViewController(vc) } else {
//1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
if model.type == 1 {
// if model.status == 1 || model.status == 4 { let vc = YHMineCertificateEntryViewController()
// return vc.orderId = orderID
// } else { navigationController?.pushViewController(vc)
// //1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
// if model.type == 1 { } else if model.type == 2 {
// let vc = YHMineCertificateEntryViewController() let vc = YHInformationPerfectListVC()
// vc.orderId = orderID vc.orderId = orderID
// navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
//
// } else if model.type == 2 { } else if model.type == 3 { // 评分
// let vc = YHInformationPerfectListVC()
// vc.orderId = orderID handleRedPointFor(key: kMyScoreRedPointInfoKey, model: model)
// navigationController?.pushViewController(vc) let vc = YHScoreDetailViewController()
// vc.orderId = orderID
// } else if model.type == 3 { // 评分 // vc.model = serviceCenterMainReqVM.allInfoScoreModel
// navigationController?.pushViewController(vc)
// handleRedPointFor(key: kMyScoreRedPointInfoKey, model: model)
// let vc = YHScoreDetailViewController() } else if model.type == 4 { // 方案
// vc.orderId = orderID handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model)
//// vc.model = serviceCenterMainReqVM.allInfoScoreModel let vc = YHMineSchemeViewController()
// navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
//
// } else if model.type == 4 { // 方案 } else if model.type == 5 {
// handleRedPointFor(key: kMyPlanRedPointInfoKey, model: model) let vc = YHMySignatureListViewController()
// let vc = YHMineSchemeViewController() vc.orderId = orderID
// navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
//
// } else if model.type == 5 { } else if model.type == 6 {
// let vc = YHMySignatureListViewController() let vc = YHMyDocumentsListViewController()
// vc.orderId = orderID vc.orderId = orderID
// navigationController?.pushViewController(vc) vc.mobile = mobile
// navigationController?.pushViewController(vc)
// } else if model.type == 6 {
// let vc = YHMyDocumentsListViewController() } else if model.type == 11 || model.type == 12 || model.type == 14 {
// vc.orderId = orderID
// vc.mobile = mobile // 11 原则批等待结果
// navigationController?.pushViewController(vc) // 12 原则批待补件
// // 14 原则批未获批准
// } else if model.type == 11 || model.type == 12 || model.type == 14 {
// let vc = YHPrincipleWaitResultViewController()
// // 11 原则批等待结果 vc.status = model.type
// // 12 原则批待补件 vc.orderId = orderID
// // 14 原则批未获批准 navigationController?.pushViewController(vc)
//
// let vc = YHPrincipleWaitResultViewController() } else if model.type == 13 { //原则批已获批~
// vc.status = model.type let vc = YHPrincipleApprovedResultVC()
// vc.orderId = orderID vc.orderId = orderID
// navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
//
// } else if model.type == 13 { //原则批已获批~ } else if model.type == 15 {
// let vc = YHPrincipleApprovedResultVC() //正式批已获批~
// vc.orderId = orderID let vc = YHOfficialApprovalResultVC()
// navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
// } else if model.type == 21 {
// } else if model.type == 15 { //家庭信息确认
// //正式批已获批~ } else if model.type == 22 {
// let vc = YHOfficialApprovalResultVC() //新增受养人
// self.navigationController?.pushViewController(vc) let vc = YHAddAdoptersViewController()
// } vc.orderId = orderID
// } navigationController?.pushViewController(vc)
} else if model.type == 23 {
//赴港时间预约
} else if model.type == 24 {
//电子签字缴费
} else if model.type == 25 {
//赴港行程指引
} else if model.type == 26 {
//旅行证件准备
} else if model.type == 27 {
//上传过关证件
}
}
} }
func handleRedPointFor(key: String, model: YHServiceCenterProgressModel) { func handleRedPointFor(key: String, model: YHServiceCenterProgressModel) {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
View file @ e19b7757
...@@ -68,6 +68,14 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -68,6 +68,14 @@ extension YHServiceOrderProgressTableViewCell {
func updateUI() { func updateUI() {
guard let model = dataModel else { return } guard let model = dataModel else { return }
progress.isHidden = false
progressImageView.isHidden = false
progressLabel.isHidden = false
messageLabel.snp.remakeConstraints { make in
make.top.equalTo(49)
make.left.equalTo(21)
make.right.equalTo(-122)
}
messageLabel.text = "您还有" + "\(model.num)" + "份信息待填写哦~" messageLabel.text = "您还有" + "\(model.num)" + "份信息待填写哦~"
// 0未知 1待开始 2进行中 3 已完成 // 0未知 1待开始 2进行中 3 已完成
if model.status == 1 { if model.status == 1 {
...@@ -239,6 +247,62 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -239,6 +247,62 @@ extension YHServiceOrderProgressTableViewCell {
progressLabel.attributed.text = b + bb progressLabel.attributed.text = b + bb
} }
if model.type == 21 {
titleLabel.text = "家庭信息确认"
messageLabel.text = "请确认现阶段信息是否存在变更～"
buttonLabel.text = "待确认"
messageLabel.textColor = UIColor.yhGreyColor50
}
if model.type == 22 {
titleLabel.text = "新增受养人"
messageLabel.text = "如需，建议现阶段新增，激活后新增需香港住址证明"
buttonLabel.text = "待完善"
progress.isHidden = true
progressImageView.isHidden = true
progressLabel.isHidden = true
messageLabel.textColor = UIColor.yhGreyColor50
messageLabel.snp.remakeConstraints { make in
make.top.equalTo(49)
make.left.equalTo(21)
make.right.equalTo(-21)
}
}
if model.type == 23 {
titleLabel.text = "赴港办证预约"
messageLabel.text = "抢号中～"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.yhGreyColor50
}
if model.type == 24 {
titleLabel.text = "电子签证缴费"
messageLabel.text = "请根据指引缴费领取电子签证～"
buttonLabel.text = "待缴费"
messageLabel.textColor = UIColor.yhGreyColor50
}
if model.type == 25 {
titleLabel.text = "赴港行程指引"
messageLabel.text = "请根据指引清单提前规划赴港行程"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.yhGreyColor50
}
if model.type == 26 {
titleLabel.text = "旅行证件准备"
messageLabel.text = "请更新所有赴港人员的旅行证件"
buttonLabel.text = "去上传"
messageLabel.textColor = UIColor.yhGreyColor50
}
if model.type == 27 {
titleLabel.text = "上传过关证件"
messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
buttonLabel.text = "去上传"
messageLabel.textColor = UIColor.yhGreyColor50
}
} }
if model.status == 3 { if model.status == 3 {
titleLabel.textColor = UIColor.mainTextColor titleLabel.textColor = UIColor.mainTextColor
...@@ -272,6 +336,36 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -272,6 +336,36 @@ extension YHServiceOrderProgressTableViewCell {
titleLabel.text = "我的文书" titleLabel.text = "我的文书"
messageLabel.text = "恭喜您，文书已全部定稿~" messageLabel.text = "恭喜您，文书已全部定稿~"
} }
if model.type == 21 {
titleLabel.text = "家庭信息确认"
messageLabel.text = "请确认现阶段信息是否存在变更～"
buttonLabel.text = "已完成"
}
if model.type == 23 {
titleLabel.text = "赴港办证预约"
messageLabel.text = "请填写意向办证时间，银河代预约～"
buttonLabel.text = "已完成"
}
if model.type == 24 {
titleLabel.text = "电子签证缴费"
messageLabel.text = "请根据指引缴费领取电子签证～"
buttonLabel.text = "已完成"
}
if model.type == 26 {
titleLabel.text = "旅行证件准备"
messageLabel.text = "请更新所有赴港人员的旅行证件"
buttonLabel.text = "已完成"
}
if model.type == 27 {
titleLabel.text = "上传过关证件"
messageLabel.text = "点击保存入境小白条及香港身份证（后续身份续期、永居均涉及）"
buttonLabel.text = "已完成"
}
let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor)) let b: ASAttributedString = .init(NSAttributedString(string: "\(model.percentage)"), .font(UIFont(name: "DINAlternate-Bold", size: 24)!),.foreground(UIColor.mainTextColor))
let bb: ASAttributedString = .init("%", .font(UIFont.PFSC_M(ofSize: 10)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3))) let bb: ASAttributedString = .init("%", .font(UIFont.PFSC_M(ofSize: 10)),.foreground(UIColor.mainTextColor.withAlphaComponent(0.3)))
progressLabel.attributed.text = b + bb progressLabel.attributed.text = b + bb
...@@ -397,13 +491,14 @@ extension YHServiceOrderProgressTableViewCell { ...@@ -397,13 +491,14 @@ extension YHServiceOrderProgressTableViewCell {
let label = UILabel() let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 13) label.font = UIFont.PFSC_M(ofSize: 13)
label.textColor = UIColor.mainTextColor label.textColor = UIColor.mainTextColor
label.numberOfLines = 0
return label return label
}() }()
holdView.addSubview(messageLabel) holdView.addSubview(messageLabel)
messageLabel.snp.makeConstraints { make in messageLabel.snp.makeConstraints { make in
make.top.equalTo(49) make.top.equalTo(49)
make.left.equalTo(21) make.left.equalTo(21)
make.height.equalTo(18) make.right.equalTo(-122)
} }
buttonLabel = { buttonLabel = {
......
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