自提返回刷新

RainbowPlanet/RainbowPlanet/Modules/CommonModules/LocationModule/SelfRecommendation/ViewController/SelfRecommendationViewController.swift

@@ -24,7 +24,6 @@ class SelfRecommendationViewController: BaseViewController {
     typealias DidSelectClosure = () -> Void
     var didSelectClosure : DidSelectClosure?
     
-    
     override func viewDidLoad() {
         super.viewDidLoad()
         navigationBar.title = "自提点推荐"

RainbowPlanet/RainbowPlanet/Modules/MineModule/SelfMentionContactsList/ViewController/SelfMentionContactsListViewController.swift

@@ -15,6 +15,9 @@ class SelfMentionContactsListViewController: BaseViewController {
     // 是否由支付订单页面进入
     var isFromOrderPay: Bool = false
     
+    typealias SaveAddressClosure = () -> Void
+    var saveAddressClosure : SaveAddressClosure?
+    
     override func viewDidLoad() {
         super.viewDidLoad()
         setupViews()
@@ -107,6 +110,9 @@ class SelfMentionContactsListViewController: BaseViewController {
         SwiftMoyaNetWorkServiceUser.shared().userSetExpreesContactsDefaultApi(id: id, completion: {
             [weak self] (data) -> (Void) in
             if self!.isFromOrderPay {
+                if let saveAddressClosure = self?.saveAddressClosure {
+                    saveAddressClosure()
+                }
                 self?.navigationController?.popViewController(animated: true)
             } else {
                 self?.userExpreesContactsListApi()

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/View/OrderApplyRefundNoteInfoCell.swift

@@ -54,11 +54,11 @@ class OrderApplyRefundNoteInfoCell: UITableViewCell {
             make.height.equalTo(20)
         }
         noteTextView.snp.remakeConstraints { (make) in
-            make.top.equalTo(14)
+            make.top.equalTo(6).priority(999)
+            make.height.greaterThanOrEqualTo(46).priority(888)
+            make.bottom.equalTo(-6).priority(777)
             make.left.equalTo(titleLabel.snp_right).offset(20)
             make.right.equalToSuperview().offset(-14)
-            make.bottom.right.equalTo(-14)
-            make.height.greaterThanOrEqualTo(20)
         }
     }
     
@@ -77,9 +77,9 @@ class OrderApplyRefundNoteInfoCell: UITableViewCell {
         noteTextView.font = kRegularFont14
         noteTextView.placeholder = "如需部分商品退款请备注退款商品的名称和数量，如订单疑问可通过“我的”联系社长哦"
         noteTextView.placeholderTextColor = k999999Color
+        noteTextView.isScrollEnabled = false
         noteTextView.rx.text.orEmpty.changed.subscribe(onNext: {
             [weak self] (text) in
-
             self?.noteTextView.text = String(text.prefix(150)) as String
 
             if let noteTextViewClosure = self?.noteTextViewClosure {

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift

@@ -163,6 +163,14 @@ extension OrderApplyRefundController : UITableViewDelegate, UITableViewDataSourc
             noteCell.noteTextViewClosure = {
                 [weak self] (text) in
                 self?.refundNote = text
+                
+                // 重算偏移量
+                let currentOffset = tableView.contentOffset
+                UIView.setAnimationsEnabled(false)
+                tableView.beginUpdates()
+                tableView.endUpdates()
+                UIView.setAnimationsEnabled(true)
+                tableView.setContentOffset(currentOffset, animated: false)
             }
             return noteCell
         case 4:

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

@@ -92,9 +92,17 @@ class ShoppingCartPayOrderController: BaseViewController {
                  :
                 let vc = SelfMentionContactsListViewController()
                 vc.isFromOrderPay = true
+                vc.saveAddressClosure = {
+                    [weak self] () in
+                    self?.setupData()
+                }
                 self?.navigationController?.pushViewController(vc, animated: true)
             case WillJumpType.selfAddressInfo:
                 let vc = SelfRecommendationViewController()
+                vc.didSelectClosure = {
+                    [weak self] () in
+                    self?.setupData()
+                }
                 self?.navigationController?.pushViewController(vc, animated: true)
             }
         }