// 授权

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 60;
+	objectVersion = 70;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1256,6 +1256,7 @@
 		04B00FC82D9A420F00F640C5 /* YHMakePlanCusttomHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B00FB62D9A420F00F640C5 /* YHMakePlanCusttomHeadView.swift */; };
 		04B00FCA2D9AAD6100F640C5 /* YHMakePlanTopView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B00FC92D9AAD6100F640C5 /* YHMakePlanTopView.swift */; };
 		04B30B7B2E86307C004E4B12 /* YHNameCardHomePageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B30B7A2E86307C004E4B12 /* YHNameCardHomePageViewController.swift */; };
+		04B30B8C2E869717004E4B12 /* YHGrayCommonAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B30B8B2E869717004E4B12 /* YHGrayCommonAlertView.swift */; };
 		04D4EC312E839C1000B0329B /* YHCircleViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D4EC302E839C1000B0329B /* YHCircleViewController.swift */; };
 		04D4EC332E839C2B00B0329B /* YHResourceViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D4EC322E839C2B00B0329B /* YHResourceViewController.swift */; };
 		04D4EC442E83D0D500B0329B /* YHCircleViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D4EC432E83D0D500B0329B /* YHCircleViewModel.swift */; };
@@ -2609,6 +2610,7 @@
 		04B00FBB2D9A420F00F640C5 /* YHMakePlanStateHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanStateHeadView.swift; sourceTree = "<group>"; };
 		04B00FC92D9AAD6100F640C5 /* YHMakePlanTopView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanTopView.swift; sourceTree = "<group>"; };
 		04B30B7A2E86307C004E4B12 /* YHNameCardHomePageViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNameCardHomePageViewController.swift; sourceTree = "<group>"; };
+		04B30B8B2E869717004E4B12 /* YHGrayCommonAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGrayCommonAlertView.swift; sourceTree = "<group>"; };
 		04D4EC302E839C1000B0329B /* YHCircleViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCircleViewController.swift; sourceTree = "<group>"; };
 		04D4EC322E839C2B00B0329B /* YHResourceViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHResourceViewController.swift; sourceTree = "<group>"; };
 		04D4EC432E83D0D500B0329B /* YHCircleViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCircleViewModel.swift; sourceTree = "<group>"; };
@@ -2671,7 +2673,7 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		043F0ED92E02A60C003354EB /* Exceptions for "yinheReplayExt" folder in "yinheReplayExt" target */ = {
+		043F0ED92E02A60C003354EB /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -2681,18 +2683,7 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		043F0ECD2E02A60C003354EB /* yinheReplayExt */ = {
-			isa = PBXFileSystemSynchronizedRootGroup;
-			exceptions = (
-				043F0ED92E02A60C003354EB /* Exceptions for "yinheReplayExt" folder in "yinheReplayExt" target */,
-			);
-			explicitFileTypes = {
-			};
-			explicitFolders = (
-			);
-			path = yinheReplayExt;
-			sourceTree = "<group>";
-		};
+		043F0ECD2E02A60C003354EB /* yinheReplayExt */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (043F0ED92E02A60C003354EB /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = yinheReplayExt; sourceTree = "<group>"; };
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -4464,6 +4455,7 @@
 				045C0C872D12CA5E00BD2DC0 /* YHMySignatureListTableViewCell.swift */,
 				045C0C882D12CA5E00BD2DC0 /* YHSignAppendStepView.swift */,
 				045C0C892D12CA5E00BD2DC0 /* YHSignatureUploadTableViewCell.swift */,
+				04B30B8B2E869717004E4B12 /* YHGrayCommonAlertView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -7424,10 +7416,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks.sh\"\n";
@@ -7441,10 +7437,14 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
+			inputPaths = (
+			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
+			outputPaths = (
+			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources.sh\"\n";
@@ -8300,6 +8300,7 @@
 				04307B902D1AB66100ED8E8D /* YHGCPreviewMainApplicantInfoViewController.swift in Sources */,
 				04307B912D1AB66100ED8E8D /* YHGCPreviewIncomeRecordViewController.swift in Sources */,
 				04307B932D1AB66100ED8E8D /* YHGCPreviewWorkExpViewController.swift in Sources */,
+				04B30B8C2E869717004E4B12 /* YHGrayCommonAlertView.swift in Sources */,
 				045C122E2D12CA5F00BD2DC0 /* YHServiceOrderSearchViewModel.swift in Sources */,
 				045C122F2D12CA5F00BD2DC0 /* YHSchemeViewModel.swift in Sources */,
 				045C12302D12CA5F00BD2DC0 /* YHAiRadarAreaView.swift in Sources */,

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHInformationAuthorizationStepOneViewController.swift

@@ -36,10 +36,10 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
                 self.photoImageView.kf.setImage(with: url)
                 if self.viewModel.isCanNext() {
                     nextButton.isEnabled = true
-                    nextButton.backgroundColor =  UIColor.brandMainColor
+                    nextButton.backgroundColor =  UIColor.brandGrayColor8
                 } else {
                     nextButton.isEnabled = false
-                    nextButton.backgroundColor =  UIColor.brandMainColor.withAlphaComponent(0.4)
+                    nextButton.backgroundColor =  UIColor.brandGrayColor4
                 }
             }
         }
