修正个人中心获取数据逻辑+修正商品管理总数显示bug

GeliBusinessPlatform/ViewController/个人中心/PersonCenterViewController.swift

@@ -24,16 +24,18 @@ class PersonCenterViewController: BaseViewController,UITableViewDelegate,UITable
     //MARK:--加载数据
     
     func loadData(){
+        if self.dataModel != nil {
+            return
+        }
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
         HUD.flash(.progress)
         adminInfo(["user_token":UserToken as Any], success: { (data) in
             HUD.hide()
             self.dataModel = (data as! AdminInfoModel)
-//            self.iconImg.sd_setImage(with:  URL(string: SERVERCE_ImageHost + (self.dataModel?.data?.shop_img)!), placeholderImage: UIImage.init(named: "个人设置头像"))
             self.shopNameLbl.text = self.dataModel?.data?.stall_name
             self.nameLbl.text = self.nowDateStr()
         }) { (error) in
-            
+            HUD.hide()
         }
     }
     func nowDateStr() -> String {

GeliBusinessPlatform/ViewController/商品管理/GoodsManageListVC.swift

@@ -34,6 +34,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
     //MARK:--数据处理字段
     var items = Array<GoodsResModel>()
     var itemsSearch = Array<GoodsResModel>()
+    var itemsAllCount = 0
     var selectIndexArr = [0,0,0]
     var showSelectvIndex = 0
     var isSearch = false
@@ -130,7 +131,7 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
         }
         getSortData ()
         
-        
+        itemsAllCount = 0
         goodsList(["user_token":UserToken as Any,"keyword":keyword,"goods_type":goodsType,"sort":sort,"is_show":isShow,"page":page], success: { (data) in
             let dataM = data as! GoodsListModel
             if self.isSearch {
@@ -138,12 +139,14 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
                 self.itemsSearch.removeAll()
                 dataM.data?.goods_res?.forEach({ (model) in
                     self.itemsSearch.append(model)
+                    self.itemsAllCount = dataM.data?.count as! Int
                 })
             }else{
                 self.pageNum = 2
                 self.items.removeAll()
                 dataM.data?.goods_res?.forEach({ (model) in
                     self.items.append(model)
+                    self.itemsAllCount = dataM.data?.count as! Int
                 })
             }
             //collection动画效果
@@ -360,13 +363,13 @@ class GoodsManageListVC: BaseViewController, UICollectionViewDelegate, UICollect
         let headerLbl = UILabel(frame: CGRect(x: 15*glscale, y: 10*glscale, width: 100*glscale, height: 20*glscale))
         if isSearch {
             if itemsSearch.count > 0 {
-                headerLbl.text = "共" + StringByInt(number: itemsSearch.count) + "件商品"
+                headerLbl.text = "共" + StringByInt(number: self.itemsAllCount) + "件商品"
             }else{
                 headerLbl.text = ""
             }
         }else{
             if items.count > 0 {
-                headerLbl.text = "共" + StringByInt(number: items.count) + "件商品"
+                headerLbl.text = "共" + StringByInt(number: self.itemsAllCount) + "件商品"
             }else{
                 headerLbl.text = ""
             }