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

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

@@ -8,7 +8,7 @@
 
 import UIKit
 class YHHomeHeadView: UIView {
-    static let viewH : CGFloat = (20 + YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 21 + 21
+    static let viewH : CGFloat = (20 + YHHomeBannerView.viewH) + (20 + YHHkLifeAndIdView.viewH) + (20 + YHHomeKingKongBlockView.viewH) + 20 + 20
     
     override init(frame: CGRect) {
         super.init(frame: frame)

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

@@ -29,7 +29,7 @@ class YHHomeKingKongBlockView: UIView {
 
 private extension YHHomeKingKongBlockView {
     func initView() {
-        let itemGap : CGFloat = (KScreenWidth - 16.0 * 2 - YHHomeKingKongBlockView.viewH * 4) / 3.0
+        let itemGap : CGFloat = (KScreenWidth - 20.0 * 2 - YHHomeKingKongBlockView.viewH * 4.0) / 3.0
         var offsetX : CGFloat = 0
         for (index,item) in arrData.enumerated() {
             let view = YHHomeKingKongBlockItem()

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

@@ -324,7 +324,7 @@ extension YHDatePickView: UIPickerViewDelegate,UIPickerViewDataSource {
             pickerView.reloadComponent(1)
         }
         
-        if component == 0, lastIsTaday {
+        if component == 0, lastIsTaday, self.type != .yyyy {
             pickerView.reloadComponent(1)
             if self.type == .yyyymmdd {
                 pickerView.reloadComponent(2)

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

@@ -312,7 +312,7 @@ class YHWorkIntroductionViewController: YHBaseViewController {
      
     @objc func endClick() {
         view.endEditing(true)
-        YHDatePickView.show(type: .yyyymmdd, title: "请选择结束时间") { date in
+        YHDatePickView.show(type: .yyyymmdd, title: "请选择结束时间", lastIsTaday: true) { date in
             if date < self.dataSource.project_start_time ?? "" {
                 YHHUD.flash(message: "结束时间不能早于开始时间")
             } else {

galaxy/galaxy/Res/Assets.xcassets/global_default_image.imageset/Contents.json

@@ -5,12 +5,12 @@
       "scale" : "1x"
     },
     {
-      "filename" : "Mask group@2x.png",
+      "filename" : "品牌logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "Mask group@3x.png",
+      "filename" : "品牌logo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }