修复主申请人bug

galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/V/YHlifeCollectionReusableView.swift

@@ -192,7 +192,7 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
             guard let dataSource = dataSource else { return }
             self.titleLabel.text =  dataSource.title
             self.subTitleLabel.text = dataSource.account
-            self.timelabel.text = dataSource.start_time
+            self.timelabel.text = dataSource.time_appointment
             flagLabel.isHidden = false
             actionButton.isSelected = dataSource.is_schedule_live
             guard let url = URL(string: dataSource.image) else { return }

galaxy/galaxy/Classes/Modules/Home(首页)/M/YHLiveModel.swift

@@ -32,6 +32,7 @@ class YHLiveListModel: SmartCodable {
     var account: String = ""
     var image: String = ""
     var is_schedule_live: Bool = false
+    var time_appointment: String = ""
     required init() {
     }
 }

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

@@ -482,8 +482,13 @@ class YHItemView: UIView {
                 title = "请选择出生日期"
                 isLastDay = true
             }
-
-            YHDatePickView.show(type: .yyyymmdd, title: title, lastIsTaday: isLastDay, currentDay: dataSource?.message ?? "") { date in
+            var type: YHDateType = .yyyymmdd
+            if dataSource?.id == .id41 {
+                title = "海外居留开始时间"
+                isLastDay = true
+                type = .yyyymm
+            }
+            YHDatePickView.show(type: type, title: title, lastIsTaday: isLastDay, currentDay: dataSource?.message ?? "") { date in
                 self.dataSource?.message = date
                 self.updateAllViews()
                 if let block = self.block {

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

@@ -48,12 +48,12 @@ class YHGCMainApplicantInformationViewModel: YHBaseViewModel {
         
         if nationality.contains("中国") && !addressCountry.contains("中国") {
             if have_permanent_residency == 1 {
-                return [section, section111, section2]
+                return [section, section111]
             } else if have_permanent_residency == 0 {
                 if isOneYearAgo(yearMonth: mainModel.residence_time) {
-                    return [section, section1111, section2]
-                } else {
                     return [section, section1111]
+                } else {
+                    return [section, section1111, section2]
                 }
             } else {
                 return [section, section111]
@@ -395,23 +395,27 @@ class YHGCMainApplicantInformationViewModel: YHBaseViewModel {
     }
     
     func isOneYearAgo(yearMonth: String) -> Bool {
-        // 创建日期格式化器
         let dateFormatter = DateFormatter()
         dateFormatter.dateFormat = "yyyy-MM"
         
         // 将字符串转换为日期
-        guard let inputDate = dateFormatter.date(from: yearMonth) else {
-            return false // 如果转换失败，返回 false
+        guard let date = dateFormatter.date(from: yearMonth) else {
+            return false // 如果日期格式不正确，返回 nil
         }
         
+        // 获取当前日期
+        let currentDate = Date()
+        
+        // 获取日历实例
         let calendar = Calendar.current
-        let oneYearAgo = calendar.date(byAdding: .year, value: -1, to: Date())!
         
-        // 获取输入日期的年份和月份
-        let inputYearMonth = calendar.date(from: calendar.dateComponents([.year, .month], from: inputDate))!
+        // 计算一年前的日期
+        if let oneYearAgo = calendar.date(byAdding: .year, value: -1, to: currentDate) {
+            // 比较日期，判断是否大于一年
+            return date < oneYearAgo
+        }
         
-        // 比较输入日期与一年前的日期
-        return calendar.isDate(inputYearMonth, inSameDayAs: oneYearAgo)
+        return false
     }
     
     func updateModel(_ type: YHCardType, isFront: Bool, url: String) {