瀏覽代碼

order-->添加地址死循环规避(同Android)

Chris 6 年之前
父節點
當前提交
16cf79b0e1

+ 3 - 1
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)
+            }
         }
     }
     

+ 6 - 10
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)