Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy/Classes/Base/C/YHTabBarViewController.swift

@@ -90,7 +90,7 @@ extension YHTabBarViewController {
     //展示tabbar上的横线
     func handleTabBarLine() -> Void {
         let rect = CGRect.init(x:0,y:0,width:KScreenWidth,height:0.5)
-        let fillColor = UIColor(hex:0x222222,transparency: 0.2)!
+        let fillColor = UIColor(hex:0x121A26,transparency: 0.05)!
         let img = UIImage.from(color: fillColor, rect: rect)
         
         UIView.transition(with:self.tabBar, duration:0.5, options: .transitionCrossDissolve) {

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

@@ -33,20 +33,22 @@ class YHServiceOrderListView: YHBaseViewController {
 
 extension YHServiceOrderListView {
     func loadData() {
-        viewModel.getServiceCenterProgressList(orderID, type) {[weak self] success, error in
-            guard let self = self else { return }
-            if (self.homeTableView != nil) {
-                if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
-                    self.homeTableView.isHidden = true
-                    self.noDataView.isHidden = false
-                } else {
-                    self.homeTableView.isHidden = false
-                    self.noDataView.isHidden = true
-                    self.homeTableView.reloadData()
+        if YHLoginManager.shared.isLogin() {
+            viewModel.getServiceCenterProgressList(orderID, type) {[weak self] success, error in
+                guard let self = self else { return }
+                if (self.homeTableView != nil) {
+                    if self.viewModel.arrDataForSeviceCenterProgress.count == 0 {
+                        self.homeTableView.isHidden = true
+                        self.noDataView.isHidden = false
+                    } else {
+                        self.homeTableView.isHidden = false
+                        self.noDataView.isHidden = true
+                        self.homeTableView.reloadData()
+                    }
+                }
+                if let block = self.block {
+                    block(type, self.viewModel.arrDataForSeviceCenterProgress.count)
                 }
-            }
-            if let block = self.block {
-                block(type, self.viewModel.arrDataForSeviceCenterProgress.count)
             }
         }
     }