Merge branch 'develop' into feature/nanxinlin

RainbowPlanet/RainbowPlanet.xcodeproj/project.pbxproj

@@ -289,7 +289,6 @@
 		A7CC75382271ADD6003C4F38 /* AddressManagerSelfMentionExpressHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC75372271ADD6003C4F38 /* AddressManagerSelfMentionExpressHeaderView.swift */; };
 		A7CC753A2271B98B003C4F38 /* AddressManagerAddTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC75392271B98B003C4F38 /* AddressManagerAddTableViewCell.swift */; };
 		A7CC753C2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC753B2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift */; };
-		A7CC753E2271C4C2003C4F38 /* AddressManagerExpressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC753D2271C4C2003C4F38 /* AddressManagerExpressTableViewCell.swift */; };
 		A7CC75432271E038003C4F38 /* SelfMentionContactsListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7CC75422271E038003C4F38 /* SelfMentionContactsListViewController.swift */; };
 		A7D4608E227616F800A5A54E /* SQLiteManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D4608D227616F800A5A54E /* SQLiteManager.swift */; };
 		A7D46090227617D200A5A54E /* SQLModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7D4608F227617D200A5A54E /* SQLModel.swift */; };
@@ -689,7 +688,6 @@
 		A7CC75372271ADD6003C4F38 /* AddressManagerSelfMentionExpressHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressManagerSelfMentionExpressHeaderView.swift; sourceTree = "<group>"; };
 		A7CC75392271B98B003C4F38 /* AddressManagerAddTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressManagerAddTableViewCell.swift; sourceTree = "<group>"; };
 		A7CC753B2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressManagerSelfMentionTableViewCell.swift; sourceTree = "<group>"; };
-		A7CC753D2271C4C2003C4F38 /* AddressManagerExpressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddressManagerExpressTableViewCell.swift; sourceTree = "<group>"; };
 		A7CC75422271E038003C4F38 /* SelfMentionContactsListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SelfMentionContactsListViewController.swift; sourceTree = "<group>"; };
 		A7D4608D227616F800A5A54E /* SQLiteManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLiteManager.swift; sourceTree = "<group>"; };
 		A7D4608F227617D200A5A54E /* SQLModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SQLModel.swift; sourceTree = "<group>"; };
@@ -2664,7 +2662,6 @@
 				A7CC75352271AC14003C4F38 /* AddressManagerView.swift */,
 				A7CC75392271B98B003C4F38 /* AddressManagerAddTableViewCell.swift */,
 				A7CC753B2271C177003C4F38 /* AddressManagerSelfMentionTableViewCell.swift */,
-				A7CC753D2271C4C2003C4F38 /* AddressManagerExpressTableViewCell.swift */,
 				A7CC75372271ADD6003C4F38 /* AddressManagerSelfMentionExpressHeaderView.swift */,
 			);
 			path = View;
@@ -3667,7 +3664,6 @@
 				A72A72B922321DE000B21995 /* Extension+Array.swift in Sources */,
 				A70B2C492288416F00B2449F /* ProductDetailHotSellCollectionViewCell.swift in Sources */,
 				A71901692275464000104A50 /* ProvinceCityAreaView.swift in Sources */,
-				A7CC753E2271C4C2003C4F38 /* AddressManagerExpressTableViewCell.swift in Sources */,
 				A7778CDD2246121500C7C47A /* PhoneCountryAreaListMdoel.swift in Sources */,
 				A72A733522325A4B00B21995 /* AppDelegate+HandleOpen.swift in Sources */,
 				A7FF156E228C6EAE00A85748 /* OrderDeliveryModeTableViewCell.swift in Sources */,

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

