完善商品列表请求对接

GeliBusinessPlatform/BaseView/BaseViewController.swift

@@ -11,9 +11,14 @@ import SwiftyJSON
 import ObjectMapper
 import Alamofire
 import IQKeyboardManagerSwift
+import Kingfisher
 
 class BaseViewController: UIViewController ,NavBarViewDelegate{
-
+    // 顶部刷新
+    let headerMJ = MJRefreshNormalHeader()
+    // 底部加载
+    let footerMJ = MJRefreshAutoNormalFooter()
+ 
     override func viewWillAppear(_ animated: Bool) {    
         self.navigationController?.navigationBar.isHidden = true
         IQKeyboardManager.shared.shouldPlayInputClicks = true

GeliBusinessPlatform/Model/GoodsListModel.swift

@@ -33,6 +33,8 @@ class GoodsListDataModel: Mappable {
     }
     func mapping(map: Map) {
         count <- map["count"]
+        goods_res <- map["goods_res"]
+
      }
     
 }

GeliBusinessPlatform/Model/Interface.swift

@@ -80,7 +80,7 @@ func getGelipayMobile(_ params:[String:Any],success:@escaping (_ res:Any)->(),fa
     }
 }
 //MARK:--获取商店管理员验证手机号
-//params-key(user_token)
+//params-key( )
 func getShopMobile(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
     NetworkRequest.sharedInstance.postRequest("获取商店管理员验证手机号", params, { (rep:DataResponse<GetMobileModel>) in
     }, success: { (data) in

GeliBusinessPlatform/View/CollectionCell/GoodsCollectionViewCell.swift

@@ -11,6 +11,7 @@ import LGButton
 
 class GoodsCollectionViewCell: UICollectionViewCell {
 
+    @IBOutlet weak var goodsImgV: UIImageView!
     @IBOutlet weak var codeBtn: UIButton!
     @IBOutlet weak var rightBtn: UIButton!
     @IBOutlet weak var leftBtn: UIButton!

GeliBusinessPlatform/View/CollectionCell/GoodsCollectionViewCell.xib

@@ -201,6 +201,7 @@
             <size key="customSize" width="136" height="281"/>
             <connections>
                 <outlet property="codeBtn" destination="4Xi-Jf-NQw" id="ORF-0T-7hL"/>
+                <outlet property="goodsImgV" destination="T8c-YA-14K" id="jQ2-Zp-Pnu"/>
                 <outlet property="goodsName" destination="tHK-Kt-m55" id="P8Y-sF-MbY"/>
                 <outlet property="leftBtn" destination="w99-DC-tI2" id="3Vh-3A-Wlg"/>
                 <outlet property="lgBtn" destination="MEL-J8-S3c" id="Ja4-8M-q7d"/>
@@ -222,7 +223,7 @@
             <color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="灰色字体颜色">
-            <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+            <color red="0.40000000596046448" green="0.40000000596046448" blue="0.40000000596046448" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>

GeliBusinessPlatform/ViewController/仓库管理/WarehoseMangementListVC.swift

@@ -13,6 +13,8 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
     weak var searchV: SearchBarView? = nil
     @IBOutlet weak var contentView: UIView!
     @IBOutlet weak var searchView: UIView!
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         self.view.backgroundColor = UIColor.white
@@ -46,7 +48,9 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
         tableSearchV.dataSource = self
         tableSearchV.separatorStyle = .none
         tableSearchV?.register(UINib(nibName: "WarehoseMangementCell", bundle: nil), forCellReuseIdentifier: "WarehoseMangementCell")
-        
+        if blackBtnView != nil {
+            blackBtnView.removeFromSuperview()
+        }
     }
     //MAKR:--调起搜索后添加个蒙版本
     var blackBtnView:UIButton! = nil
@@ -84,6 +88,8 @@ class WarehoseMangementListVC: BaseViewController, UISearchBarDelegate, UITableV
             blackBtnView.removeFromSuperview()
             searchV!.resignFirstResponder()
         }
+        let vc = CheckWareHourseViewController()
+        self.navigationController?.pushViewController(vc, animated: false)
     }
     
     var tableV :UITableView!

GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift

@@ -254,7 +254,7 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
     func btnClick(content: String, cell: TitleAndBtnCell) {        if cell.nameLbl.text == "商品类型" {
         if glSelectView == nil {
             let view = GLAlertSelectView(frame: self.view.bounds)
-            view.isMultipleSelect = false
+            view.isMultipleSelect = true
             view.titleLbl.text = "请选择仓库类型"
             view.delegate = self
             view.dataArr = ["预售","普通","期货","团购"]