南鑫林 %!s(int64=6) %!d(string=hai) anos
pai
achega
2f5cacb574

+ 1 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift

@@ -208,6 +208,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
         if button.titleLabel?.text == "退款详情" {
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = orderModel.refundNo
+            vc.orderRefunddetailsVCType = .order
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "去评价" {            

+ 2 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderApplyRefund/ViewController/OrderApplyRefundController.swift

@@ -313,6 +313,8 @@ extension OrderApplyRefundController {
             
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = applyRefundMdl.refundNo
+            vc.orderRefunddetailsVCType = .orderApplyRefund
+
             self.navigationController?.pushViewController(vc, animated: true)
             
         }

+ 1 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -129,6 +129,7 @@ class OrderDetailViewController: BaseViewController {
         if button.titleLabel?.text == "退款详情" {
             let vc = OrderRefunddetailsViewController()
             vc.refundNo = self.orderDetailModel?.refundNo
+            vc.orderRefunddetailsVCType = .orderDetail
             self.navigationController?.pushViewController(vc, animated: true)
         }
         if button.titleLabel?.text == "去评价" {

+ 23 - 0
RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderRefunddetails/ViewController/OrderRefunddetailsViewController.swift

@@ -8,6 +8,12 @@
 
 import UIKit
 
+enum OrderRefunddetailsVCType {
+    case order
+    case orderDetail
+    case orderApplyRefund
+}
+
 class OrderRefunddetailsViewController: BaseViewController {
     
     var titles = ["退款编号","申请时间","订单状态","退款原因","退款金额"]
@@ -15,6 +21,10 @@ class OrderRefunddetailsViewController: BaseViewController {
     
     var refundNo : String?
     var orderRefundDetailModel : OrderRefundDetailModel?
+    var orderRefunddetailsVCType : OrderRefunddetailsVCType?
+    
+    typealias CancelCloSure = () -> Void?
+    var cancelCloSure : CancelCloSure?
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -25,6 +35,19 @@ class OrderRefunddetailsViewController: BaseViewController {
     
     override func setupViews() {
         navigationBar.title = "退款详情"
+        navigationBar.onClickLeftButton = {
+            [weak self] in
+            if self?.orderRefunddetailsVCType == .order {
+                self?.navigationController?.popViewController(animated: true)
+            }else if self?.orderRefunddetailsVCType == .orderDetail {
+                self?.navigationController?.popViewController(animated: true)
+            }else if self?.orderRefunddetailsVCType == .orderApplyRefund {
+                if let cancelCloSure = self?.cancelCloSure {
+                    cancelCloSure()
+                }
+                self?.navigationController?.popToClass(type: OrderDetailViewController.self)
+            }
+        }
         view.addSubview(tableView)
     }