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

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // UI走查
  //  UI走查
  // UI走查
  颁发地区修改
  // UI走查
  // 证件信息UI走查
  导航栏 修改

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -143,7 +143,6 @@
 		045EEEF82B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE3F2B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift */; };
 		045EEEF92B9F171A0022A143 /* YHFormItemTitleCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE402B9F171A0022A143 /* YHFormItemTitleCell.swift */; };
 		045EEEFA2B9F171A0022A143 /* YHFormPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE422B9F171A0022A143 /* YHFormPickerViewType.swift */; };
-		045EEEFB2B9F171A0022A143 /* YHFormPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE432B9F171A0022A143 /* YHFormPickerView.swift */; };
 		045EEEFC2B9F171A0022A143 /* YHSheetPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE442B9F171A0022A143 /* YHSheetPickerView.swift */; };
 		045EEEFD2B9F171A0022A143 /* YHSheetPickerViewType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE452B9F171A0022A143 /* YHSheetPickerViewType.swift */; };
 		045EEEFE2B9F171A0022A143 /* YHFormItemInputTextCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 045EEE462B9F171A0022A143 /* YHFormItemInputTextCell.swift */; };
@@ -511,7 +510,6 @@
 		045EEE3F2B9F171A0022A143 /* YHFormItemOnlyDoubleChoiceCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormItemOnlyDoubleChoiceCell.swift; sourceTree = "<group>"; };
 		045EEE402B9F171A0022A143 /* YHFormItemTitleCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormItemTitleCell.swift; sourceTree = "<group>"; };
 		045EEE422B9F171A0022A143 /* YHFormPickerViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerViewType.swift; sourceTree = "<group>"; };
-		045EEE432B9F171A0022A143 /* YHFormPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormPickerView.swift; sourceTree = "<group>"; };
 		045EEE442B9F171A0022A143 /* YHSheetPickerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSheetPickerView.swift; sourceTree = "<group>"; };
 		045EEE452B9F171A0022A143 /* YHSheetPickerViewType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSheetPickerViewType.swift; sourceTree = "<group>"; };
 		045EEE462B9F171A0022A143 /* YHFormItemInputTextCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFormItemInputTextCell.swift; sourceTree = "<group>"; };
@@ -1213,7 +1211,6 @@
 			isa = PBXGroup;
 			children = (
 				045EEE422B9F171A0022A143 /* YHFormPickerViewType.swift */,
-				045EEE432B9F171A0022A143 /* YHFormPickerView.swift */,
 				045EEE442B9F171A0022A143 /* YHSheetPickerView.swift */,
 				045EEE452B9F171A0022A143 /* YHSheetPickerViewType.swift */,
 			);
@@ -2289,7 +2286,6 @@
 				045EEF152B9F171A0022A143 /* YHHKIDCardModel.swift in Sources */,
 				0477E17E2BA4362A00436346 /* YHCustomNavigationBar.swift in Sources */,
 				045EEEC42B9F171A0022A143 /* YHOtherInfoFillCell.swift in Sources */,
-				045EEEFB2B9F171A0022A143 /* YHFormPickerView.swift in Sources */,
 				045EEE9F2B9F171A0022A143 /* YHWorkExperienceModel.swift in Sources */,
 				045EEF232B9F171A0022A143 /* YHItemView.swift in Sources */,
 				04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */,
@@ -2623,7 +2619,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2665,7 +2661,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/C/YHMineSchemeViewController.swift

