Skip to content

G
galaxy-iOS
Commit 782e63a1 authored by David黄金龙's avatar David黄金龙
Browse files
Options

1、添加 收入证明 

2、家庭 成员信息
parent 7f6cf11b
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 99 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewControllerHoldViewController.swift
View file @ 782e63a1
...@@ -25,7 +25,7 @@ class YHPreviewControllerHoldViewController: UIViewController { ...@@ -25,7 +25,7 @@ class YHPreviewControllerHoldViewController: UIViewController {
} }
} }
let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","其他信息"] let arrItemTitles = ["主申请人信息","家庭成员信息","基本资料","学历/专业资格","工作经验","收入证明","其他信息"]
var arrItemVCs : [YHPreviewBaseViewController] = [] var arrItemVCs : [YHPreviewBaseViewController] = []
var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55)) var segmentedView : JXSegmentedView = JXSegmentedView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 55))
lazy var segmentedDataSource: JXSegmentedBaseDataSource = { lazy var segmentedDataSource: JXSegmentedBaseDataSource = {
...@@ -78,6 +78,13 @@ class YHPreviewControllerHoldViewController: UIViewController { ...@@ -78,6 +78,13 @@ class YHPreviewControllerHoldViewController: UIViewController {
let vc = YHPreviewWorkExpViewController() let vc = YHPreviewWorkExpViewController()
arrItemVCs.append(vc) arrItemVCs.append(vc)
} }
do {
//收入证明 //for test hjl
let vc = YHPreviewOtherInformationViewController()
arrItemVCs.append(vc)
}
do { do {
//其他信息 //其他信息
let vc = YHPreviewOtherInformationViewController() let vc = YHPreviewOtherInformationViewController()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/PersonInfoList(个人信息预览)/C/YHPreviewFamilyMemberViewController.swift
View file @ 782e63a1
...@@ -29,10 +29,10 @@ class YHPreviewFamilyMemberViewController: YHPreviewBaseViewController { ...@@ -29,10 +29,10 @@ class YHPreviewFamilyMemberViewController: YHPreviewBaseViewController {
return view return view
}() }()
private var parentButton : UIButton! // private var parentButton : UIButton!
private var spouseButton : UIButton! private var spouseButton : UIButton!
private var childrenButton : UIButton! private var childrenButton : UIButton!
private var brotherButton : UIButton! // private var brotherButton : UIButton!
private var arrButtons : [UIButton] = [] private var arrButtons : [UIButton] = []
} }
...@@ -72,36 +72,36 @@ private extension YHPreviewFamilyMemberViewController { ...@@ -72,36 +72,36 @@ private extension YHPreviewFamilyMemberViewController {
} }
parentButton = createButton() // parentButton = createButton()
parentButton.setTitle("父母", for: .normal) // parentButton.setTitle("父母", for: .normal)
buttonHoldView.addSubview(parentButton) // buttonHoldView.addSubview(parentButton)
parentButton.snp.makeConstraints { make in // parentButton.snp.makeConstraints { make in
make.centerY.equalToSuperview() // make.centerY.equalToSuperview()
make.left.equalTo(childrenButton.snp.right).offset(12) // make.left.equalTo(childrenButton.snp.right).offset(12)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(68) // make.width.equalTo(68)
//
} // }
//
//
//
//
//
brotherButton = createButton() // brotherButton = createButton()
brotherButton.setTitle("兄弟姐妹", for: .normal) // brotherButton.setTitle("兄弟姐妹", for: .normal)
buttonHoldView.addSubview(brotherButton) // buttonHoldView.addSubview(brotherButton)
brotherButton.snp.makeConstraints { make in // brotherButton.snp.makeConstraints { make in
make.centerY.equalToSuperview() // make.centerY.equalToSuperview()
make.left.equalTo(parentButton.snp.right).offset(12) // make.left.equalTo(parentButton.snp.right).offset(12)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(84) // make.width.equalTo(84)
} // }
arrButtons.append(parentButton) // arrButtons.append(parentButton)
arrButtons.append(spouseButton) arrButtons.append(spouseButton)
arrButtons.append(childrenButton) arrButtons.append(childrenButton)
arrButtons.append(brotherButton) // arrButtons.append(brotherButton)
homeTableView.snp.removeConstraints() homeTableView.snp.removeConstraints()
...@@ -119,8 +119,8 @@ private extension YHPreviewFamilyMemberViewController { ...@@ -119,8 +119,8 @@ private extension YHPreviewFamilyMemberViewController {
private func layouButtons() { private func layouButtons() {
spouseButton.snp.removeConstraints() spouseButton.snp.removeConstraints()
childrenButton.snp.removeConstraints() childrenButton.snp.removeConstraints()
parentButton.snp.removeConstraints() // parentButton.snp.removeConstraints()
brotherButton.snp.removeConstraints() // brotherButton.snp.removeConstraints()
var lastTagView : UIView? = nil var lastTagView : UIView? = nil
...@@ -167,55 +167,55 @@ private extension YHPreviewFamilyMemberViewController { ...@@ -167,55 +167,55 @@ private extension YHPreviewFamilyMemberViewController {
//父母 // //父母
if previewVM.arrDataForParents.isEmpty == false { // if previewVM.arrDataForParents.isEmpty == false {
parentButton.isHidden = false // parentButton.isHidden = false
if let lastTagView = lastTagView { // if let lastTagView = lastTagView {
parentButton.snp.makeConstraints { make in // parentButton.snp.makeConstraints { make in
make.centerY.equalToSuperview() // make.centerY.equalToSuperview()
make.left.equalTo(lastTagView.snp.right).offset(12) // make.left.equalTo(lastTagView.snp.right).offset(12)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(68) // make.width.equalTo(68)
} // }
} else { // } else {
parentButton.snp.makeConstraints { make in // parentButton.snp.makeConstraints { make in
make.centerY.equalToSuperview() // make.centerY.equalToSuperview()
make.left.equalToSuperview() // make.left.equalToSuperview()
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(68) // make.width.equalTo(68)
} // }
} // }
//
lastTagView = parentButton // lastTagView = parentButton
} else { // } else {
parentButton.isHidden = true // parentButton.isHidden = true
} // }
//兄弟姐妹 // //兄弟姐妹
if previewVM.arrDataForBrother.isEmpty == false { // if previewVM.arrDataForBrother.isEmpty == false {
brotherButton.isHidden = false // brotherButton.isHidden = false
if let lastTagView = lastTagView { // if let lastTagView = lastTagView {
brotherButton.snp.makeConstraints { make in // brotherButton.snp.makeConstraints { make in
make.centerY.equalToSuperview() // make.centerY.equalToSuperview()
make.left.equalTo(lastTagView.snp.right).offset(12) // make.left.equalTo(lastTagView.snp.right).offset(12)
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(68) // make.width.equalTo(68)
} // }
} else { // } else {
brotherButton.snp.makeConstraints { make in // brotherButton.snp.makeConstraints { make in
make.centerY.equalToSuperview() // make.centerY.equalToSuperview()
make.left.equalToSuperview() // make.left.equalToSuperview()
make.height.equalTo(32) // make.height.equalTo(32)
make.width.equalTo(68) // make.width.equalTo(68)
} // }
} // }
//
lastTagView = brotherButton // lastTagView = brotherButton
} else { // } else {
brotherButton.isHidden = true // brotherButton.isHidden = true
} // }
} }
...@@ -243,15 +243,19 @@ private extension YHPreviewFamilyMemberViewController { ...@@ -243,15 +243,19 @@ private extension YHPreviewFamilyMemberViewController {
sender.backgroundColor = .brandMainColor sender.backgroundColor = .brandMainColor
sender.setTitleColor(.white, for: .normal) sender.setTitleColor(.white, for: .normal)
if sender == parentButton { if sender == spouseButton {
previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForParents
} else if sender == childrenButton {
previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForChildren
} else if sender == brotherButton {
previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForBrother
} else if sender == spouseButton {
previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForSpouse previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForSpouse
} else { }
// else if sender == parentButton {
// previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForParents
// }
else if sender == childrenButton {
previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForChildren
}
// else if sender == brotherButton {
// previewVM.arrDataForMainApplicationInfo = previewVM.arrDataForBrother
// }
else {
previewVM.arrDataForMainApplicationInfo = [] previewVM.arrDataForMainApplicationInfo = []
} }
homeTableView.reloadData() homeTableView.reloadData()
...@@ -289,15 +293,15 @@ private extension YHPreviewFamilyMemberViewController { ...@@ -289,15 +293,15 @@ private extension YHPreviewFamilyMemberViewController {
return return
} }
if !parentButton.isHidden { // if !parentButton.isHidden {
clickButton(sender:parentButton) // clickButton(sender:parentButton)
return // return
} // }
//
if !brotherButton.isHidden { // if !brotherButton.isHidden {
clickButton(sender:brotherButton) // clickButton(sender:brotherButton)
return // return
} // }
} }
} }
......
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