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

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

@@ -90,7 +90,10 @@ extension YHSelectViewController {
             let model = self.viewModel.categoryArray[selectItem]
             self.viewModel.getGoodsList(categoryID: model.id, sortType: buttonItem) {[weak self] success, error in
                 guard let self = self else { return }
-                self.tableView.reloadData()
+                self.tableView.reloadData {
+                    self.tableView.contentOffset = CGPoint(x: 0, y: 92)
+                    self.sectionView.isHidden = false
+                }
                 if self.viewModel.goodsArray.count == 0 {
                     noDataView.isHidden = false
                 } else {
@@ -116,19 +119,15 @@ extension YHSelectViewController {
             let head = YHSelectLookHeadView()
             head.frame = CGRect(x: 0, y: 0, width: KScreenWidth, height: 66)
             head.block = { index in
+                self.sectionView.isHidden = true
                 self.selectItem = index
                 self.buttonItem = 0
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                    self.updataData()
-                    self.tableView.contentOffset = CGPoint(x: 0, y: 92)
-                }
+                self.updataData()
             }
             head.buttonBlock = { index in
             self.buttonItem = index
-                DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
-                    self.updataData()
-                    self.tableView.contentOffset = CGPoint(x: 0, y: 92)
-                }
+                self.sectionView.isHidden = true
+                self.updataData()
             }
             return head
         }()
@@ -158,7 +157,7 @@ extension YHSelectViewController {
         }
         
         tableView.es.addYHPullToRefresh {
-            self.updataData()
+            self.loadData()
             self.tableView.es.stopPullToRefresh()
         }
          

galaxy/galaxy/Classes/Modules/Home(首页)/YHSelect/V/YHSelectLookHeadView.swift

@@ -214,7 +214,7 @@ extension YHSelectLookHeadView: UICollectionViewDelegate, UICollectionViewDataSo
         if let block = block {
             block(indexPath.row)
         }
-        print("index is \(indexPath.row)")
+        collectionView.scrollToItem(at: indexPath, at: .centeredHorizontally, animated: true)
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/MyNewScheme(我的方案)/C/YHImproveSchemeViewController.swift

@@ -86,6 +86,7 @@ class YHImproveSchemeViewController: YHBaseViewController {
         }
         tableView.showsVerticalScrollIndicator = false
         tableView.backgroundColor = .clear
+        
         tableView.separatorStyle = .none
         tableView.delegate = self
         tableView.dataSource = self
@@ -120,7 +121,7 @@ class YHImproveSchemeViewController: YHBaseViewController {
     
     lazy var bgView: UIView = {
         let v = UIView()
-        v.backgroundColor = .white
+        v.backgroundColor = .init(hex: 0xF8F9FB)
         v.addSubview(bgImgView)
         bgImgView.snp.makeConstraints { make in
             make.top.left.right.equalToSuperview()
@@ -164,8 +165,8 @@ class YHImproveSchemeViewController: YHBaseViewController {
     override func viewDidLoad() {
         
         super.viewDidLoad()
-        view.backgroundColor = .init(hex: 0xF6F7FA)
-
+        view.backgroundColor = .init(hex: 0xF8F9FB)
+        
         gk_navTitle = "提升方案"
         gk_navTitleColor = .white
         gk_backImage = UIImage(named: "back_icon_white")

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/C/YHCompanySelectViewController.swift

@@ -37,7 +37,7 @@ class YHCompanySelectViewController: YHBaseViewController {
         let bgView = {
             let view = UIView()
             view.backgroundColor = UIColor(hex: 0xf8f9fb)
-            view.layer.cornerRadius = 20.5
+            view.layer.cornerRadius = 3
             return view
         }()
         view.addSubview(bgView)
@@ -55,10 +55,10 @@ class YHCompanySelectViewController: YHBaseViewController {
             searchBar.font = UIFont.PFSC_R(ofSize: 14)
             searchBar.keyboardType = .default
             searchBar.delegate = self
-            searchBar.layer.cornerRadius = 3
             searchBar.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 16, height: 42))
             searchBar.leftViewMode = .always
             searchBar.clearButtonMode = .always
+            searchBar.layer.cornerRadius = 3
             return searchBar
         }()
         view.addSubview(searchView)
@@ -77,7 +77,6 @@ class YHCompanySelectViewController: YHBaseViewController {
             button.setTitle("确认", for: .normal)
             button.titleLabel?.font = UIFont.PFSC_M(ofSize: 12)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-            button.layer.cornerRadius = 3
             button.addTarget(self, action: #selector(submit), for: .touchUpInside)
             return button
         }()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/ServiceProcess(我的信息流程)/MainApplicantInformation(主申请人信息)/V/YHGCMainInformationCardTableViewCell.swift

@@ -203,7 +203,7 @@ class YHGCMainInformationCardTableViewCell: UITableViewCell {
         centerView.addSubview(frontLabel)
         frontLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.right.equalTo(centerView.snp.centerX)
+            make.width.equalTo(147)
             make.top.equalTo(64)
             make.height.equalTo(20)
         }
@@ -218,7 +218,7 @@ class YHGCMainInformationCardTableViewCell: UITableViewCell {
         centerView.addSubview(backSurfaceLabel)
         backSurfaceLabel.snp.makeConstraints { make in
             make.right.equalTo(-18)
-            make.left.equalTo(centerView.snp.centerX)
+            make.width.equalTo(147)
             make.top.equalTo(64)
             make.height.equalTo(20)
         }