@@ -16,12 +16,9 @@ class YHMineSchemeViewController: YHBaseViewController {
 
     override func viewDidLoad() {
         super.viewDidLoad()
+        gk_navBarAlpha = 1
         gk_navBackgroundImage = UIImage(named: "my_scheme_nav")
-        gk_darkNavBackgroundImage = UIImage(named: "my_scheme_nav")
-        gk_navShadowImage = UIImage(named: "my_scheme_nav")
-        gk_darkNavShadowImage = UIImage(named: "my_scheme_nav")
-        gk_backImage = UIImage(named: "my_scheme_nav")
-        gk_darkBackImage = UIImage(named: "my_scheme_nav")
+        gk_backImage = UIImage(named: "nav_icon_back")
     }
     
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -107,43 +107,35 @@ class YHEducationDetailVC: YHBaseViewController {
         
         let title0 = YHFormTitleItem(type: .mainApplicantEducation)
         let item00 = YHFormDetailItem(type: .universityFullName)
-        item00.placeHolder = "请选择学校".local
         item00.tips = "请选择学校".local
         item00.value = detailInfo.college
         
         let item01 = YHFormDetailItem(type: .educationStyle)
-        item01.placeHolder = "请选择授课形式".local
         item01.tips = "请选择授课形式".local
         item01.value = detailInfo.teachingFormat
         
         let item02 = YHFormDetailItem(type: .educationTime)
-        item02.placeHolder = "请选择年月".local
         item02.tips = "请选择年月".local
         item02.value = detailInfo.admissionTime
         
         
         let item03 = YHFormDetailItem(type: .graduateTime)
-        item03.placeHolder = "请选择年月".local
         item03.tips = "请选择年月".local
         item03.value = detailInfo.graduateTime
         
         let item04 = YHFormDetailItem(type: .educationMajor)
-        item04.placeHolder = "请输入专业".local
         item04.tips = "请输入专业".local
         item04.value = detailInfo.major
         
         let item05 = YHFormDetailItem(type: .educationDegree)
-        item05.placeHolder = "请选择学位".local
         item05.tips = "请选择学位".local
         item05.value = detailInfo.degree
         
         let item06 = YHFormDetailItem(type: .degreeType)
-        item06.placeHolder = "请选择学位类型".local
         item06.tips = "请选择学位类型".local
         item06.value = detailInfo.degreeType
 
         let item07 = YHFormDetailItem(type: .educationCountry)
-        item07.placeHolder = "请输入国家及地区".local
         item07.tips = "请输入国家及地区".local
         item07.value = detailInfo.schoolAddress.country
         
@@ -152,14 +144,10 @@ class YHEducationDetailVC: YHBaseViewController {
         if detailInfo.isSchoolInAboard() {
             item08.value = detailInfo.schoolAddress.foreign
             item08.tips = "请输入城市".local
-            item08.placeHolder = "请输入城市".local
-            item08.tips = "请输入城市".local
 
         } else {
             item08.value = detailInfo.schoolAddress.area.joined(separator: ",")
             item08.tips = "请选择城市".local
-            item08.placeHolder = "请选择城市".local
-            item08.tips = "请选择城市".local
         }
         
         let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07, item08]

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -315,9 +315,10 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         } else {
                             cell.title = "学历标题".local
                         }
-                        cell.detailLabel.text = String(format: "有%d项未填", eduInfo.vacantNum)
+                        let tips = String(format: "有%d项未填", eduInfo.vacantNum)
+                        cell.detailLabel.text = tips
                         cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
-                        cell.detailLabel.textColor = (isNeedShowError && eduInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
+                        cell.setTips(tips, isShow:(isNeedShowError && eduInfo.vacantNum > 0))
                         cell.deleteBlock = {
                             var title = "确定要删除该学历吗?"
                             YHTwoOptionAlertView.showAlertView(message:title) {
@@ -366,12 +367,15 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                     if let qualification = quaInfo.qualification, !qualification.isEmpty {
                         cell.title = qualification
                     }
+                    var tips = ""
                     if quaInfo.vacantNum > 0 {
-                        cell.detailLabel.text = String(format: "有%d项未填", quaInfo.vacantNum)
+                        tips = String(format: "有%d项未填", quaInfo.vacantNum)
+                        cell.detailLabel.text = tips
                     } else {
                         cell.detailLabel.text = "已填完".local
                     }
-                    cell.detailLabel.textColor = (isNeedShowError && quaInfo.vacantNum > 0 ? .failColor : .labelTextColor2)
+                    cell.setTips(tips, isShow:(isNeedShowError && quaInfo.vacantNum > 0))
+
                     cell.isShowDeleteBtn = (isQualificationEditMode == .canCancel)
                     cell.deleteBlock = {
                         var title = "确定要删除该证书吗?"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -104,34 +104,28 @@ class YHQualificationDetailVC: YHBaseViewController {
         
         let title0 = YHFormTitleItem(type: .mainApplicantProfessionalQualification)
         let item00 = YHFormDetailItem(type: .qualificationCertificateName)
-        item00.placeHolder = "请选择资格证书名称".local
         item00.tips = "请选择资格证书名称".local
         item00.value = detailInfo.certName
         
         let item01 = YHFormDetailItem(type: .conferAgencyFullName)
-        item01.placeHolder = "请输入颁授机构".local
         item01.tips = "请输入颁授机构".local
         item01.value = detailInfo.issuingAgent
         
         let item02 = YHFormDetailItem(type: .conferTime)
-        item02.placeHolder = "请选择颁授年份".local
         item02.tips = "请选择颁授年份".local
         if detailInfo.issuingYear > 0 {
             item02.value = String(detailInfo.issuingYear)
         }
         
         let item03 = YHFormDetailItem(type: .conferCountry)
-        item03.placeHolder = "请选择颁授国家/地区".local
         item03.tips = "请选择颁授国家/地区".local
         item03.value = detailInfo.issuingAddr.country
         
         let item04 = YHFormDetailItem(type: .conferCity)
         if detailInfo.isCollegeInAboard() {
-            item04.placeHolder = "请输入颁授城市".local
             item04.tips = "请输入颁授城市".local
             item04.value = detailInfo.issuingAddr.foreign
         } else {
-            item04.placeHolder = "请选择颁授城市".local
             item04.tips = "请选择颁授城市".local
             item04.value = detailInfo.issuingAddr.area.joined(separator: ",")
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -138,8 +138,35 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
         let item:YHFormItemProtocol = arr[indexPath.row]
         
         if item is YHFormTitleItem { // 标题
+            let titleItem = item as! YHFormTitleItem
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemTitleCell.cellReuseIdentifier, for: indexPath) as! YHFormItemTitleCell
-            cell.setTitleAndSubTitle(title:item.getTitle())
+            
+            var isNeedText = ""
+            if titleItem.type == .chinaIdCardInfo {
+                if let familyMember = familyMember {
+                    let isChinaCardMust = familyMember.isChinese() && familyMember.relationType != .child
+                    isNeedText = isChinaCardMust ? "(必填)" : "(选填)"
+                }
+                
+            } else if titleItem.type == .hkAndMacaoPassport {
+                if let familyMember = familyMember {
+                    isNeedText = familyMember.isNeedHandleHKPassPort() ? "(必填)" : "(选填)"
+                }
+                
+            } else if titleItem.type == .passPortOrTravelInfo {
+                if let familyMember = familyMember {
+                    let isPassPortMust = !familyMember.isChinese()
+                    isNeedText = isPassPortMust ? "(必填)" : "(选填)"
+                }
+            }
+            
+            var title = ""
+            if isNeedText.isEmpty {
+                title = item.getTitle()
+            } else {
+                title = "\(item.getTitle())\(isNeedText)"
+            }
+            cell.setTitleAndSubTitle(title: title)
             return cell
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildPrimaryInfoVC.swift

@@ -165,12 +165,14 @@ class YHChildPrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             }
             if detailItem.type == .isAccompanyToHK 
                 || detailItem.type == .isHandleHKPassPort
-                || detailItem.type == .isLiveTother
-                || detailItem.type == .isLiveOverSeasMore1Year
-                || detailItem.type == .ownCustody
             {
                 return .twoChoice
             }
+            if detailItem.type == .ownCustody
+               || detailItem.type == .isLiveTother
+               || detailItem.type == .isLiveOverSeasMore1Year{
+                return .question
+            }
         }
         return .defaultType
     }
@@ -249,17 +251,6 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                         
                     } else if detailItem.type == .isHandleHKPassPort { // 是否办理港澳通行证
                         self.child?.setNeedHandleHKPassPort(option)
-                        
-                    } else if detailItem.type == .isLiveTother { // 是否与主申请人同住
-                        self.child?.setLiveTother(option)
-                        if option {
-                            self.child?.address.clearAddress()
-                        }
-                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
-                        self.child?.setOverSearsOver1Year(option)
-                        
-                    } else if detailItem.type == .ownCustody { // 抚养权
-                        self.child?.setOwnCustody(option)
                     }
                     self.loadInfo()
                     save()
@@ -308,7 +299,43 @@ extension YHChildPrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     }
                 }
                 return cell
+            } else if cellType == .question {
                 
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
+                cell.isMust = detailItem.isNeed
+                cell.title = detailItem.getTitle()
+                
+                var select = false
+                if let value = detailItem.value {
+                   select = Bool(value)!
+                }
+                
+                let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
+                cell.answerArr = answers
+                            
+                cell.answerBlock = {
+                    
+                    [weak self]  (arr, selectIndex) in
+                    
+                    let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    let option = (selectItem.title == "是".local ? true : false)
+
+                    guard let self = self else { return }
+                    if detailItem.type == .isLiveTother { // 是否与主申请人同住
+                        self.child?.setLiveTother(option)
+                        if option {
+                            self.child?.address.clearAddress()
+                        }
+                    } else if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                        self.child?.setOverSearsOver1Year(option)
+                        
+                    } else if detailItem.type == .ownCustody { // 抚养权
+                        self.child?.setOwnCustody(option)
+                    }
+                    self.loadInfo()
+                    save()
+                }
+                return cell
             }
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpouseBasicInfoVC.swift

