新增商品,编辑商品返回按钮无法点击问题

张旭
1 parent 8e112436
Showing 3 changed files with 20 additions and 11 deletions
metaCode/Classes/Common/Base/CNLiveBaseViewController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveGoodsCategoryController.swift
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopNewProductController.swift
@@ -226,6 +226,12 @@ class CNLiveBaseViewController: UIViewController  {
         if viewControllers!.count > 1 {
             if viewControllers?.last == self {
                 self.navigationController!.popViewController(animated: true)
+            }else{
+                viewControllers?.last?.children.forEach({ vc in
+                    if vc == self{
+                        self.navigationController!.popViewController(animated: true)
+                    }
+                })
             }
         }else{
             if (self.presentingViewController != nil) {
@@ -176,9 +176,8 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
     override func viewDidLoad() {
         super.viewDidLoad()
-        
+        navigationBarHidden = false
         self.view.backgroundColor = .clear
-        self.topNavView.removeFromSuperview()
         self.initUI()
         if self.firCategoryId == 0{
             self.secCategoryId = 0
@@ -201,11 +200,16 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
             self.postShopClassify()
         }
     }
+    
+    func initTitleName(name:String){
+        titleName = name
+    }
+    
     // MARK: - initUI
     func initUI(){
-        self.shadowView = UIView(frame: self.view.bounds)
+        self.shadowView = UIView(frame: CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height - KNavigationHeight))
         self.shadowView?.backgroundColor = UIColor(white: 0, alpha: 0.26)
-        self.shadowView?.alpha = 0
+        self.shadowView?.isHidden = true
         self.view.addSubview(self.shadowView!)
         let shadowViewTap = UITapGestureRecognizer(target: self, action: #selector(shadowViewTap))
         self.shadowView?.addGestureRecognizer(shadowViewTap)
@@ -281,20 +285,20 @@ class CNLiveGoodsCategoryController: CNLiveBaseViewController, UITableViewDataSo
         self.view.isUserInteractionEnabled = true
         UIView.animate(withDuration: 0.2) {
-            self.shadowView?.alpha = 1
+            self.shadowView?.isHidden = false
             self.contentView!.top = self.view.height-400
         }
     }
     public func hide(){
         UIView.animate(withDuration: 0.2) {
-            self.shadowView?.alpha = 0
+            self.shadowView?.isHidden = true
             self.contentView!.top = self.view.height
         }completion: { finished in
             self.view.isUserInteractionEnabled = false
         }
     }
     public func hideView(){
-        self.shadowView?.alpha = 0
+        self.shadowView?.isHidden = true
         self.contentView!.top = self.view.height
         self.view.isUserInteractionEnabled = false
     }
@@ -58,7 +58,7 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
                     singleView1.layoutSubviews()
                 }
                 self.addChild(vc)
-                vc.view.frame = CGRect(x: 0, y: 0, width: self.view.width, height: self.view.height)
+                vc.view.frame = CGRect(x: 0, y: KNavigationHeight, width: self.view.width, height: self.view.height-KNavigationHeight)
                 vc.didMove(toParent: self)
                 self.view.addSubview(vc.view)
                 _selectCategoryVC = vc
@@ -170,12 +170,11 @@ class CNLiveShopNewProductController:CNLiveBaseViewController{
         }
     }
     func setUI(){
-        navigationBarHidden = false
         titleName = "新增商品"
         if (self.type == .add) {
-            titleName = "新增商品"
+            self.selectCategoryVC?.initTitleName(name: "新增商品")
         }else {
-            titleName = "编辑商品"
+            self.selectCategoryVC?.initTitleName(name: "编辑商品")
             let deleteNavBtn = UIButton(type: .custom)
             deleteNavBtn.frame = CGRect(x: 0, y: KStatusBarHeight, width: KNavigationHeight-KStatusBarHeight, height: KNavigationHeight-KStatusBarHeight)
             deleteNavBtn.backgroundColor = .clear