@@ -51,7 +51,7 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
         
         stepOneView = {
             let view = UIView()
-            view.backgroundColor = UIColor.brandMainColor
+            view.backgroundColor = UIColor.brandGrayColor8
             return view
         }()
         view.addSubview(stepOneView)
@@ -64,7 +64,7 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
         
         stepTwoView = {
             let view = UIView()
-            view.backgroundColor = UIColor(hex: 0xf4f6fa)
+            view.backgroundColor = UIColor.brandGrayColor2
             return view
         }()
         view.addSubview(stepTwoView)
@@ -122,10 +122,10 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
         
         nextButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor.brandMainColor.withAlphaComponent(0.4)
+            button.backgroundColor =  UIColor.brandGrayColor4
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
-            button.setTitle("提交", for: .normal)
+            button.setTitle("确定", for: .normal)
             button.setTitleColor( UIColor(hex: 0xffffff), for: .normal)
             button.layer.cornerRadius = kCornerRadius3
             button.addTarget(self, action: #selector(nextStep), for: .touchUpInside)
@@ -162,8 +162,8 @@ class YHInformationAuthorizationStepOneViewController: YHBaseViewController {
         promptView = {
             let view = YHFailPromptView()
             view.titleLable.text = "温馨提示：请填写真实信息，AI人脉匹配更精准"
-            view.backgroundColor = UIColor(hex: 0xf0f4fb)
-            view.titleLable.textColor = UIColor.brandMainColor
+            view.backgroundColor = UIColor.brandGrayColor2
+            view.titleLable.textColor = UIColor.brandGrayColor8
             view.alertImageView.image = UIImage(named: "user_prompt_image")
             return view
         }()
@@ -227,10 +227,10 @@ extension YHInformationAuthorizationStepOneViewController: UITableViewDelegate,
             self.viewModel.updateModel(model)
             if self.viewModel.isCanNext() {
                 nextButton.isEnabled = true
-                nextButton.backgroundColor =  UIColor.brandMainColor
+                nextButton.backgroundColor =  UIColor.brandGrayColor8
             } else {
                 nextButton.isEnabled = false
-                nextButton.backgroundColor =  UIColor.brandMainColor.withAlphaComponent(0.4)
+                nextButton.backgroundColor =  UIColor.brandGrayColor4
             }
             if model.id != .id1 && model.id != .id3 && model.id != .id5 {
                 self.items = viewModel.getBaseDataSource()

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHInformationAuthorizationStepTwoViewController.swift

@@ -42,7 +42,7 @@ class YHInformationAuthorizationStepTwoViewController: YHBaseViewController {
         
         stepOneView = {
             let view = UIView()
-            view.backgroundColor = UIColor.brandMainColor
+            view.backgroundColor = UIColor.brandGrayColor8
             return view
         }()
         view.addSubview(stepOneView)
@@ -55,7 +55,7 @@ class YHInformationAuthorizationStepTwoViewController: YHBaseViewController {
         
         stepTwoView = {
             let view = UIView()
-            view.backgroundColor = UIColor.brandMainColor
+            view.backgroundColor = UIColor.brandGrayColor8
             return view
         }()
         view.addSubview(stepTwoView)
@@ -68,7 +68,7 @@ class YHInformationAuthorizationStepTwoViewController: YHBaseViewController {
         
         nextButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor.brandMainColor
+            button.backgroundColor =  UIColor.brandGrayColor8
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("完成", for: .normal)

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHSetExplainView.swift

@@ -62,7 +62,7 @@ class YHSetExplainView: UIView {
         addSubview(centerView)
         centerView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(592)
+            make.height.equalTo(632)
         }
         
         titleLabel = {
@@ -107,6 +107,21 @@ class YHSetExplainView: UIView {
             make.right.equalTo(-18)
         }
         
+        topImageView = {
+            let imageView = UIImageView()
+            imageView.image = UIImage(named: "service_card_id_back")
+            imageView.layer.cornerRadius = kCornerRadius3
+            imageView.clipsToBounds = true
+            return imageView
+        }()
+        centerView.addSubview(topImageView)
+        topImageView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.width.equalTo(333)
+            make.height.equalTo(382)
+            make.top.equalTo(73)
+        }
+        
         messageLabel = {
             let label = UILabel()
             label.text = "须使用二代身份证"
@@ -120,26 +135,12 @@ class YHSetExplainView: UIView {
         messageLabel.snp.makeConstraints { make in
             make.left.equalTo(21)
             make.right.equalTo(-21)
-            make.top.equalTo(426)
-        }
-        
-        topImageView = {
-            let imageView = UIImageView()
-            imageView.image = UIImage(named: "service_card_id_back")
-            imageView.layer.cornerRadius = kCornerRadius3
-            imageView.clipsToBounds = true
-            return imageView
-        }()
-        centerView.addSubview(topImageView)
-        topImageView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.width.height.equalTo(333)
-            make.top.equalTo(73)
+            make.top.equalTo(topImageView.snp.bottom).offset(20)
         }
         
         bottomButton = {
             let button = UIButton(type: .custom)
-            button.backgroundColor =  UIColor(hex: 0x4d9ffb)
+            button.backgroundColor =  UIColor.brandGrayColor8
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
             button.contentHorizontalAlignment = .center
             button.setTitle("知道了", for: .normal)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MySignature(我的签字)/V/YHGrayCommonAlertView.swift

+//
+//  YHGrayCommonAlertView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/3/13.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHGrayCommonAlertView: UIView {
+    typealias AgreeBlock = () -> Void
+    var agreeBlock: AgreeBlock?
+    var cancelBlcok: AgreeBlock?
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var lineView: UIView!
+    var messageLabel: UILabel!
+    var agreeButton: UIButton!
+    var disAgressButton: UIButton!
+    
+    var isFullGuestureEnabel: Bool = true // view响应全局手势 默认响应
+    
+    static func show(_ title: String? = nil, _ message: String? = nil, _ leftButtonString: String? = nil, _ rightButtonString: String? = nil, fullGuestureEnable: Bool = true, cancelCallBack: (() -> Void)? = nil, callBack: @escaping (() -> Void)) {
+        let view = YHGrayCommonAlertView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
+        view.agreeBlock = callBack
+        view.cancelBlcok = cancelCallBack
+        view.setContent(title, message, leftButtonString, rightButtonString)
+        view.isFullGuestureEnabel = fullGuestureEnable
+        let window = UIApplication.shared.yhKeyWindow()
+        window?.addSubview(view)
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = UIColor(white: 0.5, alpha: 0.1)
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+        tap.delegate = self
+        addGestureRecognizer(tap)
+        setView()
+    }
+    
+    func setContent(_ title: String? = nil, _ message: String? = nil, _ leftButtonString: String? = nil, _ rightButtonString: String? = nil) {
+        titleLabel.text = title
+        messageLabel.text = message
+        disAgressButton.setTitle(leftButtonString, for: .normal)
+        agreeButton.setTitle(rightButtonString, for: .normal)
+        
+        centerView.snp.remakeConstraints { make in
+            make.center.equalToSuperview()
+            make.width.equalTo(299)
+            //            make.height.equalTo(164)
+        }
+        
+        if title?.count == 0 || title == nil {
+            lineView.isHidden = true
+            
+            messageLabel.snp.remakeConstraints { make in
+                make.left.equalTo(22)
+                make.right.equalTo(-22)
+                make.height.greaterThanOrEqualTo(21)
+                make.top.equalTo(37)
+                make.bottom.equalTo(disAgressButton.snp.top).offset(-20)
+            }
+            
+        } else {
+            lineView.isHidden = false
+            
+            messageLabel.snp.remakeConstraints { make in
+                make.left.equalTo(22)
+                make.right.equalTo(-22)
+                make.height.greaterThanOrEqualTo(21)
+                make.top.equalTo(lineView.snp.bottom).offset(21)
+                make.bottom.equalTo(disAgressButton.snp.top).offset(-20)
+            }
+        }
+        
+        if leftButtonString?.isEmpty == false && rightButtonString?.isEmpty == false {
+            disAgressButton.isHidden = false
+            agreeButton.isHidden = false
+            
+            disAgressButton.snp.remakeConstraints { make in
+                make.top.equalTo(messageLabel.snp.bottom).offset(36)
+                make.left.equalTo(16)
+                make.bottom.equalTo(-16)
+                make.width.equalTo(128)
+                make.height.equalTo(45)
+            }
+            
+            agreeButton.snp.remakeConstraints { make in
+                make.top.equalTo(disAgressButton.snp.top)
+                make.width.equalTo(disAgressButton.snp.width)
+                make.height.equalTo(disAgressButton.snp.height)
+                make.right.equalToSuperview().offset(-kMargin)
+            }
+        } else {
+            disAgressButton.isHidden = true
+            agreeButton.isHidden = false
+            
+            agreeButton.snp.remakeConstraints { make in
+                make.height.equalTo(45)
+                make.right.equalToSuperview().offset(-kMargin)
+                make.left.equalToSuperview().offset(kMargin)
+                make.bottom.equalToSuperview().offset(-kMargin)
+            }
+            
+            if rightButtonString?.isEmpty == true && leftButtonString?.isEmpty == true {
+                agreeButton.setTitle("我知道了", for: .normal)
+            } else if leftButtonString?.isEmpty == true {
+                
+            } else {
+                agreeButton.setTitle(leftButtonString, for: .normal)
+            }
+        }
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setView() {
+        backgroundColor = UIColor(hex: 0x0000, alpha: 0.5)
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius6
+            return view
+        }()
+        addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.center.equalToSuperview()
+            make.width.equalTo(299)
+            make.height.equalTo(143)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.textAlignment = .center
+            label.textColor = UIColor.mainTextColor
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.numberOfLines = 0
+            return label
+        }()
+        
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.left.equalTo(22)
+            make.right.equalTo(-22)
+            make.height.equalTo(20)
+            make.top.equalTo(16)
+        }
+        
+        messageLabel = {
+            let label = UILabel()
+            label.textColor = UIColor.mainTextColor
+            label.font = UIFont.PFSC_R(ofSize: 16)
+            label.numberOfLines = 0
+            return label
+        }()
+        
+        centerView.addSubview(messageLabel)
+        messageLabel.snp.makeConstraints { make in
+            make.left.equalTo(22)
+            make.right.equalTo(-22)
+            make.height.equalTo(42)
+            make.top.equalTo(63)
+        }
+        
+        disAgressButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandGrayColor2
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("不同意", for: .normal)
+            button.setTitleColor( UIColor.brandGrayColor8, for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.addTarget(self, action: #selector(disagree), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(disAgressButton)
+        disAgressButton.snp.makeConstraints { make in
+            make.left.equalTo(16)
+            make.bottom.equalTo(-21)
+            make.width.equalTo(128)
+            make.height.equalTo(45)
+        }
+        
+        agreeButton = {
+            let button = UIButton(type: .custom)
+            button.backgroundColor =  UIColor.brandGrayColor8
+            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 = kCornerRadius3
+            button.addTarget(self, action: #selector(agree), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(agreeButton)
+        agreeButton.snp.makeConstraints { make in
+            make.right.equalTo(-16)
+            make.bottom.equalTo(-21)
+            make.width.equalTo(128)
+            make.height.equalTo(45)
+        }
+        
+        lineView = {
+            let line = UIView()
+            line.backgroundColor = UIColor.separatorColor
+            return line
+        }()
+        centerView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.right.equalTo(0)
+            make.height.equalTo(1)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+        }
+    }
+    
+    @objc func agree() {
+        if let block = self.agreeBlock {
+            block()
+        }
+        dismiss()
+    }
+    
+    @objc private func handleTap(_ sender: AnyObject?) {
+        if isFullGuestureEnabel {
+            dismiss()
+        }
+    }
+    
+    @objc func disagree() {
+        if let block = self.cancelBlcok {
+            block()
+        }
+        dismiss()
+    }
+    
+    func dismiss() {
+        removeFromSuperview()
+    }
+}
+
+extension YHGrayCommonAlertView: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer: UIGestureRecognizer, shouldReceive touch: UITouch) -> Bool {
+        if touch.view == self {
+            return true
+        }
+        return false
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHAddressPicker/YHAddressPickView.swift

@@ -53,9 +53,9 @@ class YHAddressPickView: UIView {
             case .city:
                 /// 选择城市时没有热门城市view,并将titleSV显示出来
                 self.tableView.tableHeaderView = UIView()
-                self.tableView.frame = CGRect(x: 0, y: 146, width: UIScreen.main.bounds.width, height: 417)
+                self.tableView.frame = CGRect(x: 0, y: 124, width: UIScreen.main.bounds.width, height: 496)
                 self.titleSV.isHidden = false
-                self.leftLabel.isHidden = false
+                self.leftLabel.isHidden = true
                 /// 将省份选择保留,将城市与地区数据清空
                 self.selectedCity = ""
                 self.selectedArea = ""
@@ -63,11 +63,13 @@ class YHAddressPickView: UIView {
                 /// 通过修改titleSV中button的选中状态来修改它的颜色
                 for button in buttonArr {
                     button.isSelected = false
+                    button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
                     if button.tag != 0 {
                         button.setTitle("请选择", for: .normal)
                     }
                     if button.tag == 1 {
                         button.isSelected = true
+                        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
                     }
                 }
                 /// 滚动titleSV中button下滚动的Line
@@ -196,20 +198,20 @@ class YHAddressPickView: UIView {
             titleSV.removeFromSuperview()
         }
         buttonArr = []
-        titleSV = UIScrollView(frame: CGRect(x: 0, y: 92, width: UIScreen.main.bounds.width, height: 44))
+        titleSV = UIScrollView(frame: CGRect(x: 0, y: 52, width: UIScreen.main.bounds.width, height: 72))
 //        self.underLine = UIView(frame: CGRect(x: 0, y: 40, width: 30, height: 2))
 //        self.underLine.backgroundColor = UIColor.brandMainColor
         for i in 0..<2 {
-            let button = UIButton(frame: CGRect(x: 21 + CGFloat(i) * 86, y: 10, width: 74, height: 32))
+            let button = UIButton(frame: CGRect(x: 21 + CGFloat(i) * 86, y: 20, width: 74, height: 32))
             button.tag = Int(i)
             button.setTitle("请选择", for: .normal)
             button.setTitleColor(UIColor.mainTextColor, for: .normal)
-            button.setTitleColor(UIColor.brandMainColor, for: .selected)
+            button.setTitleColor(UIColor.mainTextColor, for: .selected)
             button.titleLabel?.font = UIFont.PFSC_R(ofSize: 13)
             button.titleLabel?.adjustsFontSizeToFitWidth = true
             button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .normal)
-            button.setBackgroundColor(color: UIColor.brandMainColor.withAlphaComponent(0.08), forState: .selected)
-            button.layer.borderColor = UIColor.brandMainColor.cgColor
+            button.setBackgroundColor(color: UIColor.contentBkgColor, forState: .selected)
+            button.layer.borderColor = UIColor.mainTextColor.cgColor
             button.layer.borderWidth = 0
             button.layer.cornerRadius = kCornerRadius3
             button.addTarget(self, action: #selector(onClickTitlebutton(sender:)), for: .touchUpInside)
@@ -304,6 +306,9 @@ class YHAddressPickView: UIView {
 // MARK: - tableViewDelegate
 extension YHAddressPickView: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        if indexPath.row == 0, self.tableViewType == .city {
+            return 0
+        }
         return 40
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
@@ -314,7 +319,7 @@ extension YHAddressPickView: UITableViewDelegate, UITableViewDataSource {
             guard let cell = tableView.dequeueReusableCell(withIdentifier: YHAddressPickViewFirstTableViewCell.identifier) as? YHAddressPickViewFirstTableViewCell else {
                 return YHAddressPickViewFirstTableViewCell()
             }
-            cell.label.text = "请选择"
+            cell.label.text = self.tableViewType == .provinces ? "请选择" : ""
             return cell
         }
         guard let cell = tableView.dequeueReusableCell(withIdentifier: YHAddressPickViewTableViewCell.identifier) as? YHAddressPickViewTableViewCell else {

galaxy/galaxy/Classes/Modules/Login(登录)/V/YHAllowSettingTableViewCell.swift

@@ -37,7 +37,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
         
         titleLabel = {
             let label = UILabel()
-            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.font = UIFont.PFSC_M(ofSize: 16)
             label.textColor = UIColor.mainTextColor
             return label
         }()
@@ -78,7 +78,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
         
         detailSwitch = {
             let switchView = UISwitch()
-            switchView.onTintColor =  UIColor.brandMainColor
+            switchView.onTintColor =  UIColor.brandGrayColor8
             switchView.addTarget(self, action: #selector(switchViewChange), for: .valueChanged)
             return switchView
         }()
@@ -111,7 +111,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
             }
         case .people:
             if !detailSwitch.isOn {
-                YHCommonAlertView.show("", "关闭后，您将无法体验AI人脉匹配功能？", "仍然关闭", "开启", fullGuestureEnable: false) {
+                YHGrayCommonAlertView.show("", "关闭后，您将无法体验AI人脉匹配功能？", "仍然关闭", "开启", fullGuestureEnable: false) {
                     self.detailSwitch.isOn = false
                     model.isSelect = self.detailSwitch.isOn
                     if let block = self.block {
@@ -132,7 +132,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
             }
         case .school:
             if !detailSwitch.isOn {
-                YHCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的教育经历", "仍然关闭", "开启", fullGuestureEnable: false) {
+                YHGrayCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的教育经历", "仍然关闭", "开启", fullGuestureEnable: false) {
                     self.detailSwitch.isOn = false
                     model.isSelect = self.detailSwitch.isOn
                     if let block = self.block {
@@ -153,7 +153,7 @@ class YHAllowSettingTableViewCell: UITableViewCell {
             }
         case .work:
             if !detailSwitch.isOn {
-                YHCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的工作经历", "仍然关闭", "开启", fullGuestureEnable: false) {
+                YHGrayCommonAlertView.show("", "关闭后，您的好友将无法从您的名片中查看您的工作经历", "仍然关闭", "开启", fullGuestureEnable: false) {
                     self.detailSwitch.isOn = false
                     model.isSelect = self.detailSwitch.isOn
                     if let block = self.block {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyNewViewController.swift

@@ -667,7 +667,9 @@ extension YHMyNewViewController {
 
         switch item.type {
         case .myCard:// 我的名片
-            enterMyNameCard()
+            let vc = YHNewNameCardViewController()
+            self.navigationController?.pushViewController(vc)
+//            enterMyNameCard()
         case .myMessage:// 我的消息
             printLog("我的消息")
             goToMessagePage()
@@ -772,6 +774,13 @@ extension YHMyNewViewController {
                 UIViewController.current?.navigationController?.pushViewController(vc)
                 
             }
+        case .myFriend:
+            let vc = YHMyGoodFriendsVC()
+            self.navigationController?.pushViewController(vc)
+        case .myEnterprise:
+            let vc = YHInformationAuthorizationStepOneViewController()
+//            vc.stepFlag = false
+            self.navigationController?.pushViewController(vc)
         default:
             printLog("不需要响应")
         }

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_school.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Mask group@2x.png",
+      "filename" : "Frame 2033198781-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Mask group@3x.png",
+      "filename" : "Frame 2033198781.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/MyCard/set_example_work.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Mask group@2x.png",
+      "filename" : "Frame 2033198781-1.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Mask group@3x.png",
+      "filename" : "Frame 2033198781.png",
       "idiom" : "universal",
       "scale" : "3x"
     }

galaxy/galaxy/Res/Assets.xcassets/MyCard/user_prompt_image.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "user_prompt_image@2x.png",
+      "filename" : "tishi.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "user_prompt_image@3x.png",
+      "filename" : "tishi@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }