修改几处问题

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2106,8 +2106,8 @@
 			children = (
 				A567E5742BD7643D00D5D5A0 /* YHSearchInfomationVC.swift */,
 				A567E5752BD7643D00D5D5A0 /* YHFourKingViewController.swift */,
-				04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */,
 				04F5F86B2C1A9B52004A463C /* YHOtherServiceListViewController.swift */,
+				04F5F8692C1A95BB004A463C /* YHOtherServiceViewController.swift */,
 				A567E5762BD7643D00D5D5A0 /* YHHomePageViewController.swift */,
 				A567E5772BD7643D00D5D5A0 /* YHStartPageViewController.swift */,
 				A567E5782BD7643D00D5D5A0 /* YHHomeWebViewController.swift */,

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -223,7 +223,6 @@ private extension YHHomePageViewController {
     }
     
     func loadFirstData() {
-        DispatchQueue.global().async {
             self.viewModel.getHomeNewsList(firstPageFlag : true) {[weak self] success, error in
                 guard let self = self else { return }
                 
@@ -235,8 +234,8 @@ private extension YHHomePageViewController {
                 
                 DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                     self.homeCollectView.es.stopPullToRefresh()
-                })
-                DispatchQueue.main.async {
+                    
+                    
                     if self.viewModel.hasMoreForHomeNews == false {
                         self.homeCollectView.es.noticeNoMoreData()
                         self.homeCollectView.footer?.alpha = 1
@@ -245,8 +244,7 @@ private extension YHHomePageViewController {
                     CATransaction.setDisableActions(true)
                     self.homeCollectView.reloadData()
                     CATransaction.commit()
-                }
-            }
+                })
             }
     }
     

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

@@ -102,7 +102,7 @@ class YHHKIdentityCardViewController: YHBaseViewController {
         
         //2.网络请求
         loadData()
-        updateDefaultSearchKeyWord()
+//        updateDefaultSearchKeyWord()
     }
     
     func updateDefaultSearchKeyWord() {
@@ -120,6 +120,11 @@ class YHHKIdentityCardViewController: YHBaseViewController {
         super.viewDidLayoutSubviews()
         cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight)
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        updateDefaultSearchKeyWord()
+    }
 }
 
 // MARK: - 私有方法

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

@@ -102,11 +102,12 @@ class YHHKLifeViewController: YHBaseViewController {
         
         //2.网络请求
         loadData()
-        updateDefaultSearchKeyWord()
+        
+//        updateDefaultSearchKeyWord()
     }
     
     func updateDefaultSearchKeyWord() {
-        var placeHolder = "香港身份"
+        var placeHolder = "香港生活"
         if isHaveLocalSearchRecords() {
             let latestValidSearchWord = getLatestValidSearchWord()
             if !latestValidSearchWord.isEmpty {
@@ -120,6 +121,11 @@ class YHHKLifeViewController: YHBaseViewController {
         super.viewDidLayoutSubviews()
         cellView.view.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: myCellHeight)
     }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        updateDefaultSearchKeyWord()
+    }
 }
 
 // MARK: - 私有方法
@@ -127,7 +133,7 @@ extension YHHKLifeViewController {
     func loadData() {
         self.tableHeadView.bannarView.dataArr = [YHBannerModel.localDefaultItem()]
 
-        homeViewModel.getHomeBanner(1){[weak self] success, error in
+        homeViewModel.getHomeBanner(2){[weak self] success, error in
             guard let self = self else { return }
             self.tableHeadView.bannarView.dataArr = self.homeViewModel.banners ?? [YHBannerModel.localDefaultItem()]
         }
@@ -145,7 +151,7 @@ extension YHHKLifeViewController {
             make.left.right.bottom.equalToSuperview()
         }
         tableHeadView = YHServerTableHeadView()
-        tableHeadView.titleLabel.text = "香港身份攻略"
+        tableHeadView.titleLabel.text = "香港生活攻略"
         tableHeadView.frame = CGRect(x: 0, y: -365 - 48, width: KScreenWidth, height: 365)
         homeTableView.tableHeaderView = tableHeadView
     }