Merge branch 'master' of http://bj.gitlab.cnlive.com/ios-team/CNLiveMateCode

liushiyu
2 parents c60aca44 7692b096
Showing 3 changed files with 43 additions and 9 deletions
metaCode/Classes/Main/HomePage/Controller/GoodsManager/CNLiveShopProductManagerController.swift
metaCode/Classes/Main/HomePage/View/CNLiveDownSlideTodayRecommendCell.swift
metaCode/Classes/Main/HomePage/View/GoodsManager/CNLiveShopGoodsListClassifyView.swift
@@ -41,6 +41,17 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         tableView.register(CNLiveShopGoodsListCell.self, forCellReuseIdentifier: kCNLiveShopGoodsListCellIdentifier)
         return tableView
     }()
+    
+    lazy var emptyLabel: UILabel = {
+        let emptyLabel = UILabel.init(frame: CGRectMake(0, 0, 100, 35))
+        emptyLabel.center = self.view.center
+        emptyLabel.textColor = .black
+        emptyLabel.textAlignment = .center
+        emptyLabel.text = "暂无商品"
+        emptyLabel.font = Font_21
+        emptyLabel.adjustsFontSizeToFitWidth=true
+        return emptyLabel
+    }()
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -53,6 +64,8 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
 //        rightNavBtns = [self.addBtn]
         self.view.addSubview(self.classifyView)
         self.view.addSubview(tableView)
+        self.view.addSubview(self.emptyLabel)
+        self.emptyLabel.isHidden = true
         tableView.frame = CGRect(x: 0, y:self.classifyView.bottom , width: KSreenWidth, height: KSreenHeight - self.classifyView.bottom)
     }
@@ -95,17 +108,27 @@ class CNLiveShopProductManagerController:CNLiveBaseViewController, UITableViewDa
         CNLiveShopGoodListViewModel.requestGoodsList(shopId: DSUserInfoManager.shared.dsUserInfo.id, sortType: "1", page: page) { result, status in
             hiddenLoading()
             if status == .success{
-                self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
-                let newDataArray = NSMutableArray()
-                for goodsModel in self.dataArray {
-                    if let model = goodsModel as? CNLiveShopGoodsListModel{
-                        newDataArray.add(model)
+                let arr = result as! [CNLiveShopGoodsListModel]
+                if arr.count > 0
+                {
+                    self.dataArray.addObjects(from: result as! [CNLiveShopGoodsListModel])
+                    let newDataArray = NSMutableArray()
+                    for goodsModel in self.dataArray {
+                        if let model = goodsModel as? CNLiveShopGoodsListModel{
+                            newDataArray.add(model)
+                        }
                     }
+                    self.dataArray.removeAllObjects()
+                    self.dataArray.addObjects(from: newDataArray as! [Any])
+                    
+                    self.tableView.reloadData()
+                    self.emptyLabel.isHidden = true
+                    self.classifyView.emptyView(isEmpty: false)
+                }else if arr.count == 0{
+                    //展示emptyView
+                    self.classifyView.emptyView(isEmpty: true)
+                    self.emptyLabel.isHidden = false
                 }
-                self.dataArray.removeAllObjects()
-                self.dataArray.addObjects(from: newDataArray as! [Any])
-                
-                self.tableView.reloadData()
             }else if (status == .failed){
 //                self.NetApiStatus = .apiError
             }else if (status == .noNetwork){
@@ -21,6 +21,10 @@ class CNLiveDownSlideTodayRecommendCell: UITableViewCell {
         }
         set{
             _slideModel = newValue!
+            
+            for obj in contentView.subviews{
+                obj.removeFromSuperview()
+            }
             self.setupNewUI(model: _slideModel!)
         }
     }
@@ -34,6 +34,7 @@ class CNLiveShopGoodsListClassifyView: UIView {
         priceBtn.addTarget(self, action: #selector(priceBtnAction), for: .touchUpInside)
         return priceBtn
     }()
+
     override init(frame: CGRect) {
         super.init(frame: frame)
@@ -50,6 +51,12 @@ class CNLiveShopGoodsListClassifyView: UIView {
         fatalError("init(coder:) has not been implemented")
     }
+    public func emptyView(isEmpty:Bool){
+        //后面替换成其他
+        self.lastestBtn.isHidden = isEmpty
+        
+    }
+    
     @objc func priceBtnAction(){
         self.priceBtn.isSelected = true
         self.lastestBtn.isSelected = false