我的订单逻辑

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderDetailViewController.swift

@@ -14,6 +14,12 @@ class YHOrderDetailViewController: YHBaseViewController {
     var tableView: UITableView!
     var viewModel: YHServiceOrderSearchViewModel = YHServiceOrderSearchViewModel()
     var dataSource: [YHContactItemModel] = []
+    
+    lazy var noDataView: YHEmptyDataView = {
+        let view = YHEmptyDataView.createView("暂无", kEmptyCommonBgName)
+        view.backgroundColor = .clear
+        return view
+    }()
     override func viewDidLoad() {
         super.viewDidLoad()
         setView()
@@ -26,11 +32,20 @@ class YHOrderDetailViewController: YHBaseViewController {
         viewModel.getAssistList {[weak self] success, error in
             guard let self = self else { return }
             if success {
-                dataSource.append(model)
+                if model.id != -1 {
+                    dataSource.append(model)
+                }
                 for item in self.viewModel.arrContactList {
                     dataSource.append(item)
                 }
-                self.tableView.reloadData()
+                if dataSource.count != 0 {
+                    self.noDataView.isHidden = true
+                    self.tableView.isHidden = false
+                    self.tableView.reloadData()
+                } else {
+                    self.noDataView.isHidden = false
+                    self.tableView.isHidden = true
+                }
             }
         }
     }
@@ -87,7 +102,13 @@ class YHOrderDetailViewController: YHBaseViewController {
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
             make.left.right.bottom.equalTo(view)
         }
-        
+        view.addSubview(noDataView)
+        noDataView.snp.makeConstraints { make in
+            make.centerX.equalToSuperview()
+            make.centerY.equalToSuperview()
+            make.width.equalTo(KScreenWidth)
+            make.height.equalTo(150)
+        }
     }
 
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -106,7 +106,6 @@ class YHServiceCenterMainViewController: YHBaseViewController {
         nameBgImageView.isHidden = true
         segmentedView.isHidden = true
         listContainerView.isHidden = true
-        orderButton.isHidden = true
     }
     
     @objc func logoutSuccess() {
@@ -127,7 +126,6 @@ extension YHServiceCenterMainViewController {
             nameBgImageView.isHidden = false
             segmentedView.isHidden = false
             listContainerView.isHidden = false
-            orderButton.isHidden = false
             if self.navigationController?.viewControllers.count != 1 {
                 orderButton.isHidden = true
             }
@@ -304,7 +302,6 @@ extension YHServiceCenterMainViewController {
             nameBgImageView.isHidden = true
             segmentedView.isHidden = true
             listContainerView.isHidden = true
-            orderButton.isHidden = true
         } else {
             guard let model = serviceCenterMainReqVM.arrContactList.first else {
                 return
@@ -313,7 +310,6 @@ extension YHServiceCenterMainViewController {
             nameBgImageView.isHidden = false
             segmentedView.isHidden = false
             listContainerView.isHidden = false
-            orderButton.isHidden = false
             if self.navigationController?.viewControllers.count != 1 {
                 orderButton.isHidden = true
             }

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -95,14 +95,14 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         let view = YHUserInfoHeaderView.createView()
         view.settingBlock = {
             [weak self] in
-//            guard let self = self else { return }
-//            if !checkLogin() { return }
-//            let vc = YHMySettingViewController()
-//            self.navigationController?.pushViewController(vc)
+            guard let self = self else { return }
+            if !checkLogin() { return }
+            let vc = YHMySettingViewController()
+            self.navigationController?.pushViewController(vc)
             
         
-            let vc = YHOfficialApprovalResultVC2()
-            self?.navigationController?.pushViewController(vc) //for test hjl
+//            let vc = YHOfficialApprovalResultVC2()
+//            self?.navigationController?.pushViewController(vc) //for test hjl
         }
         view.evaluateBlock = {
             [weak self] in