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(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -320,7 +320,10 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
                         cell.setTips(tips, isShow:(isNeedShowError && eduInfo.vacantNum > 0))
                         cell.deleteBlock = {
-                            var title = "确定要删除该学历吗?"
+                            var title = "确定删除该学历吗?"
+                            if let collegeName = eduInfo.college, !collegeName.isEmpty {
+                                title = "确定删除学历\(collegeName)吗"
+                            }
                             YHTwoOptionAlertView.showAlertView(message:title) {
                                 [weak self] sure in
                                 guard let self = self else { return }
@@ -345,7 +348,10 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                         }
                         cell.isShowDeleteBtn = (isDegreeEditMode == .canCancel)
                         cell.deleteBlock = {
-                            var title = "确定要删除该学历吗?"
+                            var title = "确定删除该学历吗?"
+                            if let collegeName = eduInfo.college, !collegeName.isEmpty {
+                                title = "确定删除学历\(collegeName)吗"
+                            }
                             YHTwoOptionAlertView.showAlertView(message:title) {
                                 [weak self] sure in
                                 guard let self = self else { return }
@@ -379,7 +385,11 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
                     cell.isShowDeleteBtn = (isQualificationEditMode == .canCancel)
                     cell.deleteBlock = {
                         var title = "确定要删除该证书吗?"
-                        YHTwoOptionAlertView.showAlertView(message:title) { 
+                        if let qualification = quaInfo.qualification, !qualification.isEmpty {
+                            title = "确定删除证书\(qualification)吗"
+                        }
+
+                        YHTwoOptionAlertView.showAlertView(message:title) {
                             [weak self] sure in
                             guard let self = self else { return }
                             if !sure { return }
@@ -512,6 +522,7 @@ extension YHEducationInfoListVC {
             [weak self] success, error in
             guard let self = self else { return }
             if success {
+                YHHUD.flash(message: "删除成功")
                 requestEducationInfo()
             } else {
                 var errorMsg = "删除失败"
@@ -530,6 +541,7 @@ extension YHEducationInfoListVC {
             [weak self] success, error in
             guard let self = self else { return }
             if success {
+                YHHUD.flash(message: "删除成功")
                 requestEducationInfo()
             } else {
                 var errorMsg = "删除失败"

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

@@ -25,6 +25,7 @@ class YHEducationInfoCell: UITableViewCell {
         let label = UILabel()
         label.textColor = .mainTextColor
         label.textAlignment = .left
+        label.numberOfLines = 0
         label.font = UIFont.PFSC_B(ofSize: 14)
         return label
     }()
@@ -112,19 +113,21 @@ class YHEducationInfoCell: UITableViewCell {
         }
         
         timeLabel.snp.makeConstraints { make in
+            make.width.equalTo(108)
+            make.height.equalTo(20)
             make.right.equalTo(arrowImgView.snp.left)
-            make.centerY.equalTo(titleLabel)
+            make.top.equalTo(titleLabel)
         }
         
         deleteButton.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(64, 40))
-            make.centerY.equalTo(titleLabel)
+            make.centerY.equalTo(timeLabel)
             make.right.equalToSuperview()
         }
         
         arrowImgView.snp.makeConstraints { make in
             make.width.height.equalTo(20.0)
-            make.centerY.equalTo(titleLabel)
+            make.centerY.equalTo(timeLabel)
             make.right.equalToSuperview().offset(-horizonalGap)
         }