@@ -1,168 +0,0 @@
-//
-//  AddressManagerExpressTableViewCell.swift
-//  RainbowPlanet
-//
-//  Created by 南鑫林 on 2019/4/25.
-//  Copyright © 2019 南鑫林. All rights reserved.
-//  Abandoned(May.27,2019)
-
-import UIKit
-
-class AddressManagerExpressTableViewCell: UITableViewCell {
-
-    class func cellWith(tableView:UITableView,indexPath:IndexPath) -> AddressManagerExpressTableViewCell {
-        let ID = "AddressManagerExpressTableViewCell"
-        tableView.register(AddressManagerExpressTableViewCell.self, forCellReuseIdentifier: ID)
-        let cell : AddressManagerExpressTableViewCell = tableView.dequeueReusableCell(withIdentifier: ID, for: indexPath) as! AddressManagerExpressTableViewCell
-        cell.indexPath = indexPath
-        return cell
-    }
-    
-    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
-        super.init(style: style, reuseIdentifier: reuseIdentifier)
-        setupViews()
-        setupLayouts()
-    }
-    
-    required init?(coder aDecoder: NSCoder) {
-        fatalError("init(coder:) has not been implemented")
-    }
-    
-    var indexPath: IndexPath? {
-        didSet {
-            
-        }
-    }
-    //MRAK: - 设置View
-    private func setupViews() {
-        self.selectionStyle = .none
-        addSubview(nameLabel)
-        addSubview(moblieLabel)
-        addSubview(defalutLabel)
-        addSubview(addressLabel)
-        addSubview(selectedButton)
-        addSubview(lineLabel)
-    }
-    
-    private func setupLayouts() {
-        nameLabel.snp.makeConstraints { (make) in
-            make.top.equalTo(15)
-            make.left.equalTo(52)
-            make.height.equalTo(23)
-        }
-        
-        moblieLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(nameLabel.snp.right).offset(10)
-            make.centerY.equalTo(nameLabel)
-            make.height.equalTo(20)
-        }
-        
-        addressLabel.snp.remakeConstraints { (make) in
-            make.top.equalTo(nameLabel.snp.bottom).offset(5)
-            make.left.equalTo(92)
-            make.right.equalTo(-14)
-            make.bottom.equalTo(-15)
-        }
-        
-        defalutLabel.snp.makeConstraints { (make) in
-            make.left.equalTo(nameLabel)
-            make.top.equalTo(addressLabel).offset(2)
-            make.width.equalTo(36)
-            make.height.equalTo(17)
-        }
-        
-        selectedButton.snp.makeConstraints { (make) in
-            make.left.equalTo(14)
-            make.top.equalTo(addressLabel.snp.top)
-            make.size.equalTo(16)
-        }
-        
-        lineLabel.snp.makeConstraints { (make) in
-            make.top.right.equalToSuperview()
-            make.left.equalTo(14)
-            make.height.equalTo(0.5)
-        }
-    }
-    
-    private lazy var nameLabel: UILabel = {
-        let nameLabel = UILabel()
-        nameLabel.textColor = k333333Color
-        nameLabel.font = kMediumFont16
-        return nameLabel
-    }()
-    
-    private lazy var moblieLabel: UILabel = {
-        let moblieLabel = UILabel()
-        moblieLabel.textColor = k999999Color
-        moblieLabel.font = kRegularFont14
-        return moblieLabel
-    }()
-    
-    private lazy var defalutLabel: UILabel = {
-        let defalutLabel = UILabel()
-        defalutLabel.backgroundColor = kFFF1EBColor
-        defalutLabel.text = "默认"
-        defalutLabel.textColor = kFE5706Color
-        defalutLabel.font = kRegularFont13
-        defalutLabel.cornerRadius = 17/2
-        defalutLabel.masksToBounds = true
-        defalutLabel.textAlignment = .center
-        return defalutLabel
-    }()
-    
-    private lazy var selectedButton: UIButton = {
-        let selectedButton = UIButton(type: UIButton.ButtonType.custom)
-        selectedButton.setImage(kImage(name: "common_uncheck_icon"), for: UIControl.State.normal)
-        selectedButton.setImage(kImage(name: "common_check_icon"), for: UIControl.State.selected)
-        return selectedButton
-    }()
-    
-    private lazy var addressLabel: UILabel = {
-        let addressLabel = UILabel()
-        addressLabel.text = "陕西省 西安市 雁塔区 曲江街道 翠华南路创意盒子"
-        addressLabel.textColor = k333333Color
-        addressLabel.font = kRegularFont14
-        addressLabel.numberOfLines = 0
-        return addressLabel
-    }()
-    
-    private lazy var lineLabel: UILabel = {
-        let lineLabel = UILabel()
-        lineLabel.backgroundColor = kf5f5f5Color
-        return lineLabel
-    }()
-    
-    var expressAddresModel: ExpressAddresModel? {
-        didSet {
-            nameLabel.text = expressAddresModel?.contactName 
-            moblieLabel.text = expressAddresModel?.contactMobile
-            let provinceName = expressAddresModel!.provinceName
-            let cityName = expressAddresModel!.cityName
-            let areaName = expressAddresModel!.areaName
-            let address = expressAddresModel!.address
-            
-            addressLabel.text = "\(String(describing: provinceName ??  ""))\(String(describing: cityName ?? ""))\(String(describing: areaName ?? ""))\(String(describing: address ?? ""))"
-            if expressAddresModel!.isDefault == 1 {
-                selectedButton.isSelected = true
-                defalutLabel.isHidden = false
-                addressLabel.snp.remakeConstraints { (make) in
-                    make.top.equalTo(nameLabel.snp.bottom).offset(5)
-                    make.left.equalTo(92)
-                    make.right.equalTo(-14)
-                    make.bottom.equalTo(-15)
-                }
-            }else {
-                selectedButton.isSelected = false
-                defalutLabel.isHidden = true
-                addressLabel.snp.remakeConstraints { (make) in
-                    make.top.equalTo(nameLabel.snp.bottom).offset(5)
-                    make.left.equalTo(52)
-                    make.right.equalTo(-14)
-                    make.bottom.equalTo(-15)
-                }
-            }
-            
-        }
-    }
-    
-}

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

