提示逻辑

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

@@ -124,13 +124,6 @@ class YHUploadCertificateDetailVC: YHBaseViewController {
     private var endDateStr : String = ""
     private var uploadImageUrl : String = ""
     
-    
-    lazy var lineView2 : UIView = {
-        let view = UIView()
-        view.backgroundColor = .separatorColor
-        return view
-    }()
-    
     private lazy var endDateItem : YHUploadCertificateDateItem = {
         let view = YHUploadCertificateDateItem()
         return view
@@ -176,11 +169,15 @@ private extension YHUploadCertificateDetailVC {
             
             if startDateStr.isEmpty {
                 YHHUD.flash(message: "选择入境日期")
+                startDateItem.needCheckMustFlag = true
+                endDateItem.needCheckMustFlag = true
                 return false
             }
             
             if endDateStr.isEmpty {
                 YHHUD.flash(message: "选择逗留截止日期")
+                startDateItem.needCheckMustFlag = true
+                endDateItem.needCheckMustFlag = true
                 return false
             }
             
@@ -195,20 +192,12 @@ private extension YHUploadCertificateDetailVC {
 
                 // 比较结果
                 let isDate1Earlier = calendar.compare(date1, to: date2, toGranularity: .day) == .orderedAscending
-//                let isDate2Earlier = calendar.compare(date1, to: date2, toGranularity: .day) == .orderedDescending
-
                 if isDate1Earlier {
                     print("date1 在 date2 之前")
                 } else {
                     YHHUD.flash(message: "逗留截止日期必须晚于入境日期")
                     return false
-                    
                 }
-//                else if isDate2Earlier {
-//                    print("date2 在 date1 之前")
-//                } else {
-//                    print("两个日期相同")
-//                }
             }
         }
         return true
@@ -287,7 +276,6 @@ private extension YHUploadCertificateDetailVC {
         YHDatePickView.show(type: .yyyymmdd, title:title, lastIsTaday: false, currentDay: defaultDate) { [weak self] dateStr in
             guard let self = self else { return }
             
-            
             if gestureRecognizer.view == startDateItem {
                 startDateStr = dateStr
                 startDateItem.updateDate(date: dateStr)
@@ -476,33 +464,20 @@ private extension YHUploadCertificateDetailVC {
             startDateItem.snp.makeConstraints { make in
                 make.left.equalToSuperview().offset(18)
                 make.right.equalToSuperview().offset(-18)
-                make.top.equalTo(cardButton.snp.bottom).offset(32)
-                make.height.equalTo(20)
+                make.top.equalTo(cardButton.snp.bottom).offset(16)
+                make.height.equalTo(YHUploadCertificateDateItem.viewH)
             }
-            startDateItem.update(title: "入境日期")
-            
-            
-            
-            whiteContentView.addSubview(lineView2)
-            lineView2.snp.makeConstraints { make in
-                make.left.equalToSuperview().offset(18)
-                make.right.equalToSuperview().offset(-18)
-                make.top.equalTo(startDateItem.snp.bottom).offset(16)
-                make.height.equalTo(1)
-            }
-            
-            
-            
+            startDateItem.update(title: "入境日期",isMust: true,hideLineFlag: false)
             
             whiteContentView.addSubview(endDateItem)
             endDateItem.snp.makeConstraints { make in
                 make.left.equalToSuperview().offset(18)
                 make.right.equalToSuperview().offset(-18)
-                make.top.equalTo(lineView2.snp.bottom).offset(16)
-                make.height.equalTo(20)
-                make.bottom.equalToSuperview().offset(-kMargin)
+                make.top.equalTo(startDateItem.snp.bottom)
+                make.height.equalTo(YHUploadCertificateDateItem.viewH)
+                make.bottom.equalToSuperview()
             }
-            endDateItem.update(title: "逗留截止")
+            endDateItem.update(title: "逗留截止",isMust: true,hideLineFlag: true)
             
             
             

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

@@ -11,7 +11,16 @@ import AttributedString
 
 class YHUploadCertificateDateItem: UIView {
     
-    static let viewH : CGFloat = 20.0
+    static let viewH : CGFloat = 20.0 + 16*2
+    
+    
+    var needCheckMustFlag : Bool = false {
+        didSet {
+            checkMustStatus()
+        }
+    }
+    
+    
     
     private lazy var cardLabel : UILabel = {
         let lable = UILabel()
@@ -21,6 +30,15 @@ class YHUploadCertificateDateItem: UIView {
         return lable
     }()
     
+    private lazy var redTipsLabel : UILabel = {
+        let lable = UILabel()
+        lable.text = "请选择入境日期"
+        lable.font = .PFSC_R(ofSize: 10)
+        lable.textColor = UIColor.failColor
+        lable.isHidden = true
+        return lable
+    }()
+    
     lazy var dateTextField:UITextField = {
         let textField = UITextField()
         textField.backgroundColor = .clear
@@ -56,11 +74,27 @@ class YHUploadCertificateDateItem: UIView {
 }
 
 private extension YHUploadCertificateDateItem {
+    func checkMustStatus() {
+        if needCheckMustFlag {
+            
+            if dateTextField.text?.isEmpty == true {
+                redTipsLabel.isHidden = false
+            } else {
+                redTipsLabel.isHidden = true
+            }
+            
+        } else {
+            redTipsLabel.isHidden = true
+        }
+    }
+    
     func setupUI() {
         
         addSubview(cardLabel)
         cardLabel.snp.makeConstraints { make in
-            make.top.left.bottom.equalToSuperview()
+            make.top.equalToSuperview().offset(kMargin)
+            make.left.equalToSuperview()
+            make.height.equalTo(20)
         }
         
         
@@ -76,32 +110,49 @@ private extension YHUploadCertificateDateItem {
             make.left.equalTo(cardLabel.snp.right).offset(48)
         }
         
-        
         addSubview(statusImageView)
         statusImageView.snp.makeConstraints { make in
             make.right.equalToSuperview()
             make.centerY.equalToSuperview()
             make.height.width.equalTo(20)
         }
+        
+        addSubview(redTipsLabel)
+        redTipsLabel.snp.makeConstraints { make in
+            make.top.equalTo(cardLabel.snp.bottom)
+            make.left.equalToSuperview()
+            make.height.equalTo(10)
+        }
+        
+        
+        addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.right.bottom.equalToSuperview()
+            make.height.equalTo(1)
+        }
     }
 }
 
 
 extension YHUploadCertificateDateItem {
-    func update(title : String,isMust : Bool = true) {
+    func update(title : String,isMust : Bool = true,hideLineFlag : Bool = true) {
         if isMust {
             let a: ASAttributedString = .init("*", .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.failColor))
             let b: ASAttributedString = .init(NSAttributedString(string: title), .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
             cardLabel.attributed.text = a + b
+            redTipsLabel.text = "请选择" + title
             
         } else {
             let b: ASAttributedString = .init(NSAttributedString(string: title), .font(UIFont.PFSC_R(ofSize: 14)),.foreground(UIColor.mainTextColor))
             cardLabel.attributed.text = b
         }
+        
+        lineView.isHidden = hideLineFlag
     }
     
     func updateDate(date : String) {
         dateTextField.text = date
+        checkMustStatus()
     }
 }