// 家庭成员

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

@@ -493,24 +493,26 @@ extension YHSpouseBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                         // 前两行是 学历学位信息标题 和 是否拥有学位
                         cell.showDeleteBtn(indexPath.row > 2)
                         
+                        var degree = ""
                         if !degreeInfo.degree.isEmpty {
                             if let degreeIndex = Int(degreeInfo.degree), let subType = YHPickerViewDegreeType(rawValue: degreeIndex) {
-                                cell.degree = YHFormPickerViewSubType.degree(subType).title
-                            } else {
-                                cell.degree = ""
+                                degree = YHFormPickerViewSubType.degree(subType).title
                             }
-                        } else {
-                            cell.degree = ""
                         }
+                        cell.degree = degree
+                        
+                        var degreePlace = ""
                         if !degreeInfo.address.isEmpty {
                             if let addressIndex = Int(degreeInfo.address), let subType = YHPickerViewDegreeLocationType(rawValue: addressIndex) {
-                                cell.degreePlace = YHFormPickerViewSubType.degreeLocation(subType).title
-                            } else {
-                                cell.degreePlace = ""
+                                degreePlace = YHFormPickerViewSubType.degreeLocation(subType).title
                             }
-                        } else {
-                            cell.degreePlace = ""
                         }
+                        cell.degreePlace = degreePlace
+                        
+                        let isNeedShowDegreeTips = isNeedShowError && isEmptyString(degree)
+                        let isNeedShowPlaceTips = isNeedShowError && isEmptyString(degreePlace)
+                        cell.showTips(isShowDegreeTips:isNeedShowDegreeTips, isShowPlaceTips:isNeedShowPlaceTips)
+                        
                         cell.degreeClickBlock = {
                             YHFormPickerView.show(type: .degree) { [weak self] selectType in
                                 guard let self = self else { return }

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

@@ -48,17 +48,20 @@ class YHFormItemDegreeInfoCell: UITableViewCell {
     var degree:String? {
         didSet {
             degreeView.detail = degree
-            degreeView.setTips("请选择学位", isShow: isEmptyString(degree))
         }
     }
     
     var degreePlace:String? {
         didSet {
             areaView.detail = degreePlace
-            areaView.setTips("请选择颁发地区", isShow: isEmptyString(degreePlace))
         }
     }
     
+    func showTips(isShowDegreeTips:Bool, isShowPlaceTips:Bool) {
+        degreeView.setTips("请选择学位".local, isShow:isShowDegreeTips)
+        areaView.setTips("请选择颁发地区".local, isShow: isShowPlaceTips)
+    }
+    
     lazy var titleLabel: UILabel = {
         let label = UILabel()
         label.textColor = UIColor.mainTextColor