Merge branch 'feature/dev_Chris' into develop

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

@@ -185,7 +185,12 @@ class AddressManagerViewController: BaseViewController {
     func setDeliveryMethodTypeAndReload(type: String, reloadType: Int) {
         SwiftMoyaNetWorkServiceUser.shared().userSetDeliverTypeApi(deliveryMethodType: type) {
             [weak self] (data) -> (Void) in
+            // 刷新列表
             self?.userSelfAndExpressAddressListApi(type:reloadType)
+            // 发送选中为自提の通知
+            if type == "1" {
+                NotificationCenter.default.post(name: NSNotification.Name("ChooseSelfAddressNoti"), object: nil)
+            }
         }
     }
 

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

@@ -15,8 +15,11 @@ class ShoppingMallNavigationBarView: BaseView {
     typealias SearchBlock = () -> Void
     var searchBlock : SearchBlock?
     
+    typealias SelfAddrTipClosure = () -> Void
+    var selfAddrTipClosure : SelfAddrTipClosure?
+    
     override func setupViews() {
-        addSubview(addressImageView)
+        addSubview(addressImageBtn)
         addSubview(addressLabel)
         addSubview(searchButton)
         searchButton.addSubview(searchIconImageView)
@@ -26,7 +29,7 @@ class ShoppingMallNavigationBarView: BaseView {
 
     override func setupLayouts() {
         
-        addressImageView.snp.makeConstraints { (make) in
+        addressImageBtn.snp.makeConstraints { (make) in
             make.centerY.equalToSuperview()
             make.left.equalToSuperview().offset(14)
             make.size.equalTo(20)
@@ -34,7 +37,7 @@ class ShoppingMallNavigationBarView: BaseView {
         
         addressLabel.snp.remakeConstraints { (make) in
             make.centerY.equalToSuperview()
-            make.left.equalTo(addressImageView.snp.right).offset(kScaleValue(value: 6))
+            make.left.equalTo(addressImageBtn.snp.right).offset(kScaleValue(value: 6))
         }
         
         categoryButton.snp.makeConstraints { (make) in
@@ -50,7 +53,7 @@ class ShoppingMallNavigationBarView: BaseView {
             let model = DeliveryMethodTypeModel.shared().getModel()
             if model?.deliveryMethodType == "1" { //自提
                 addressLabel.isHidden = true
-                make.left.equalTo(addressImageView.snp.right).offset(9)
+                make.left.equalTo(addressImageBtn.snp.right).offset(9)
             }
             if model?.deliveryMethodType == "2" { //快递
                 addressLabel.isHidden = false
@@ -72,10 +75,15 @@ class ShoppingMallNavigationBarView: BaseView {
         
     }
     
-    private lazy var addressImageView: UIImageView = {
-        let addressImageView = UIImageView()
-        addressImageView.image = kImage(name: "navbar_address")
-        return addressImageView
+    private lazy var addressImageBtn: UIButton = {
+        let addressImageBtn = UIButton(type: UIButton.ButtonType.custom)
+        addressImageBtn.setImage(kImage(name: "navbar_address"), for: UIControl.State.normal)
+        addressImageBtn.rx.tap.subscribe(onNext: {[weak self] (data) in
+            if let selfAddrTipClosure = self?.selfAddrTipClosure {
+                selfAddrTipClosure()
+            }
+        }).disposed(by: disposeBag)
+        return addressImageBtn
     }()
     
     private lazy var addressLabel: UILabel = {

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

@@ -22,6 +22,11 @@ class ShoppingMallViewController: BaseViewController {
         setupViews()
         setupLayouts()
         setupData()
+        
+        NotificationCenter.default.addObserver(forName: NSNotification.Name(rawValue: "ChooseSelfAddressNoti"), object: nil, queue: operationQueue) {
+            [weak self] (notification) in
+            
+        }
     }
     override func setupViews() {
         super.setupViews()
@@ -106,6 +111,13 @@ class ShoppingMallViewController: BaseViewController {
 
     private lazy var navigationBarView: ShoppingMallNavigationBarView = {
         let navigationBarView = ShoppingMallNavigationBarView()
+        navigationBarView.selfAddrTipClosure = {
+            [weak self] in
+            let model = DeliveryMethodTypeModel.shared().getModel()
+            if model?.deliveryMethodType == "1" { //自提
+                
+            }            
+        }
         return navigationBarView
     }()