1、处理首页 身份 和 生活的下拉刷新

2、处理与h5的交互问题

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

@@ -8,6 +8,7 @@
 
 import UIKit
 import JXSegmentedView
+import ESPullToRefresh
 
 class YHHomeIdentityItem {
     var url: String = ""
@@ -47,7 +48,7 @@ class YHHomeIdentityListVC: YHBaseViewController {
         tableView.register(YHHomeIdentityCell.self, forCellReuseIdentifier: YHHomeIdentityCell.cellReuseIdentifier)
         tableView.delegate = self
         tableView.dataSource = self
-        tableView.bounces = false
+//        tableView.bounces = false
         tableView.tableHeaderView = self.headerView
         tableView.separatorStyle = .none
         return tableView
@@ -136,6 +137,10 @@ class YHHomeIdentityListVC: YHBaseViewController {
         self.tableView.snp.makeConstraints { make in
             make.top.left.right.bottom.equalToSuperview()
         }
+        
+        self.tableView.es.addYHPullToRefresh {
+            self.loadData()
+        }
     }
 }
 
@@ -238,6 +243,9 @@ extension YHHomeIdentityListVC {
                                     "levelId": self.detailId]
         self.viewModel.getGoodsCategoryDetail(params: params) {
             [weak self] success, error in
+            
+            self?.tableView.es.stopPullToRefresh()
+            
             guard let self = self else { return }
             self.titles.removeAll()
             self.imgItems.removeAll()

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

@@ -9,8 +9,6 @@
 import UIKit
 import JXSegmentedView
 
-
-
 class YHHomeIdentityViewController: YHBaseViewController {
     
     var subTabArr:[YHHomeLifeCategoryModel] = []
@@ -106,6 +104,9 @@ extension YHHomeIdentityViewController {
         let params : [String : Any] = ["pid" : 2]
         self.viewModel.getGoodsCategory(params: params) {
             [weak self] success, error in
+            
+            self?.scrollView.es.stopPullToRefresh()
+            
             guard let self = self else { return }
             
             if !success {

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/C/YHLifeViewController.swift

@@ -8,6 +8,7 @@
 
 import UIKit
 import JXSegmentedView
+import ESPullToRefresh
 
 class YHLifeViewController: YHBaseViewController {
     var sectionView: YHLifeSectionView!
@@ -15,6 +16,7 @@ class YHLifeViewController: YHBaseViewController {
     var headView = YHLifeHeadView()
     var viewModel: YHHomePageViewModel = YHHomePageViewModel()
     var selectSubTab: YHHomeLifeCategoryModel? = nil
+    var selectSubIndex : Int = -1
 
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -32,11 +34,24 @@ extension YHLifeViewController {
         let params : [String : Any] = ["pid" : 3]
         self.viewModel.getGoodsCategory(params: params) {
             [weak self] success, error in
+            self?.tableView.es.stopPullToRefresh()
             guard let self = self else { return }
             let items = self.viewModel.categoryArr.map { $0?.name }
             let result = items.compactMap { $0 }
             self.sectionView.items = result
-            self.selectSubTab = self.viewModel.categoryArr.first ?? YHHomeLifeCategoryModel()
+            if selectSubIndex == -1 {
+                selectSubIndex = 0
+                self.selectSubTab = self.viewModel.categoryArr.first ?? YHHomeLifeCategoryModel()
+            } else {
+                
+                if self.viewModel.categoryArr.count > selectSubIndex {
+                    self.selectSubTab = self.viewModel.categoryArr[selectSubIndex]
+                } else {
+                    selectSubIndex = 0
+                    self.selectSubTab = self.viewModel.categoryArr.first ?? YHHomeLifeCategoryModel()
+                }
+            }
+            
             getDetailImages()
         }
     }
@@ -71,9 +86,10 @@ extension YHLifeViewController {
         view.backgroundColor = .white
         sectionView = {
             let view = YHLifeSectionView()
-            view.block = {[weak self] model in
+            view.block = {[weak self] itemIndex in
                 guard let self = self else { return }
-                self.selectSubTab = self.viewModel.categoryArr[model]
+                selectSubIndex = itemIndex
+                self.selectSubTab = self.viewModel.categoryArr[itemIndex]
                 self.getDetailImages()
             }
             return view
@@ -103,6 +119,10 @@ extension YHLifeViewController {
             make.bottom.left.right.equalToSuperview()
             make.top.equalTo(44)
         }
+        
+        tableView.es.addYHPullToRefresh {
+            self.loadData()
+        }
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/UploadCertificate(7上传过关证件)/C/YHUploadCertificateDetailVC.swift

@@ -490,7 +490,7 @@ private extension YHUploadCertificateDetailVC {
             endDateItem.addGestureRecognizer(tap2)
         } else if detailType == .HongKongCard {
             titleTextView.attributed.text = """
-                \("*", .foreground(UIColor.failColor), .font(UIFont.PFSC_M(ofSize: 17)))\(" \(dataModel.apply_name)的香港身份 ", .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_M(ofSize: 17)))\(.view(customLabel, .original(.center)))
+                \("*", .foreground(UIColor.failColor), .font(UIFont.PFSC_M(ofSize: 17)))\(" \(dataModel.apply_name)的香港身份证 ", .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_M(ofSize: 17)))\(.view(customLabel, .original(.center)))
                 """
             
             whiteContentView.addSubview(cardButton)

galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHJsApi.swift

@@ -17,6 +17,14 @@ class YHJsApi: NSObject {
 }
 
 extension YHJsApi {
+    //跳转到 办证3 - 赴港时间预约界面
+    @objc func gotoAppointCertificateSyn(_ orderID : Int) {
+        let vc = YHCertificateAppointViewController()
+//        vc.orderId = 151090
+        vc.orderId = orderID
+        delegate?.navigationController?.pushViewController(vc)
+    }
+    
     //展示pics
     @objc func showPicsSyn(_ dicPics: String) {
         DispatchQueue.main.async {