Skip to content

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

服务中心相关修改

parent bc055303
Hide whitespace changes
Inline Side-by-side
Showing with 219 additions and 7 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift
View file @ 5f183c50
......@@ -454,6 +454,25 @@ extension YHServiceCenterViewController {
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
}
}
if self.state == 4 {
if self.serviceCenterMainReqVM.mainModel.permanentSection.list.count > headIndex {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.permanentSection.list[headIndex].list
self.stepID = self.serviceCenterMainReqVM.mainModel.permanentSection.list[headIndex].id
self.homeTableView.tableHeaderView = headView
self.headView.block = {[weak self] stepIndex, id, array in
guard let self = self else { return }
self.headIndex = stepIndex
self.stepID = id
self.arrDataForSeviceCenterProgress = array
self.homeTableView.reloadData()
}
self.headView.selectIndex = self.headIndex
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.permanentSection.list
self.titleLabel.setTitle("续签阶段", for: .normal)
self.titleLabel.setImage(UIImage(named: ""), for: .normal)
}
}
self.homeTableView.reloadData()
// 首次显示指引
if UserDefaults.standard.string(forKey: "service_tip_show") != nil {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceOrderListViewController.swift
View file @ 5f183c50
......@@ -252,6 +252,54 @@ class YHServiceOrderListViewController: YHBaseViewController {
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 41 {
// 续签资料管理
let vc = YHResinMaterialManageContainerVC()
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 42 {
// 续签文书管理
let vc = YHResignDocumentManagementVC(orderId: orderId, id: stepId)
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 43 {
// 续签信息确认
let vc = YHResignConfirmInfoListViewController()
vc.orderId = orderId
vc.stepId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 44 {
// 在港递交预约
let vc = YHResignAppointContainerViewController()
vc.orderId = orderId
vc.renewalId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 45 {
// 查看续签结果
let vc = YHLookResignResultViewController()
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 46 {
// 续签补件
let vc = YHResignUploadDocListViewController()
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 47 {
// 在港签证缴费
let vc = YHHKVisaRenewalPaymentVC(orderId: orderId, renewalId: stepId)
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 48 {
// 上传旅行证件
let vc = YHResignUploadTravelCardListViewController()
vc.orderId = orderId
vc.batchId = stepId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 101 {
// 身份续签指引
gotoResignGuideVC()
......@@ -322,7 +370,7 @@ extension YHServiceOrderListViewController {
if self.arrDataForSeviceCenterProgress.count == 0 {
self.homeTableView.tableFooterView = footView
self.homeTableView.reloadData()
if state == 3 && (type == 0 || type == 2) {
if (state == 3 || state == 4) && (type == 0 || type == 2) {
self.homeTableView.tableFooterView = UIView()
self.homeTableView.reloadData()
}
......@@ -455,7 +503,7 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
if orderType == 3 {
return 42.fix + 20
}
if state == 3 && (type == 0 || type == 2) {
if (state == 3 || state == 4) && (type == 0 || type == 2) {
return 104
} else {
return kMargin
......@@ -473,7 +521,7 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
}
return view
}
if state == 3 && (type == 0 || type == 2) {
if (state == 3 || state == 4) && (type == 0 || type == 2) {
let view = YHServiceStepThreeSectionView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 104))
view.block = { [weak self] tag in
guard let self = self else { return }
......@@ -513,7 +561,7 @@ extension YHServiceOrderListViewController: UITableViewDelegate, UITableViewData
let arr = self.arrDataForSeviceCenterProgress
if 0 <= indexPath.row, indexPath.row < arr.count {
let model = arr[indexPath.row]
if model.type == 27 || model.type == 32 || model.type == 31 || model.type == 34 {
if model.type == 27 || model.type == 32 || model.type == 31 || model.type == 34 || model.type == 42 || model.type == 41 || model.type == 44 {
return 162
}
return 144
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/M/YHContactItemModel.swift
View file @ 5f183c50
......@@ -18,7 +18,7 @@ struct YHContactItemModel: SmartCodable {
var type: String = ""
var mobile: String = ""
var status: Int = 0
var product_type: Int = 0 // 1-优才 2-高才
var product_type: Int = 0 // 1-优才 2-高才
var isOther: Bool = false // 是否协作单
var service_name: String = ""
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/M/YHServiceCenterProgressModel.swift
View file @ 5f183c50
......@@ -52,8 +52,9 @@ struct YHServiceCenterMainModel: SmartCodable {
var applySection: YHServiceProgressModel = YHServiceProgressModel()
var certificateSection: YHServiceProgressModel = YHServiceProgressModel()
var renewalSection: YHServiceStepProgressModel = YHServiceStepProgressModel()
var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段
var permanentSection: YHServiceStepProgressModel = YHServiceStepProgressModel()
var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段 4永居
var master_id: Int = 0 // 批次
var status: Int = 0
var category_type: Int = 0 // 1.优才 2.高才
var category_type: Int = 0 // 1.优才 2.高才 3永居
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/V/YHServiceOrderProgressTableViewCell.swift
View file @ 5f183c50
......@@ -194,6 +194,46 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.text = "请上传&核对续签旅行证件~"
}
if model.type == 41 {
titleLabel.text = "续签资料管理"
messageLabel.text = "请根据资料清单上传您的续签证明文件~"
}
if model.type == 42 {
titleLabel.text = "续签文书管理"
messageLabel.text = "请确认您的续签文书内容并完成签字~"
}
if model.type == 43 {
titleLabel.text = "续签信息确认"
messageLabel.text = "请确认家庭续签信息是否有变更~"
}
if model.type == 44 {
titleLabel.text = "在港递交预约"
messageLabel.text = "请预约在港递交续签时间&确认在港时间~"
}
if model.type == 45 {
titleLabel.text = "查看续签结果"
messageLabel.text = "请查看递交凭证&续签结果~"
}
if model.type == 46 {
titleLabel.text = "续签补件"
messageLabel.text = "请尽快补件~"
}
if model.type == 47 {
titleLabel.text = "续签签证缴费"
messageLabel.text = "请根据指引缴费并领取新电子签证~"
}
if model.type == 48 {
titleLabel.text = "上传旅行证件"
messageLabel.text = "请上传&核对续签旅行证件~"
}
if model.type == 201 {
titleLabel.text = "我的信息"
}
......@@ -482,6 +522,62 @@ extension YHServiceOrderProgressTableViewCell {
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 41 {
titleLabel.text = "续签资料管理"
messageLabel.text = "请根据资料清单上传您的续签证明文件~"
buttonLabel.text = "去上传"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 42 {
titleLabel.text = "续签文书管理"
messageLabel.text = "请确认您的续签文书内容并完成签字~"
buttonLabel.text = "去确认"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 43 {
titleLabel.text = "续签信息确认"
messageLabel.text = "请确认家庭续签信息是否有变更~"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 44 {
titleLabel.text = "在港递交预约"
messageLabel.text = "请预约在港递交续签时间&确认在港时间~"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 45 {
titleLabel.text = "查看续签结果"
messageLabel.text = "请查看递交凭证&续签结果~"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 46 {
titleLabel.text = "续签补件"
messageLabel.text = "请尽快补件~"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 47 {
titleLabel.text = "续签签证缴费"
messageLabel.text = "请根据指引缴费并领取新电子签证~"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 48 {
titleLabel.text = "上传旅行证件"
messageLabel.text = "请上传&核对续签旅行证件~"
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 201 {
titleLabel.text = "我的信息"
buttonLabel.text = "去填写"
......@@ -644,6 +740,54 @@ extension YHServiceOrderProgressTableViewCell {
buttonLabel.text = "去查看"
}
if model.type == 41 {
titleLabel.text = "续签资料管理"
messageLabel.text = "请根据资料清单上传您的续签证明文件~"
buttonLabel.text = "已完成"
}
if model.type == 42 {
titleLabel.text = "续签文书管理"
messageLabel.text = "请确认您的续签文书内容并完成签字~"
buttonLabel.text = "已完成"
}
if model.type == 43 {
titleLabel.text = "续签信息确认"
messageLabel.text = "请确认家庭续签信息是否有变更~"
buttonLabel.text = "去查看"
}
if model.type == 44 {
titleLabel.text = "在港递交预约"
messageLabel.text = "请预约在港递交续签时间&确认在港时间~"
buttonLabel.text = "去查看"
}
if model.type == 45 {
titleLabel.text = "查看续签结果"
messageLabel.text = "请查看递交凭证&续签结果~"
buttonLabel.text = "去查看"
}
if model.type == 46 {
titleLabel.text = "续签补件"
messageLabel.text = "恭喜您，已完成补件~"
buttonLabel.text = "已完成"
}
if model.type == 47 {
titleLabel.text = "续签签证缴费"
messageLabel.text = "请根据指引缴费并领取新电子签证~"
buttonLabel.text = "去查看"
}
if model.type == 48 {
titleLabel.text = "上传旅行证件"
messageLabel.text = "请上传&核对续签旅行证件~"
buttonLabel.text = "去查看"
}
if model.type == 201 {
titleLabel.text = "我的信息"
messageLabel.text = "恭喜您，信息已全部填写完~"
......
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