处理 填写列表 弹窗

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -187,18 +187,20 @@ extension YHInformationPerfectListVC {
         submitBtn.setTitle("提交信息", for: .normal)
         submitBtn.setTitleColor(UIColor.white, for: .normal)
 
-        submitBtn.setBackgroundImage(UIImage.from(color: UIColor(hex: 0x4D9FF8, alpha: 1.0)), for: .normal)
-        submitBtn.layer.cornerRadius = 8
+        submitBtn.layer.cornerRadius = kCornerRadius6
         submitBtn.clipsToBounds = true
         myBottomView.addSubview(submitBtn)
         
         submitBtn.addTarget(self, action: #selector(clickSubmitBtn), for: .touchUpInside)
         submitBtn.snp.makeConstraints { make in
             make.top.equalTo(8)
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
             make.height.equalTo(48)
         }
+        submitBtn.layoutIfNeeded()
+        submitBtn.backgroundGradient()
+        
         
         submitBtn.isHidden = hasSubmitFlag
         submitHoldView.isHidden = !hasSubmitFlag
@@ -206,8 +208,8 @@ extension YHInformationPerfectListVC {
         myBottomView.addSubview(submitHoldView)
         submitHoldView.snp.makeConstraints { make in
             make.top.equalTo(8)
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
             make.height.equalTo(48)
         }
         
@@ -215,13 +217,13 @@ extension YHInformationPerfectListVC {
         let scoreButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0xffffff)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("我的评分", for: .normal)
-            button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
-            button.layer.cornerRadius = 8
+            button.setTitleColor(UIColor.brandMainColor, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
             button.layer.borderWidth = 1
-            button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
+            button.layer.borderColor = UIColor.brandMainColor.cgColor
             button.addTarget(self, action: #selector(goScoreVC), for: .touchUpInside)
             return button
         }()
@@ -234,11 +236,12 @@ extension YHInformationPerfectListVC {
         let infoButton = {
             let button = UIButton(type: .custom)
             button.backgroundColor =  UIColor(hex:0x3c86f8)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("个人信息表", for: .normal)
-            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-            button.layer.cornerRadius = 8
+            button.setTitleColor(.white, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
             button.addTarget(self, action: #selector(goInfoListVC), for: .touchUpInside)
             return button
         }()
@@ -247,6 +250,8 @@ extension YHInformationPerfectListVC {
             make.right.top.bottom.equalToSuperview()
             make.left.equalTo(submitHoldView.snp.centerX).offset(6)
         }
+        infoButton.layoutIfNeeded()
+        infoButton.backgroundGradient()
         
         homeTableView.delegate = self
         homeTableView.dataSource = self

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHInformationPerfectModel.swift

@@ -47,7 +47,7 @@ class YHInformationPerfectModel {
     var isFinished : Bool = false {
         didSet {
             status = isFinished ? "已完成" : "待完善"
-            color = isFinished ? UIColor(hex: 0x222222, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            color = isFinished ? UIColor.mainTextColor : UIColor.labelTextColor2
             statusColor = isFinished ? UIColor.successColor : UIColor.labelTextColor2
             if type != 1 {
                 icon = isFinished ? icon : (icon + "_grey")
@@ -57,8 +57,8 @@ class YHInformationPerfectModel {
     
     var isDoing : Bool = false {
         didSet {
-            color = isDoing ? UIColor(hex: 0x222222, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
-            statusColor = isDoing ? UIColor(hex: 0x3F8BF8, alpha: 1.0) : UIColor(hex: 0x888F98, alpha: 1.0)
+            color = isFinished ? UIColor.mainTextColor : UIColor.labelTextColor2
+            statusColor = isDoing ? UIColor.brandMainColor : UIColor.labelTextColor2
             if type != 1 {
                 icon = isDoing ? icon : (icon + "_grey")
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsAlertView.swift

@@ -76,7 +76,7 @@ class YHInformationFillTipsAlertView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 8
+            view.layer.cornerRadius = kCornerRadius8
             return view
         }()
         addSubview(centerView)
@@ -99,14 +99,15 @@ class YHInformationFillTipsAlertView: UIView {
         checkBtn.addTarget(self, action: #selector(onClickReadyBtn), for: .touchUpInside)
         checkBtn.setTitle("准备完毕", for: .normal)
         checkBtn.setTitleColor(.white, for: .normal)
-        checkBtn.layer.cornerRadius = 8
+        checkBtn.layer.cornerRadius = kCornerRadius6
         checkBtn.clipsToBounds = true
+        checkBtn.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
         
         bottomView.addSubview(checkBtn)
         checkBtn.snp.makeConstraints { make in
             make.bottom.equalToSuperview().offset(-40)
-            make.left.equalTo(16)
-            make.right.equalTo(-16)
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
             make.height.equalTo(48)
         }
         checkBtn.layoutIfNeeded()//非常重要！！！！ 
@@ -115,8 +116,8 @@ class YHInformationFillTipsAlertView: UIView {
         
         
         let lable00 = UILabel(text: "我确认我所提供的材料真实有效，并知悉其中内容。")
-        lable00.font = kFont(size: 12)
-        lable00.textColor = UIColor(red: 0.533, green: 0.561, blue: 0.596, alpha: 1)
+        lable00.font = UIFont.PFSC_R(ofSize: 12)
+        lable00.textColor = UIColor.labelTextColor2
         let tap = UITapGestureRecognizer(target: self, action: #selector(onClickAgree))
         lable00.isUserInteractionEnabled = true
         lable00.addGestureRecognizer(tap)
@@ -151,8 +152,8 @@ class YHInformationFillTipsAlertView: UIView {
         
         
         let lable01 = UILabel(text: "信息填写提示")
-        lable01.font = UIFont.PFSC_B(ofSize: 18)
-        lable01.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable01.font = UIFont.PFSC_M(ofSize: 17)
+        lable01.textColor = UIColor.mainTextColor
         
         topView.addSubview(lable01)
         lable01.snp.makeConstraints { make in
@@ -164,7 +165,7 @@ class YHInformationFillTipsAlertView: UIView {
         
         
         let line = UIView()
-        line.backgroundColor = UIColor(red: 0.941, green: 0.941, blue: 0.941, alpha: 1)
+        line.backgroundColor = UIColor(hexString: "#F0F0F0")
         topView.addSubview(line)
         line.snp.makeConstraints { make in
             make.left.equalTo(21)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHInformationFillTipsCell.swift

@@ -58,8 +58,8 @@ extension YHInformationFillTipsCell {
         
         //添加元素
         let lable0 = UILabel(text: "    您好！欢迎来到香港优才申请系统，请按照实际情况填写。")
-        lable0.font = kFont(size: 14)
-        lable0.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable0.font = UIFont.PFSC_R(ofSize: 14)
+        lable0.textColor = UIColor.mainTextColor
         lable0.numberOfLines = 0
         lable0.lineBreakMode = .byWordWrapping
         
@@ -72,12 +72,12 @@ extension YHInformationFillTipsCell {
         
         let lable1 = UILabel(text: "    1. 如您填写途中想离开系统，记得点击保存，在您有空闲的时间再继续进行填写；")
         lable1.font = UIFont.PFSC_R(ofSize: 14)
-        lable1.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable1.textColor = UIColor.mainTextColor
         lable1.numberOfLines = 0
         lable1.lineBreakMode = .byWordWrapping
-        let a: ASAttributedString = .init("    1. 如您填写途中想离开系统，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
-        let b: ASAttributedString = .init("记得点击保存", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(hex:0x3271F5)))
-        let c: ASAttributedString = .init("，在您有空闲的时间再继续进行填写；", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
+        let a: ASAttributedString = .init("    1. 如您填写途中想离开系统，", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
+        let b: ASAttributedString = .init("记得点击保存", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        let c: ASAttributedString = .init("，在您有空闲的时间再继续进行填写；", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         lable1.attributed.text = a + b + c
         
         holdView.addSubview(lable1)
@@ -88,13 +88,13 @@ extension YHInformationFillTipsCell {
         
         let lable2 = UILabel(text: "    2. 此次填写将花费您30-40分钟，系统将根据您所填写的信息，形成详细资料清单，一起为香港身份起航吧~")
         lable2.font =  UIFont.PFSC_R(ofSize: 14)
-        lable2.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable2.textColor = UIColor.mainTextColor
         lable2.numberOfLines = 0
         lable2.lineBreakMode = .byWordWrapping
         
-        let aa: ASAttributedString = .init("    2. 此次填写将花费您", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
-        let bb: ASAttributedString = .init("30-40分钟", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(hex:0x3271F5)))
-        let cc: ASAttributedString = .init("，系统将根据您所填写的信息，形成详细资料清单，一起为香港身份起航吧~", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)))
+        let aa: ASAttributedString = .init("    2. 此次填写将花费您", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
+        let bb: ASAttributedString = .init("30-40分钟", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.brandMainColor))
+        let cc: ASAttributedString = .init("，系统将根据您所填写的信息，形成详细资料清单，一起为香港身份起航吧~", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
         lable2.attributed.text = aa + bb + cc
         
         
@@ -106,8 +106,8 @@ extension YHInformationFillTipsCell {
         }
         
         let holdView2 = UIView()
-        holdView2.backgroundColor = UIColor(red: 0.973, green: 0.976, blue: 0.984, alpha: 1)
-        holdView2.layer.cornerRadius = 8
+        holdView2.backgroundColor = UIColor.contentBkgColor
+        holdView2.layer.cornerRadius = kCornerRadius6
         holdView2.clipsToBounds = true
         holdView.addSubview(holdView2)
         holdView2.snp.makeConstraints { make in
@@ -117,7 +117,7 @@ extension YHInformationFillTipsCell {
         
         
         let view0 = UIView()
-        view0.backgroundColor = UIColor(red: 0.196, green: 0.443, blue: 0.961, alpha: 1)
+        view0.backgroundColor = UIColor.brandMainColor
         holdView2.addSubview(view0)
         view0.snp.makeConstraints { make in
             make.top.equalTo(15.5)
@@ -130,7 +130,7 @@ extension YHInformationFillTipsCell {
         
         let lable3 = UILabel(text: "准备材料：")
         lable3.font =  UIFont.PFSC_M(ofSize: 14)
-        lable3.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable3.textColor = UIColor.mainTextColor
         holdView2.addSubview(lable3)
         lable3.snp.makeConstraints { make in
             make.centerY.equalTo(view0)
@@ -155,7 +155,7 @@ extension YHInformationFillTipsCell {
         
         let lable4 = UILabel(text: "身份证正反面照片（外国国籍准备护照）")
         lable4.font =  UIFont.PFSC_R(ofSize: 14)
-        lable4.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable4.textColor = UIColor.mainTextColor
         holdView2.addSubview(lable4)
         lable4.snp.makeConstraints { make in
             make.centerY.equalTo(imageV0)
@@ -176,7 +176,7 @@ extension YHInformationFillTipsCell {
         
         let lable5 = UILabel(text: "护照（如有）")
         lable5.font =  UIFont.PFSC_R(ofSize: 14)
-        lable5.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable5.textColor = UIColor.mainTextColor
         holdView2.addSubview(lable5)
         lable5.snp.makeConstraints { make in
             make.centerY.equalTo(imageV1)
@@ -198,7 +198,7 @@ extension YHInformationFillTipsCell {
         
         let lable6 = UILabel(text: "港澳通行证正反面照片（如有）")
         lable6.font =  UIFont.PFSC_R(ofSize: 14)
-        lable6.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable6.textColor = UIColor.mainTextColor
         holdView2.addSubview(lable6)
         lable6.snp.makeConstraints { make in
             make.centerY.equalTo(imageV2)
@@ -220,7 +220,7 @@ extension YHInformationFillTipsCell {
         
         let lable7 = UILabel(text: "简历/工作总结")
         lable7.font =  UIFont.PFSC_R(ofSize: 14)
-        lable7.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable7.textColor = UIColor.mainTextColor
         holdView2.addSubview(lable7)
         lable7.snp.makeConstraints { make in
             make.centerY.equalTo(imageV3)
@@ -232,17 +232,23 @@ extension YHInformationFillTipsCell {
         
         
         let holdView3 = UIView()
-        holdView3.backgroundColor = UIColor(red: 0.973, green: 0.976, blue: 0.984, alpha: 1)
-        holdView3.layer.cornerRadius = 8
+        holdView3.backgroundColor = UIColor.clear
+        holdView3.layer.cornerRadius = kCornerRadius6
         holdView3.clipsToBounds = true
+        holdView3.layer.borderWidth = 1
+        holdView3.layer.borderColor = UIColor(hexString: "#E4EEFF").cgColor
         holdView.addSubview(holdView3)
         holdView3.snp.makeConstraints { make in
             make.top.equalTo(holdView2.snp.bottom).offset(12)
             make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview().offset(-8)//for test hjl
+            make.bottom.equalToSuperview().offset(-8)
         }
         
         
+
+        
+        
+        
         let imageV4 = UIImageView()
         imageV4.image = UIImage(named: "tips_icon")
         imageV4.contentMode = .scaleAspectFill
@@ -255,8 +261,8 @@ extension YHInformationFillTipsCell {
         
         
         let lable8 = UILabel(text: "温馨提示：")
-        lable8.font = UIFont.PFSC_R(ofSize: 12)
-        lable8.textColor = UIColor(red: 0.263, green: 0.533, blue: 1, alpha: 1)
+        lable8.font = UIFont.PFSC_M(ofSize: 12)
+        lable8.textColor = UIColor.brandMainColor
         holdView3.addSubview(lable8)
         lable8.snp.makeConstraints { make in
             make.centerY.equalTo(imageV4)
@@ -270,12 +276,11 @@ extension YHInformationFillTipsCell {
         lable9.numberOfLines = 0
         lable9.lineBreakMode = .byWordWrapping
         lable9.font = UIFont.PFSC_R(ofSize: 12)
-        lable9.textColor = UIColor(red: 0.263, green: 0.533, blue: 1, alpha: 1)
+        lable9.textColor = UIColor.brandMainColor
         holdView3.addSubview(lable9)
         lable9.snp.makeConstraints { make in
             make.top.equalTo(lable8.snp.bottom).offset(7)
             make.left.equalTo(imageV4.snp.left)
-//            make.height.equalTo(28)
             make.right.equalToSuperview().offset(-16)
         }
         
@@ -284,7 +289,7 @@ extension YHInformationFillTipsCell {
         lable10.numberOfLines = 0
         lable10.lineBreakMode = .byWordWrapping
         lable10.font = UIFont.PFSC_R(ofSize: 12)
-        lable10.textColor = UIColor(red: 0.533, green: 0.561, blue: 0.596, alpha: 1)
+        lable10.textColor = UIColor.labelTextColor2
         holdView3.addSubview(lable10)
         lable10.snp.makeConstraints { make in
             make.top.equalTo(lable9.snp.bottom).offset(7)
@@ -292,5 +297,16 @@ extension YHInformationFillTipsCell {
             make.right.equalToSuperview().offset(-16)
             make.bottom.equalToSuperview().offset(-18)
         }
+        
+        holdView3.layoutIfNeeded()
+        let imageV44 = UIImageView()
+        imageV44.frame = holdView3.bounds
+        imageV44.image = UIImage(named: "tips_cell_bkg")
+        imageV44.contentMode = .scaleAspectFill
+        imageV44.layer.zPosition = -1
+        holdView3.addSubview(imageV44)
+//        imageV44.snp.makeConstraints { make in
+//            make.edges.equalTo(0)
+//        }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmintAllInfoSuccessTipView.swift

@@ -61,7 +61,7 @@ class YHSubmintAllInfoSuccessTipView: UIView {
         centerView = {
             let view = UIView()
             view.backgroundColor = .white
-            view.layer.cornerRadius = 12
+            view.layer.cornerRadius = kCornerRadius8
             return view
         }()
         addSubview(centerView)
@@ -89,8 +89,8 @@ class YHSubmintAllInfoSuccessTipView: UIView {
         
         let lable = UILabel(text: "提交成功")
         lable.textAlignment = .center
-        lable.font = kFont(name: "PingFangSC-Medium", size: 17)
-        lable.textColor = UIColor(hex:0x222222)
+        lable.font = UIFont.PFSC_M(ofSize: 17)
+        lable.textColor = UIColor.mainTextColor
         
         headBkgImagV.addSubview(lable)
         lable.snp.makeConstraints { make in
@@ -102,8 +102,8 @@ class YHSubmintAllInfoSuccessTipView: UIView {
         
         let lable2 = UILabel(text: "根据您填写的资料，您的评分如下：")
         lable2.textAlignment = .center
-        lable2.font = kFont(name: "PingFangSC-Medium", size: 14)
-        lable2.textColor = UIColor(hex:0x222222)
+        lable2.font = UIFont.PFSC_R(ofSize: 14)
+        lable2.textColor = UIColor.mainTextColor
         
         centerView.addSubview(lable2)
         lable2.snp.makeConstraints { make in
@@ -127,26 +127,27 @@ class YHSubmintAllInfoSuccessTipView: UIView {
             make.height.equalTo(50)
         }
         
-        let a: ASAttributedString = .init("90", .font(UIFont.PFSC_R(ofSize: 32)),.foreground(UIColor(hex:0xFF9900)))
-        let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor(hex:0x888F98)))
+        let a: ASAttributedString = .init("90", .font(UIFont.PFSC_M(ofSize: 43)),.foreground(UIColor.warnColor))
+        let b: ASAttributedString = .init("分", .font(UIFont.PFSC_R(ofSize: 12)),.foreground(UIColor.labelTextColor2))
         messageLabel.attributed.text = a + b
         
         disAgressButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0xffffff)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.backgroundColor =  .white
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("取消", for: .normal)
-            button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
-            button.layer.cornerRadius = 8
+            button.setTitleColor(UIColor.brandMainColor, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
             button.layer.borderWidth = 1
-            button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
+            button.layer.borderColor = UIColor.brandMainColor.cgColor
             button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
             return button
         }()
         centerView.addSubview(disAgressButton)
         disAgressButton.snp.makeConstraints { make in
-            make.left.equalTo(16)
+            make.left.equalTo(kMargin)
             make.bottom.equalTo(-21)
             make.width.equalTo(128)
             make.height.equalTo(45)
@@ -154,22 +155,24 @@ class YHSubmintAllInfoSuccessTipView: UIView {
         
         agreeButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0x3c86f8)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("评分详情", for: .normal)
-            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-            button.layer.cornerRadius = 8
+            button.setTitleColor(.white, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
             button.addTarget(self, action: #selector(agree), for: .touchUpInside)
             return button
         }()
         centerView.addSubview(agreeButton)
         agreeButton.snp.makeConstraints { make in
-            make.right.equalTo(-16)
+            make.right.equalTo(-kMargin)
             make.bottom.equalTo(-21)
             make.width.equalTo(128)
             make.height.equalTo(45)
         }
+        agreeButton.layoutIfNeeded()
+        agreeButton.backgroundGradient()
         
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHSubmitAllInfoCheckView.swift

@@ -72,9 +72,8 @@ class YHSubmitAllInfoCheckView: UIView {
         messageLabel = {
             let label = UILabel()
             label.text = "确定是否提交信息？提交后将不能修改"
-            label.font = kFont(size: 16)
-            label.textColor = UIColor(hex:0x222222)
-            label.textAlignment = .left
+            label.font = UIFont.PFSC_R(ofSize: 16)
+            label.textColor = UIColor.mainTextColor
             label.numberOfLines = 0
             return label
         }()
@@ -82,26 +81,27 @@ class YHSubmitAllInfoCheckView: UIView {
         messageLabel.snp.makeConstraints { make in
             make.left.equalTo(22)
             make.right.equalTo(-22)
-            make.height.equalTo(42)
+//            make.height.equalTo(42)
             make.top.equalTo(40)
         }
         
         disAgressButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0xffffff)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.backgroundColor =  .white
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("取消", for: .normal)
-            button.setTitleColor( UIColor(hex:0x3c86f8), for: .normal)
-            button.layer.cornerRadius = 8
+            button.setTitleColor(UIColor.brandMainColor, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
+            button.clipsToBounds = true
             button.layer.borderWidth = 1
-            button.layer.borderColor = UIColor(hex: 0x3c86f8).cgColor
+            button.layer.borderColor = UIColor.brandMainColor.cgColor
             button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
             return button
         }()
         centerView.addSubview(disAgressButton)
         disAgressButton.snp.makeConstraints { make in
-            make.left.equalTo(16)
+            make.left.equalTo(kMargin)
             make.bottom.equalTo(-21)
             make.width.equalTo(128)
             make.height.equalTo(45)
@@ -109,22 +109,24 @@ class YHSubmitAllInfoCheckView: UIView {
         
         agreeButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex:0x3c86f8)
-            button.titleLabel?.font = kBoldFont(size: 14)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .center
             button.setTitle("确认", for: .normal)
-            button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-            button.layer.cornerRadius = 8
+            button.clipsToBounds = true
+            button.setTitleColor(.white, for: .normal)
+            button.layer.cornerRadius = kCornerRadius6
             button.addTarget(self, action: #selector(agree), for: .touchUpInside)
             return button
         }()
         centerView.addSubview(agreeButton)
         agreeButton.snp.makeConstraints { make in
-            make.right.equalTo(-16)
+            make.right.equalTo(-kMargin)
             make.bottom.equalTo(-21)
             make.width.equalTo(128)
             make.height.equalTo(45)
         }
+        agreeButton.layoutIfNeeded()
+        agreeButton.backgroundGradient()
         
     }
     

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/right_gou.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 2849.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/selected_icon_0.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Rectangle 2490.png",
       "idiom" : "universal",
       "scale" : "1x"
     },

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/selected_icon_1.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "Group 33334300.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "Group 33334300@2x.png",
+      "filename" : "Group 3040@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Group 33334300@3x.png",
+      "filename" : "Group 3040@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/tips_cell_bkg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Rectangle 2461@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Rectangle 2461@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/tips_icon.imageset/Contents.json

 {
   "images" : [
     {
-      "filename" : "温馨提示.png",
       "idiom" : "universal",
       "scale" : "1x"
     },