// 生活详情

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

@@ -11,7 +11,8 @@ import JXSegmentedView
 
 class YHLifeDetailViewController: YHBaseViewController {
 
-    var detailId: String = ""
+    var tabId: String = ""
+    var productModel: YHProductModel = YHProductModel()
     var codeUrl: String = ""
     var downloadUrl: String = ""
     
@@ -30,11 +31,8 @@ class YHLifeDetailViewController: YHBaseViewController {
         view.block = { tag in
             if tag == 0 {
                 //分享小程序
-                if let product = self.viewModel.detailModel.products.first {
-                    
-                    let path = "/pages/commodityInfo/commodityInfo?categoryId=3&levelId=\(self.detailId)&productId=\(product.id)&from=wxApp"
+                let path = "/pages/commodityInfo/commodityInfo?categoryId=3&levelId=\(self.tabId)&productId=\(self.productModel.id)&from=wxApp"
                 YHShareManager.shared.shareToMiniProgram(path:path, shareTitle: "")
-                }
                 
             } else {
                 //预约咨询
@@ -59,10 +57,31 @@ class YHLifeDetailViewController: YHBaseViewController {
         return tableView
     }()
     
+    lazy var navBar: YHCustomNavigationBar = {
+        let bar = YHCustomNavigationBar.navBar()
+        bar.backgroundColor = .white
+        bar.backBlock = {
+            [weak self] in
+            guard let self = self else { return }
+            self.navigationController?.popViewController(animated: true)
+        }
+        return bar
+    }()
+    
+    lazy var navView:UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        view.addSubview(self.navBar)
+        self.navBar.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(k_Height_NavContentBar)
+        }
+        return view
+    }()
+    
     static let headerHeight: CGFloat = KScreenWidth+44.0+9.0
     lazy var headerView:UIView = {
         let view = UIView(frame: CGRectMake(0, 0, KScreenWidth, Self.headerHeight))
-        view.clipsToBounds = true
         view.backgroundColor = .white
         view.addSubview(self.headImgView)
         headImgView.snp.makeConstraints { make in
@@ -91,7 +110,6 @@ class YHLifeDetailViewController: YHBaseViewController {
     lazy var headImgView: UIImageView = {
         let imgView = UIImageView()
         imgView.image = UIImage(named: "global_default_image")
-        imgView.clipsToBounds = true
         return imgView
     }()
     
@@ -135,9 +153,15 @@ class YHLifeDetailViewController: YHBaseViewController {
     
     func createUI() {
         gk_navigationBar.isHidden = true
+        self.navView.isHidden = true
         self.view.backgroundColor = .white
         self.view.addSubview(self.tableView)
         self.view.addSubview(self.shareView)
+        self.view.addSubview(self.navView)
+        self.navView.snp.makeConstraints { make in
+            make.left.right.top.equalToSuperview()
+            make.height.equalTo(k_Height_NavigationtBarAndStatuBar)
+        }
         self.shareView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(YHShareViewOnTablebarView.viewH)
@@ -157,6 +181,16 @@ extension YHLifeDetailViewController: JXSegmentedViewDelegate {
     }
 }
 
+extension YHLifeDetailViewController: UIScrollViewDelegate {
+    func scrollViewDidScroll(_ scrollView: UIScrollView) {
+        if scrollView.contentOffset.y >= (Self.headerHeight-k_Height_NavigationtBarAndStatuBar-45.0) {
+            navView.isHidden = false
+        } else {
+            navView.isHidden = true
+        }
+    }
+}
+
 extension YHLifeDetailViewController: UITableViewDataSource, UITableViewDelegate {
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
@@ -200,29 +234,21 @@ extension YHLifeDetailViewController: UITableViewDataSource, UITableViewDelegate
 extension YHLifeDetailViewController {
     
     func loadData() {
-        let params:[String: Any] = ["categoryId": "2",
-                                    "levelId": self.detailId]
-        self.viewModel.getGoodsCategoryDetail(params: params) {
-            [weak self] success, error in
-            guard let self = self else { return }
         self.titles.removeAll()
         self.imgItems.removeAll()
-            for product in self.viewModel.detailModel.products {
-                self.headImgView.kf.setImage(with: URL(string: product.image), placeholder: UIImage(named: "global_default_image"))
-                for detail in product.details {
+        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
             self.imgItems.append(item)
             self.titles.append(detail.name)
         }
-            }
         self.segmentedDataSource.titles = self.titles
         self.segmentedView.dataSource = self.segmentedDataSource
         self.segmentedView.reloadDataWithoutListContainer()
         self.tableView.reloadData()
         requestImages()
     }
-    }
     
     func requestImages() {
         let ossGroup = DispatchGroup()

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

@@ -141,7 +141,8 @@ extension YHLifeViewController: UITableViewDelegate, UITableViewDataSource {
         let model = self.viewModel.detailModel.products[indexPath.row]
         
         let vc = YHLifeDetailViewController()
-        vc.detailId = "4"//model.id
+        vc.tabId =  self.selectSubTab?.id ?? ""
+        vc.productModel = model
         vc.codeUrl = self.viewModel.detailModel.imageURLDefault
         vc.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload
         self.navigationController?.pushViewController(vc)