no message

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3189,7 +3189,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3393,7 +3393,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -3439,7 +3439,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 5;
+				CURRENT_PROJECT_VERSION = 6;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -89,7 +89,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 14)
         btn.setTitleColor(UIColor.mainTextColor, for: .normal)
         btn.iconInLeft(spacing: 6)
-        let unselectImg = UIImage(named: "login_privacy_disagree")
+        let unselectImg = UIImage(named: "login_privacy_disagree_white")
         let selectImg = UIImage(named: "login_privacy_agree")
         btn.setImage(unselectImg, for: .normal)
         btn.setImage(selectImg, for: .selected)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceItemView.swift

@@ -149,10 +149,11 @@ class YHWorkExperienceItemView: UIView {
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
             button.contentHorizontalAlignment = .right
             button.addTarget(self, action: #selector(longTimeButtonClick), for: .touchUpInside)
-            button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 30)
+//            button.imageEdgeInsets = UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 30)
             button.isSelected = false
             return button
         }()
+        
         addSubview(longTimeButton)
         longTimeButton.snp.makeConstraints { make in
             make.right.equalToSuperview()

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

@@ -186,7 +186,7 @@ class YHInformationFillTipsAlertView: UIView {
         }
 
         let selectedBtn = UIButton(type: .custom)
-        selectedBtn.setImage(UIImage(named: "login_privacy_disagree"), for: .normal)
+        selectedBtn.setImage(UIImage(named: "login_privacy_disagree_grey"), for: .normal)
         selectedBtn.setImage(UIImage(named: "login_privacy_agree"), for: .selected)
         selectedBtn.addTarget(self, action: #selector(onClickAgree), for: .touchUpInside)
         footer.addSubview(selectedBtn)

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHCodeSueecssWithVideoBkgViewController.swift

@@ -12,7 +12,7 @@ import AVFoundation
 
 
 class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController {
-
+    
     var time = 60
     
     var bgImageView: UIImageView!
@@ -25,6 +25,8 @@ class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController {
     var phoneNumber: String?
     var viewModel: YHLoginViewModel?
     
+    private var isRequestFlag : Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setView()
@@ -50,6 +52,11 @@ class YHCodeSueecssWithVideoBkgViewController: YHBaseViewController {
     override var preferredStatusBarStyle: UIStatusBarStyle {
         return .lightContent
     }
+    
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        isRequestFlag = false
+    }
 }
 
 
@@ -89,9 +96,18 @@ extension YHCodeSueecssWithVideoBkgViewController {
     }
     
     func requetLogin(phone: String, code: String) {
+        if isRequestFlag {
+#if DEBUG
+            YHHUD.flash(message: "请求已发送")
+#endif
+            return
+        }
+        
+        isRequestFlag = true
         YHHUD.show(.progress(message: "登录中..."))
         self.viewModel?.login(phone : phone, code: code, callBackBlock: {[weak self] success,error in
             YHHUD.hide()
+            self?.isRequestFlag = false
             guard let self = self else { return }
             if success == false {
                 
@@ -155,17 +171,17 @@ extension YHCodeSueecssWithVideoBkgViewController {
         self.navigationController?.popViewController()
     }
     func setupFrontUI() {
-//        bgImageView = {
-//            let imageView = UIImageView()
-//            imageView.image = UIImage(named: "login_phone_bg_image")
-//            imageView.isUserInteractionEnabled = true
-//            return imageView
-//        }()
-//        view.addSubview(bgImageView)
-//        bgImageView.snp.makeConstraints { make in
-//            make.left.right.top.equalTo(view)
-//            make.height.equalTo(300)
-//        }
+        //        bgImageView = {
+        //            let imageView = UIImageView()
+        //            imageView.image = UIImage(named: "login_phone_bg_image")
+        //            imageView.isUserInteractionEnabled = true
+        //            return imageView
+        //        }()
+        //        view.addSubview(bgImageView)
+        //        bgImageView.snp.makeConstraints { make in
+        //            make.left.right.top.equalTo(view)
+        //            make.height.equalTo(300)
+        //        }
         
         view.addSubview(frontHoldView)
         frontHoldView.snp.makeConstraints { make in
@@ -174,7 +190,7 @@ extension YHCodeSueecssWithVideoBkgViewController {
         
         closeButton = {
             let button = UIButton(type: .custom)
-//            button.setImage(UIImage(named: "login_back"), for: .normal)
+            //            button.setImage(UIImage(named: "login_back"), for: .normal)
             button.setImage(UIImage(named: "back_icon_for_code_input"), for: .normal)
             button.addTarget(self, action: #selector(close), for: .touchUpInside)
             return button
@@ -258,8 +274,8 @@ extension YHCodeSueecssWithVideoBkgViewController {
             button.layer.cornerRadius = 24
             button.backgroundColor = UIColor.init(hex: 0xffffff,transparency: 0.4)
             button.clipsToBounds = true
-//            button.layer.borderWidth = 1
-//            button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor
+            //            button.layer.borderWidth = 1
+            //            button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor
             return button
         }()
         frontHoldView.addSubview(getCodeLabel)
@@ -281,8 +297,8 @@ extension YHCodeSueecssWithVideoBkgViewController {
             button.layer.cornerRadius = 24
             button.clipsToBounds = true
             button.backgroundColor = UIColor(hex: 0xffffff, alpha: 1.0)
-//            button.layer.borderWidth = 1
-//            button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor
+            //            button.layer.borderWidth = 1
+            //            button.layer.borderColor = UIColor(hex: 0xebeef4).cgColor
             return button
         }()
         frontHoldView.addSubview(getCodeButton)

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

@@ -32,8 +32,13 @@ class YHLoginPrivacyView: UIView {
     func setView() {
         agreeButton = {
             let button = UIButton(type: .custom)
+<<<<<<< HEAD
             button.setBackgroundImage(UIImage(named: "login_privacy_disagree_glay"), for: .normal)
             button.setBackgroundImage(UIImage(named: "login_privacy_agree"), for: .selected)
+=======
+            button.setBackgroundImage(UIImage(named: "login_privacy_disagree_white"), for: .normal)
+            button.setBackgroundImage(UIImage(named: "login_privacy_agree_white"), for: .selected)
+>>>>>>> main
             button.addTarget(self, action: #selector(agreeClick), for: .touchUpInside)
             return button
         }()

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主申请人/service_card_passport_frant.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "service_card_passport_frant@2x.png",
+      "filename" : "港澳通行证@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "service_card_passport_frant@3x.png",
+      "filename" : "港澳通行证@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }