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 走查

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

@@ -86,7 +86,7 @@ class YHCertificateInfoController: YHBaseViewController, YHFamilyMemberProtol {
         // 港澳通行证 非必须
         if familyMember.isNeedHandleHKPassPort() {
             let title1 = YHFormTitleItem(type: .hkAndMacaoPassport)
-            let item10 = YHFormDetailItem(type: .traverlPassportNumber, value: familyMember.certificates.hkMacaoPass.number, tips:"请输入旅行证件号码".local)
+            let item10 = YHFormDetailItem(type: .traverlPassportNumber, value: familyMember.certificates.hkMacaoPass.number, tips:"请输入证件号码".local)
             let item11 = YHFormDetailItem(type: .certificateSignPlace, value: familyMember.certificates.hkMacaoPass.issueAt, tips:"请输入签发地".local)
             let item12 = YHFormDetailItem(type: .certificateSignDate, value: familyMember.certificates.hkMacaoPass.issueDateStartAt, tips:"请选择签发日期".local)
             let item13 = YHFormDetailItem(type: .certificateValidDate, value: familyMember.certificates.hkMacaoPass.issueDateEndAt, tips:"请选择届满日期".local)

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

@@ -143,7 +143,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
         let item20 = YHFormDetailItem(type: .ownDegree)
         item20.placeHolder = "请选择".local
         item20.value = spouse.hasDegreeName()
-        item20.tips = "请选择".local
+        item20.tips = "请选择是否拥有学位".local
 
         var arr2:[YHFormItemProtocol] = [title2, item20]
         
@@ -163,16 +163,15 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             let item = YHFormAddItem(type: .addDegree)
             arr2.append(item)
         }
+        items.append(contentsOf: [arr0, arr1, arr2])
         
-        
-        
+        if spouse.isFollow() {
             // 在港信息
             let title3 = YHFormTitleItem(type: .inHongKongInfo)
             let item30 = YHFormDetailItem(type: .isNowInHK)
             item30.value = String(spouse.isNowInHK())
             var arr3:[YHFormItemProtocol] = [title3, item30]
             
-        
             if spouse.isNowInHK() { // 目前在港才显示 逗留期限和在港身份
                 let item31 = YHFormDetailItem(type: .stayHKDate)
                 item31.placeHolder = "请选择".local
@@ -186,6 +185,9 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
 
                 arr3.append(contentsOf: [item31, item32])
             }
+            items.append(arr3)
+        }
+        
 
         // 香港身份证
         let title4 = YHFormTitleItem(type: .hkIdentityCardInfo)
@@ -199,7 +201,7 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             item41.tips = "请输入正确的香港身份证号码".local
             arr4.append(item41)
         }
-        items.append(contentsOf: [arr0, arr1, arr2, arr3, arr4])
+        items.append(arr4)
         tableView.reloadData()
     }
     
@@ -233,6 +235,10 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             return false
         }
         
+        if spouse.hasDegree.isEmpty {
+            return false
+        }
+        
         if spouse.isHaveDegree() { // 选择了有学位
             if !spouse.hasDegreeJson.isEmpty {
                 for degreeInfo in spouse.hasDegreeJson {
@@ -243,11 +249,13 @@ class YHSpouseBasicInfoVC: YHBaseViewController, YHFamilyMemberProtol {
             }
         }
         
+        if spouse.isFollow() {
             if spouse.isNowInHK() {
                 if isEmptyString(spouse.childInHk.info) ||  isEmptyString(spouse.hkIdentity) {
                     return false
                 }
             }
+        }
         
         if spouse.isHaveHKIdentityCard() {
             if isEmptyString(spouse.hkIdentityCard) {

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

@@ -432,7 +432,7 @@ class YHFormDetailItem : YHFormItemProtocol {
         case .chinaIdentityCardNumber:
             return "中国身份证号".local
         case .traverlPassportNumber:
-            return "旅行证件号码".local
+            return "证件号码".local
         case .certificateSignDate:
             return "签发日期".local
         case .certificateValidDate:
@@ -645,9 +645,9 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     
     func checkDefaultValue() -> Self {
         
-        if hasDegree.isEmpty { // 默认无学位
-            hasDegree = "0"
-        }
+//        if hasDegree.isEmpty { // 默认无学位
+//            hasDegree = "0"
+//        }
         if childHasHkId.has.isEmpty { // 默认未办理过香港身份证
             childHasHkId.has = "N"
         }
@@ -798,9 +798,11 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     func hasDegreeName() -> String {
         if hasDegree == "1" {
             return "有学位".local
-        }
+        } else if hasDegree == "0" {
             return "无学位".local
         }
+        return ""
+    }
     
     func isHaveDegree() ->Bool {
         return self.hasDegree == "1"