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

// UI整改

parent 978ee110
...@@ -80,8 +80,8 @@ class YHCertificateUploadContentListVC: YHBaseViewController { ...@@ -80,8 +80,8 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
btn.setTitle("继续上传".local, for: .normal) btn.setTitle("继续上传".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 6.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickUploadBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickUploadBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -146,8 +146,8 @@ class YHCertificateFilterView: UIView { ...@@ -146,8 +146,8 @@ class YHCertificateFilterView: UIView {
btn.setTitle("确定".local, for: .normal) btn.setTitle("确定".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside)
return btn return btn
}() }()
...@@ -158,7 +158,7 @@ class YHCertificateFilterView: UIView { ...@@ -158,7 +158,7 @@ class YHCertificateFilterView: UIView {
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(UIColor.mainTextColor, for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.backgroundColor = UIColor(hexString:"#F8F9FB") btn.backgroundColor = UIColor(hexString:"#F8F9FB")
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickResetBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickResetBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -116,8 +116,8 @@ class YHCertificateTemplateSheetView: UIView { ...@@ -116,8 +116,8 @@ class YHCertificateTemplateSheetView: UIView {
btn.setTitle("知道了".local, for: .normal) btn.setTitle("知道了".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickKnownBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickKnownBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -59,8 +59,8 @@ class YHCertificateUploadFailTipsView: UIView { ...@@ -59,8 +59,8 @@ class YHCertificateUploadFailTipsView: UIView {
btn.setTitle("我知道了".local, for: .normal) btn.setTitle("我知道了".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 6.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(dismiss), for: .touchUpInside) btn.addTarget(self, action: #selector(dismiss), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -85,7 +85,7 @@ class YHFileRenameInputView: UIView { ...@@ -85,7 +85,7 @@ class YHFileRenameInputView: UIView {
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(UIColor.mainTextColor, for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.backgroundColor = .contentBkgColor btn.backgroundColor = .contentBkgColor
btn.layer.cornerRadius = 6.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickCancelBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickCancelBtn), for: .touchUpInside)
return btn return btn
}() }()
...@@ -95,8 +95,8 @@ class YHFileRenameInputView: UIView { ...@@ -95,8 +95,8 @@ class YHFileRenameInputView: UIView {
btn.setTitle("确定".local, for: .normal) btn.setTitle("确定".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 6.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -77,7 +77,7 @@ class YHEmailInputAlertView: UIView { ...@@ -77,7 +77,7 @@ class YHEmailInputAlertView: UIView {
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(UIColor.mainTextColor, for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.backgroundColor = .contentBkgColor btn.backgroundColor = .contentBkgColor
btn.layer.cornerRadius = 6.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickCancelBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickCancelBtn), for: .touchUpInside)
return btn return btn
}() }()
...@@ -87,8 +87,8 @@ class YHEmailInputAlertView: UIView { ...@@ -87,8 +87,8 @@ class YHEmailInputAlertView: UIView {
btn.setTitle("确定".local, for: .normal) btn.setTitle("确定".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 6.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickConfirmBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -54,8 +54,8 @@ class YHFamilyMemberInfoListVC: YHBaseViewController { ...@@ -54,8 +54,8 @@ class YHFamilyMemberInfoListVC: YHBaseViewController {
btn.setTitle("提交".local, for: .normal) btn.setTitle("提交".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -120,7 +120,7 @@ class YHSheetPickerView: UIView { ...@@ -120,7 +120,7 @@ class YHSheetPickerView: UIView {
let btn = UIButton() let btn = UIButton()
btn.setTitle("确定".local, for: .normal) btn.setTitle("确定".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
btn.setTitleColor(UIColor(hex: 0x4487F9), for: .normal) btn.setTitleColor(UIColor.brandMainColor, for: .normal)
btn.addTarget(self, action: #selector(didClickConfirmButton), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickConfirmButton), for: .touchUpInside)
btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20) btn.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
return btn return btn
...@@ -548,7 +548,7 @@ extension YHSheetPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -548,7 +548,7 @@ extension YHSheetPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
// 选中背景色 // 选中背景色
if #available(iOS 14.0, *), pickerView.subviews.count > 1 { if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06) pickerView.subviews[1].backgroundColor = UIColor.brandMainColor6
} }
return label return label
} }
......
...@@ -13,10 +13,10 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell { ...@@ -13,10 +13,10 @@ class YHFormItemOnlyDoubleChoiceCell: UITableViewCell {
static let cellReuseIdentifier = "YHFormItemOnlyDoubleChoiceCell" static let cellReuseIdentifier = "YHFormItemOnlyDoubleChoiceCell"
let btnWidth = 70.0 let btnWidth = 70.0
let btnHeight = 32.0 let btnHeight = 32.0
let btnTitleSelectColor = UIColor(hex: 0x4487F9) let btnTitleSelectColor = UIColor.brandMainColor
let btnTitleDefaultColor = UIColor.mainTextColor let btnTitleDefaultColor = UIColor.mainTextColor
let btnBgDefaultColor = UIColor(hex:0xF8F9FB) let btnBgDefaultColor = UIColor(hex:0xF8F9FB)
let btnBgSelectColor = UIColor(hex:0x4487F9, alpha: 0.08) let btnBgSelectColor = UIColor.brandMainColor8
let answerBaseTag = 9527 let answerBaseTag = 9527
var answerBlock:(([YHFormChoiceItem], Int)->Void)? var answerBlock:(([YHFormChoiceItem], Int)->Void)?
......
...@@ -78,8 +78,8 @@ class YHSaveAndSubmitView: UIView { ...@@ -78,8 +78,8 @@ class YHSaveAndSubmitView: UIView {
btn.setTitle("提交".local, for: .normal) btn.setTitle("提交".local, for: .normal)
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(.white, for: .normal) btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#4388FF") btn.backgroundColor = UIColor.brandMainColor
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickSubmitBtn), for: .touchUpInside)
return btn return btn
}() }()
...@@ -90,7 +90,7 @@ class YHSaveAndSubmitView: UIView { ...@@ -90,7 +90,7 @@ class YHSaveAndSubmitView: UIView {
btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14) btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
btn.setTitleColor(UIColor.mainTextColor, for: .normal) btn.setTitleColor(UIColor.mainTextColor, for: .normal)
btn.backgroundColor = UIColor(hexString:"#F8F9FB") btn.backgroundColor = UIColor(hexString:"#F8F9FB")
btn.layer.cornerRadius = 8.0 btn.layer.cornerRadius = 3.0
btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside) btn.addTarget(self, action: #selector(didClickSaveBtn), for: .touchUpInside)
return btn return btn
}() }()
......
...@@ -275,7 +275,7 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -275,7 +275,7 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
// 选中背景色 // 选中背景色
if #available(iOS 14.0, *), pickerView.subviews.count > 1 { if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06) pickerView.subviews[1].backgroundColor = UIColor.brandMainColor6
} }
return label return label
...@@ -299,7 +299,7 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -299,7 +299,7 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
// 选中背景色 // 选中背景色
if #available(iOS 14.0, *), pickerView.subviews.count > 1 { if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06) pickerView.subviews[1].backgroundColor = UIColor.brandMainColor6
} }
return label return label
......
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