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

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:
  细节修改
  细节修改
parents 9828f3f8 81f235f0
...@@ -232,9 +232,7 @@ extension YHInvitationWithGiftsSelectItemView: UITableViewDelegate, UITableViewD ...@@ -232,9 +232,7 @@ extension YHInvitationWithGiftsSelectItemView: UITableViewDelegate, UITableViewD
cell.block = {[weak self] index in cell.block = {[weak self] index in
if indexPath.section == 0 { if indexPath.section == 0 {
self?.selectOne = index self?.selectOne = index
if index == 3 { self?.tableView.reloadData()
self?.tableView.reloadData()
}
} else { } else {
self?.selectTwo = index self?.selectTwo = index
} }
...@@ -422,6 +420,14 @@ class YHInvitationWithGiftsSelectItemCell: UITableViewCell { ...@@ -422,6 +420,14 @@ class YHInvitationWithGiftsSelectItemCell: UITableViewCell {
} }
@objc func click(sender: UIButton) { @objc func click(sender: UIButton) {
if selectIndex == sender.tag - 1000 {
sender.isSelected = false
sender.layer.borderWidth = 0
if let block = block {
block(100)
}
return
}
guard let data = dataSource else { return } guard let data = dataSource else { return }
for i in 0..<data.count { for i in 0..<data.count {
let button = centerView.viewWithTag(1000+i) as! UIButton let button = centerView.viewWithTag(1000+i) as! UIButton
...@@ -433,6 +439,7 @@ class YHInvitationWithGiftsSelectItemCell: UITableViewCell { ...@@ -433,6 +439,7 @@ class YHInvitationWithGiftsSelectItemCell: UITableViewCell {
button.layer.borderWidth = 0 button.layer.borderWidth = 0
} }
} }
selectIndex = sender.tag - 1000
if let block = block { if let block = block {
block(sender.tag - 1000) block(sender.tag - 1000)
} }
......
...@@ -568,6 +568,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -568,6 +568,7 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
safariViewController.modalPresentationStyle = .fullScreen safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
}) })
} }
} else { } else {
......
...@@ -418,6 +418,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -418,6 +418,7 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
safariViewController.dismissButtonStyle = .close safariViewController.dismissButtonStyle = .close
safariViewController.delegate = self safariViewController.delegate = self
safariViewController.modalPresentationStyle = .fullScreen safariViewController.modalPresentationStyle = .fullScreen
present(safariViewController, animated: true, completion: nil)
}) })
} }
} else { } else {
......
...@@ -219,7 +219,7 @@ class YHSignAppendStepView: UIView { ...@@ -219,7 +219,7 @@ class YHSignAppendStepView: UIView {
let button = UIButton(type: .custom) let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16) button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("确定", for: .normal) button.setTitle("下一步", for: .normal)
button.setTitleColor(UIColor.white, for: .normal) button.setTitleColor(UIColor.white, for: .normal)
button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.3) button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.3)
button.isEnabled = false button.isEnabled = false
......
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