// 确认

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/C/YHResignInfoConfirmModifyViewController.swift

@@ -170,7 +170,8 @@ class YHResignInfoConfirmModifyViewController: YHBaseViewController {
     
     func requestNamePinYin() {
         YHHUD.hide()
-        if !self.detailMember.name.isEmpty, self.detailMember.familyName.isEmpty {
+        let pinyinIsEmpty = (self.detailMember.familyName.isEmpty || self.detailMember.givenName.isEmpty)
+        if !self.detailMember.name.isEmpty,  pinyinIsEmpty {
             YHHUD.show(.progress(message: "加载中..."))
             self.viewModel.getPinYinFromName(self.detailMember.name) {
                 [weak self] firstName, lastName in

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/V/YHResignInfoValidTimeItemView.swift

@@ -147,6 +147,13 @@ class YHResignInfoValidTimeItemView: UIView {
         titleLabel.attributed.text = title
         detailLabel.text = item.value
         
+        detailLabel.snp.remakeConstraints { make in
+            make.top.equalTo(16)
+            make.left.equalTo(titleLabel.snp.right)
+            make.right.equalTo(-18)
+            make.height.greaterThanOrEqualTo(20)
+        }
+        
         // 是否隐藏有效期不足灰色视图
         var isNeedHiddenGrayView = true
         if let identity = familyInfo.identity {
@@ -154,8 +161,10 @@ class YHResignInfoValidTimeItemView: UIView {
             
         }
         grayContentView.isHidden = isNeedHiddenGrayView
-        grayContentView.snp.updateConstraints { make in
+        grayContentView.snp.remakeConstraints { make in
+            make.left.right.equalToSuperview()
             make.top.equalTo(detailLabel.snp.bottom).offset(isNeedHiddenGrayView ? 0 : 16)
+            make.bottom.equalTo(-16)
             make.height.equalTo(isNeedHiddenGrayView ? 0 : 42)
         }
         self.setNeedsLayout()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignInfoConfirm(续签信息确认)/VM/YHResignInfoConfirmIViewModel.swift

@@ -298,7 +298,10 @@ extension YHResignInfoConfirmViewModel {
         resultArr.append(cerIdInfo)
 
         // 有效期
-        let validTime = "\(identity.begin) ~ \(identity.end)"
+        var validTime = " "
+        if !identity.begin.isEmpty, !identity.end.isEmpty {
+            validTime = "\(identity.begin) ~ \(identity.end)"
+        }
         let validTimeInfo = YHResignFamilyInfoItem(id: .certificateValidTime,
                                                  action: .edit,
                                                  isMust: false,