@@ -70,7 +70,9 @@ class AddressManagerSelfMentionExpressHeaderView: BaseView {
     
     var section:Int? {
         didSet {
-            
+            if self.section == 1 {
+                managerButton.setTitle("新建地址", for: UIControl.State.normal)
+            }
         }
     }
     

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

@@ -8,10 +8,6 @@
 
 import UIKit
 
-enum AddressManagerVCType {
-    case mine
-}
-
 class AddressManagerViewController: BaseViewController {
     
     deinit {
@@ -19,7 +15,6 @@ class AddressManagerViewController: BaseViewController {
     }
     weak var observe : NSObjectProtocol?
     
-    var addressManagerVCType : AddressManagerVCType = .mine
     var addressManagerListModel : AddressManagerListModel?
     var isOpenCity : Bool = false
     
@@ -95,6 +90,7 @@ class AddressManagerViewController: BaseViewController {
         addressManagerView.editClosure = {
             [weak self] indexPath in
             let vc = EditExpressAddressViewController()
+            vc.isAddNewAddress = false
             vc.expressAddresModel = self?.addressManagerListModel?.expressAddress![indexPath.row]
             self?.navigationController?.pushViewController(vc, animated: true)
         }
@@ -106,6 +102,7 @@ class AddressManagerViewController: BaseViewController {
     /// 添加快递地址跳转页面
     private func addExpressAddressPushVC() {
         let vc = EditExpressAddressViewController()
+        vc.isAddNewAddress = true
         self.navigationController?.pushViewController(vc, animated: true)
     }
     
@@ -133,12 +130,7 @@ class AddressManagerViewController: BaseViewController {
             }
             self.navigationController?.pushViewController(vc, animated: true)
         }else {
-            if self.addressManagerVCType == .mine {
-                managerSelfMentionAddressPushVC()
-            }else {
-                let selfAddressModel = self.addressManagerListModel?.selfAddress?[indexPath.row]
-                self.userAddressIsDefaultApi(id:selfAddressModel?.id ?? 0, type: "1")
-            }
+            managerSelfMentionAddressPushVC()
         }
     }
     
@@ -147,6 +139,7 @@ class AddressManagerViewController: BaseViewController {
     func didSelectExpressAddress(indexPath:IndexPath) {
         if self.addressManagerListModel?.expressAddress?.isEmpty ?? true {
             let vc = EditExpressAddressViewController()
+            vc.isAddNewAddress = true
             self.navigationController?.pushViewController(vc, animated: true)
         }else {
             let expressAddressModel = self.addressManagerListModel?.expressAddress?[indexPath.row]

RainbowPlanet/RainbowPlanet/Modules/MineModule/EditExpressAddress/ViewController/EditExpressAddressViewController.swift

@@ -15,6 +15,17 @@ class EditExpressAddressViewController: BaseViewController {
     // 是否由支付订单页面进入
     var isFromOrderPay: Bool = false
     
+    // 新增/编辑
+    var isAddNewAddress: Bool = true {
+        didSet {
+            if self.isAddNewAddress {
+                navigationBar.title = "新增收货地址"
+            } else {
+                navigationBar.title = "编辑收货地址"
+            }
+        }
+    }
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -22,7 +33,7 @@ class EditExpressAddressViewController: BaseViewController {
     }
     
     override func setupViews() {
-        navigationBar.title = "编辑收货地址"
+        navigationBar.title = ""
         navigationBar.wr_setRightButton(title: "保存", titleColor: k333333Color)
         navigationBar.onClickRightButton = {
             [weak self] in

RainbowPlanet/RainbowPlanet/Modules/MineModule/ExpressAddressList/ViewController/ExpressAddressListViewController.swift

@@ -33,6 +33,7 @@ class ExpressAddressListViewController: BaseViewController {
         navigationBar.onClickRightButton = {
             [weak self] in
            let vc = EditExpressAddressViewController()
+            vc.isAddNewAddress = true
             self?.navigationController?.pushViewController(vc, animated: true)
         }
         view.addSubview(expressAddressListView)
@@ -60,6 +61,7 @@ class ExpressAddressListViewController: BaseViewController {
         expressAddressListView.editClosure = {
             [weak self] indexPath in
             let vc = EditExpressAddressViewController()
+            vc.isAddNewAddress = false
             vc.expressAddresModel = self?.addressManagerListModel?.expressAddress![indexPath.row]
             self?.navigationController?.pushViewController(vc, animated: true)
         }

RainbowPlanet/RainbowPlanet/Modules/MineModule/Mine/ViewController/MineViewController.swift

@@ -62,8 +62,7 @@ class MineViewController: BaseViewController {
         }
         mineView.addressClosure = {
             [weak self] in
-            let vc = AddressManagerViewController()
-            vc.addressManagerVCType = .mine
+            let vc = AddressManagerViewController()            
             self?.navigationController?.pushViewController(vc, animated: true)
         }
         mineView.lookAllOrderButtonBlock = {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -73,19 +73,15 @@ class ShoppingCartPayOrderController: BaseViewController {
         orderPayView.jumpNavBlock = {
             [weak self] (jumpType) in
             switch jumpType {
-            case WillJumpType.expressAddInfo:
-                let vc = EditExpressAddressViewController()
-                vc.isFromOrderPay = true
-                self?.navigationController?.pushViewController(vc, animated: true)
-            case WillJumpType.expressManageInfo:
+            case WillJumpType.expressAddInfo,
+                 WillJumpType.expressManageInfo
+                 :
                 let vc = ExpressAddressListViewController()
                 vc.isFromOrderPay = true
                 self?.navigationController?.pushViewController(vc, animated: true)
-            case WillJumpType.selfAddInfo:
-                let vc = EditSelfMentionContactsViewController()
-                vc.isFromOrderPay = true
-                self?.navigationController?.pushViewController(vc, animated: true)
-            case WillJumpType.selfPersonalInfo:
+            case WillJumpType.selfAddInfo,
+                 WillJumpType.selfPersonalInfo
+                 :
                 let vc = SelfMentionContactsListViewController()
                 vc.isFromOrderPay = true
                 self?.navigationController?.pushViewController(vc, animated: true)