Commit 5b21d938 authored by Alex朱枝文's avatar Alex朱枝文

在港记录以及文书管理ui走查bug修复

parent 4d984786
...@@ -35,10 +35,10 @@ class YHHKImmigrationRecordsVC: YHBaseViewController { ...@@ -35,10 +35,10 @@ class YHHKImmigrationRecordsVC: YHBaseViewController {
let dataSource = JXSegmentedDotDataSource() let dataSource = JXSegmentedDotDataSource()
dataSource.isTitleColorGradientEnabled = true dataSource.isTitleColorGradientEnabled = true
dataSource.titles = arrItemTitles dataSource.titles = arrItemTitles
dataSource.titleNormalFont = UIFont.PFSC_M(ofSize: 14) dataSource.titleNormalFont = UIFont.PFSC_R(ofSize: 14)
dataSource.titleNormalColor = UIColor(hexString: "#000000")! dataSource.titleNormalColor = .labelTextColor2
dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16) dataSource.titleSelectedFont = UIFont.PFSC_M(ofSize: 16)
dataSource.titleSelectedColor = .mainTextColor dataSource.titleSelectedColor = UIColor(hexString: "#000000")!
dataSource.isItemSpacingAverageEnabled = false dataSource.isItemSpacingAverageEnabled = false
dataSource.itemWidth = JXSegmentedViewAutomaticDimension dataSource.itemWidth = JXSegmentedViewAutomaticDimension
dataSource.itemSpacing = 24 dataSource.itemSpacing = 24
......
...@@ -23,16 +23,22 @@ class YHHKRecordsRemarkCell: YHResignDocumentCell { ...@@ -23,16 +23,22 @@ class YHHKRecordsRemarkCell: YHResignDocumentCell {
return label return label
}() }()
private lazy var remarkTextViewContainer: YHBaseDynamicCornerRadiusView = {
let view = YHBaseDynamicCornerRadiusView(cornerRadius: 4, corner: .allCorners)
view.backgroundColor = .contentBkgColor
return view
}()
private lazy var remarkTextView: UITextView = { private lazy var remarkTextView: UITextView = {
let view = UITextView() let view = UITextView()
view.backgroundColor = .clear
view.font = .PFSC_R(ofSize: 14) view.font = .PFSC_R(ofSize: 14)
view.textColor = .mainTextColor view.textColor = .mainTextColor
view.tintColor = .mainTextColor view.tintColor = .mainTextColor
view.backgroundColor = .contentBkgColor
view.returnKeyType = .default view.returnKeyType = .default
view.enablesReturnKeyAutomatically = true view.enablesReturnKeyAutomatically = true
view.delegate = self view.delegate = self
view.textContainerInset = UIEdgeInsets(top: 10, left: 12, bottom: 10, right: 12) view.textContainerInset = .zero
view.textContainer.lineFragmentPadding = 0 view.textContainer.lineFragmentPadding = 0
return view return view
}() }()
...@@ -69,23 +75,33 @@ extension YHHKRecordsRemarkCell { ...@@ -69,23 +75,33 @@ extension YHHKRecordsRemarkCell {
private func setupUI() { private func setupUI() {
subContainerView.addSubview(infoTitleLabel) subContainerView.addSubview(infoTitleLabel)
subContainerView.addSubview(remarkTextView) subContainerView.addSubview(remarkTextViewContainer)
remarkTextViewContainer.addSubview(remarkTextView)
subContainerView.addSubview(editTipsLabel) subContainerView.addSubview(editTipsLabel)
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.top.equalToSuperview().offset(16) make.top.equalToSuperview().offset(16)
} }
remarkTextView.snp.makeConstraints { make in
remarkTextViewContainer.snp.makeConstraints { make in
make.left.equalTo(infoTitleLabel) make.left.equalTo(infoTitleLabel)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(86).priority(.high) make.height.equalTo(86).priority(.high)
make.top.equalTo(infoTitleLabel.snp.bottom).offset(8) make.top.equalTo(infoTitleLabel.snp.bottom).offset(8)
make.bottom.equalToSuperview().offset(-16) make.bottom.equalToSuperview().offset(-16)
} }
remarkTextView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(12)
make.right.equalToSuperview().offset(-12)
make.top.equalToSuperview().offset(10)
make.bottom.equalToSuperview().offset(-10)
}
editTipsLabel.snp.makeConstraints { make in editTipsLabel.snp.makeConstraints { make in
make.left.equalTo(remarkTextView.snp.left).offset(12) make.left.equalTo(remarkTextViewContainer.snp.left).offset(12)
make.top.equalTo(remarkTextView.snp.top).offset(10) make.top.equalTo(remarkTextViewContainer.snp.top).offset(10)
} }
} }
} }
......
...@@ -348,9 +348,9 @@ extension YHResignDocumentStatusCell { ...@@ -348,9 +348,9 @@ extension YHResignDocumentStatusCell {
} }
bottomLineView.snp.makeConstraints { make in bottomLineView.snp.makeConstraints { make in
make.left.equalTo(infoTitleLabel.snp.left) make.left.equalToSuperview()
make.top.equalTo(fileCoverView.snp.bottom) make.top.equalTo(fileCoverView.snp.bottom)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview()
make.height.equalTo(0.5) make.height.equalTo(0.5)
} }
......
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