Commit fbe56f99 authored by David黄金龙's avatar David黄金龙

基本资料 UI

parent d1b7b997
...@@ -343,10 +343,5 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource ...@@ -343,10 +343,5 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
} }
} }
} }
...@@ -122,19 +122,9 @@ extension YHBasicInfoFillViewController : UITableViewDelegate,UITableViewDataSou ...@@ -122,19 +122,9 @@ extension YHBasicInfoFillViewController : UITableViewDelegate,UITableViewDataSou
return UIView() return UIView()
} }
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return UITableView.automaticDimension
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHBasicInfoFillCell.self) let cell = tableView.dequeueReusableCell(withClass: YHBasicInfoFillCell.self)
// cell.selectionStyle = .none
// cell.optionData = self.serviceCenterMainReqVM.localScoreData?[indexPath.row + 1]
cell.block = { cell.block = {
// tableView.reloadRows(at: <#T##[IndexPath]#>, with: <#T##UITableView.RowAnimation#>)
tableView.reloadData() tableView.reloadData()
} }
return cell return cell
......
...@@ -33,14 +33,9 @@ class YHBasicInfoFillCell: UITableViewCell { ...@@ -33,14 +33,9 @@ class YHBasicInfoFillCell: UITableViewCell {
extension YHBasicInfoFillCell { extension YHBasicInfoFillCell {
func updateUI() { func updateUI() {
// for item in contentView.subviews {
// item.removeFromSuperview()
// }
//主申请人 //主申请人
let holdView1 = UIView() let holdView1 = UIView()
holdView1.backgroundColor = .white holdView1.backgroundColor = .white
// holdView1.backgroundColor = .red //for test hjl
holdView1.layer.cornerRadius = kCornerRadius6 holdView1.layer.cornerRadius = kCornerRadius6
holdView1.clipsToBounds = true holdView1.clipsToBounds = true
contentView.addSubview(holdView1) contentView.addSubview(holdView1)
...@@ -50,7 +45,6 @@ extension YHBasicInfoFillCell { ...@@ -50,7 +45,6 @@ extension YHBasicInfoFillCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
} }
do { do {
let sessionView = YHPersonInfoSessionView() let sessionView = YHPersonInfoSessionView()
sessionView.updateTitle(title: "主申请人") sessionView.updateTitle(title: "主申请人")
holdView1.addSubview(sessionView) holdView1.addSubview(sessionView)
...@@ -61,8 +55,6 @@ extension YHBasicInfoFillCell { ...@@ -61,8 +55,6 @@ extension YHBasicInfoFillCell {
make.height.equalTo(YHPersonInfoSessionView.viewH) make.height.equalTo(YHPersonInfoSessionView.viewH)
} }
holdView1.addSubview(view0) holdView1.addSubview(view0)
view0.snp.makeConstraints { make in view0.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom) make.top.equalTo(sessionView.snp.bottom)
...@@ -70,39 +62,11 @@ extension YHBasicInfoFillCell { ...@@ -70,39 +62,11 @@ extension YHBasicInfoFillCell {
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
} }
// view0.backgroundColor = .red //for test hjl
view0.block = { view0.block = {
// self.contentView.layoutIfNeeded()
self.view0.snp.remakeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
}
self.view1.snp.remakeConstraints { make in
make.top.equalTo(self.view0.snp.bottom)
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
make.bottom.equalToSuperview()
}
// self.layoutIfNeeded()
self.block?() self.block?()
} }
holdView1.addSubview(view1) holdView1.addSubview(view1)
view1.snp.makeConstraints { make in view1.snp.makeConstraints { make in
make.top.equalTo(view0.snp.bottom) make.top.equalTo(view0.snp.bottom)
...@@ -110,19 +74,7 @@ extension YHBasicInfoFillCell { ...@@ -110,19 +74,7 @@ extension YHBasicInfoFillCell {
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
} }
// view1.backgroundColor = .purple //for test hjl
view1.block = { view1.block = {
self.view1.snp.remakeConstraints { make in
make.top.equalTo(self.view0.snp.bottom)
make.right.equalToSuperview().offset(-18)
make.left.equalToSuperview().offset(18)
make.bottom.equalToSuperview()
}
// self.layoutIfNeeded()
self.block?() self.block?()
} }
} }
......
...@@ -80,7 +80,7 @@ class YHBasicInfoFillView: UIView { ...@@ -80,7 +80,7 @@ class YHBasicInfoFillView: UIView {
private lazy var bottomLine : UIView = { private lazy var bottomLine : UIView = {
let view = UIView() let view = UIView()
view.backgroundColor = UIColor(hex: 0xF0F0F0) view.backgroundColor = UIColor(hex: 0xF0F0F0)
view.backgroundColor = .red //for test hjl // view.backgroundColor = .red //for test hjl
return view return view
}() }()
...@@ -114,11 +114,8 @@ class YHBasicInfoFillView: UIView { ...@@ -114,11 +114,8 @@ class YHBasicInfoFillView: UIView {
private extension YHBasicInfoFillView { private extension YHBasicInfoFillView {
func setupUI() { func setupUI() {
backgroundColor = .clear backgroundColor = .clear
title = "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪?" title = "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪?"
addSubview(titleLabel) addSubview(titleLabel)
addSubview(answer2Btn) addSubview(answer2Btn)
addSubview(answer1Btn) addSubview(answer1Btn)
...@@ -128,7 +125,6 @@ private extension YHBasicInfoFillView { ...@@ -128,7 +125,6 @@ private extension YHBasicInfoFillView {
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
} }
answer1Btn.snp.makeConstraints { make in answer1Btn.snp.makeConstraints { make in
make.size.equalTo(CGSize(width: btnWidth, height: btnHeight)) make.size.equalTo(CGSize(width: btnWidth, height: btnHeight))
make.left.equalTo(titleLabel.snp.left) make.left.equalTo(titleLabel.snp.left)
...@@ -148,55 +144,46 @@ private extension YHBasicInfoFillView { ...@@ -148,55 +144,46 @@ private extension YHBasicInfoFillView {
make.height.equalTo(0.5) make.height.equalTo(0.5)
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
} }
bottomLine.isHidden = false
addSubview(additionHoldView) addSubview(additionHoldView)
additionHoldView.snp.makeConstraints { make in
make.top.equalTo(answer1Btn.snp.bottom).offset(12)
make.left.right.equalToSuperview()
make.height.equalTo(78)
}
additionHoldView.isHidden = true additionHoldView.isHidden = true
// answer1Btn.isSelected = true
// updateAnswerButton(answer1Btn, true)//for test hjl
} }
@objc func didClickResponseBtn(btn: UIButton) { @objc func didClickResponseBtn(btn: UIButton) {
printLog("点击了按钮哈 \(btn.tag)") printLog("点击了按钮哈 \(btn.tag)")
btn.isSelected = true btn.isSelected = true
updateAnswerButton(btn, true) updateAnswerButton(btn, true)
if btn == answer1Btn { if btn == answer1Btn {
answer2Btn.isSelected = false answer2Btn.isSelected = false
updateAnswerButton(answer2Btn, false) updateAnswerButton(answer2Btn, false)
additionHoldView.isHidden = true
bottomLine.isHidden = false
additionHoldView.snp.removeConstraints()
bottomLine.snp.remakeConstraints { make in bottomLine.snp.remakeConstraints { make in
make.top.equalTo(answer1Btn.snp.bottom).offset(12) make.top.equalTo(answer1Btn.snp.bottom).offset(12)
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.height.equalTo(0.5) make.height.equalTo(0.5)
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
} }
additionHoldView.isHidden = true
bottomLine.isHidden = false
} else { } else {
answer1Btn.isSelected = false answer1Btn.isSelected = false
updateAnswerButton(answer1Btn, false) updateAnswerButton(answer1Btn, false)
additionHoldView.isHidden = false
bottomLine.isHidden = true
bottomLine.snp.removeConstraints()
additionHoldView.snp.remakeConstraints { make in additionHoldView.snp.remakeConstraints { make in
make.top.equalTo(answer1Btn.snp.bottom).offset(12) make.top.equalTo(answer1Btn.snp.bottom).offset(12)
make.left.right.equalToSuperview() make.left.right.equalToSuperview()
make.height.equalTo(78) make.height.equalTo(78)
make.bottom.equalToSuperview().offset(-18) make.bottom.equalToSuperview().offset(-18)
} }
additionHoldView.isHidden = false
bottomLine.isHidden = true
} }
layoutIfNeeded()
block?() block?()
} }
......
...@@ -78,7 +78,7 @@ class YHMainApplicantInformationViewController: YHBaseViewController { ...@@ -78,7 +78,7 @@ class YHMainApplicantInformationViewController: YHBaseViewController {
}() }()
view.addSubview(tableView) view.addSubview(tableView)
tableView.snp.makeConstraints { make in tableView.snp.makeConstraints { make in
make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 104) make.top.equalTo(k_Height_NavigationtBarAndStatuBar + YHStepView.height)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64) make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
make.left.right.bottom.equalTo(view) make.left.right.bottom.equalTo(view)
} }
......
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