Skip to content

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

服务中心逻辑

parent 003e08b0
Hide whitespace changes
Inline Side-by-side
Showing with 581 additions and 64 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 2527caf8
......@@ -618,6 +618,8 @@
04BD83452CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 04BD83442CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf */; };
04BD83582CE32D93003A88DF /* YHServiceOrderTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BD83572CE32D93003A88DF /* YHServiceOrderTipsView.swift */; };
04BD835A2CE34032003A88DF /* YHServiceOrderGuideTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BD83592CE34032003A88DF /* YHServiceOrderGuideTipsView.swift */; };
04BD835C2CE44695003A88DF /* YHServiceOrderInIncubationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BD835B2CE44695003A88DF /* YHServiceOrderInIncubationView.swift */; };
04BD835E2CE451E2003A88DF /* YHServiceOrderInIncubationSectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BD835D2CE451E2003A88DF /* YHServiceOrderInIncubationSectionView.swift */; };
04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */; };
......@@ -1613,6 +1615,8 @@
04BD83442CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "AlimamaShuHeiTi-Bold.ttf"; sourceTree = "<group>"; };
04BD83572CE32D93003A88DF /* YHServiceOrderTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderTipsView.swift; sourceTree = "<group>"; };
04BD83592CE34032003A88DF /* YHServiceOrderGuideTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderGuideTipsView.swift; sourceTree = "<group>"; };
04BD835B2CE44695003A88DF /* YHServiceOrderInIncubationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderInIncubationView.swift; sourceTree = "<group>"; };
04BD835D2CE451E2003A88DF /* YHServiceOrderInIncubationSectionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderInIncubationSectionView.swift; sourceTree = "<group>"; };
04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsCell.swift; sourceTree = "<group>"; };
......@@ -5170,6 +5174,8 @@
044EE22E2C918D1400A2FE3A /* YHServiceStepAlertView.swift */,
04BD83572CE32D93003A88DF /* YHServiceOrderTipsView.swift */,
04BD83592CE34032003A88DF /* YHServiceOrderGuideTipsView.swift */,
04BD835B2CE44695003A88DF /* YHServiceOrderInIncubationView.swift */,
04BD835D2CE451E2003A88DF /* YHServiceOrderInIncubationSectionView.swift */,
);
path = V;
sourceTree = "<group>";
......@@ -5834,6 +5840,7 @@
041892242C91BCF100B9FB94 /* YHResignRoundCellType.swift in Sources */,
04912F7A2CB7A5F400CC3105 /* YHResignHaveAppointedApplicantsInfoCell.swift in Sources */,
0430E6722C749E74000511E2 /* YHAdopterBirthViewController.swift in Sources */,
04BD835E2CE451E2003A88DF /* YHServiceOrderInIncubationSectionView.swift in Sources */,
048058392C7F289700502CAA /* YHTravelCertificateItemView.swift in Sources */,
045EEE7B2B9F171A0022A143 /* YHPersonInfoCellModel2.swift in Sources */,
A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */,
......@@ -6404,6 +6411,7 @@
A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */,
044F395C2CB8D58A007CA277 /* YHVisaRenewalPayInfoBaseCell.swift in Sources */,
A567E5A62BD7643D00D5D5A0 /* YHHomeSearchView.swift in Sources */,
04BD835C2CE44695003A88DF /* YHServiceOrderInIncubationView.swift in Sources */,
045792212CBF8B3900EBD99B /* YHResignUploadDetailFileNameCell.swift in Sources */,
045EEE912B9F171A0022A143 /* YHPreviewInfoCertificatePictureItemView.swift in Sources */,
04358E082C77657000811928 /* YHReAppointViewController.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderDetailViewController.swift
View file @ 2527caf8
......@@ -38,7 +38,9 @@ class YHOrderDetailViewController: YHBaseViewController {
guard let self = self else { return }
if success {
for item in self.viewModel.arrContactList {
dataSource.append(item)
var model = item
model.isOther = true
dataSource.append(model)
}
if dataSource.count != 0 {
self.noDataView.isHidden = true
......@@ -127,14 +129,17 @@ extension YHOrderDetailViewController: UITableViewDelegate, UITableViewDataSourc
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHOrderDetailTableViewCell.self)
cell.dataSource = dataSource[indexPath.row]
if model.id != -1 && indexPath.row == 0 {
cell.otherTypeView.isHidden = false
cell.otherTypeView.image = UIImage(named: "service_my_order")
} else {
cell.otherTypeView.isHidden = false
}
cell.cellBlock = {[weak self] model in
guard let self = self else { return }
if model.status == 3 {
YHServiceOrderInIncubationView.show {
if self.backDate != nil {
self.backDate?(model)
}
self.navigationController?.popViewController()
}
return
}
if self.backDate != nil {
self.backDate?(model)
}
......@@ -144,7 +149,11 @@ extension YHOrderDetailViewController: UITableViewDelegate, UITableViewDataSourc
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return 255
let model = dataSource[indexPath.row]
if model.status == 2 {
return 206 + 16
}
return 258 + 16
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
......@@ -171,6 +180,8 @@ class YHOrderDetailTableViewCell: UITableViewCell {
var centerView: UIView!
var titleLabel: UILabel!
var lineView: UIView!
var orderTitleLabel: UILabel!
var orderTitleNumLabel: UILabel!
var orderLabel: UILabel!
var orderNumLabel: UILabel!
var phoneLabel: UILabel!
......@@ -180,8 +191,8 @@ class YHOrderDetailTableViewCell: UITableViewCell {
var nameLabel: UILabel!
var nameValueLabel: UILabel!
var showDetailButton: UIButton!
var otherTypeView: UIImageView!
var otherTypeView: UILabel!
var bottomLineView: UIView!
var dataSource: YHContactItemModel? {
didSet {
updateAllViews()
......@@ -242,17 +253,21 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}
otherTypeView = {
let view = UIImageView()
view.image = UIImage(named: "service_other_order")
view.isHidden = true
let view = UILabel()
view.text = "进行中"
view.backgroundColor = UIColor(hex: 0xf0f4fb)
view.textColor = UIColor.brandMainColor
view.textAlignment = .center
view.font = UIFont.PFSC_M(ofSize: 12)
view.layer.cornerRadius = 2
return view
}()
centerView.addSubview(otherTypeView)
otherTypeView.snp.makeConstraints { make in
make.centerY.equalTo(titleLabel.snp.centerY)
make.left.equalTo(titleLabel.snp.right).offset(8)
make.height.equalTo(18)
make.width.equalTo(48)
make.right.equalTo(-16)
make.height.equalTo(24)
make.width.equalTo(52)
}
lineView = {
......@@ -267,6 +282,34 @@ class YHOrderDetailTableViewCell: UITableViewCell {
make.right.equalTo(-16)
make.height.equalTo(1)
}
orderTitleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 14)
label.textColor = UIColor.mainTextColor.withAlphaComponent(0.5)
label.text = "订单类型： "
return label
}()
centerView.addSubview(orderTitleLabel)
orderTitleLabel.snp.makeConstraints { make in
make.top.equalTo(72)
make.left.equalTo(16)
make.height.equalTo(20)
}
orderTitleNumLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 14)
label.textColor = UIColor.mainTextColor
// label.text = model.orderSn
label.textAlignment = .right
return label
}()
centerView.addSubview(orderTitleNumLabel)
orderTitleNumLabel.snp.makeConstraints { make in
make.top.equalTo(72)
make.right.equalTo(-16)
make.height.equalTo(20)
}
orderLabel = {
let label = UILabel()
......@@ -277,7 +320,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(orderLabel)
orderLabel.snp.makeConstraints { make in
make.top.equalTo(72.5)
make.top.equalTo(104)
make.left.equalTo(16)
make.height.equalTo(20)
}
......@@ -291,7 +334,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(phoneLabel)
phoneLabel.snp.makeConstraints { make in
make.top.equalTo(110.5)
make.top.equalTo(136)
make.left.equalTo(16)
make.height.equalTo(20)
}
......@@ -305,7 +348,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(nameLabel)
nameLabel.snp.makeConstraints { make in
make.top.equalTo(149.5)
make.top.equalTo(168)
make.left.equalTo(16)
make.height.equalTo(20)
}
......@@ -320,7 +363,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(nameValueLabel)
nameValueLabel.snp.makeConstraints { make in
make.top.equalTo(149.5)
make.top.equalTo(168)
make.right.equalTo(-16)
make.height.equalTo(20)
}
......@@ -335,7 +378,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(orderNumLabel)
orderNumLabel.snp.makeConstraints { make in
make.top.equalTo(72.5)
make.top.equalTo(104)
make.right.equalTo(-58)
make.height.equalTo(20)
}
......@@ -350,7 +393,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(phoneNumLabel)
phoneNumLabel.snp.makeConstraints { make in
make.top.equalTo(110.5)
make.top.equalTo(136)
make.right.equalTo(-58)
make.height.equalTo(20)
}
......@@ -365,7 +408,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(copyButton)
copyButton.snp.makeConstraints { make in
make.top.equalTo(72.5)
make.top.equalTo(104)
make.right.equalTo(-16)
make.height.equalTo(18)
make.width.equalTo(26)
......@@ -381,7 +424,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(phoneCopyButton)
phoneCopyButton.snp.makeConstraints { make in
make.top.equalTo(112.5)
make.top.equalTo(136)
make.right.equalTo(-16)
make.height.equalTo(18)
make.width.equalTo(26)
......@@ -413,14 +456,14 @@ class YHOrderDetailTableViewCell: UITableViewCell {
make.height.equalTo(6)
}
let bottomLineView = {
bottomLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomLineView)
bottomLineView.snp.makeConstraints { make in
make.top.equalTo(187)
make.top.equalTo(206)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
}
......@@ -466,9 +509,38 @@ class YHOrderDetailTableViewCell: UITableViewCell {
func updateAllViews() {
guard let model = dataSource else { return }
bottomLineView.isHidden = false
showDetailButton.isHidden = false
if model.status == 0 {
otherTypeView.text = "进行中"
otherTypeView.backgroundColor = UIColor(hex: 0xf0f4fb)
otherTypeView.textColor = UIColor.brandMainColor
}
if model.status == 1 {
otherTypeView.text = "退款中"
otherTypeView.backgroundColor = UIColor.failColor.withAlphaComponent(0.3)
otherTypeView.textColor = UIColor.failColor
}
if model.status == 2 {
otherTypeView.text = "已完成"
otherTypeView.backgroundColor = UIColor(hex:0xf0fbf7)
otherTypeView.textColor = UIColor(hex:0x3cc694)
bottomLineView.isHidden = true
showDetailButton.isHidden = true
}
if model.status == 3 {
otherTypeView.text = "孵化中"
otherTypeView.backgroundColor = UIColor(hex:0xfff5eb)
otherTypeView.textColor = UIColor(hex:0xff8000)
}
titleLabel.text = model.productName
orderNumLabel.text = model.orderSn
phoneNumLabel.text = model.mobile
nameValueLabel.text = model.username
if model.isOther {
orderTitleNumLabel.text = "协作订单"
} else {
orderTitleNumLabel.text = "主申订单"
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServerCenterHoldViewController.swift
View file @ 2527caf8
......@@ -13,6 +13,7 @@ class YHServerCenterHoldViewController: UIViewController {
private let serviceCenterMainReqVM : YHServiceCenterViewModel = YHServiceCenterViewModel()
var stepID: Int = 0
var mobile: String = ""
var orderType: Int = 0
var orderId: Int = 0 {
didSet {
for i in 0..<arrItemTitles.count {
......@@ -29,6 +30,7 @@ class YHServerCenterHoldViewController: UIViewController {
vc.arrDataForSeviceCenterProgress = arrDataForSeviceCenterProgress
vc.state = state
vc.stepID = stepID
vc.orderType = orderType
vc.loadData()
}
}
......@@ -102,6 +104,7 @@ class YHServerCenterHoldViewController: UIViewController {
controllerOne.type = 0
controllerOne.orderID = orderId
controllerOne.stepID = stepID
controllerOne.orderType = orderType
controllerOne.block = {[weak self] type, count, flag in
guard let self = self else { return }
arrItemTitles[0] = "全部(\(count))"
......@@ -110,6 +113,7 @@ class YHServerCenterHoldViewController: UIViewController {
controllerTwo.type = 2
controllerTwo.orderID = orderId
controllerTwo.stepID = stepID
controllerTwo.orderType = orderType
controllerTwo.block = {[weak self] type, count, flag in
guard let self = self else { return }
arrItemTitles[1] = "进行中(\(count))"
......@@ -118,6 +122,7 @@ class YHServerCenterHoldViewController: UIViewController {
controllerThree.type = 1
controllerThree.orderID = orderId
controllerThree.stepID = stepID
controllerThree.orderType = orderType
controllerThree.block = {[weak self] type, count, flag in
guard let self = self else { return }
arrItemTitles[2] = "待开始(\(count))"
......@@ -126,6 +131,7 @@ class YHServerCenterHoldViewController: UIViewController {
controllerFour.type = 3
controllerFour.orderID = orderId
controllerFour.stepID = stepID
controllerFour.orderType = orderType
controllerFour.block = {[weak self] type, count, flag in
guard let self = self else { return }
arrItemTitles[3] = "已完成(\(count))"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift
View file @ 2527caf8
......@@ -187,7 +187,7 @@ extension YHServiceCenterViewController {
make.top.equalTo(53)
make.left.equalTo(20)
make.height.equalTo(29)
make.width.equalTo(102)
make.width.equalTo(18 + 126)
}
titleLabel.iconInRight(with: 8)
......@@ -292,7 +292,11 @@ extension YHServiceCenterViewController {
if self.state == 2 {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.certificateSection.list
self.homeTableView.tableHeaderView = UIView()
self.titleLabel.setTitle("办证阶段", for: .normal)
if self.model.product_type == 1 {
self.titleLabel.setTitle("优才办证阶段", for: .normal)
} else {
self.titleLabel.setTitle("高才办证阶段", for: .normal)
}
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
}
if self.state == 3 {
......@@ -309,7 +313,11 @@ extension YHServiceCenterViewController {
}
self.headView.selectIndex = self.headIndex
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
self.titleLabel.setTitle("续签阶段", for: .normal)
if self.model.product_type == 1 {
self.titleLabel.setTitle("优才续签阶段", for: .normal)
} else {
self.titleLabel.setTitle("高才续签阶段", for: .normal)
}
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
self.isCanSelectStep = true
}
......@@ -358,13 +366,21 @@ extension YHServiceCenterViewController {
if self.state == 1 {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.applySection.list
self.homeTableView.tableHeaderView = UIView()
self.titleLabel.setTitle("申请阶段", for: .normal)
if self.model.product_type == 1 {
self.titleLabel.setTitle("优才申请阶段", for: .normal)
} else {
self.titleLabel.setTitle("高才申请阶段", for: .normal)
}
self.titleLabel.setImage(UIImage(named: ""), for: .normal)
}
if self.state == 2 {
self.arrDataForSeviceCenterProgress = self.serviceCenterMainReqVM.mainModel.certificateSection.list
self.homeTableView.tableHeaderView = UIView()
self.titleLabel.setTitle("办证阶段", for: .normal)
if self.model.product_type == 1 {
self.titleLabel.setTitle("优才办证阶段", for: .normal)
} else {
self.titleLabel.setTitle("高才办证阶段", for: .normal)
}
if isCanSelectStep {
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
} else {
......@@ -385,13 +401,17 @@ extension YHServiceCenterViewController {
}
self.headView.selectIndex = self.headIndex
self.headView.dataSource = self.serviceCenterMainReqVM.mainModel.renewalSection.list
self.titleLabel.setTitle("续签阶段", for: .normal)
if self.model.product_type == 1 {
self.titleLabel.setTitle("优才续签阶段", for: .normal)
} else {
self.titleLabel.setTitle("高才续签阶段", for: .normal)
}
self.titleLabel.setImage(UIImage(named: "service_center_select_step"), for: .normal)
}
}
self.homeTableView.reloadData()
//首次显示指引
if let flag = UserDefaults.standard.string(forKey: "service_tip_show") {
if UserDefaults.standard.string(forKey: "service_tip_show") != nil {
} else {
YHServiceOrderTipsView.show()
}
......@@ -448,6 +468,7 @@ extension YHServiceCenterViewController : UITableViewDelegate,UITableViewDataSou
make.edges.equalTo(0)
}
cellView.arrDataForSeviceCenterProgress = arrDataForSeviceCenterProgress
cellView.orderType = serviceCenterMainReqVM.mainModel.status
cellView.mobile = model.mobile
cellView.state = state
cellView.stepID = stepID
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ 2527caf8
......@@ -253,6 +253,14 @@ class YHServiceOrderListView: YHBaseViewController {
} else if type == 104 {
//续签证件管理
gotoResignCertificateListVC(orderID: orderId)
} else if type == 201 {
//高才我的信息
} else if type == 202 {
//高才我的方案
} else if type == 203 {
//高才我的证件
} else if type == 204 {
//高才我的签字
}
}
}
......@@ -403,6 +411,9 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
}
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
if orderType == 3 {
return 42.fix + 16
}
if state == 3 && (type == 0 || type == 2) {
return 104
} else {
......@@ -411,6 +422,16 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
}
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
if orderType == 3 {
let view = YHServiceOrderInIncubationSectionView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 42.fix + 16))
view.block = { [weak self] tag in
guard let self = self else { return }
YHServiceOrderInIncubationView.show(false) {
}
}
return view
}
if state == 3 && (type == 0 || type == 2) {
let view = YHServiceStepThreeSectionView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 104))
view.block = { [weak self] tag in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactItemModel.swift
View file @ 2527caf8
......@@ -19,4 +19,5 @@ struct YHContactItemModel : SmartCodable {
var mobile: String = ""
var status: Int = 0
var product_type: Int = 0
var isOther: Bool = false //是否协作单
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHServiceCenterProgressModel.swift
View file @ 2527caf8
......@@ -54,4 +54,5 @@ struct YHServiceCenterMainModel: SmartCodable {
var renewalSection: YHServiceStepProgressModel = YHServiceStepProgressModel()
var stage: Int = 0 // 1 申请阶段 2办证阶段 3续期阶段
var master_id: Int = 0 // 批次
var status: Int = 0
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderGuideTipsView.swift
View file @ 2527caf8
......@@ -108,7 +108,7 @@ class YHServiceOrderGuideTipsView: UIView {
let imageV = UIImageView()
imageV.image = UIImage(named: "service_order_guideline_one")
// service_order_guideline_two
imageV.contentMode = .scaleToFill
// imageV.contentMode = .scaleToFill
imageV.clipsToBounds = true
return imageV
}()
......@@ -150,17 +150,16 @@ class YHServiceOrderGuideTipsView: UIView {
func isShow(flag: Bool) {
buttonContentView.isHidden = !flag
if flag {
myScrollView.snp.makeConstraints { make in
myScrollView.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(120)
make.right.equalToSuperview()
make.left.right.equalToSuperview()
make.width.equalTo(KScreenWidth)
make.height.equalTo(KScreenHeight - k_Height_NavigationtBarAndStatuBar - 98 - 120)
}
} else {
myScrollView.snp.makeConstraints { make in
myScrollView.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(68)
make.right.equalToSuperview()
make.width.equalTo(KScreenWidth)
make.left.right.equalToSuperview()
make.height.equalTo(KScreenHeight - k_Height_NavigationtBarAndStatuBar - 98 - 68)
}
}
......@@ -202,27 +201,37 @@ extension YHServiceOrderGuideTipsView {
@objc func clickLeftBtn() {
leftBtn.isSelected = true
rightBtn.isSelected = false
bkgImageV.snp.remakeConstraints { make in
make.left.equalTo(20)
make.top.equalTo(0)
make.right.equalTo(-20)
make.height.equalTo(952.fix)
if let tmpImage = UIImage(named:"service_order_guideline_one") {
let scale = Double(tmpImage.size.height / tmpImage.size.width)
let imageH = scale * (KScreenWidth - 40)
bkgImageV.snp.remakeConstraints { make in
make.top.equalToSuperview()
make.left.equalTo(20)
make.right.equalTo(-20)
make.height.equalTo(imageH)
}
bkgImageV.image = tmpImage
myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
}
bkgImageV.image = UIImage(named: "service_order_guideline_one")
myScrollView.contentSize = CGSize(width: KScreenWidth, height: 952.fix)
}
@objc func clickRightBtn() {
leftBtn.isSelected = false
rightBtn.isSelected = true
bkgImageV.snp.remakeConstraints { make in
make.left.equalTo(20)
make.top.equalTo(0)
make.right.equalTo(-20)
make.height.equalTo(830.fix)
if let tmpImage = UIImage(named:"service_order_guideline_two") {
let scale = Double(tmpImage.size.height / tmpImage.size.width)
let imageH = scale * (KScreenWidth - 40)
bkgImageV.snp.remakeConstraints { make in
make.top.equalToSuperview()
make.left.equalTo(20)
make.right.equalTo(-20)
make.height.equalTo(imageH)
}
bkgImageV.image = tmpImage
myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
}
bkgImageV.image = UIImage(named: "service_order_guideline_two")
myScrollView.contentSize = CGSize(width: KScreenWidth, height: 830.fix)
}
}
......@@ -327,19 +336,23 @@ private extension YHServiceOrderGuideTipsView {
whiteContentView.addSubview(myScrollView)
myScrollView.snp.makeConstraints { make in
make.top.equalToSuperview().offset(120)
make.right.equalToSuperview()
make.width.equalTo(KScreenWidth)
make.right.left.equalToSuperview()
make.height.equalTo(whiteHeight - 98 - 120)
}
myScrollView.addSubview(bkgImageV)
bkgImageV.snp.makeConstraints { make in
make.left.equalTo(20)
make.top.equalTo(0)
make.right.equalTo(-20)
make.height.equalTo(952.fix)
if let tmpImage = UIImage(named:"service_order_guideline_one") {
let scale = Double(tmpImage.size.height / tmpImage.size.width)
let imageH = scale * (KScreenWidth - 40)
myScrollView.addSubview(bkgImageV)
bkgImageV.snp.makeConstraints { make in
make.top.equalToSuperview()
make.left.equalTo(20)
make.right.equalTo(-20)
make.height.equalTo(imageH)
}
myScrollView.contentSize = CGSize(width: KScreenWidth, height: imageH)
}
myScrollView.contentSize = CGSize(width: KScreenWidth, height: 952.fix)
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderInIncubationSectionView.swift 0 → 100644
View file @ 2527caf8
//
// YHServiceOrderInIncubationSectionView.swift
// galaxy
//
// Created by EDY on 2024/11/13.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHServiceOrderInIncubationSectionView: UIView {
typealias Block = (Int) -> ()
var block: Block?
var oneButton: UIButton!
public override init(frame: CGRect) {
super.init(frame:frame)
initView()
}
private func initView() {
oneButton = {
let btn = UIButton(type: .custom)
btn.setBackgroundImage(UIImage(named: "service_center_In_section"), for: .normal)
btn.addTarget(self, action: #selector(oneBtnClick), for: .touchUpInside)
return btn
}()
addSubview(oneButton)
oneButton.snp.makeConstraints { make in
make.top.equalTo(16)
make.left.equalTo(16)
make.right.equalTo(-16)
make.height.equalTo(42.fix)
}
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
@objc func oneBtnClick() {
if let block = block {
block(1)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderInIncubationView.swift 0 → 100644
View file @ 2527caf8
//
// YHServiceOrderInIncubationView.swift
// galaxy
//
// Created by EDY on 2024/11/13.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
import AttributedString
class YHServiceOrderInIncubationView: UIView {
typealias Block = () -> ()
var block: Block?
var centerView: UIView!
var centerImageView: UIView!
var titleLabel: UILabel!
var closeButton: UIButton!
var knowButton: UIButton!
var measageLabel: UILabel!
var showBack: Bool = true {
didSet {
if !showBack {
closeButton.isHidden = true
knowButton.setTitle("我知道了", for: .normal)
knowButton.snp.remakeConstraints { make in
make.right.equalTo(-20)
make.left.equalTo(20)
make.height.equalTo(46)
make.bottom.equalTo(-20)
}
}
}
}
static func show(_ flag: Bool = true, callBack: @escaping (() -> Void)) {
let view = YHServiceOrderInIncubationView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
view.showBack = flag
view.block = callBack
let window = UIApplication.shared.yhKeyWindow()
window?.addSubview(view)
}
override init(frame: CGRect) {
super.init(frame: frame)
backgroundColor = UIColor(white: 0.5, alpha: 0.1)
setView()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func setView() {
backgroundColor = UIColor(hex: 0x0000, alpha: 0.5)
centerView = {
let view = UIView()
view.backgroundColor = .white
view.layer.cornerRadius = kCornerRadius8
return view
}()
addSubview(centerView)
centerView.snp.makeConstraints { make in
make.center.equalToSuperview()
make.height.equalTo(361)
make.width.equalTo(299)
}
centerImageView = {
let view = UIImageView()
view.image = UIImage(named: "service_order_in_incubation_view")
return view
}()
centerView.addSubview(centerImageView)
centerImageView.snp.makeConstraints { make in
make.centerX.equalToSuperview()
make.width.height.equalTo(53)
make.top.equalTo(30)
}
titleLabel = {
let label = UILabel()
label.text = "订单孵化中"
label.font = UIFont.PFSC_M(ofSize: 17)
label.textColor = UIColor.mainTextColor
label.textAlignment = .center
return label
}()
centerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.top.equalTo(99)
make.left.height.equalTo(21)
make.right.equalTo(-21)
}
closeButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .center
button.setTitle("返回", for: .normal)
button.setTitleColor( UIColor.brandMainColor, for: .normal)
button.layer.cornerRadius = kCornerRadius3
button.layer.borderWidth = 1
button.layer.borderColor = UIColor.brandMainColor.cgColor
button.clipsToBounds = true
button.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
return button
}()
centerView.addSubview(closeButton)
closeButton.snp.makeConstraints { make in
make.left.equalTo(20)
make.width.equalTo(123)
make.height.equalTo(46)
make.bottom.equalTo(-20)
}
knowButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.contentHorizontalAlignment = .center
button.setTitle("去更新", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.backgroundColor = UIColor.brandMainColor
button.layer.cornerRadius = kCornerRadius3
button.clipsToBounds = true
button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
return button
}()
centerView.addSubview(knowButton)
knowButton.snp.makeConstraints { make in
make.right.equalTo(-20)
make.width.equalTo(123)
make.height.equalTo(46)
make.bottom.equalTo(-20)
}
measageLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 14)
label.textColor = UIColor.mainTextColor
label.numberOfLines = 0
return label
}()
centerView.addSubview(measageLabel)
measageLabel.snp.makeConstraints { make in
make.right.equalTo(-21)
make.left.equalTo(21)
make.top.equalTo(131)
}
let a: ASAttributedString = .init("您的高才订单目前处于孵化状态， 若自评已满足申请条件（", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor(hex: 0x6d788a)))
let aa: ASAttributedString = .init(NSAttributedString(string: "过去12个月收入为250W港币以上或获得入境处认可的院校学士学位"), .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("），可点击进入【我的信息】，如实更新完善您的信息， 检查无误后提交，文案老师会进行评估并反馈。", .font(UIFont.PFSC_M(ofSize: 15)),.foreground(UIColor(hex: 0x6d788a)))
measageLabel.attributed.text = a + aa + aaa
}
@objc private func handleTap(_ sender: AnyObject?) {
dismiss()
}
@objc func dismiss() {
removeFromSuperview()
}
@objc func goNext() {
if let block = block {
block()
}
dismiss()
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift
View file @ 2527caf8
......@@ -205,6 +205,26 @@ extension YHServiceOrderProgressTableViewCell {
titleLabel.text = "上传旅行证件"
messageLabel.text = "请上传&核对续签旅行证件~"
}
if model.type == 201 {
titleLabel.text = "我的信息"
}
if model.type == 202 {
titleLabel.text = "我的方案"
messageLabel.text = "您的专属方案还没生成哦~"
}
if model.type == 203 {
titleLabel.text = "我的证件"
messageLabel.text = "您的证件还没生成哦~"
}
if model.type == 204 {
titleLabel.text = "我的签字"
messageLabel.text = "您的文件还没签字哦~"
}
}
if model.status == 2 {
titleLabel.textColor = UIColor.mainTextColor
......@@ -473,6 +493,47 @@ extension YHServiceOrderProgressTableViewCell {
buttonLabel.text = "去查看"
messageLabel.textColor = UIColor.mainTextColor50
}
if model.type == 201 {
titleLabel.text = "我的信息"
buttonLabel.text = "去填写"
if model.reject_status == 0 {
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("信息待填写哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
} else {
let a: ASAttributedString = .init("您的信息被", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "驳回"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.failColor))
let aaa: ASAttributedString = .init("了哦～", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
buttonLabel.text = "去修改"
}
}
if model.type == 202 {
titleLabel.text = "我的方案"
messageLabel.text = "后端出问题会显示"
}
if model.type == 203 {
titleLabel.text = "我的证件"
// messageLabel.text = "恭喜您，证件已全部上传完~"
buttonLabel.text = "去上传"
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("证件待上传哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 204 {
titleLabel.text = "我的签字"
buttonLabel.text = "去签字"
let a: ASAttributedString = .init("您还有", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "\(model.num)份"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("文件待签字哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
}
if model.status == 3 {
titleLabel.textColor = UIColor.mainTextColor
......@@ -595,6 +656,24 @@ extension YHServiceOrderProgressTableViewCell {
buttonLabel.text = "去查看"
}
if model.type == 201 {
titleLabel.text = "我的信息"
messageLabel.text = "恭喜您，信息已全部填写完~"
}
if model.type == 202 {
titleLabel.text = "我的方案"
messageLabel.text = "恭喜您，专属方案已生成~"
}
if model.type == 203 {
titleLabel.text = "我的证件"
messageLabel.text = "恭喜您，证件已全部上传完~"
}
if model.type == 204 {
titleLabel.text = "我的签字"
messageLabel.text = "恭喜您，文件已全部签字完~"
}
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)))
progressLabel.attributed.text = b + bb
......@@ -650,6 +729,34 @@ extension YHServiceOrderProgressTableViewCell {
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)))
progressLabel.attributed.text = b + bb
if model.type == 203 {
titleLabel.text = "我的证件"
// messageLabel.text = "恭喜您，证件已全部上传完~"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "证件清单"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 201 {
titleLabel.text = "我的信息"
messageLabel.attributed.text = "如果显示后端问题"
}
if model.type == 202 {
titleLabel.text = "我的方案"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "专属方案"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
if model.type == 204 {
titleLabel.text = "我的签字"
let a: ASAttributedString = .init("您的", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
let aa: ASAttributedString = .init(NSAttributedString(string: "签字清单"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
let aaa: ASAttributedString = .init("正在制作中哦~", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.yhGreyColor))
messageLabel.attributed.text = a + aa + aaa
}
}
if model.percentage == 0 {
progress.setProgress(0, animated: false)
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_In_section.imageset/Contents.json 0 → 100644
View file @ 2527caf8
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "service_center_In_section@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_center_In_section@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_guideline_two.imageset/Contents.json
View file @ 2527caf8
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "service_order_guideline_two@2x.png",
"filename" : "3@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_order_guideline_two@3x.png",
"filename" : "3@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_in_incubation_view.imageset/Contents.json 0 → 100644
View file @ 2527caf8
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "service_order_in_incubation_view@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "service_order_in_incubation_view@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