地址管理 -- logic fixed

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

@@ -87,6 +87,7 @@ class AddressManagerViewController: BaseViewController {
             
         }
         
+        // 编辑快递收货地址回调
         addressManagerView.editClosure = {
             [weak self] indexPath in
             let vc = EditExpressAddressViewController()
@@ -112,8 +113,9 @@ class AddressManagerViewController: BaseViewController {
         let vc = SelfRecommendationViewController()
         vc.didSelectClosure = {
             [weak self] in
-            self?.configCityManagementIndexApi()
             self?.setDeliveryMethodType(type: "1")
+            self?.isOpenCity = true
+            self?.userSelfAndExpressAddressListApi(type:0)
         }
         self.navigationController?.pushViewController(vc, animated: true)
     }
@@ -121,26 +123,15 @@ class AddressManagerViewController: BaseViewController {
     
     /// 选择自提地址
     func didSelectSelfMentionAddress(indexPath:IndexPath) {
-        if self.addressManagerListModel?.selfAddress?.isEmpty ?? true {
-            let vc = SelfRecommendationViewController()
-            vc.didSelectClosure = {
-                [weak self] in
-                self?.configCityManagementIndexApi()
-                self?.setDeliveryMethodType(type: "1")
-            }
-            self.navigationController?.pushViewController(vc, animated: true)
-        }else {
-            managerSelfMentionAddressPushVC()
-        }
+        managerSelfMentionAddressPushVC()
     }
     
     
     /// 选择快递地址
     func didSelectExpressAddress(indexPath:IndexPath) {
         if self.addressManagerListModel?.expressAddress?.isEmpty ?? true {
-            let vc = EditExpressAddressViewController()
-            vc.isAddNewAddress = true
-            self.navigationController?.pushViewController(vc, animated: true)
+            self.addExpressAddressPushVC()
+            
         }else {
             let expressAddressModel = self.addressManagerListModel?.expressAddress?[indexPath.row]
             self.userAddressIsDefaultApi(id:expressAddressModel?.id ?? 0, type: "2")
@@ -160,7 +151,7 @@ class AddressManagerViewController: BaseViewController {
                 let openCityListModel = openCityListModel as! OpenCityListModel
                 if openCityListModel.data?.isEmpty ?? true { //自提没有开通
                     self?.isOpenCity = false
-                    self?.userSelfAndExpressAddressListApi(type:1)
+                    self?.userSelfAndExpressAddressListApi(type:2)
                 }else { //自提开通/加快递
                     self?.isOpenCity = true
                     self?.userSelfAndExpressAddressListApi(type:0)
@@ -185,8 +176,13 @@ class AddressManagerViewController: BaseViewController {
     func userAddressIsDefaultApi(id:Int = 0, type:String) {
         SwiftMoyaNetWorkServiceUser.shared().userAddressIsDefaultApi(id: id, completion: {
             [weak self] (data) -> (Void) in
-            self?.userSelfAndExpressAddressListApi(type:0)
             self?.setDeliveryMethodType(type: type)
+            
+            if self?.isOpenCity ?? true {
+                self?.userSelfAndExpressAddressListApi(type:0)
+            }else {
+                self?.userSelfAndExpressAddressListApi(type:2)
+            }
         })
     }
     

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

@@ -33,7 +33,6 @@ class EditExpressAddressViewController: BaseViewController {
     }
     
     override func setupViews() {
-        navigationBar.title = ""
         navigationBar.wr_setRightButton(title: "保存", titleColor: k333333Color)
         navigationBar.onClickRightButton = {
             [weak self] in

RainbowPlanet/RainbowPlanet/Service/SwiftMoyaService/SwiftMoyaServiceApi/SwiftMoyaServiceUser/SwiftMoyaNetWorkServiceUser.swift

@@ -530,14 +530,16 @@ public class SwiftMoyaNetWorkServiceUser: NSObject {
     func userSetDeliverTypeApi(deliveryMethodType:String = "2",completion: @escaping apiCallBack) {
         var parameters = Dictionary<String,Any>()
         let model = DeliveryMethodTypeModel.shared().getModel()
-        model?.deliveryMethodType = deliveryMethodType
-        DeliveryMethodTypeModel.shared().setModel(model: model!)
         parameters.updateValue(model?.deliveryMethodType ?? "2", forKey: "deliver_type")
         SwiftProgressHUD.shared().showWait()
         SwiftMoyaNetWorkManager.shared().request(target: MultiTarget(SwiftMoyaServiceUserApi.userSetDeliverType(parameters: parameters))) {
             (rootModel) in
             let rootModel = rootModel as! RootModel
             SwiftProgressHUD.shared().showText(rootModel.msg!)
+            
+            // 设置成功更新本地存储数据
+            model?.deliveryMethodType = deliveryMethodType
+            DeliveryMethodTypeModel.shared().setModel(model: model!)
             completion("")
         }
     }