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:
  // 成员列表显示

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

@@ -377,15 +377,18 @@ extension YHFamilyMemberInfoListVC : UITableViewDelegate, UITableViewDataSource
             let detailItem = item as! YHFamilyMember
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
             cell.title = detailItem.getTitle()
-            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber != 0 ? .failColor : .labelTextColor2)
+//            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber != 0 ? .failColor : .labelTextColor2)
 
+            var tips = ""
             if detailItem.notFillNumber > 0 {
-                cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNumber)
+                tips  = String(format: "有%d项未填写".local, detailItem.notFillNumber)
             } else if detailItem.notFillNumber == 0 {
-                cell.detailLabel.text = "已填完".local
+                tips = "已填完".local
             } else {
-                cell.detailLabel.text = "还未开始填写".local
+                tips = "还未开始填写".local
             }
+            cell.detailLabel.text = tips
+            cell.setTips(tips, isShow: (isNeedShowError && detailItem.notFillNumber != 0))
             
             if isEmptyString(detailItem.subsetName) { // 姓名为空
                 if detailItem.relationType == .child {

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

@@ -55,7 +55,6 @@ class YHFormItemEnterDetailCell: UITableViewCell {
 
     private lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.text = "XXXXXXX"
         label.textColor = titleColor
         label.textAlignment = .left
         label.numberOfLines = 0
@@ -65,13 +64,20 @@ class YHFormItemEnterDetailCell: UITableViewCell {
     
     lazy var detailLabel: UILabel = {
         let label = UILabel()
-        label.text = "XXXXXXX"
         label.textColor = .labelTextColor2
         label.textAlignment = .right
         label.font = UIFont.PFSC_R(ofSize: 14)
         return label
     }()
     
+    lazy var tipsLabel: UILabel = {
+        let label = UILabel()
+        label.textColor = .failColor
+        label.textAlignment = .left
+        label.font = UIFont.PFSC_R(ofSize: 12)
+        return label
+    }()
+    
     private lazy var arrowImgView: UIImageView = {
         let imgView = UIImageView(image: UIImage(named: "form_right_arrow"))
         return imgView
@@ -110,6 +116,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
 
         contentView.addSubview(titleLabel)
         contentView.addSubview(detailLabel)
+        contentView.addSubview(tipsLabel)
         contentView.addSubview(arrowImgView)
         contentView.addSubview(deleteButton)
         contentView.addSubview(topLine)
@@ -119,7 +126,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
             make.top.equalToSuperview().offset(16)
             make.left.equalToSuperview().offset(horizonalGap)
             make.right.equalTo(detailLabel.snp.left).offset(-8)
-            make.bottom.equalToSuperview().offset(-16)
+            make.height.equalTo(20)
         }
         
         detailLabel.snp.makeConstraints { make in
@@ -127,7 +134,7 @@ class YHFormItemEnterDetailCell: UITableViewCell {
             make.width.equalTo(110.0)
             make.top.equalTo(titleLabel)
         }
-        
+
         arrowImgView.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(20, 20))
             make.right.equalToSuperview().offset(-horizonalGap)
@@ -146,6 +153,31 @@ class YHFormItemEnterDetailCell: UITableViewCell {
             make.height.equalTo(1.0)
             make.top.equalToSuperview()
         }
+        
+        setTips("", isShow:false)
+    }
+    
+    func setTips(_ tips:String?, isShow:Bool) {
+        tipsLabel.text = tips
+        tipsLabel.isHidden = !isShow
+        if isShow {
+            tipsLabel.snp.remakeConstraints { make in
+                make.left.equalToSuperview().offset(horizonalGap)
+                make.right.equalToSuperview().offset(-horizonalGap)
+                make.top.equalTo(titleLabel.snp.bottom).offset(6)
+                make.bottom.equalToSuperview().offset(-16)
+            }
+        } else {
+            tipsLabel.snp.remakeConstraints { make in
+                make.top.equalTo(titleLabel.snp.bottom)
+                make.left.equalToSuperview().offset(horizonalGap)
+                make.right.equalToSuperview().offset(-horizonalGap)
+                make.height.equalTo(0)
+                make.bottom.equalToSuperview().offset(-16)
+            }
+        }
+        self.setNeedsLayout()
+        self.layoutIfNeeded()
     }
     
     @objc func didClickDeleteBtn(btn:UIButton) {