Skip to content

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

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop 

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  UI走查bug修复
parents 10ac4cad 0af4620b
Hide whitespace changes
Inline Side-by-side
Showing with 85 additions and 72 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift
View file @ 1b118b8a
...@@ -143,7 +143,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController { ...@@ -143,7 +143,7 @@ class YHMyDocumentsDetailViewController: YHBaseViewController {
} }
func getPromptHeight(_ value: String) -> CGFloat { func getPromptHeight(_ value: String) -> CGFloat {
let text = value // 要显示的文本内容 let text = "驳回原因：" + value // 要显示的文本内容
let font = UIFont.PFSC_R(ofSize: 12) // 字体大小 let font = UIFont.PFSC_R(ofSize: 12) // 字体大小
let maxWidth = KScreenWidth - 74 // 最大宽度限制 let maxWidth = KScreenWidth - 74 // 最大宽度限制
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift
View file @ 1b118b8a
...@@ -346,24 +346,17 @@ extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataS ...@@ -346,24 +346,17 @@ extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataS
tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none) tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
updateBottomViewNumbers() updateBottomViewNumbers()
} else { } else {
if model.document.status == 6 && model.sign_doc.id > 0 && model.sign_doc.status > 2 { //文书状态
//签字状态 if model.template_id == 195 {
let vc = YHMySignatureDetailViewController() //跳转赴港计划书
vc.id = model.sign_doc.id let vc = YHHKPlanDoctumentVC()
vc.supplement_id = model.id
vc.status = model.status
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else { } else {
//文书状态 let vc = YHMyDocumentsDetailViewController()
if model.template_id == 195 { vc.id = model.id
//跳转赴港计划书 self.navigationController?.pushViewController(vc)
let vc = YHHKPlanDoctumentVC()
vc.supplement_id = model.id
vc.status = model.status
self.navigationController?.pushViewController(vc)
} else {
let vc = YHMyDocumentsDetailViewController()
vc.id = model.id
self.navigationController?.pushViewController(vc)
}
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentToActionTableViewCell.swift
View file @ 1b118b8a
...@@ -106,33 +106,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell { ...@@ -106,33 +106,7 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
bottomView.snp.makeConstraints { make in bottomView.snp.makeConstraints { make in
make.right.left.equalToSuperview() make.right.left.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(1)
make.top.equalTo(123) make.top.equalTo(115)
}
bottomLeftLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomLeftLineView)
bottomLeftLineView.snp.makeConstraints { make in
make.left.equalTo(width)
make.width.equalTo(1)
make.bottom.equalTo(-17.5)
make.height.equalTo(16)
}
bottomRightLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomRightLineView)
bottomRightLineView.snp.makeConstraints { make in
make.left.equalTo(width * 2)
make.width.equalTo(1)
make.bottom.equalTo(-17.5)
make.height.equalTo(16)
} }
editButton = { editButton = {
...@@ -208,6 +182,32 @@ class YHDocumentToActionTableViewCell: UITableViewCell { ...@@ -208,6 +182,32 @@ class YHDocumentToActionTableViewCell: UITableViewCell {
make.height.equalTo(40) make.height.equalTo(40)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
bottomLeftLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomLeftLineView)
bottomLeftLineView.snp.makeConstraints { make in
make.left.equalTo(width)
make.width.equalTo(1)
make.centerY.equalTo(editButton.snp.centerY)
make.height.equalTo(16)
}
bottomRightLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomRightLineView)
bottomRightLineView.snp.makeConstraints { make in
make.left.equalTo(width * 2)
make.width.equalTo(1)
make.centerY.equalTo(editButton.snp.centerY)
make.height.equalTo(16)
}
} }
func updateAllViews() { func updateAllViews() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentUploadTableViewCell.swift
View file @ 1b118b8a
...@@ -129,6 +129,16 @@ class YHDocumentUploadTableViewCell: UITableViewCell { ...@@ -129,6 +129,16 @@ class YHDocumentUploadTableViewCell: UITableViewCell {
make.bottom.equalTo(-153) make.bottom.equalTo(-153)
make.top.equalTo(52) make.top.equalTo(52)
} }
let line = UIView()
line.backgroundColor = UIColor.separatorColor
centerView.addSubview(line)
line.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(52)
make.height.equalTo(1)
make.right.equalTo(-18)
}
} }
func updateAllViews() { func updateAllViews() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift
View file @ 1b118b8a
...@@ -116,7 +116,7 @@ class YHMySignatureDetailViewController: YHBaseViewController { ...@@ -116,7 +116,7 @@ class YHMySignatureDetailViewController: YHBaseViewController {
} }
func getPromptHeight(_ value: String) -> CGFloat { func getPromptHeight(_ value: String) -> CGFloat {
let text = value // 要显示的文本内容 let text = "驳回原因：" + value // 要显示的文本内容
let font = UIFont.PFSC_R(ofSize: 12) // 字体大小 let font = UIFont.PFSC_R(ofSize: 12) // 字体大小
let maxWidth = KScreenWidth - 74 // 最大宽度限制 let maxWidth = KScreenWidth - 74 // 最大宽度限制
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHMyFileMethodTableViewCell.swift
View file @ 1b118b8a
...@@ -118,33 +118,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell { ...@@ -118,33 +118,7 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
bottomView.snp.makeConstraints { make in bottomView.snp.makeConstraints { make in
make.right.left.equalToSuperview() make.right.left.equalToSuperview()
make.height.equalTo(1) make.height.equalTo(1)
make.top.equalTo(123) make.top.equalTo(115)
}
bottomLeftLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomLeftLineView)
bottomLeftLineView.snp.makeConstraints { make in
make.left.equalTo(width)
make.width.equalTo(1)
make.bottom.equalTo(-17.5)
make.height.equalTo(16)
}
bottomRightLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomRightLineView)
bottomRightLineView.snp.makeConstraints { make in
make.left.equalTo(width * 2)
make.width.equalTo(1)
make.bottom.equalTo(-17.5)
make.height.equalTo(16)
} }
editButton = { editButton = {
...@@ -220,6 +194,32 @@ class YHSignatureToActionTableViewCell: UITableViewCell { ...@@ -220,6 +194,32 @@ class YHSignatureToActionTableViewCell: UITableViewCell {
make.height.equalTo(40) make.height.equalTo(40)
make.centerY.equalToSuperview() make.centerY.equalToSuperview()
} }
bottomLeftLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomLeftLineView)
bottomLeftLineView.snp.makeConstraints { make in
make.left.equalTo(width)
make.width.equalTo(1)
make.centerY.equalTo(editButton.snp.centerY)
make.height.equalTo(16)
}
bottomRightLineView = {
let view = UIView()
view.backgroundColor = UIColor.separatorColor
return view
}()
centerView.addSubview(bottomRightLineView)
bottomRightLineView.snp.makeConstraints { make in
make.left.equalTo(width * 2)
make.width.equalTo(1)
make.centerY.equalTo(editButton.snp.centerY)
make.height.equalTo(16)
}
} }
func updateAllViews() { func updateAllViews() {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHSignatureUploadTableViewCell.swift
View file @ 1b118b8a
...@@ -129,6 +129,16 @@ class YHSignatureUploadTableViewCell: UITableViewCell { ...@@ -129,6 +129,16 @@ class YHSignatureUploadTableViewCell: UITableViewCell {
make.bottom.equalTo(-153) make.bottom.equalTo(-153)
make.top.equalTo(52) make.top.equalTo(52)
} }
let line = UIView()
line.backgroundColor = UIColor.separatorColor
centerView.addSubview(line)
line.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(52)
make.height.equalTo(1)
make.right.equalTo(-18)
}
} }
func updateAllViews() { func updateAllViews() {
......
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