专题页面完成缺接口

RainbowPlanet/RainbowPlanet/AppDelegate/AppDelegate.swift

@@ -18,15 +18,15 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
        
         //初始化窗口
         initWindow()
+        //初始化友盟
+        UMManager.shared().initUM(launchOptions: launchOptions)
         DispatchQueue.global(qos: .default).async {
             //初始化百度地图
             BaiduMapManager.shared().initBaiduMap()
-            //初始化友盟
-            UMManager.shared().initUM(launchOptions: launchOptions)
-            //初始化键盘
+//            //初始化键盘
             IQKeyboardManagerSwiftManager.shared().initIQKeyboardManagerSwift()
         }
-        
+    
         return true
     }
 

RainbowPlanet/RainbowPlanet/Modules/CommonModules/SearchModule/SearchResult/View/SearchResultNavigationbarView.swift

@@ -43,7 +43,7 @@ class SearchResultNavigationbarView: BaseView {
         shoppingCarButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalToSuperview().offset(-14)
-            make.size.equalTo(24)
+            make.width.equalTo(24)
             make.height.equalTo(21)
         }
         searchbgView.snp.makeConstraints { (make) in

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/View/CategorySearchView.swift

@@ -29,7 +29,7 @@ class CategorySearchView: BaseView {
         shoppingCarButton.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.right.equalToSuperview().offset(-14)
-            make.size.equalTo(24)
+            make.width.equalTo(24)
             make.height.equalTo(21)
         }
         searchbgView.snp.makeConstraints { (make) in
@@ -53,8 +53,8 @@ class CategorySearchView: BaseView {
         }
     }
     
-    private lazy var searchbgView: UIView = {
-        let searchbgView = UIView()
+    lazy var searchbgView: UIButton = {
+        let searchbgView = UIButton(type: UIButton.ButtonType.custom)
         searchbgView.backgroundColor = kf7f8faColor
         searchbgView.cornerRadius = 15
         searchbgView.masksToBounds = true
@@ -75,29 +75,7 @@ class CategorySearchView: BaseView {
         searchTextField.returnKeyType = .search
         searchTextField.font = kScaleRegularFont14
         searchTextField.borderStyle = .none
-        searchTextField.rx.controlEvent([.editingDidEndOnExit]).asObservable().subscribe(onNext: {  [weak self] (text) in
-            
-            if searchTextField.text?.count ?? 0 > 0 {
-                self?.endEditing(true)
-                
-                var searchHistoryArray = Array<String>()
-                
-                if UserDefaults.standard.array(forKey: "SearchHistoryArray")?.isEmpty ?? true {
-                    searchHistoryArray.append(searchTextField.text ?? "")
-                } else {
-                    searchHistoryArray = UserDefaults.standard.array(forKey: "SearchHistoryArray") as! [String]
-                    searchHistoryArray.append(searchTextField.text ?? "")
-                }
-                UserDefaults.standard.set(searchHistoryArray, forKey: "SearchHistoryArray")
-                if let searchResultBlock = self?.searchResultBlock {
-                    searchResultBlock(searchTextField.text ?? "")
-                }
-            }else {
-                SwiftProgressHUD.shared().showText("搜索商品不能为空")
-            }
-            
-            
-        }).disposed(by: disposeBag)
+        searchTextField.isEnabled = false
         return searchTextField
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Category/ViewController/CategoryViewController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import RxSwift
 
 class CategoryViewController: BaseViewController {
     
@@ -40,6 +41,15 @@ class CategoryViewController: BaseViewController {
     }
     
     override func setupData() {
+        categorySearchView.searchbgView.rx.tap.subscribe(onNext: {
+            [weak self] in
+            let vc = SearchViewController()
+            let nav = BaseNavigationViewController.init(rootViewController: vc)
+            self?.present(nav, animated: true, completion: {
+                
+            })
+        }).disposed(by: disposeBag)
+        
         categoryView.leftTableView.addHeaderWithHeader(withBeginRefresh: true, animation: false) {
             [weak self] (page) in
             self?.productCategoryApi(page: page)

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallNavigationBarView.swift

@@ -107,7 +107,7 @@ class ShoppingMallNavigationBarView: BaseView {
     
     private lazy var searchTextField: UITextField = {
         let searchTextField = UITextField()
-        searchTextField.placeholder = "车里子"
+        searchTextField.placeholder = "搜索商品名称"
         searchTextField.tintColor = kFFA42FColor
         searchTextField.textColor = k333333Color
         searchTextField.returnKeyType = .done

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Special/View/SpecialBannerView.swift

@@ -17,9 +17,9 @@ class SpecialBannerView: BaseView {
     override func setupLayouts() {
         bannerButton.snp.makeConstraints { (make) in
             make.top.equalTo(10)
-            make.left.equalTo(14)
+            make.left.equalToSuperview().offset(14)
             make.bottom.equalTo(-10)
-            make.right.equalTo(-14)
+            make.width.equalTo(kScreenWidth - 28)
         }
     }
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/Special/ViewController/SpecialViewController.swift

@@ -35,7 +35,14 @@ class SpecialViewController: BaseViewController {
     }
     
     override func setupData() {
-        
+        categorySearchView.searchbgView.rx.tap.subscribe(onNext: {
+            [weak self] in
+            let vc = SearchViewController()
+            let nav = BaseNavigationViewController.init(rootViewController: vc)
+            self?.present(nav, animated: true, completion: {
+                
+            })
+        }).disposed(by: disposeBag)
     }
     
     private lazy var categorySearchView: CategorySearchView = {