@@ -19,6 +19,7 @@ enum HKFormItemCellType: Int {
     case addItem = 6
     case degreeDetailInfo = 7
     case onlyTwoChoice = 8
+    case question = 9
     
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -38,6 +38,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         tableView.register(YHFormItemDoubleChoiceCell.self, forCellReuseIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier)
         tableView.register(YHFormItemInputTextCell.self, forCellReuseIdentifier: YHFormItemInputTextCell.cellReuseIdentifier)
         tableView.register(YHFormItemSelectSheetCell.self, forCellReuseIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier)
+        tableView.register(YHFormItemQuestionsCell.self, forCellReuseIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier)
         tableView.register(YHFormItemTitleCell.self, forCellReuseIdentifier: YHFormItemTitleCell.cellReuseIdentifier)
         tableView.register(YHFormItemAddCell.self, forCellReuseIdentifier: YHFormItemAddCell.cellReuseIdentifier)
         return tableView
@@ -167,7 +168,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFormDetailItem
             
             // 是否随行到香港 / 是否办理港澳通行证 / // 是否与主申请人同住 均用双项按钮cell
-            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother || detailItem.type == .isLiveOverSeasMore1Year {
+            if detailItem.type == .isAccompanyToHK || detailItem.type == .isHandleHKPassPort || detailItem.type == .isLiveTother {
                 
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
                 cell.isMust = detailItem.isNeed
@@ -215,7 +216,34 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                     save()
                 }
                 return cell
+            }
+            
+            if detailItem.type == .isLiveOverSeasMore1Year {
                 
+                let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemQuestionsCell.cellReuseIdentifier, for: indexPath) as! YHFormItemQuestionsCell
+                cell.isMust = detailItem.isNeed
+                cell.title = detailItem.getTitle()
+                cell.setTips(detailItem.tips, isShow: isNeedShowError && detailItem.isShowTips)
+    
+                var select = false
+                if let value = detailItem.value {
+                   select = Bool(value)!
+                }
+                let answers = [YHFormChoiceItem(title: "是".local, isSelect: select),YHFormChoiceItem(title: "否".local, isSelect: !select)]
+                cell.answerArr = answers
+                            
+                cell.answerBlock = {
+                    [weak self]  (arr, selectIndex) in
+                    guard let self = self else { return }
+                    let selectItem:YHFormChoiceItem = arr[selectIndex]
+                    let option = (selectItem.title == "是".local ? true : false)
+                    if detailItem.type == .isLiveOverSeasMore1Year { // 是否在海外居住满1年及以上
+                        self.spouse?.setOverSearsOver1Year(option)
+                        self.loadInfo()
+                    }
+                    save()
+                }
+                return cell
             }
             
             if detailItem.type == .nationOrArea || detailItem.type == .liveCity  {

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

@@ -265,7 +265,7 @@ class YHFormTitleItem : YHFormItemProtocol {
         case .chinaIdCardInfo:
             return "中国身份证".local
         case .passPortOrTravelInfo:
-            return String(format: "%@(%@)", "护照及其他旅行证件".local, "选填".local)
+            return "护照及其他旅行证件".local
         case .spouseInfo:
             return "配偶信息".local
         case .occupationInfo:

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

@@ -175,8 +175,8 @@ class YHSheetPickerView: UIView {
             
             // 婚姻
             .marriage:
-                [YHSheetPickerViewItem(title:"未婚".local, index:0),
-                 YHSheetPickerViewItem(title:"已婚".local, index:1),
+                [YHSheetPickerViewItem(title:"已婚".local, index:1),
+                 YHSheetPickerViewItem(title:"未婚".local, index:0),
                  YHSheetPickerViewItem(title:"分居".local, index:2),
                  YHSheetPickerViewItem(title:"离婚".local, index:3),
                  YHSheetPickerViewItem(title:"丧偶".local, index:4),
@@ -186,7 +186,8 @@ class YHSheetPickerView: UIView {
             .educationStyle:
                 [YHSheetPickerViewItem(title:"全日制".local, index:0),
                  YHSheetPickerViewItem(title:"兼职制".local, index:1),
-                 YHSheetPickerViewItem(title:"遥距课程".local, index:2),
+                 YHSheetPickerViewItem(title:"全日制(遥距课程)".local, index:2),
+                 YHSheetPickerViewItem(title:"兼职制(遥距课程)".local, index:3),
                  ],
            
             // 职业
@@ -360,7 +361,7 @@ extension YHSheetPickerView {
         case .marriage:
             return "选择婚姻状况"
         case .educationStyle:
-            return "选择学位"
+            return "选择授课形式"
         case .occupation:
             return "选择职业"
         case .gender:

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

@@ -138,7 +138,6 @@ class YHFormItemEnterDetailCell: UITableViewCell {
             make.top.equalToSuperview().offset(16)
             make.left.equalToSuperview().offset(horizonalGap)
             make.right.equalTo(detailLabel.snp.left).offset(-8)
-            make.height.equalTo(20)
         }
         
         detailLabel.snp.makeConstraints { make in

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

@@ -84,6 +84,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         let label = UILabel()
         label.textColor = detailColor
         label.textAlignment = .left
+        label.numberOfLines = 0
         label.font = UIFont.PFSC_M(ofSize: 14)
         return label
     }()
@@ -105,7 +106,6 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         let label = UILabel()
         label.textColor = .failColor
         label.textAlignment = .left
-        label.numberOfLines = 0
         label.font = UIFont.PFSC_R(ofSize: 12)
         label.isHidden = true
         return label
@@ -170,6 +170,8 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         }
         
         setTips("", isShow: false)
+        tipsButton.YH_clickEdgeInsets = UIEdgeInsets(top: 20, left: 20, bottom: 20, right: 20)
+
     }
     
     @objc func didTipsButtonClicked() {
@@ -183,14 +185,14 @@ class YHFormItemSelectSheetCell: UITableViewCell {
             tipsLabel.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(horizonalGap)
                 make.right.equalToSuperview().offset(-horizonalGap)
-                make.top.equalTo(titleLabel.snp.bottom).offset(6)
+                make.top.equalTo(detailLabel.snp.bottom).offset(6)
                 make.bottom.equalToSuperview().offset(-16)
             }
         } else {
             tipsLabel.snp.remakeConstraints { make in
                 make.left.equalToSuperview().offset(horizonalGap)
                 make.right.equalToSuperview().offset(-horizonalGap)
-                make.top.equalTo(titleLabel.snp.bottom)
+                make.top.equalTo(detailLabel.snp.bottom)
                 make.height.equalTo(0)
                 make.bottom.equalToSuperview().offset(-16)
             }

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

@@ -114,7 +114,7 @@ class YHAddressPickView: UIView {
     private let titleLabel: UILabel = {
         let label = UILabel(frame: CGRect(x: (UIScreen.main.bounds.width - 150) / 2, y: 16, width: 150, height: 24))
         label.textColor = UIColor.mainTextColor
-        label.text = "选择国家地区"
+        label.text = "选择省市地区"
         label.textAlignment = .center
         label.font = UIFont.PFSC_M(ofSize: 17)
         return label

galaxy/galaxy/Classes/Tools/Helper/YHConstantArrayData.swift

@@ -364,8 +364,8 @@ class YHConstantArrayData {
     
     //学位颁发地
     static let arrDegreeAddress = [
-        [ "id": "0", "title": "国内（颁发）" ],
-        [ "id": "1", "title": "国外（颁发）" ],
+        [ "id": "1", "title": "国内（颁发）" ],
+        [ "id": "2", "title": "国外（颁发）" ],
     ]
     
     //通过 id 获取 title