Skip to content

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

1、图片替换 

2、圆角3
parent dc9034ba
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 126 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 036818a5
......@@ -250,7 +250,7 @@ extension YHInformationPerfectListVC {
submitBtn.setTitleColor(UIColor.white, for: .normal)
submitBtn.isEnabled = false
submitBtn.layer.cornerRadius = kCornerRadius6
submitBtn.layer.cornerRadius = kCornerRadius3
submitBtn.clipsToBounds = true
myBottomView.addSubview(submitBtn)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListBottomView.swift
View file @ 036818a5
......@@ -24,34 +24,12 @@ class YHFileListBottomView: UIView {
typealias Block = (Int) -> ()
var block: Block?
// var saveButton: UIButton!
var nextButton: UIButton!
}
private extension YHFileListBottomView {
func setupUI() {
backgroundColor = .white
// saveButton = {
// let button = UIButton(type: .custom)
// button.backgroundColor = UIColor.contentBkgColor
// button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
// button.contentHorizontalAlignment = .center
// button.setTitle("问题答疑", for: .normal)
// button.setTitleColor(UIColor.mainTextColor, for: .normal)
// button.layer.cornerRadius = kCornerRadius6
// button.addTarget(self, action: #selector(save), for: .touchUpInside)
// return button
// }()
// addSubview(saveButton)
// saveButton.snp.makeConstraints { make in
// make.left.equalTo(kMargin)
// make.top.equalTo(12)
// make.height.equalTo(44)
// make.width.equalTo(86)
// }
nextButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocumentUploadTableViewCell.swift
View file @ 036818a5
......@@ -51,7 +51,6 @@ class YHDocumentUploadTableViewCell: UITableViewCell {
}
func setupUI() {
let width = (KScreenWidth - 32)/3.0
backgroundColor = .clear
centerView = {
let view = UIView()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHCompanySelectViewController.swift
View file @ 036818a5
......@@ -71,7 +71,7 @@ class YHCompanySelectViewController: YHBaseViewController {
sureButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2274ee)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("确认", for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHImageClipperViewController.swift
View file @ 036818a5
......@@ -78,7 +78,7 @@ class YHImageClipperViewController: YHBaseViewController {
sureButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.backgroundColor = UIColor(hex: 0x2274ee)
button.backgroundColor = UIColor.brandMainColor
button.contentHorizontalAlignment = .center
button.setTitle("确认", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkExperienceListViewController.swift
View file @ 036818a5
......@@ -79,7 +79,6 @@ class YHWorkExperienceListViewController: YHBaseViewController {
bottomButton = {
let button = UIButton(type: .custom)
// button.backgroundColor = UIColor(hex:0x2274ee)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("提交", for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift
View file @ 036818a5
......@@ -239,7 +239,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
bottomButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2274ee)
button.backgroundColor = UIColor.brandMainColor
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("保存", for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHResultBottomView.swift
View file @ 036818a5
......@@ -28,7 +28,7 @@ class YHResultBottomView: UIView {
nextButton = {
let button = UIButton(type: .custom)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
button.backgroundColor = UIColor(hex: 0x2274ee)
button.backgroundColor = UIColor.brandMainColor
button.contentHorizontalAlignment = .center
button.setTitle("开始识别", for: .normal)
button.setImage(UIImage(named: "image_scan"), for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkHighlightsTableViewCell.swift
View file @ 036818a5
......@@ -88,7 +88,7 @@ class YHWorkHighlightsTableViewCell: UITableViewCell {
subTitleLabel = {
let label = UILabel()
label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知"
label.textColor = UIColor(hex: 0x2f7ef6)
label.textColor = UIColor.brandMainColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.numberOfLines = 0
return label
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkMessageSelectTableViewCell.swift
View file @ 036818a5
......@@ -116,14 +116,14 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
rightButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .selected)
button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
button.setTitleColor(UIColor.brandMainColor, for: .selected)
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("是", for: .normal)
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
button.layer.cornerRadius = 16
button.layer.borderWidth = 1
button.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
button.layer.borderColor = UIColor.brandMainColor.cgColor
button.isSelected = true
button.addTarget(self, action: #selector(rightClick), for: .touchUpInside)
return button
......@@ -139,7 +139,7 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
leftButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor.contentBkgColor
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .selected)
button.setTitleColor(UIColor.brandMainColor, for: .selected)
button.setTitleColor(UIColor.mainTextColor, for: .normal)
button.setTitle("否", for: .normal)
button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
......@@ -161,16 +161,16 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
rightButton.isSelected = true
leftButton.isSelected = false
rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0
} else {
leftButton.isSelected = true
rightButton.isSelected = false
leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0
}
......@@ -180,8 +180,8 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
rightButton.isSelected = true
leftButton.isSelected = false
rightButton.layer.borderWidth = 1
rightButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
rightButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
rightButton.layer.borderColor = UIColor.brandMainColor.cgColor
rightButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
leftButton.backgroundColor = UIColor.contentBkgColor
leftButton.layer.borderWidth = 0
if let block = isNeedFileBlock {
......@@ -193,8 +193,8 @@ class YHWorkMessageSelectTableViewCell: UITableViewCell {
leftButton.isSelected = true
rightButton.isSelected = false
leftButton.layer.borderWidth = 1
leftButton.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
leftButton.backgroundColor = UIColor(hex: 0x2f7ef6).withAlphaComponent(0.08)
leftButton.layer.borderColor = UIColor.brandMainColor.cgColor
leftButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.08)
rightButton.backgroundColor = UIColor.contentBkgColor
rightButton.layer.borderWidth = 0
if let block = isNeedFileBlock {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkResponsibilitiesTableViewCell.swift
View file @ 036818a5
......@@ -84,7 +84,7 @@ class YHWorkResponsibilitiesTableViewCell: UITableViewCell {
subTitleLabel = {
let label = UILabel()
label.text = "温馨提示：如下模板仅供思路参考，工作内容请按您的实际填写，后期文案会基于该内容进行文书材料撰写，望悉知"
label.textColor = UIColor(hex: 0x2f7ef6)
label.textColor = UIColor.brandMainColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.numberOfLines = 0
return label
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsAlertView.swift
View file @ 036818a5
......@@ -109,7 +109,7 @@ class YHInformationFillTipsAlertView: UIView {
checkBtn.addTarget(self, action: #selector(onClickReadyBtn), for: .touchUpInside)
checkBtn.setTitle("准备完毕", for: .normal)
checkBtn.setTitleColor(.white, for: .normal)
checkBtn.layer.cornerRadius = kCornerRadius6
checkBtn.layer.cornerRadius = kCornerRadius3
checkBtn.clipsToBounds = true
checkBtn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
......@@ -205,8 +205,8 @@ class YHInformationFillTipsAlertView: UIView {
}
let selectedBtn = UIButton(type: .custom)
selectedBtn.setImage(UIImage(named: "selected_icon_0"), for: .normal)
selectedBtn.setImage(UIImage(named: "selected_icon_1"), for: .selected)
selectedBtn.setImage(UIImage(named: "login_privacy_agree"), for: .normal)
selectedBtn.setImage(UIImage(named: "login_privacy_disagree"), for: .selected)
selectedBtn.addTarget(self, action: #selector(onClickAgree), for: .touchUpInside)
footer.addSubview(selectedBtn)
selectedBtn.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHLoginTipsView.swift
View file @ 036818a5
......@@ -49,7 +49,7 @@ class YHLoginTipsView: UIView {
private lazy var loginBtn : UIButton = {
let btn = UIButton(type: .custom)
btn.setTitle("去登录", for: .normal)
btn.layer.cornerRadius = kCornerRadius6
btn.layer.cornerRadius = kCornerRadius3
btn.clipsToBounds = true
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
btn.setTitleColor(.white, for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceNoOrderView.swift
View file @ 036818a5
......@@ -47,7 +47,7 @@ class YHServiceNoOrderView: UIView {
private lazy var moreBtn : UIButton = {
let btn = UIButton(type: .custom)
btn.setTitle("更多资讯", for: .normal)
btn.layer.cornerRadius = kCornerRadius6
btn.layer.cornerRadius = kCornerRadius3
btn.clipsToBounds = true
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
btn.setTitleColor(UIColor.mainTextColor, for: .normal)
......@@ -58,7 +58,7 @@ class YHServiceNoOrderView: UIView {
private lazy var backBtn : UIButton = {
let btn = UIButton(type: .custom)
btn.setTitle("返回首页", for: .normal)
btn.layer.cornerRadius = kCornerRadius6
btn.layer.cornerRadius = kCornerRadius3
btn.clipsToBounds = true
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
btn.setTitleColor(.white, for: .normal)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmitAllInfoCheckView.swift
View file @ 036818a5
......@@ -55,21 +55,6 @@ class YHSubmitAllInfoCheckView: UIView {
make.height.equalTo(165)
}
// titleLabel = {
// let label = UILabel()
// label.text = "同意隐私协议"
// label.font = UIFont.PFSC_R(ofSize: 16)
// label.textColor = UIColor.mainTextColor
// label.textAlignment = .center
// return label
// }()
// centerView.addSubview(titleLabel)
// titleLabel.snp.makeConstraints { make in
// make.left.right.equalToSuperview()
// make.height.equalTo(19)
// make.top.equalTo(27)
// }
messageLabel = {
let label = UILabel()
label.text = "确定是否提交信息？提交后将不能修改"
......@@ -83,7 +68,6 @@ class YHSubmitAllInfoCheckView: UIView {
messageLabel.snp.makeConstraints { make in
make.left.equalTo(22)
make.right.equalTo(-22)
// make.height.equalTo(42)
make.top.equalTo(40)
}
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeResultViewController.swift
View file @ 036818a5
......@@ -146,7 +146,6 @@ class YHCodeResultViewController: YHBaseViewController {
} else if self.time <= 0 {
sourceTimer.cancel()
DispatchQueue.main.async {
// self.getCodeLabel?.text = "获取验证码"
self.time = 60
self.getCodeLabel.isHidden = true
self.getCodeButton.isHidden = false
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssViewController.swift
View file @ 036818a5
......@@ -201,7 +201,6 @@ class YHCodeSueecssViewController: YHBaseViewController {
} else if self.time <= 0 {
sourceTimer.cancel()
DispatchQueue.main.async {
// self.getCodeLabel?.text = "获取验证码"
self.time = 60
self.getCodeLabel.isHidden = true
self.getCodeButton.isHidden = false
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHPhoneLoginViewController.swift
View file @ 036818a5
......@@ -124,10 +124,10 @@ class YHPhoneLoginViewController: YHBaseViewController {
view.phoneBlock = {[weak self] count in
guard let self = self else { return }
if count == 0 {
self.getCodeButton.backgroundColor = UIColor(hex:0x2274ee).withAlphaComponent(0.4)
self.getCodeButton.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.4)
self.getCodeButton.isEnabled = false
} else {
self.getCodeButton.backgroundColor = UIColor(hex:0x2274ee)
self.getCodeButton.backgroundColor = UIColor.brandMainColor
self.getCodeButton.isEnabled = true
}
}
......@@ -143,7 +143,7 @@ class YHPhoneLoginViewController: YHBaseViewController {
getCodeButton = {
let button = UIButton(type: .custom)
button.backgroundColor = UIColor(hex:0x2274ee).withAlphaComponent(0.4)
button.backgroundColor = UIColor.brandMainColor.withAlphaComponent(0.4)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("获取验证码", for: .normal)
......
galaxy/galaxy/Classes/Modules/Login(登录)/C/YHVerificationCodeLoginController.swift
View file @ 036818a5
......@@ -185,7 +185,6 @@ class YHVerificationCodeLoginController: YHBaseViewController {
make.height.equalTo(20)
make.width.equalTo(308)
}
//测试
}
@objc func getCode() {
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginPrivacyView.swift
View file @ 036818a5
......@@ -61,7 +61,7 @@ class YHLoginPrivacyView: UIView {
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.contentHorizontalAlignment = .center
button.setTitle("《隐私协议》", for: .normal)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(firstUrlClick), for: .touchUpInside)
return button
}()
......@@ -91,7 +91,7 @@ class YHLoginPrivacyView: UIView {
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
button.contentHorizontalAlignment = .center
button.setTitle("《用户条款》", for: .normal)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
button.setTitleColor(UIColor.brandMainColor, for: .normal)
button.addTarget(self, action: #selector(secondUrlClick), for: .touchUpInside)
return button
}()
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/验证码输入框/YHSmsCodeInputView.swift
View file @ 036818a5
......@@ -12,7 +12,7 @@ struct YHSmsCodeViewConfig {
var textColor : UIColor? = UIColor(hex: 0x000000)
var bgColor : UIColor? = UIColor(hex: 0xebeef4)
var cursorColor : UIColor? = UIColor(hex: 0x2f7ef6)
var cursorColor : UIColor? = UIColor.brandMainColor
var font: UIFont? = .systemFont(ofSize: 20)
// 展示输入框个数
var count : Int = 6
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/验证码输入框/YHSmsCodeView.swift
View file @ 036818a5
......@@ -16,7 +16,7 @@ class YHSmsCodeView: UIView {
self.cursor.layer .removeAllAnimations()
self.animaitonShow(true)
self.layer.borderWidth = 1
self.layer.borderColor = UIColor(hex: 0x2f7ef6).cgColor
self.layer.borderColor = UIColor.brandMainColor.cgColor
} else {
self.cursor.layer .removeAllAnimations()
self.cursor.isHidden = true
......@@ -39,7 +39,7 @@ class YHSmsCodeView: UIView {
var cursor : UIView = {
let cursor = UIView()
cursor.backgroundColor = UIColor(hex: 0x2f7ef6)
cursor.backgroundColor = UIColor.brandMainColor
cursor.isHidden = true
return cursor
}()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMySettingViewController.swift
View file @ 036818a5
......@@ -29,7 +29,7 @@ class YHMySettingViewController: YHBaseViewController, ConstraintRelatableTarget
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
btn.setTitleColor(UIColor(hexString:"#313131"), for: .normal)
btn.backgroundColor = .contentBkgColor
btn.layer.cornerRadius = kCornerRadius6
btn.layer.cornerRadius = kCornerRadius3
btn.addTarget(self, action: #selector(logout), for: .touchUpInside)
return btn
}()
......
galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift
View file @ 036818a5
......@@ -145,7 +145,7 @@ class YHUserInfoHeaderView: UIView {
btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
btn.setTitleColor(.white, for: .normal)
btn.backgroundColor = UIColor(hexString:"#242424")
btn.layer.cornerRadius = kCornerRadius6
btn.layer.cornerRadius = kCornerRadius3
btn.clipsToBounds = true
btn.addTarget(self, action: #selector(didClickEvaluateBtn(btn:)), for: .touchUpInside)
return btn
......
galaxy/galaxy/Res/Assets.xcassets/Login/login_privacy_agree.imageset/Contents.json
View file @ 036818a5
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "login_privacy_agree@2x.png",
"filename" : "Group 3040@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "login_privacy_agree@3x.png",
"filename" : "Group 3040@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/Login/login_privacy_disagree.imageset/Contents.json
View file @ 036818a5
......@@ -5,12 +5,12 @@
"scale" : "1x"
},
{
"filename" : "login_privacy_disagree@2x.png",
"filename" : "Rectangle 2490@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "login_privacy_disagree@3x.png",
"filename" : "Rectangle 2490@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
......
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/selected_icon_0.imageset/Contents.json deleted 100644 → 0
View file @ dc9034ba
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Rectangle 2490@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Rectangle 2490@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/selected_icon_1.imageset/Contents.json deleted 100644 → 0
View file @ dc9034ba
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 3040@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 3040@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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