Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

galaxy/galaxy.xcodeproj/project.pbxproj

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

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

@@ -88,11 +88,9 @@ class YHFormItemExpireDateCell: UITableViewCell {
         btn.setTitle("长期".local, for: .normal)
         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_white")
-        let selectImg = UIImage(named: "login_privacy_agree")
-        btn.setImage(unselectImg, for: .normal)
-        btn.setImage(selectImg, for: .selected)
+        btn.iconInLeft(spacing: 3)
+        btn.setImage(UIImage(named: "main_time_normal"), for: .normal)
+        btn.setImage(UIImage(named: "login_privacy_agree"), for: .selected)
         return btn
     }()
     

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

@@ -149,6 +149,8 @@ class YHDatePickView: UIView {
             make.top.equalTo(18)
         }
         
+        sureButton.YH_clickEdgeInsets = UIEdgeInsets(top: 10, left: 10, bottom: 10, right: 10)
+        
         lineView = {
             let view = UIView()
             view.backgroundColor = UIColor.separatorColor