// 扩大长期按钮点击范围

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/C/Certificates(证书上传和证书信息)/YHCertificateInfoController.swift

@@ -235,7 +235,8 @@ extension YHCertificateInfoController : UITableViewDelegate, UITableViewDataSour
                         [weak self] isLongTime in
                         guard let self = self else { return }
                         if title.type == .chinaIdCardInfo {
-                            self.familyMember?.certificates.cnIdentityCard.issueDateEndAt = (isLongTime ? YHCNIdentityCard.longTime : "")
+                            guard let familyMember = familyMember else { return }
+                            familyMember.certificates.cnIdentityCard.issueDateEndAt = (isLongTime ? YHCNIdentityCard.longTime : familyMember.certificates.cnIdentityCard.lastIssueDateEndAt)
                             loadInfo()
                             save()
                         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/M/YHFamilyInitialInfo.swift

@@ -1070,7 +1070,14 @@ class YHCNIdentityCard: SmartCodable {
     var number: String = ""
     var issueAt: String = ""
     var issueDateStartAt: String = ""
-    var issueDateEndAt: String = ""
+    var issueDateEndAt: String = "" {
+        didSet {
+            if !issueDateEndAt.isEmpty && issueDateEndAt != Self.longTime {
+                lastIssueDateEndAt = issueDateEndAt
+            }
+        }
+    }
+    var lastIssueDateEndAt: String = ""
     var imgFront: String = ""
     var imgBack: String = ""
     var passPortType: Int = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/FamilyMember(家庭成员信息表)/V/YHFormItemExpireDateCell.swift

@@ -15,7 +15,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
     private let horizonalGap = 18.0
     private let detailColor = UIColor.mainTextColor
     private let placeHolderColor = UIColor.placeHolderColor
-    let longTimeBtnWidth = 40.0
+    let longTimeBtnWidth = 44.0
     // 是否必填 如必填title会展示红色*
     var isMust = false
     var placeHolder:String? = "请选择"
@@ -91,6 +91,12 @@ class YHFormItemExpireDateCell: UITableViewCell {
         btn.iconInLeft(spacing: 6)
         btn.setImage(UIImage(named: "form_square_unselect"), for: .normal)
         btn.setImage(UIImage(named: "form_square_select"), for: .selected)
+        return btn
+    }()
+    
+    // 增大点击区域
+    lazy var longAreaBtn: UIButton = {
+        let btn = UIButton()
         btn.addTarget(self, action: #selector(didClickLongTimeBtn), for: .touchUpInside)
         return btn
     }()
@@ -130,6 +136,7 @@ class YHFormItemExpireDateCell: UITableViewCell {
         contentView.addSubview(titleLabel)
         contentView.addSubview(detailLabel)
         contentView.addSubview(longTimeBtn)
+        contentView.addSubview(longAreaBtn)
         contentView.addSubview(tipsLabel)
         contentView.addSubview(topLine)
 
@@ -151,6 +158,11 @@ class YHFormItemExpireDateCell: UITableViewCell {
             make.centerY.equalTo(titleLabel)
         }
         
+        longAreaBtn.snp.makeConstraints { make in
+            make.center.equalTo(longTimeBtn.snp.center)
+            make.size.equalTo(CGSizeMake(longTimeBtnWidth+20, 40))
+        }
+        
         topLine.snp.makeConstraints { make in
             make.left.equalToSuperview().offset(horizonalGap)
             make.right.equalToSuperview().offset(-horizonalGap)