Merge branch 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into youhua-dev

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // 生活详情

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeDetailViewController.swift

@@ -108,9 +108,6 @@ class YHLifeDetailViewController: YHBaseViewController {
         }
         self.segmentedView.dataSource = segmentedDataSource
         view.addSubview(self.segmentedView)
-        let lineView = UIView()
-        lineView.backgroundColor = .separatorColor
-        view.addSubview(lineView)
         let left = 20.0-Self.tabGap
         self.segmentedView.snp.makeConstraints { make in
             make.left.equalTo(left)
@@ -118,10 +115,6 @@ class YHLifeDetailViewController: YHBaseViewController {
             make.height.equalTo(44)
             make.top.equalTo(headImgView.snp.bottom).offset(8.0)
         }
-        lineView.snp.makeConstraints { make in
-            make.left.right.bottom.equalToSuperview()
-            make.height.equalTo(1.0)
-        }
         return view
     }()
     
@@ -143,6 +136,14 @@ class YHLifeDetailViewController: YHBaseViewController {
         segmentedView.indicators = [indicator]
         segmentedView.defaultSelectedIndex = 0
         segmentedView.backgroundColor = .white
+        let lineView = UIView()
+        lineView.backgroundColor = .separatorColor
+        segmentedView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(1.0)
+            make.height.equalTo(1.0)
+        }
         return segmentedView
     }()
     
@@ -160,14 +161,15 @@ class YHLifeDetailViewController: YHBaseViewController {
         segmentedView.defaultSelectedIndex = 0
         segmentedView.backgroundColor = .white
         segmentedView.isHidden = true
-        return segmentedView
-    }()
-    
-    lazy var topLine:UIView = {
         let lineView = UIView()
         lineView.backgroundColor = .separatorColor
-        lineView.isHidden = true
-        return lineView
+        segmentedView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalToSuperview().offset(1.0)
+            make.height.equalTo(1.0)
+        }
+        return segmentedView
     }()
     
     static let tabWidth = 64.0
@@ -201,7 +203,6 @@ class YHLifeDetailViewController: YHBaseViewController {
         self.view.addSubview(self.tableView)
         self.view.addSubview(self.shareView)
         self.view.addSubview(self.topSegmentedView)
-        self.view.addSubview(self.topLine)
         self.view.addSubview(self.navView)
         self.navView.snp.makeConstraints { make in
             make.left.right.top.equalToSuperview()
@@ -226,11 +227,6 @@ class YHLifeDetailViewController: YHBaseViewController {
             make.height.equalTo(44)
             make.top.equalTo(self.navView.snp.bottom)
         }
-        self.topLine.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.height.equalTo(1.0)
-            make.top.equalTo(self.topSegmentedView.snp.bottom)
-        }
     }
 }
 
@@ -286,10 +282,8 @@ extension YHLifeDetailViewController: UIScrollViewDelegate {
  
         if scrollView.contentOffset.y >= (self.headerHeight-k_Height_NavigationtBarAndStatuBar-45.0) {
             topSegmentedView.isHidden = false
-            topLine.isHidden = false
         } else {
             topSegmentedView.isHidden = true
-            topLine.isHidden = true
         }
     }
     
@@ -390,7 +384,6 @@ extension YHLifeDetailViewController {
     func loadData() {
         self.titles.removeAll()
         self.imgItems.removeAll()
-        self.headImgView.kf.setImage(with: URL(string: self.productModel.image), placeholder: UIImage(named: "global_default_image"))
         for detail in self.productModel.details {
             let item = YHHomeIdentityItem()
             item.url = detail.image
@@ -402,6 +395,7 @@ extension YHLifeDetailViewController {
         self.segmentedView.reloadDataWithoutListContainer()
         self.topSegmentedView.dataSource = self.segmentedDataSource
         self.topSegmentedView.reloadDataWithoutListContainer()
+        self.segmentedView.isHidden = self.titles.count <= 0
         self.tableView.reloadData()
         self.fakeTableView.reloadData()
         requestImages()