Merge branch 'develop' into feature/nanxinlin

* develop:
  购物车列表数据填充 -- to be continued
  购物车首页table数据源

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartHotSale/ShoppingCartHotSaleTableViewCell.swift

@@ -123,7 +123,7 @@ extension ShoppingCartHotSaleTableViewCell: UICollectionViewDelegateFlowLayout,U
     }
     
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
-        return 9
+        return 5
     }
     
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
@@ -136,7 +136,7 @@ extension ShoppingCartHotSaleTableViewCell: UICollectionViewDelegateFlowLayout,U
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, insetForSectionAt section: Int) -> UIEdgeInsets {
-        return UIEdgeInsets(top: 10, left: 0, bottom: 10, right: 0)
+        return UIEdgeInsets(top: 10, left: 0, bottom: 20, right: 0)
     }
     
 }

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListNoneItemCell.swift

@@ -12,6 +12,8 @@ import RxCocoa
 
 class ShoppingCartListNoneItemCell: UITableViewCell {
     
+    let disposeBag = DisposeBag()
+    
     override var frame: CGRect {
         get {
             return super.frame
@@ -105,12 +107,9 @@ class ShoppingCartListNoneItemCell: UITableViewCell {
         jumpButton.titleLabel?.font = kRegularFont16
         jumpButton.cornerRadius = 18
         jumpButton.masksToBounds = true
-//        jumpButton.rx.tap.subscribe(onNext: { [weak self] (data) in
-//            //            if let forgetPasswordBlock = self?.forgetPasswordBlock {
-//            //                forgetPasswordBlock()
-//            //            }
-//            print("点击了跳转到首页")
-//        }).disposed(by: disposeBag)
+        jumpButton.rx.tap.subscribe(onNext: { [weak self] (data) in
+            NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ChartListToHomePage"), object: nil)
+        }).disposed(by: disposeBag)
         return jumpButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewCell.swift

@@ -10,6 +10,25 @@ import UIKit
 
 class ShoppingCartListTableViewCell: UITableViewCell {
     
+    var productMdl : ProductModel? {
+        didSet {
+            // 商品图片
+            iconImageView.kf.setImage(with: kURLImage(name: productMdl?.productImg ?? ""), placeholder: kImage(name: "pic_preload"))
+            // 商品名称
+            titleLabel.text = productMdl?.productName
+            // 预计配送时间
+            deliveryTime.text = "预计配送时间：次日达"
+            // 规格
+            sellScaleLabel.text = "规格：\(productMdl?.skuName ?? "")"
+            // 数量
+            sellNumberLabel.text = "x1"
+            // 价格
+            sellPriceLabel.text = "¥\(productMdl?.skuPrice ?? 0)"
+            // 数量
+            numberLabel.text = "1"
+        }
+    }
+    
     override var frame: CGRect {
         get {
             return super.frame
@@ -53,7 +72,7 @@ class ShoppingCartListTableViewCell: UITableViewCell {
 //        masksToBounds = true
         
         addSubview(selectedButton)
-        addSubview(iconImagView)
+        addSubview(iconImageView)
         addSubview(titleLabel)
         addSubview(deliveryTime)
         addSubview(sellScaleLabel)
@@ -72,13 +91,13 @@ class ShoppingCartListTableViewCell: UITableViewCell {
             make.bottom.equalTo(-80)
             make.size.equalTo(18)
         }
-        iconImagView.snp.makeConstraints { (make) in
+        iconImageView.snp.makeConstraints { (make) in
             make.left.equalToSuperview().offset(40)
             make.centerY.equalToSuperview()
             make.width.height.equalTo(92)
         }
         titleLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(iconImagView.snp_right).offset(10)
+            make.left.equalTo(iconImageView.snp_right).offset(10)
             make.top.equalTo(14)
             make.right.equalTo(-26)
             make.height.equalTo(20)
@@ -130,15 +149,13 @@ class ShoppingCartListTableViewCell: UITableViewCell {
         return selectedButton
     }()
 
-    private lazy var iconImagView: UIImageView = {
-        let iconImagView = UIImageView()
-        iconImagView.image = kImage(name: "pic_preload")
-        return iconImagView
+    private lazy var iconImageView: UIImageView = {
+        let iconImageView = UIImageView()
+        return iconImageView
     }()
 
     private lazy var titleLabel: UILabel = {
         let titleLabel = UILabel()
-        titleLabel.text = "妈妈冬装外套棉袄短款"
         titleLabel.textColor = k333333Color
         titleLabel.font = kBoldFont14
         titleLabel.textAlignment = .left
@@ -148,7 +165,6 @@ class ShoppingCartListTableViewCell: UITableViewCell {
 
     private lazy var deliveryTime: UILabel = {
         let deliveryTime = UILabel()
-        deliveryTime.text = "预计配送时间：次日达"
         deliveryTime.textColor = k666666Color
         deliveryTime.font = kRegularFont12
         deliveryTime.textAlignment = .left
@@ -157,7 +173,6 @@ class ShoppingCartListTableViewCell: UITableViewCell {
 
     private lazy var sellScaleLabel: UILabel = {
         let sellScaleLabel = UILabel()
-        sellScaleLabel.text = "规格：3个装"
         sellScaleLabel.textColor = k999999Color
         sellScaleLabel.font = kRegularFont12
         return sellScaleLabel
@@ -165,7 +180,6 @@ class ShoppingCartListTableViewCell: UITableViewCell {
 
     private lazy var sellNumberLabel: UILabel = {
         let sellNumberLabel = UILabel()
-        sellNumberLabel.text = "x1"
         sellNumberLabel.textColor = k999999Color
         sellNumberLabel.font = kRegularFont12
         return sellNumberLabel
@@ -173,7 +187,6 @@ class ShoppingCartListTableViewCell: UITableViewCell {
 
     private lazy var sellPriceLabel: UILabel = {
         let sellPriceLabel = UILabel()
-        sellPriceLabel.text = "￥11.8"
         sellPriceLabel.textColor = kfe352bColor
         sellPriceLabel.font = kBoldFont15
         sellPriceLabel.textAlignment = .left
@@ -188,7 +201,6 @@ class ShoppingCartListTableViewCell: UITableViewCell {
 
     private lazy var numberLabel: UILabel = {
         let numberLabel = UILabel()
-        numberLabel.text = "1"
         numberLabel.textAlignment = .center
         numberLabel.font = kRegularFont14
         numberLabel.textColor = k333333Color

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartList/ShoppingCartListTableViewHeader.swift

@@ -12,6 +12,12 @@ import RxCocoa
 
 class ShoppingCartListTableViewHeader: BaseView {
     
+    var shopName : String? {
+        didSet {
+            titleButton.setTitle(shopName, for: UIControl.State.normal)
+        }
+    }
+    
     override var frame: CGRect {
         get {
             return super.frame
@@ -50,7 +56,6 @@ class ShoppingCartListTableViewHeader: BaseView {
     
     private lazy var titleButton: UIButton = {
         let titleButton = UIButton(type: UIButton.ButtonType.custom)
-        titleButton.setTitle("彩虹星球专营", for: UIControl.State.normal)
         titleButton.setTitleColor(k333333Color, for: UIControl.State.normal)
         titleButton.setTitleColor(k666666Color, for: UIControl.State.selected)
         titleButton.setImage(UIImage.imageWithColor(color: kDisabledButtonColor), for: UIControl.State.selected)

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/View/ShoppingCartView.swift

@@ -10,6 +10,12 @@ import UIKit
 
 class ShoppingCartView: BaseView {
     
+    var cartListModelsArr : Array<CartProductListModel>? {
+        didSet {
+            tableView.reloadData()
+        }
+    }
+    
     override func setupViews() {
         self.backgroundColor = kf7f8faColor
         addSubview(accountView)
@@ -26,8 +32,8 @@ class ShoppingCartView: BaseView {
             make.height.equalTo(48)
         }
         tableView.snp.makeConstraints { (make) in
-            make.edges.equalToSuperview()
-            make.bottom.equalTo(accountView.snp_top).offset(-20)
+            make.top.left.right.equalToSuperview()
+            make.bottom.equalTo(accountView.snp_top).offset(0)
         }
     }
     
@@ -52,78 +58,77 @@ class ShoppingCartView: BaseView {
 
 extension ShoppingCartView : UITableViewDelegate, UITableViewDataSource {
     func numberOfSections(in tableView: UITableView) -> Int {
-        return 4
+        // 购物车列表 + 超值热卖
+        return cartListModelsArr?.isEmpty ?? true ? 2 : cartListModelsArr!.count + 1
     }
     
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        switch section {
-        case 0:
-            return 1
-        case 1:
-            return 3
-        case 2:
-            return 2
-        case 3:
-            return 1
-        default:
+        if cartListModelsArr?.isEmpty ?? true {
             return 1
+            
+        } else {
+            if  section < cartListModelsArr!.count {
+                return cartListModelsArr![section].productList?.isEmpty ?? true ? 0 : cartListModelsArr![section].productList!.count
+            } else {
+                return 1
+            }
         }
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        switch indexPath.section {
-        case 0:
-            let cell = ShoppingCartListNoneItemCell.cellWith(tableView: tableView, indexPath: indexPath)
-            return cell
-        case 1:
-            let cell = ShoppingCartListTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-            return cell
-        case 2:
-            let cell = ShoppingCartListTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-            return cell
-        case 3:
-            let cell = ShoppingCartHotSaleTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
-            cell.frame = tableView.bounds
-            cell.layoutIfNeeded()
-            cell.reloadData()
-            return cell
+        if cartListModelsArr?.count == 0 {
+            switch indexPath.section {
+            case 0:
+                // 购物车列表为空
+                let cell = ShoppingCartListNoneItemCell.cellWith(tableView: tableView, indexPath: indexPath)
+                return cell
+            case 1:
+                // 超值热卖
+                let cell = ShoppingCartHotSaleTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.frame = tableView.bounds
+                cell.layoutIfNeeded()
+                cell.reloadData()
+                return cell
+            default:
+                return UITableViewCell()
+            }
             
-        default:
-            return UITableViewCell()
+        } else {
+            if indexPath.section < cartListModelsArr!.count {
+                // 购物车列表Item
+                let cell = ShoppingCartListTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.productMdl = cartListModelsArr![indexPath.section].productList![indexPath.row]
+                return cell
+                
+            } else {
+                let cell = ShoppingCartHotSaleTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
+                cell.frame = tableView.bounds
+                cell.layoutIfNeeded()
+                cell.reloadData()
+                return cell
+            }
         }
-        
     }
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        switch indexPath.section {
-        case 0:
-            return  UITableView.automaticDimension
-        case 1:
-            return  UITableView.automaticDimension
-        case 2:
-            return  UITableView.automaticDimension
-        case 3:
-            return  UITableView.automaticDimension
-        default:
-            return 0
-        }
-        
+        return  UITableView.automaticDimension
     }
     
     func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
-        if section == 0 || section == 3 {
-            return 10
-        } else {
+        if cartListModelsArr?.count ?? 0 > 0 && section < cartListModelsArr!.count {
             return 48
+        } else {
+            return 10
         }
     }
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
-        if section == 3 || section == 0 {
-            return nil
-        } else {
+        if cartListModelsArr?.count ?? 0 > 0 && section < cartListModelsArr!.count {
             let headerView = ShoppingCartListTableViewHeader(frame: CGRect(x: 0, y: 0, width: kScreenWidth, height: 48))
+            headerView.shopName = cartListModelsArr![section].shopName
             return headerView
+        } else {
+            return nil
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCart/ViewController/ShoppingCartViewController.swift

@@ -4,36 +4,49 @@
 //
 //  Created by 南鑫林 on 2019/3/7.
 //  Copyright © 2019 RainbowPlanet. All rights reserved.
-//
+//  购物车首页Vc
 
 import UIKit
 import RxSwift
 
 class ShoppingCartViewController: BaseViewController {
-
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
         setupLayouts()
+        
+        let operationQueue = OperationQueue.main
+        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: "ChartListToHomePage"), object: nil, queue: operationQueue) {
+            [weak self] (notification) in
+            self?.tabBarController?.selectedIndex = 0
+        }
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
         setupData()
     }
     
+    deinit {
+        NotificationCenter.default.removeObserver(self)
+    }
+    
     override func setupViews() {
         navigationBar.title = "购物车"
         
     }
     
     override func setupLayouts() {
-        
+        self.tabBarController?.selectedIndex = 0
     }
     
     override func setupData() {
-        //TODO:获取购物车列表
-//        SwiftMoyaNetWorkServiceCMS.shared().cmsTemplateSetTemplateNameApi {
-//            [weak self] (data) -> (Void) in
-//            self?.setShoppingCartView()
-        self.setShoppingCartView()
-//        }
+        SwiftMoyaNetWorkServiceProduct.shared().productCartListApi { [weak self] (cartListData) -> (Void) in
+            let cartListData = cartListData as? ProductCartListData
+            self?.setShoppingCartView()
+            self?.shoppingCartView.cartListModelsArr = cartListData?.data
+            
+        }
     }
     
     /// 添加view