Skip to content

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

高才主申请人

parent e669ea20
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 7 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 7dfae27b
......@@ -7,6 +7,9 @@
objects = {
/* Begin PBXBuildFile section */
0411CEDE2D14006C00644D35 /* YHGCMainApplicantInformationViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEDD2D14006C00644D35 /* YHGCMainApplicantInformationViewController.swift */; };
0411CEE02D1400C200644D35 /* YHGCMainApplicantInformationViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEDF2D1400C200644D35 /* YHGCMainApplicantInformationViewModel.swift */; };
0411CEE22D14014000644D35 /* YHGCMainInformationCardTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CEE12D14014000644D35 /* YHGCMainInformationCardTableViewCell.swift */; };
045C0F7F2D12CA5F00BD2DC0 /* submit_page_scroll.gif in Resources */ = {isa = PBXBuildFile; fileRef = 045C0F4F2D12CA5E00BD2DC0 /* submit_page_scroll.gif */; };
045C0F802D12CA5F00BD2DC0 /* Localizable.xcstrings in Resources */ = {isa = PBXBuildFile; fileRef = 045C0F762D12CA5E00BD2DC0 /* Localizable.xcstrings */; };
045C0F812D12CA5F00BD2DC0 /* img_0.png in Resources */ = {isa = PBXBuildFile; fileRef = 045C0F5E2D12CA5E00BD2DC0 /* img_0.png */; };
......@@ -1142,6 +1145,9 @@
/* End PBXCopyFilesBuildPhase section */
/* Begin PBXFileReference section */
0411CEDD2D14006C00644D35 /* YHGCMainApplicantInformationViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMainApplicantInformationViewController.swift; sourceTree = "<group>"; };
0411CEDF2D1400C200644D35 /* YHGCMainApplicantInformationViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMainApplicantInformationViewModel.swift; sourceTree = "<group>"; };
0411CEE12D14014000644D35 /* YHGCMainInformationCardTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMainInformationCardTableViewCell.swift; sourceTree = "<group>"; };
045C09A12D12C2A800BD2DC0 /* YHGCMineSchemeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCMineSchemeViewController.swift; sourceTree = "<group>"; };
045C0A142D12CA5E00BD2DC0 /* YHBaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewController.swift; sourceTree = "<group>"; };
045C0A152D12CA5E00BD2DC0 /* YHBaseViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseViewModel.swift; sourceTree = "<group>"; };
......@@ -2290,6 +2296,40 @@
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
0411CED92D14000D00644D35 /* MainApplicantInformation(主申请人信息) */ = {
isa = PBXGroup;
children = (
0411CEDC2D14005C00644D35 /* C */,
0411CEDB2D14004600644D35 /* V */,
0411CEDA2D14003F00644D35 /* VM */,
);
path = "MainApplicantInformation(主申请人信息)";
sourceTree = "<group>";
};
0411CEDA2D14003F00644D35 /* VM */ = {
isa = PBXGroup;
children = (
0411CEDF2D1400C200644D35 /* YHGCMainApplicantInformationViewModel.swift */,
);
path = VM;
sourceTree = "<group>";
};
0411CEDB2D14004600644D35 /* V */ = {
isa = PBXGroup;
children = (
0411CEE12D14014000644D35 /* YHGCMainInformationCardTableViewCell.swift */,
);
path = V;
sourceTree = "<group>";
};
0411CEDC2D14005C00644D35 /* C */ = {
isa = PBXGroup;
children = (
0411CEDD2D14006C00644D35 /* YHGCMainApplicantInformationViewController.swift */,
);
path = C;
sourceTree = "<group>";
};
045C0A182D12CA5E00BD2DC0 /* C */ = {
isa = PBXGroup;
children = (
......@@ -5882,6 +5922,7 @@
04AE200D2D12CFAF00891D24 /* ServiceProcess(我的信息流程) */ = {
isa = PBXGroup;
children = (
0411CED92D14000D00644D35 /* MainApplicantInformation(主申请人信息) */,
04AE20092D12CFAF00891D24 /* ApplicationType(申请类别) */,
04AE200C2D12CFAF00891D24 /* BaseInformation(基本资料) */,
);
......@@ -6321,6 +6362,7 @@
045C10192D12CA5F00BD2DC0 /* YHVisaRenewalPresenceStatus.swift in Sources */,
045C101A2D12CA5F00BD2DC0 /* YHActivityDetailCell1.swift in Sources */,
045C101B2D12CA5F00BD2DC0 /* YHLoginOneLeadView.swift in Sources */,
0411CEE22D14014000644D35 /* YHGCMainInformationCardTableViewCell.swift in Sources */,
045C101C2D12CA5F00BD2DC0 /* YHCollectionViewLeftAlignedFlowLayout.swift in Sources */,
045C101D2D12CA5F00BD2DC0 /* YHHUDProgressView.swift in Sources */,
045C101E2D12CA5F00BD2DC0 /* YHFailPromptView.swift in Sources */,
......@@ -6900,6 +6942,7 @@
045C12522D12CA5F00BD2DC0 /* YHVisaRenewalPaymentStatus.swift in Sources */,
045C12532D12CA5F00BD2DC0 /* YHConfigManager.swift in Sources */,
045C12542D12CA5F00BD2DC0 /* YHCertificateEntryCell.swift in Sources */,
0411CEE02D1400C200644D35 /* YHGCMainApplicantInformationViewModel.swift in Sources */,
045C12552D12CA5F00BD2DC0 /* YHSetExplainView.swift in Sources */,
045C12562D12CA5F00BD2DC0 /* YHAddressPickView.swift in Sources */,
045C12572D12CA5F00BD2DC0 /* YHPreviewBasiceInformationViewController.swift in Sources */,
......@@ -7185,6 +7228,7 @@
045C136F2D12CA5F00BD2DC0 /* YHCommonAlertView.swift in Sources */,
045C13702D12CA5F00BD2DC0 /* YHUserInfoSettingViewModel.swift in Sources */,
045C13712D12CA5F00BD2DC0 /* YHBaseCornerRadiusBorderView.swift in Sources */,
0411CEDE2D14006C00644D35 /* YHGCMainApplicantInformationViewController.swift in Sources */,
045C13722D12CA5F00BD2DC0 /* YHResignDocumentDetailViewController.swift in Sources */,
045C13732D12CA5F00BD2DC0 /* YHPlayerManager.swift in Sources */,
045C13742D12CA5F00BD2DC0 /* YHInterestModel.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHOrderDetailViewController.swift
View file @ 7dfae27b
......@@ -462,7 +462,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(bottomLineView)
bottomLineView.snp.makeConstraints { make in
make.top.equalTo(206)
make.bottom.equalTo(-52)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
}
......@@ -476,7 +476,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(serviceLabel)
serviceLabel.snp.makeConstraints { make in
make.top.equalTo(188.5)
make.top.equalTo(200)
make.left.equalTo(16)
make.height.equalTo(20)
}
......@@ -491,7 +491,7 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}()
centerView.addSubview(serviceValueLabel)
serviceValueLabel.snp.makeConstraints { make in
make.top.equalTo(188.5)
make.top.equalTo(200)
make.right.equalTo(-16)
make.left.equalTo(serviceLabel.snp.right).offset(20)
}
......@@ -563,6 +563,11 @@ class YHOrderDetailTableViewCell: UITableViewCell {
}
titleLabel.text = model.productName
orderNumLabel.text = model.orderSn
var title = "主申订单"
if model.isOther {
title = "协作订单"
}
orderTitleNumLabel.text = title
phoneNumLabel.text = model.mobile
nameValueLabel.text = model.username
serviceValueLabel.text = model.service_name
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceOrderListViewController.swift
View file @ 7dfae27b
......@@ -255,6 +255,9 @@ class YHServiceOrderListView: YHBaseViewController {
gotoResignCertificateListVC(orderID: orderId)
} else if type == 201 {
//高才我的信息
let vc = YHGCMainApplicantInformationViewController()
vc.orderId = orderId
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 202 {
//高才我的方案
} else if type == 203 {
......@@ -498,10 +501,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
if model.status == 1 || model.status == 4 {
return
} else {
// let vc = YHGCMainApplicantInformationViewController()
// vc.orderId = orderID
// UIViewController.current?.navigationController?.pushViewController(vc)
// YHServiceOrderListView.jumpToMessageController(type: model.type, orderId: orderID, stepID)
YHServiceOrderListView.jumpToMessageController(type: model.type, orderId: orderID, stepID)
if model.type == 3 {
//我的评分
handleRedPointFor(key: kMyScoreRedPointInfoKey, model: model)
......
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