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:
  // 职业 字数限制
  // 我的tab
  //  专业限制

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

@@ -215,8 +215,9 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
                     textField in
                     
                     var max = -1
-                    if detailItem.type == .educationMajor ||
-                        detailItem.type == .educationCity {
+                    if detailItem.type == .educationMajor {
+                        max = 50
+                    } else if detailItem.type == .educationCity {
                         max = 100
                     }
 

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

@@ -285,9 +285,9 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     if detailItem.type == .childName ||
                         detailItem.type == .everName {
                         max = 30
-                    } else if detailItem.type == .birthCity ||
-                              detailItem.type == .occupationName
-                    {
+                    } else if detailItem.type == .occupationName {
+                        max = 50
+                    } else if detailItem.type == .birthCity {
                         max = 100
                     }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHBrotherInfoVC.swift

@@ -244,6 +244,8 @@ extension YHBrotherInfoVC : UITableViewDelegate, UITableViewDataSource {
                     var max = -1
                     if detailItem.type == .brotherName {
                         max = 30
+                    } else if detailItem.type == .occupationName {
+                        max = 50
                     } else if detailItem.type == .birthCity {
                         max = 100
                     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Parents&Brothers(父母和兄弟姐妹)/YHParentInfoVC.swift

@@ -287,9 +287,10 @@ extension YHParentInfoVC : UITableViewDelegate, UITableViewDataSource {
                     if detailItem.type == .fatherName ||
                         detailItem.type == .motherName {
                         max = 30
-                    } else if detailItem.type == .birthCity ||
-                              detailItem.type == .occupationName
-                    {
+                        
+                    } else if detailItem.type == .occupationName {
+                        max = 50
+                    } else if detailItem.type == .birthCity {
                         max = 100
                     }
 

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

@@ -411,9 +411,9 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                     if detailItem.type == .spouseName ||
                         detailItem.type == .everName {
                         max = 30
-                    } else if detailItem.type == .birthCity ||
-                              detailItem.type == .occupationName
-                    {
+                    } else if detailItem.type == .occupationName {
+                        max = 50
+                    } else if detailItem.type == .birthCity {
                         max = 100
                     }
 

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -36,6 +36,7 @@ class YHUserInfoHeaderView: UIView {
     
     private lazy var userNameLabel:UILabel = {
         let label = UILabel()
+        label.text = "登录/注册".local
         label.textColor = UIColor(hexString:"##242424")
         label.textAlignment = NSTextAlignment.left
         label.font = UIFont.PFSC_B(ofSize: 21)
@@ -47,6 +48,7 @@ class YHUserInfoHeaderView: UIView {
     
     private lazy var infoLabel:UILabel = {
         let label = UILabel()
+        label.text = "点赞 0  收藏 0 最近浏览 0".local
         label.textColor = UIColor(hexString:"#949DB5")
         label.textAlignment = NSTextAlignment.left
         label.font = UIFont.PFSC_R(ofSize: 13)
@@ -60,16 +62,17 @@ class YHUserInfoHeaderView: UIView {
     
     private lazy var evaluateLabel:UILabel = {
         let label = UILabel()
+        label.text = "香港身份20秒极速测评".local
         label.textColor = UIColor(hexString:"#242424")
         label.textAlignment = NSTextAlignment.left
-        label.font = UIFont.PFSC_R(ofSize: 17)
+        label.font = UIFont.PFSC_M(ofSize: 17)
         return label
     }()
     
     private lazy var evaluateBtn: UIButton = {
         let btn = UIButton()
         btn.setTitle("免费测评", for: .normal)
-        btn.titleLabel?.font = UIFont.PFSC_R(ofSize: 12)
+        btn.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
         btn.setTitleColor(.white, for: .normal)
         btn.backgroundColor = UIColor(hexString:"#242424")
         btn.layer.cornerRadius = 6.0
@@ -125,11 +128,7 @@ class YHUserInfoHeaderView: UIView {
         evaluateView.addSubview(evaluateBgImgView)
         evaluateView.addSubview(evaluateLabel)
         evaluateView.addSubview(evaluateBtn)
-        
-        userNameLabel.text = "登录/注册".local
-        infoLabel.text = "点赞 0  收藏 0 最近浏览 0".local
-        evaluateLabel.text = "香港身份20秒极速测评".local
-        
+                
         bgImgView.snp.makeConstraints { make in
             make.left.right.equalTo(self)
             let topMargin = (k_Height_StatusBar > 20.0 ? 0 : -24)