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(服务中心)/C/YHServiceOrderListViewController.swift

@@ -243,6 +243,10 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 self.navigationController?.pushViewController(vc)
             } else if model.type == 21 {
                 //家庭信息确认
+                let vc = YHFamilyInfoConfirmViewController()
+                vc.orderId = orderID
+                self.navigationController?.pushViewController(vc)
+                
             } else if model.type == 22 {
                 //新增受养人
                 let vc = YHAddAdoptersViewController()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/C/YHFamilyInfoConfirmViewController.swift

@@ -94,11 +94,13 @@ class YHFamilyInfoConfirmViewController: YHBaseViewController {
             guard let self = self else { return }
             if success {
                 YHHUD.flash(message: "确认修改成功")
+                self.navigationController?.popViewController()
+                YHFamilyInfoWarmTipsView.tipsView().show()
                 return
             }
             let msg = error?.errorMsg ?? "确认修改失败"
             YHHUD.flash(message: msg)
-            self.navigationController?.popViewController()
+            
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/FamilyInfoConfirm(1 家庭信息确认)/V/YHFamilyInfoWarmTipsView.swift

@@ -14,6 +14,8 @@ class YHFamilyInfoWarmTipsView: UIView {
     lazy var blackMaskView: UIView = {
         let view = UIView()
         view.backgroundColor = .alertMaskColor
+        let tap = UITapGestureRecognizer(target: self, action: #selector(dismiss))
+        view.addGestureRecognizer(tap)
         return view
     }()
     
@@ -168,8 +170,6 @@ class YHFamilyInfoWarmTipsView: UIView {
             make.bottom.equalTo(-16)
             make.height.equalTo(45)
         }
-        
-
     }
 
 }