Skip to content

G
galaxy-iOS
Commit 528fdb00 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

续签文书与在港记录ui问题修复

parent 59e339c4
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 22 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsCustomerItemCell.swift
View file @ 528fdb00
...@@ -63,7 +63,7 @@ extension YHHKRecordsCustomerItemCell { ...@@ -63,7 +63,7 @@ extension YHHKRecordsCustomerItemCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsEditButtonCell.swift
View file @ 528fdb00
...@@ -51,7 +51,7 @@ extension YHHKRecordsEditButtonCell { ...@@ -51,7 +51,7 @@ extension YHHKRecordsEditButtonCell {
make.top.equalToSuperview() make.top.equalToSuperview()
make.left.equalToSuperview() make.left.equalToSuperview()
make.right.equalToSuperview() make.right.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(0.5)
} }
centerLabel.snp.makeConstraints { make in centerLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsExpandedCell.swift
View file @ 528fdb00
...@@ -112,7 +112,7 @@ extension YHHKRecordsExpandedCell { ...@@ -112,7 +112,7 @@ extension YHHKRecordsExpandedCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
tagView.snp.makeConstraints { make in tagView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsHeaderCell.swift
View file @ 528fdb00
...@@ -59,7 +59,7 @@ extension YHHKRecordsHeaderCell { ...@@ -59,7 +59,7 @@ extension YHHKRecordsHeaderCell {
bottomLineView.snp.makeConstraints { make in bottomLineView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview() make.left.right.bottom.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsOccupyingSpaceCell.swift
View file @ 528fdb00
...@@ -56,7 +56,7 @@ extension YHHKRecordsOccupyingSpaceCell { ...@@ -56,7 +56,7 @@ extension YHHKRecordsOccupyingSpaceCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsRemarkCell.swift
View file @ 528fdb00
...@@ -58,6 +58,7 @@ class YHHKRecordsRemarkCell: YHResignDocumentCell { ...@@ -58,6 +58,7 @@ class YHHKRecordsRemarkCell: YHResignDocumentCell {
func setupCellInfo(title: String? = "备注：", titleColor: UIColor = .mainTextColor50, detail: String?, isEditable: Bool = false, cellType: YHResignRoundCellType = .mid) { func setupCellInfo(title: String? = "备注：", titleColor: UIColor = .mainTextColor50, detail: String?, isEditable: Bool = false, cellType: YHResignRoundCellType = .mid) {
updateCellCorner(cellType) updateCellCorner(cellType)
infoTitleLabel.text = title infoTitleLabel.text = title
infoTitleLabel.textColor = titleColor
remarkTextView.isEditable = isEditable remarkTextView.isEditable = isEditable
remarkTextView.text = detail remarkTextView.text = detail
editTipsLabel.isHidden = !isEditable || (detail?.count ?? 0) > 0 editTipsLabel.isHidden = !isEditable || (detail?.count ?? 0) > 0
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsSectionHeaderCell.swift
View file @ 528fdb00
...@@ -51,7 +51,7 @@ extension YHHKRecordsSectionHeaderCell { ...@@ -51,7 +51,7 @@ extension YHHKRecordsSectionHeaderCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalToSuperview().offset(14) make.left.equalToSuperview().offset(14)
make.right.equalToSuperview().offset(-14) make.right.equalToSuperview().offset(-14)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsStayingPersonnelCell.swift
View file @ 528fdb00
...@@ -155,7 +155,7 @@ extension YHHKRecordsStayingPersonnelCell { ...@@ -155,7 +155,7 @@ extension YHHKRecordsStayingPersonnelCell {
bottomLineView.snp.makeConstraints { make in bottomLineView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoCollectionView.snp.makeConstraints { make in infoCollectionView.snp.makeConstraints { make in
make.top.equalTo(infoTitleLabel.snp.bottom) make.top.equalTo(infoTitleLabel.snp.bottom)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsTimeSelectCell.swift
View file @ 528fdb00
...@@ -111,7 +111,7 @@ extension YHHKRecordsTimeSelectCell { ...@@ -111,7 +111,7 @@ extension YHHKRecordsTimeSelectCell {
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
} }
} }
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/V/YHHKRecordsTitleCell.swift
View file @ 528fdb00
...@@ -48,7 +48,7 @@ extension YHHKRecordsTitleCell { ...@@ -48,7 +48,7 @@ extension YHHKRecordsTitleCell {
subContainerView.addSubview(bottomLineView) subContainerView.addSubview(bottomLineView)
bottomLineView.snp.makeConstraints { make in bottomLineView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview() make.left.right.bottom.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift
View file @ 528fdb00
...@@ -384,7 +384,7 @@ private extension YHResignDocumentType { ...@@ -384,7 +384,7 @@ private extension YHResignDocumentType {
case .powerOfAttorney: case .powerOfAttorney:
let firstLine: ASAttributedString = .init(string: "请您尽快核对信息，如信息有误，可进行在线编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let firstLine: ASAttributedString = .init(string: "请您尽快核对信息，如信息有误，可进行在线编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let secondLineL: ASAttributedString = .init(string: "如信息无误，请主申请人在", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let secondLineL: ASAttributedString = .init(string: "如信息无误，请主申请人在", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let secondLineR: ASAttributedString = .init(string: "右下角的位置完成电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor)) let secondLineR: ASAttributedString = .init(string: "右下角的位置完成电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
let secondLine = (secondLineL + secondLineR) let secondLine = (secondLineL + secondLineR)
return (indentStr + firstLine + indentStr + secondLine).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11))) return (indentStr + firstLine + indentStr + secondLine).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
case .qmasDoc: case .qmasDoc:
...@@ -392,21 +392,21 @@ private extension YHResignDocumentType { ...@@ -392,21 +392,21 @@ private extension YHResignDocumentType {
let firstLine2: ASAttributedString = .init(string: "（内地电话号码或香港电话号码）", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor50)) let firstLine2: ASAttributedString = .init(string: "（内地电话号码或香港电话号码）", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor50))
let firstLine3: ASAttributedString = .init(string: "、日期", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor)) let firstLine3: ASAttributedString = .init(string: "、日期", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor))
let firstLine4: ASAttributedString = .init(string: "（填写当下日期即可）\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor50)) let firstLine4: ASAttributedString = .init(string: "（填写当下日期即可）\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor50))
let secondLine: ASAttributedString = .init(string: "请主申请人勾选信息并完成电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor)) let secondLine: ASAttributedString = .init(string: "请主申请人勾选信息并完成电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
return (indentStr + firstLine1 + firstLine2 + firstLine3 + firstLine4 + indentStr + secondLine).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11))) return (indentStr + firstLine1 + firstLine2 + firstLine3 + firstLine4 + indentStr + secondLine).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
case .settlementPlan: case .settlementPlan:
let firstLine: ASAttributedString = .init(string: "如需调整和补充内容，请在文档中进行编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let firstLine: ASAttributedString = .init(string: "如需调整和补充内容，请在文档中进行编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let secondLine: ASAttributedString = .init(string: "编辑完成后，点击“完成编辑，提交”\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let secondLine: ASAttributedString = .init(string: "编辑完成后，点击“完成编辑，提交”\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let third: ASAttributedString = .init(string: "我们将根据您的修改调整文书\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let third: ASAttributedString = .init(string: "我们将根据您的修改调整文书\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let fourth1: ASAttributedString = .init(string: "如您对《定居计划书》无其他补充建议，", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let fourth1: ASAttributedString = .init(string: "如您对《定居计划书》无其他补充建议，", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor)) let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
return (indentStr + firstLine + indentStr + secondLine + indentStr + third + indentStr + fourth1 + fourth2).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11))) return (indentStr + firstLine + indentStr + secondLine + indentStr + third + indentStr + fourth1 + fourth2).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
case .explanatoryStatement: case .explanatoryStatement:
let firstLine: ASAttributedString = .init(string: "如需调整和补充内容，请在文档中进行编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let firstLine: ASAttributedString = .init(string: "如需调整和补充内容，请在文档中进行编辑\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let secondLine: ASAttributedString = .init(string: "编辑完成后，点击“完成编辑，提交”\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let secondLine: ASAttributedString = .init(string: "编辑完成后，点击“完成编辑，提交”\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let third: ASAttributedString = .init(string: "我们将根据您的修改调整文书\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let third: ASAttributedString = .init(string: "我们将根据您的修改调整文书\n", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let fourth1: ASAttributedString = .init(string: "如您对《解释说明书》无其他补充建议，", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70)) let fourth1: ASAttributedString = .init(string: "如您对《解释说明书》无其他补充建议，", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.mainTextColor70))
let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_R(ofSize: 12)), .foreground(UIColor.brandMainColor)) let fourth2: ASAttributedString = .init(string: "请您在文书尾部进行电子签字", .font(UIFont.PFSC_B(ofSize: 12)), .foreground(UIColor.brandMainColor))
return (indentStr + firstLine + indentStr + secondLine + indentStr + third + indentStr + fourth1 + fourth2).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11))) return (indentStr + firstLine + indentStr + secondLine + indentStr + third + indentStr + fourth1 + fourth2).add(attributes: .paragraph(.lineSpacing(8), .firstLineHeadIndent(0), .headIndent(11)))
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentContentCell.swift
View file @ 528fdb00
...@@ -71,7 +71,7 @@ extension YHResignDocumentContentCell { ...@@ -71,7 +71,7 @@ extension YHResignDocumentContentCell {
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentHeaderCell.swift
View file @ 528fdb00
...@@ -61,7 +61,7 @@ extension YHResignDocumentHeaderCell { ...@@ -61,7 +61,7 @@ extension YHResignDocumentHeaderCell {
make.left.equalToSuperview().offset(18) make.left.equalToSuperview().offset(18)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.bottom.equalToSuperview() make.bottom.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(0.5)
} }
infoTitleLabel.snp.makeConstraints { make in infoTitleLabel.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/V/YHResignDocumentStatusCell.swift
View file @ 528fdb00
...@@ -232,7 +232,7 @@ extension YHResignDocumentStatusCell { ...@@ -232,7 +232,7 @@ extension YHResignDocumentStatusCell {
leftLineView.snp.remakeConstraints { make in leftLineView.snp.remakeConstraints { make in
make.left.equalTo(leftButton.snp.right) make.left.equalTo(leftButton.snp.right)
make.height.equalTo(16) make.height.equalTo(16)
make.width.equalTo(1) make.width.equalTo(0.5)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
midButton.snp.remakeConstraints { make in midButton.snp.remakeConstraints { make in
...@@ -272,7 +272,7 @@ extension YHResignDocumentStatusCell { ...@@ -272,7 +272,7 @@ extension YHResignDocumentStatusCell {
leftLineView.snp.remakeConstraints { make in leftLineView.snp.remakeConstraints { make in
make.left.equalTo(leftButton.snp.right) make.left.equalTo(leftButton.snp.right)
make.height.equalTo(16) make.height.equalTo(16)
make.width.equalTo(1) make.width.equalTo(0.5)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
...@@ -285,7 +285,7 @@ extension YHResignDocumentStatusCell { ...@@ -285,7 +285,7 @@ extension YHResignDocumentStatusCell {
rightLineView.snp.remakeConstraints { make in rightLineView.snp.remakeConstraints { make in
make.left.equalTo(midButton.snp.right) make.left.equalTo(midButton.snp.right)
make.height.equalTo(16) make.height.equalTo(16)
make.width.equalTo(1) make.width.equalTo(0.5)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
...@@ -323,7 +323,7 @@ extension YHResignDocumentStatusCell { ...@@ -323,7 +323,7 @@ extension YHResignDocumentStatusCell {
make.left.equalTo(infoTitleLabel.snp.left) make.left.equalTo(infoTitleLabel.snp.left)
make.top.equalTo(infoTitleLabel.snp.bottom).offset(12) make.top.equalTo(infoTitleLabel.snp.bottom).offset(12)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
fileCoverView.snp.makeConstraints { make in fileCoverView.snp.makeConstraints { make in
...@@ -351,7 +351,7 @@ extension YHResignDocumentStatusCell { ...@@ -351,7 +351,7 @@ extension YHResignDocumentStatusCell {
make.left.equalTo(infoTitleLabel.snp.left) make.left.equalTo(infoTitleLabel.snp.left)
make.top.equalTo(fileCoverView.snp.bottom) make.top.equalTo(fileCoverView.snp.bottom)
make.right.equalToSuperview().offset(-18) make.right.equalToSuperview().offset(-18)
make.height.equalTo(1) make.height.equalTo(0.5)
} }
buttonsCoverView.snp.makeConstraints { make in buttonsCoverView.snp.makeConstraints { make in
...@@ -368,7 +368,7 @@ extension YHResignDocumentStatusCell { ...@@ -368,7 +368,7 @@ extension YHResignDocumentStatusCell {
leftLineView.snp.makeConstraints { make in leftLineView.snp.makeConstraints { make in
make.left.equalTo(leftButton.snp.right) make.left.equalTo(leftButton.snp.right)
make.height.equalTo(16) make.height.equalTo(16)
make.width.equalTo(1) make.width.equalTo(0.5)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
...@@ -381,7 +381,7 @@ extension YHResignDocumentStatusCell { ...@@ -381,7 +381,7 @@ extension YHResignDocumentStatusCell {
rightLineView.snp.makeConstraints { make in rightLineView.snp.makeConstraints { make in
make.left.equalTo(midButton.snp.right) make.left.equalTo(midButton.snp.right)
make.height.equalTo(16) make.height.equalTo(16)
make.width.equalTo(1) make.width.equalTo(0.5)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
......
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