ExpressAddress -- title fixed

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

@@ -90,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)
         }
@@ -101,6 +102,7 @@ class AddressManagerViewController: BaseViewController {
     /// 添加快递地址跳转页面
     private func addExpressAddressPushVC() {
         let vc = EditExpressAddressViewController()
+        vc.isAddNewAddress = true
         self.navigationController?.pushViewController(vc, animated: true)
     }
     
@@ -137,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)
         }