新增商品-点击商品分类,店铺分类有遮挡问题

张旭
1 parent 36950533
Showing 3 changed files with 34 additions and 7 deletions
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
@@ -144,7 +144,7 @@ class CNLiveBaseViewController: UIViewController  {
  
     override func viewWillLayoutSubviews() {
         super.viewWillLayoutSubviews()
-        topNavView.frame = CGRect(x: 0, y: 0, width: view.width, height: topNavViewHeight +  get_system_statusBar_height())
+        topNavView.frame = CGRect(x: 0, y: 0, width: view.width, height:topNavViewHeight)// topNavViewHeight +  get_system_statusBar_height())
         let lrSpace = leftNavSpace > rightNavSpace ? leftNavSpace : rightNavSpace
         titleLabel.frame = CGRect(x: CGFloat(Int(lrSpace)) , y: topNavViewHeight - get_system_nav_ui_height() - topNavViewSubUIContentOffsetY, width: topNavView.width - (lrSpace * 2), height: get_system_nav_ui_height())
         leftNavBtns.forEach { currentBtn in
@@ -223,7 +223,7 @@ class CNLiveBaseViewController: UIViewController  {
  
     @objc func ClickBackBtn() {
         let viewControllers = self.navigationController?.viewControllers
-        if viewControllers!.count > 1 {
+        if viewControllers?.count ?? 0 > 1 {
             if viewControllers?.last == self {
                 self.navigationController!.popViewController(animated: true)
             }else{
@@ -6,7 +6,7 @@
 //  商品分类/店铺分类
  
 import Foundation
-
+import QMUIKit
 ///分类类型
 enum CNLiveGoodsCategoryType:Int {
     ///商品分类
@@ -207,7 +207,7 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
  
     // MARK: - initUI
     func initUI(){
-        self.shadowView = UIView(frame: CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height - KNavigationHeight))
+        self.shadowView = UIView(frame: CGRect(x: 0, y: self.topNavView.height, width: self.view.width, height: self.view.height - self.topNavView.height))
         self.shadowView?.backgroundColor = UIColor(white: 0, alpha: 0.26)
         self.shadowView?.isHidden = true
         self.view.addSubview(self.shadowView!)
@@ -279,7 +279,10 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
  
         self.contentView?.addSubview(self.tableView)
     }
-        
+    deinit {
+        print("CNLiveGoodsCategoryController销毁")
+    }
+    
     // MARK: - 显示/隐藏方法
     public func display(){
  
@@ -290,9 +293,16 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         }
     }
     public func hide(){
+        let vc = self.view.superview?.qmui_viewController?.qmui_visibleViewControllerIfExist() as! CNLiveShopNewProductController
+        if self.categoryType == .goods{
+            vc.isShowGoodsCategory = false
+        }else{
+            vc.isShowShopCategory = false
+        }
         UIView.animate(withDuration: 0.2) {
             self.shadowView?.isHidden = true
             self.contentView!.top = self.view.height
+            self.view.removeFromSuperview()
         }completion: { finished in
             self.view.isUserInteractionEnabled = false
         }
@@ -26,7 +26,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     var isRequestAdd:Bool = false
  
     lazy var bgScrollView :UIScrollView = {
-        let bgScrollView = UIScrollView(frame: CGRect(x: 0, y: KNavigationHeight, width: KSreenWidth, height: KSreenHeight-KNavigationHeight-KTabBarHeight))
+        let bgScrollView = UIScrollView(frame: CGRect(x: 0, y: self.topNavView.height, width: KSreenWidth, height: KSreenHeight-self.topNavView.height-KTabBarHeight))
         bgScrollView.showsVerticalScrollIndicator = false
         return bgScrollView
     }()
@@ -58,11 +58,14 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     singleView1.layoutSubviews()
                 }
                 self.addChild(vc)
-                vc.view.frame = CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height-KNavigationHeight)
+                vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
                 vc.didMove(toParent: self)
                 self.view.addSubview(vc.view)
                 _selectCategoryVC = vc
             }
+            if _selectCategoryVC!.view.superview == nil && self.isShowGoodsCategory == true{
+                self.view.addSubview(_selectCategoryVC!.view)
+            }
             return _selectCategoryVC
         }
         set{
@@ -94,6 +97,14 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                 vc.didMove(toParent: self)
                 _selectShopClassifyVC = vc
                 _selectShopClassifyVC!.hideView()
+                if (self.type == .add) {
+                    _selectShopClassifyVC!.initTitleName(name: "新增商品")
+                }else {
+                    _selectShopClassifyVC!.initTitleName(name: "编辑商品")
+                }
+            }
+            if _selectShopClassifyVC!.view.superview == nil && self.isShowShopCategory == true{
+                self.view.addSubview(_selectShopClassifyVC!.view)
             }
             return _selectShopClassifyVC
         }
@@ -133,8 +144,12 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         return bottomNavView
     }()
  
+    var isShowGoodsCategory = false
+    var isShowShopCategory = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        navigationBarHidden = false
         self.setUI()
         self.bgScrollView.backgroundColor = .white
         self.view.addSubview(self.bgScrollView)
@@ -326,6 +341,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
  
     // MARK: - 显示选取分类界面
     func displaySelectCategoryVC(){
+        self.isShowGoodsCategory = true
         self.view.bringSubviewToFront(self.selectCategoryVC!.view)
         self.selectCategoryVC!.display()
     }
@@ -344,6 +360,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
     }
     // MARK: - 显示选取店铺分类界面
     func displaySelectShopClassifyVC(){
+        self.isShowShopCategory = true
         self.selectShopClassifyVC!.display()
     }