首页自提pop换行 && 订单快递地址逻辑

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

@@ -12,6 +12,9 @@ class EditExpressAddressViewController: BaseViewController {
     
     var expressAddresModel: ExpressAddresModel?
     
+    // 是否由支付订单页面进入
+    var isFromOrderPay: Bool = false
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -59,7 +62,11 @@ class EditExpressAddressViewController: BaseViewController {
         SwiftMoyaNetWorkServiceUser.shared().userAddExpressAddressApi(
         expressAddresModel:expressAddresModel!) {
             [weak self] (data) -> (Void) in
-            self?.popVC()
+            if self!.isFromOrderPay {
+                self?.navigationController?.popViewController(animated: true)
+            } else {
+                self?.popVC()
+            }
         }
     }
     

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

@@ -15,6 +15,9 @@ class ExpressAddressListViewController: BaseViewController {
     }
     weak var observe : NSObjectProtocol?
     var addressManagerListModel : AddressManagerListModel?
+    
+    // 是否由支付订单页面进入
+    var isFromOrderPay: Bool = false
    
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -83,8 +86,12 @@ class ExpressAddressListViewController: BaseViewController {
     func userAddressIsDefaultApi(id:Int = 0) {
         SwiftMoyaNetWorkServiceUser.shared().userAddressIsDefaultApi(id: id, completion: {
             [weak self] (data) -> (Void) in
-            NotificationCenter.default.post(name: NSNotification.Name("editAddress"), object: nil)
-            self?.userExpressAddressListApi()
+            if self!.isFromOrderPay {
+                self?.navigationController?.popViewController(animated: true)
+            } else {
+                NotificationCenter.default.post(name: NSNotification.Name("editAddress"), object: nil)
+                self?.userExpressAddressListApi()
+            }
         })
     }
 }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderPayOrder/View/ShoppingCartOrderPayView.swift

@@ -334,7 +334,7 @@ extension ShoppingCartOrderPayView : UITableViewDelegate, UITableViewDataSource
             }
         case "2":
             // 快递
-            if expressAddressMdl == nil {
+            if expressAddressMdl?.id == nil {
                 if let jumpNavBlock = self.jumpNavBlock {
                     jumpNavBlock(WillJumpType.expressAddInfo)
                 }

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

@@ -74,9 +74,11 @@ class ShoppingCartPayOrderController: BaseViewController {
             switch jumpType {
             case WillJumpType.expressAddInfo:
                 let vc = EditExpressAddressViewController()
+                vc.isFromOrderPay = true
                 self?.navigationController?.pushViewController(vc, animated: true)
             case WillJumpType.expressManageInfo:
                 let vc = ExpressAddressListViewController()
+                vc.isFromOrderPay = true
                 self?.navigationController?.pushViewController(vc, animated: true)
             case WillJumpType.selfAddInfo:
                 let vc = EditSelfMentionContactsViewController()

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/PopTopTriangleView.swift

@@ -31,17 +31,18 @@ class PopTopTriangleView: BaseView {
             make.height.equalTo(8)
         }
         
-        contentView.snp.makeConstraints { (make) in
+        contentView.snp.remakeConstraints { (make) in
             make.top.equalTo(triangleView.snp_bottom)
             make.left.right.equalToSuperview()
-            make.height.equalTo(24)
+            make.height.greaterThanOrEqualTo(24)
         }
         
-        addressLabel.snp.makeConstraints { (make) in
+        addressLabel.snp.remakeConstraints { (make) in
             make.left.equalToSuperview().offset(5)
             make.right.equalToSuperview().offset(-8)
+            make.top.equalToSuperview().offset(5)
             make.bottom.equalToSuperview().offset(-5)
-            make.height.equalTo(14)
+            make.height.greaterThanOrEqualTo(14)
         }
         
     }
@@ -80,6 +81,7 @@ class PopTopTriangleView: BaseView {
         addressLabel.text = "建设西路新旅城南门自提点"
         addressLabel.textColor = kffffffColor
         addressLabel.font = kScaleRegularFont14
+        addressLabel.numberOfLines = 0
         return addressLabel
     }()
     

RainbowPlanet/RainbowPlanet/Modules/ShoppingMallModule/ShoppingMall/View/ShoppingMallView.swift

@@ -36,10 +36,11 @@ class ShoppingMallView: BaseView {
         if deliverType == "1" {
             // 自提
             addSubview(selfAddressPopView)
-            selfAddressPopView.snp.makeConstraints { (make) in
+            selfAddressPopView.snp.remakeConstraints { (make) in
                 make.top.equalTo(segmentedView.snp_top)
                 make.left.equalToSuperview().offset(14)
-                make.height.equalTo(32)
+                make.right.equalToSuperview().offset(-14)
+                make.height.greaterThanOrEqualTo(32)
             }
             DispatchQueue.main.asyncAfter(deadline: .now() + .seconds(2)) {
                 self.selfAddressPopView.removeFromSuperview()