快递地址流程 -- 完善细节

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

@@ -59,7 +59,7 @@ class EditExpressAddressViewController: BaseViewController {
         editExpressAddressView.expressAddresModel = expressAddresModel
         editExpressAddressView.deleteClosure = {
             [weak self] in
-            if self!.listCount! <= 1 {
+            if self!.listCount ?? 0 <= 1 {
                 SwiftProgressHUD.shared().showText("至少需保留一条收货地址")
                 return
             }

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

@@ -72,8 +72,15 @@ class ExpressAddressListViewController: BaseViewController {
         }
         expressAddressListView.didSelectRowClosure = {
             [weak self] indexPath in
-             let expressAddresModel = self?.addressManagerListModel?.expressAddress![indexPath.row]
-            self?.userAddressIsDefaultApi(id: expressAddresModel?.id ?? 0)
+            let expressAddresModel = (self?.addressManagerListModel?.expressAddress?[indexPath.row])
+            // 点击非默认，设置默认
+            if expressAddresModel?.isDefault == 1 {
+                if self!.isFromOrderPay {
+                    self?.navigationController?.popViewController(animated: true)
+                }
+            } else {
+                self?.userAddressIsDefaultApi(id: expressAddresModel?.id ?? 0)
+            }
             if let selectAddressClosure = self?.selectAddressClosure {
                 selectAddressClosure(expressAddresModel!)
             }