首页跳转修改bug

RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/View/AddressManagerView.swift

@@ -180,14 +180,7 @@ extension AddressManagerView: UITableViewDelegate,UITableViewDataSource {
     
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        switch section {
-        case 0:
-            return 58
-        case 1:
-            return 72
-        default:
-            return 0
-        }
+        return 58
     }
     
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {

RainbowPlanet/RainbowPlanet/Modules/MineModule/AddressManager/ViewController/AddressManagerViewController.swift

@@ -143,7 +143,7 @@ class AddressManagerViewController: BaseViewController {
     func configCityManagementIndexApi() {
         let deliveryMethodType = Int(DeliveryMethodTypeModel.shared().getModel()?.deliveryMethodType ?? "2")
         if deliveryMethodType == 1 { //自提
-            self.isOpenCity = true
+            isOpenCity = true
             userSelfAndExpressAddressListApi(type:0)
         }
         if deliveryMethodType == 2 { //快递
@@ -163,7 +163,6 @@ class AddressManagerViewController: BaseViewController {
     /// 获取地址列表
     func userSelfAndExpressAddressListApi(type:Int) {
         SwiftMoyaNetWorkServiceUser.shared().userSelfAndExpressAddressListApi(type: type) {
-            
             [weak self] (addressManagerListModel) -> (Void) in
             self?.addressManagerListModel = (addressManagerListModel as! AddressManagerListModel)
             self?.addressManagerView.isOpenCity = self?.isOpenCity

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallFloor/Floor/ShoppingMallFloorTableViewCell.swift

@@ -153,7 +153,15 @@ extension ShoppingMallFloorTableViewCell: UICollectionViewDelegateFlowLayout,UIC
             }
             return 0
         case 2: //  2:左右滑动
-            return 1
+            if !(productModelsArrays?.isEmpty ?? true) {
+                let productModels = productModelsArrays?[section]
+                if productModels?.isEmpty ?? true {
+                    return 0
+                }else {
+                    return 1
+                }
+            }
+            return 0
         default:
             return 0
         }

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/ViewController/ShoppingMallViewController.swift

@@ -11,7 +11,9 @@ import UIKit
 class ShoppingMallViewController: BaseViewController {
     
     deinit {
-        NotificationCenter.default.removeObserver(observe!)
+        if observe != nil {
+            NotificationCenter.default.removeObserver(observe!)
+        }
     }
     weak var observe : NSObjectProtocol?
     
@@ -88,7 +90,7 @@ class ShoppingMallViewController: BaseViewController {
     }
     
     func pushVCCMSRule(cmsRuleModel:CMSRuleModel?,areaType:String) {
-        switch cmsRuleModel?.rule?.linkType  {
+        switch cmsRuleModel?.linkType  {
         case 1:
             let vc = SpecialViewController()
             vc.navigationBar.title = cmsRuleModel?.title

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceCMS/SwiftMoyaNetWorkServiceCMS.swift

@@ -67,10 +67,9 @@ class SwiftMoyaNetWorkServiceCMS: NSObject {
     /// 获取商品列表
     ///
     /// - Parameter completion: 完成
-    func cmsTemplateSetProductListApi(id:Int = 0,block:String = "",completion: @escaping apiCallBack) {
+    func cmsTemplateSetProductListApi(subjectId:Int = 0,block:String = "",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
-        parameters.updateValue(block, forKey: "block")
-        parameters.updateValue(id, forKey: "id")
+        parameters.updateValue(subjectId, forKey: "subject_id")
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceCMSApi.cmsTemplateSetProductList(parameters: parameters))) {
             (data) in