Commit 02441494 authored by Steven杜宇's avatar Steven杜宇

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

parents 3f21ac8a 3b08a08d
...@@ -37,16 +37,6 @@ class YHPreviewBaseViewController: YHBaseViewController { ...@@ -37,16 +37,6 @@ class YHPreviewBaseViewController: YHBaseViewController {
make.left.equalTo(16) make.left.equalTo(16)
make.right.equalTo(-16) make.right.equalTo(-16)
} }
}
override func viewWillLayoutSubviews() {
super.viewWillLayoutSubviews()
// homeTableView.snp.makeConstraints { make in
// make.top.bottom.equalToSuperview()
// make.left.equalTo(16)
// make.right.equalTo(-16)
// }
} }
} }
......
...@@ -129,9 +129,6 @@ class YHPreviewControllerHoldViewController: UIViewController { ...@@ -129,9 +129,6 @@ class YHPreviewControllerHoldViewController: UIViewController {
segmentedView.frame = CGRect(x: 0, y: 0, width: view.bounds.size.width, height: 55) segmentedView.frame = CGRect(x: 0, y: 0, width: view.bounds.size.width, height: 55)
listContainerView.frame = CGRect(x: 0, y: 55, width: view.bounds.size.width, height: view.bounds.size.height - 55) listContainerView.frame = CGRect(x: 0, y: 55, width: view.bounds.size.width, height: view.bounds.size.height - 55)
segmentedView.backgroundColor = .white segmentedView.backgroundColor = .white
view.backgroundColor = .yellow//for test hjl
} }
} }
......
...@@ -48,7 +48,7 @@ extension YHPreviewInfoCell { ...@@ -48,7 +48,7 @@ extension YHPreviewInfoCell {
holdView.snp.makeConstraints { make in holdView.snp.makeConstraints { make in
make.top.equalTo(14) make.top.equalTo(14)
make.left.equalToSuperview() make.left.equalToSuperview()
make.bottom.equalToSuperview().offset(-40) make.bottom.equalToSuperview()
make.width.equalTo(contentView.snp.width) make.width.equalTo(contentView.snp.width)
} }
......
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