完成

RainbowPlanet/RainbowPlanet/Modules/MineModule/Mine/View/MineOrderCollectionViewCell.swift

@@ -45,6 +45,7 @@ class MineOrderCollectionViewCell: UICollectionViewCell {
         iconButton.setTitleColor(k999999Color, for: UIControl.State.normal)
         iconButton.titleLabel?.font = kRegularFont13
         iconButton.titleLabel?.adjustsFontSizeToFitWidth = true
+        iconButton.isUserInteractionEnabled = false
         return iconButton
     }()
     

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderListViewController.swift

@@ -70,6 +70,9 @@ class OrderListViewController: UIViewController {
                 }
                 self?.orderModelArray = (self?.orderModelArray)! + (orderListModel?.data!)!
                 self?.orderListView.tableView.reloadData()
+                if self?.orderModelArray.isEmpty ?? true {
+                    self?.orderListView.tableView.isHiddenFooter(true)
+                }
             }else {
                 self?.orderListView.tableView.endFooterNoMoreData()
             }

RainbowPlanet/RainbowPlanet/Modules/OrderModule/Order/ViewController/OrderViewController.swift

@@ -58,7 +58,6 @@ class OrderViewController: BaseViewController {
     }
     
     override func setupData() {
-        
     }
     
     //1.初始化JXSegmentedView
@@ -68,7 +67,8 @@ class OrderViewController: BaseViewController {
         segmentedView.dataSource = segmentedDataSource
         segmentedView.indicators = [indicator]
         segmentedView.contentScrollView = listContainerView.scrollView
-        segmentedView.selectItemAt(index: orderVCType!.rawValue + 1)
+        segmentedView.selectItemAt(index: orderVCType!.rawValue+1)
+        segmentedView.defaultSelectedIndex = orderVCType!.rawValue+1
         return segmentedView
     }()
     
@@ -84,7 +84,8 @@ class OrderViewController: BaseViewController {
         segmentedDataSource.titleSelectedFont = kBoldFont14
         
         //reloadData(selectedIndex:)方法一定要调用，方法内部会刷新数据源数组
-        segmentedDataSource.reloadData(selectedIndex: 0)
+        segmentedDataSource.reloadData(selectedIndex: orderVCType!.rawValue+1)
+        
         return segmentedDataSource
     }()
     //3.初始化指示器indicator
@@ -100,6 +101,7 @@ class OrderViewController: BaseViewController {
     lazy var listContainerView: JXSegmentedListContainerView = {
         let listContainerView = JXSegmentedListContainerView(dataSource: self)
         listContainerView.didAppearPercent = 0.01
+        listContainerView.defaultSelectedIndex = orderVCType!.rawValue + 1
         return listContainerView
     }()
     
@@ -145,7 +147,7 @@ extension OrderViewController :JXSegmentedListContainerViewDataSource {
     }
     func listContainerView(_ listContainerView: JXSegmentedListContainerView, initListAt index: Int) -> JXSegmentedListContainerViewListDelegate {
         let vc = OrderListViewController()
-        vc.orderVCType = OrderVCType(rawValue: index-1)
+        vc.orderVCType =  OrderVCType(rawValue: index-1)
         vc.setButtonBlock = {
             [weak self] (button,orderModel) in
             self?.setButton(button: button, orderModel: orderModel)

RainbowPlanet/RainbowPlanet/Modules/OrderModule/OrderDetail/ViewController/OrderDetailViewController.swift

@@ -238,10 +238,10 @@ extension OrderDetailViewController : UITableViewDelegate, UITableViewDataSource
             switch indexPath.row {
             case 0:
                 return 43
-            case detail?.count ?? 0 + 1:
+            case (detail?.isEmpty ?? true) ? 1 : detail!.count + 1:
                 return UITableView.automaticDimension
             default:
-                return 40
+                return 108
             }
         case 3:
             return 33.5

RainbowPlanet/RainbowPlanet/Modules/ShoppingCartModule/ShoppingCartPayOrder/ViewController/ShoppingCartPayOrderController.swift

@@ -142,9 +142,10 @@ class ShoppingCartPayOrderController: BaseViewController {
         }
     }
     
+    //跳转到字符失败,跟支付成功页面
     func pushVC(payStatus: Bool){
         let vc = ShoppingCartFinishPayController()
-        vc.payStatus = true
+        vc.payStatus = payStatus
         self.navigationController?.pushViewController(vc, animated: true)
     }