Commit 486a2c29 authored by pete谢兆麟's avatar pete谢兆麟

服务中心跳转

parent aae685f3
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */; }; 044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */; };
044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */; }; 044867B62BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */; };
044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */; }; 044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */; };
044BACC72BCFA58E00184C64 /* YHNoDataTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044BACC62BCFA58E00184C64 /* YHNoDataTipsView.swift */; };
044CF8D42BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */; }; 044CF8D42BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */; };
044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */; }; 044CF8D62BBA57DC00008CE8 /* YHFailPromptView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */; };
044E1E812BC3BBC200A3B4AF /* YHSearchInfomationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044E1E802BC3BBC200A3B4AF /* YHSearchInfomationVC.swift */; }; 044E1E812BC3BBC200A3B4AF /* YHSearchInfomationVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 044E1E802BC3BBC200A3B4AF /* YHSearchInfomationVC.swift */; };
...@@ -491,6 +492,7 @@ ...@@ -491,6 +492,7 @@
044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterView.swift; sourceTree = "<group>"; }; 044867B32BA1953B00DFAD4A /* YHCertificateFilterView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterView.swift; sourceTree = "<group>"; };
044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterItemCell.swift; sourceTree = "<group>"; }; 044867B52BA1A03800DFAD4A /* YHCertificateFilterItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateFilterItemCell.swift; sourceTree = "<group>"; };
044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadFailTipsView.swift; sourceTree = "<group>"; }; 044867B72BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateUploadFailTipsView.swift; sourceTree = "<group>"; };
044BACC62BCFA58E00184C64 /* YHNoDataTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNoDataTipsView.swift; sourceTree = "<group>"; };
044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignatureUploadTableViewCell.swift; sourceTree = "<group>"; }; 044CF8D32BB6BCF700008CE8 /* YHSignatureUploadTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSignatureUploadTableViewCell.swift; sourceTree = "<group>"; };
044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFailPromptView.swift; sourceTree = "<group>"; }; 044CF8D52BBA57DC00008CE8 /* YHFailPromptView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFailPromptView.swift; sourceTree = "<group>"; };
044E1E802BC3BBC200A3B4AF /* YHSearchInfomationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSearchInfomationVC.swift; sourceTree = "<group>"; }; 044E1E802BC3BBC200A3B4AF /* YHSearchInfomationVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSearchInfomationVC.swift; sourceTree = "<group>"; };
...@@ -2141,6 +2143,7 @@ ...@@ -2141,6 +2143,7 @@
048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */, 048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */,
048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */, 048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */,
048787D82BCF68530036E221 /* YHProgressView.swift */, 048787D82BCF68530036E221 /* YHProgressView.swift */,
044BACC62BCFA58E00184C64 /* YHNoDataTipsView.swift */,
); );
path = V; path = V;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -2867,6 +2870,7 @@ ...@@ -2867,6 +2870,7 @@
045EEF1F2B9F171A0022A143 /* YHDatePickView.swift in Sources */, 045EEF1F2B9F171A0022A143 /* YHDatePickView.swift in Sources */,
04174D7A2BCD5B74000BA46D /* YHDetailMessageCell.swift in Sources */, 04174D7A2BCD5B74000BA46D /* YHDetailMessageCell.swift in Sources */,
045EEE972B9F171A0022A143 /* YHPreviewInfoWorkExpView.swift in Sources */, 045EEE972B9F171A0022A143 /* YHPreviewInfoWorkExpView.swift in Sources */,
044BACC72BCFA58E00184C64 /* YHNoDataTipsView.swift in Sources */,
044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */, 044414012BC3979800784A14 /* YHServerHKLifeViewController.swift in Sources */,
04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */, 04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */,
A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */, A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */,
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
import UIKit import UIKit
import JXSegmentedView import JXSegmentedView
import AttributedString
//服务中心 //服务中心
class YHServiceCenterMainViewController: YHBaseViewController { class YHServiceCenterMainViewController: YHBaseViewController {
...@@ -17,6 +18,7 @@ class YHServiceCenterMainViewController: YHBaseViewController { ...@@ -17,6 +18,7 @@ class YHServiceCenterMainViewController: YHBaseViewController {
var nameBgImageView: UIImageView! var nameBgImageView: UIImageView!
var nameLabel: UILabel! var nameLabel: UILabel!
var orderId: Int = 0 var orderId: Int = 0
var mobile: String = ""
private lazy var topBkg : UIView = { private lazy var topBkg : UIView = {
let imagV = UIImageView() let imagV = UIImageView()
imagV.image = UIImage(named: "service_center_head_bkg4") imagV.image = UIImage(named: "service_center_head_bkg4")
...@@ -31,7 +33,7 @@ class YHServiceCenterMainViewController: YHBaseViewController { ...@@ -31,7 +33,7 @@ class YHServiceCenterMainViewController: YHBaseViewController {
return view return view
}() }()
var arrItemTitles = ["全部","进行中", "待开始", "已完成"] var arrItemTitles = ["全部", "待开始", "进行中", "已完成"]
var arrItemVCs : [YHServiceOrderListView] = [] var arrItemVCs : [YHServiceOrderListView] = []
var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48)) var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: k_Height_safeAreaInsetsTop(), width: KScreenWidth, height: 48))
lazy var segmentedDataSource: JXSegmentedTitleDataSource = { lazy var segmentedDataSource: JXSegmentedTitleDataSource = {
...@@ -59,8 +61,8 @@ class YHServiceCenterMainViewController: YHBaseViewController { ...@@ -59,8 +61,8 @@ class YHServiceCenterMainViewController: YHBaseViewController {
super.viewDidLoad() super.viewDidLoad()
setupUI() setupUI()
handleRightUI() addListView()
noDataView.clickMoreBtnClickkBlock = {[weak self] in noDataView.clickMoreBtnClickkBlock = {[weak self] in
guard let self = self else { return } guard let self = self else { return }
let vc = YHServiceViewController() let vc = YHServiceViewController()
...@@ -78,7 +80,6 @@ class YHServiceCenterMainViewController: YHBaseViewController { ...@@ -78,7 +80,6 @@ class YHServiceCenterMainViewController: YHBaseViewController {
override func viewWillAppear(_ animated: Bool) { override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated) super.viewWillAppear(animated)
handleRightUI()
loadData() loadData()
} }
} }
...@@ -177,15 +178,73 @@ extension YHServiceCenterMainViewController { ...@@ -177,15 +178,73 @@ extension YHServiceCenterMainViewController {
private func handleRightUI() { private func handleRightUI() {
if serviceCenterMainReqVM.arrContactList.isEmpty { if serviceCenterMainReqVM.arrContactList.isEmpty {
noDataView.isHidden = false noDataView.isHidden = false
nameBgImageView.isHidden = true
segmentedView.isHidden = true
listContainerView.isHidden = true
} else { } else {
noDataView.isHidden = true
guard let model = serviceCenterMainReqVM.arrContactList.first else { guard let model = serviceCenterMainReqVM.arrContactList.first else {
return return
} }
noDataView.isHidden = true
nameBgImageView.isHidden = false
segmentedView.isHidden = false
listContainerView.isHidden = false
orderId = model.id orderId = model.id
mobile = model.mobile
UserDefaults.standard.set(orderId, forKey: "orderIdForPreview") UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
UserDefaults.standard.synchronize() UserDefaults.standard.synchronize()
addListView() segmentedView.dataSource = segmentedDataSource
segmentedView.reloadData()
arrItemVCs.removeAll()
for i in 0..<arrItemTitles.count {
let vc = YHServiceOrderListView()
vc.type = i
vc.orderID = orderId
vc.mobile = mobile
vc.loadData()
vc.block = {[weak self] type, count in
guard let self = self else {
return
}
if type == 0 {
arrItemTitles[0] = "全部(\(count))"
} else if type == 1 {
arrItemTitles[1] = "待开始(\(count))"
} else if type == 2 {
arrItemTitles[2] = "进行中(\(count))"
} else if type == 3 {
arrItemTitles[3] = "已完成(\(count))"
}
self.updata()
}
arrItemVCs.append(vc)
}
segmentedView.reloadData()
serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) {[weak self] success, error in
guard let self = self else { return }
var name = ""
if let applicant = self.serviceCenterMainReqVM.informationFillStepModel {
if applicant.applicantName.isEmpty {
name = "尊敬的客户"
} else {
name = applicant.applicantName
if applicant.sex == 1 {
name = name + "先生"
} else if applicant.sex == 2 {
name = name + "女士"
} else {
}
}
}
let a: ASAttributedString = .init("您好,\(name),您当前处于", .font(UIFont.PFSC_M(ofSize: 12)),.foreground(UIColor(hex: 0x121a26)))
let aa: ASAttributedString = .init(NSAttributedString(string: "身份申请"), .font(UIFont.PFSC_M(ofSize: 12)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("阶段", .font(UIFont.PFSC_M(ofSize: 12)),.foreground(UIColor(hex: 0x121a26)))
self.nameLabel.attributed.text = a + aa + aaa
}
} }
} }
...@@ -225,9 +284,7 @@ extension YHServiceCenterMainViewController { ...@@ -225,9 +284,7 @@ extension YHServiceCenterMainViewController {
make.width.equalTo(KScreenWidth) make.width.equalTo(KScreenWidth)
make.height.equalTo(225) make.height.equalTo(225)
} }
self.noDataView.isHidden = false
for i in 0..<arrItemTitles.count { for i in 0..<arrItemTitles.count {
let vc = YHServiceOrderListView() let vc = YHServiceOrderListView()
vc.type = i vc.type = i
......
...@@ -15,7 +15,13 @@ class YHServiceOrderListView: YHBaseViewController { ...@@ -15,7 +15,13 @@ class YHServiceOrderListView: YHBaseViewController {
var block: Block? var block: Block?
var orderID: Int = 0 var orderID: Int = 0
var type: Int = 0 var type: Int = 0
var mobile: String = ""
var homeTableView: UITableView! var homeTableView: UITableView!
private let noDataView : YHNoDataTipsView = {
let view = YHNoDataTipsView()
view.isHidden = true
return view
}()
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
...@@ -23,10 +29,6 @@ class YHServiceOrderListView: YHBaseViewController { ...@@ -23,10 +29,6 @@ class YHServiceOrderListView: YHBaseViewController {
loadData() loadData()
} }
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
// loadData()
}
} }
extension YHServiceOrderListView { extension YHServiceOrderListView {
...@@ -34,7 +36,11 @@ extension YHServiceOrderListView { ...@@ -34,7 +36,11 @@ extension YHServiceOrderListView {
viewModel.getServiceCenterProgressList(orderID, type) {[weak self] success, error in viewModel.getServiceCenterProgressList(orderID, type) {[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) {
self.homeTableView.reloadData() if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
self.homeTableView.isHidden = true
} else {
self.homeTableView.reloadData()
}
} }
if let block = self.block { if let block = self.block {
block(type, self.viewModel.arrDataForSeviceCenterProgress.count) block(type, self.viewModel.arrDataForSeviceCenterProgress.count)
...@@ -62,6 +68,14 @@ extension YHServiceOrderListView { ...@@ -62,6 +68,14 @@ extension YHServiceOrderListView {
homeTableView.snp.makeConstraints { make in homeTableView.snp.makeConstraints { make in
make.top.right.left.bottom.equalToSuperview() make.top.right.left.bottom.equalToSuperview()
} }
view.addSubview(noDataView)
noDataView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.centerY.equalToSuperview()
make.width.equalTo(KScreenWidth)
make.height.equalTo(150)
}
} }
} }
...@@ -108,19 +122,38 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -108,19 +122,38 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
} }
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) { func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
// tableView.deselectRow(at: indexPath, animated: true) let model = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section]
// printLog("点击了 tableView Cell \(indexPath.section)") if model.status == 1 {
// return
// } else {
// //获取订单号 //1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
// let orderId = viewModel.arrContactList[indexPath.section].id if model.type == 1 {
// UserDefaults.standard.set(orderId, forKey: "orderIdForPreview") let vc = YHMineCertificateEntryViewController()
// UserDefaults.standard.synchronize() vc.orderId = orderID
// navigationController?.pushViewController(vc)
// let vc = YHServiceCenterSecondViewController() } else if model.type == 2 {
// vc.orderId = orderId let vc = YHInformationPerfectListVC()
// vc.mobile = viewModel.arrContactList[indexPath.section].mobile vc.orderId = orderID
// self.navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} else if model.type == 3 {
let vc = YHScoreDetailViewController()
vc.orderId = orderID
// vc.model = serviceCenterMainReqVM.allInfoScoreModel
navigationController?.pushViewController(vc)
} else if model.type == 4 {
let vc = YHMineSchemeViewController()
navigationController?.pushViewController(vc)
} else if model.type == 5 {
let vc = YHMySignatureListViewController()
vc.orderId = orderID
navigationController?.pushViewController(vc)
} else if model.type == 6 {
let vc = YHMyDocumentsListViewController()
vc.orderId = orderID
vc.mobile = mobile
navigationController?.pushViewController(vc)
}
}
} }
} }
...@@ -129,8 +162,4 @@ extension YHServiceOrderListView: JXSegmentedListContainerViewListDelegate { ...@@ -129,8 +162,4 @@ extension YHServiceOrderListView: JXSegmentedListContainerViewListDelegate {
func listView() -> UIView { func listView() -> UIView {
return view return view
} }
// func listWillAppear() {
// loadData()
// }
} }
//
// YHNoDataTipsView.swift
// galaxy
//
// Created by EDY on 2024/4/17.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHNoDataTipsView: UIView {
private lazy var iconImgV : UIImageView = {
let imagV = UIImageView()
imagV.image = UIImage(named: "list_no_data")
imagV.contentMode = .scaleAspectFill
return imagV
}()
private lazy var tipsLab : UILabel = {
let lable = UILabel()
lable.textColor = UIColor.labelTextColor2
lable.font = UIFont.PFSC_R(ofSize: 14)
lable.textAlignment = .center
lable.text = "暂无"
return lable
}()
public override init(frame: CGRect) {
super.init(frame:frame)
initView()
}
private func initView() {
addSubview(iconImgV)
iconImgV.snp.makeConstraints { make in
make.top.equalToSuperview()
make.centerX.equalToSuperview()
make.height.equalTo(93)
make.width.equalTo(93)
}
addSubview(tipsLab)
tipsLab.snp.makeConstraints { make in
make.top.equalTo(iconImgV.snp.bottom).offset(12)
make.centerX.equalToSuperview()
make.left.right.equalToSuperview()
}
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "list_no_data@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "list_no_data@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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