// 增加result_open字段

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointContainerViewController.swift

@@ -93,6 +93,7 @@ class YHResignAppointContainerViewController: YHBaseViewController {
             } else { // 预约过
                 self.scheduleVC.scheduleArr = self.viewModel.scheduleInfoList.renewal_List
                 self.scheduleVC.isTogether = self.viewModel.scheduleInfoList.is_together
+                self.scheduleVC.result_open = self.viewModel.scheduleInfoList.result_open
                 self.scheduleVC.view.isHidden = false
                 self.appointVC.view.isHidden = true
                 scheduleBlock?()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointScheduleListViewController.swift

@@ -17,6 +17,8 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
 
     let viewModel = YHResignAppointViewModel()
     var isTogether: Int = 0  // 0单人 1一起 2分批
+    var result_open: Bool = false // 是否可以下一步，去查看递交凭证
+    
     var scheduleArr: [YHResignAppointGroup] = [] {
         didSet {
             self.tableView.reloadData()
@@ -158,10 +160,9 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
     
     // 更新底部下一步按钮点击状态
     func updateBottomBtnAndMotifyBtnStatus() {
-        // 至少有一个行程已确认在港
-        let isAtLeatOneHaveConfirmInHK = self.isAtLeatOneHaveConfirmInHK()
-        self.nextBtn.isUserInteractionEnabled = isAtLeatOneHaveConfirmInHK
-        self.nextBtn.alpha = isAtLeatOneHaveConfirmInHK ? 1.0 : 0.3
+        let isCanNextStep = self.result_open
+        self.nextBtn.isUserInteractionEnabled = isCanNextStep
+        self.nextBtn.alpha = isCanNextStep ? 1.0 : 0.3
         
         // 所有分批都已确认在港 则无需修改了
         self.isHiddenModifyBtn = self.isAllHaveHaveConfirmInHK()
@@ -322,16 +323,6 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
         }
     }
     
-    func isAtLeatOneHaveConfirmInHK() -> Bool { // 所有行程安排中是否至少有一个已确认在港
-        for group in scheduleArr {
-            let status = group.getConfirmInHKStatus()
-            if status == .haveConfirmHK {
-                return true
-            }
-        }
-        return false
-    }
-    
     func isAllHaveHaveConfirmInHK() -> Bool { // 是否所有行程安排都已确认在港
         var isAllHaveConfirmed = true
         for group in scheduleArr {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/M/YHResignAppointGroup.swift

@@ -20,6 +20,7 @@ class YHResignAppointTogetherSetting: SmartCodable {
 class YHResignScheduleListModel: SmartCodable {
     
     var is_together: Int = 0 // 1 是2不是 一起赴港
+    var result_open: Bool = false // 是否可以下一步，去查看递交凭证
     var renewal_List: [YHResignAppointGroup] = []
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointGuideLineView.swift

@@ -36,7 +36,7 @@ class YHResignAppointGuideLineView: UIView {
             make.top.equalToSuperview().offset(10)
             make.left.equalTo(kMargin)
             make.right.equalTo(-kMargin)
-            make.height.equalTo(44)
+            make.height.equalTo(48)
         }
         view.layer.zPosition = 10
         return view

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignHKAppoint(在港递交预约)/V/YHResignAppointedScheduleSingleItemView.swift

@@ -103,6 +103,18 @@ class YHResignAppointedScheduleSingleItemView: UIView {
         haveConfirmInHKLabel.isHidden = (self.confirmHKStatus != .haveConfirmHK)
         confirmInHKBtn.isHidden = (self.confirmHKStatus == .haveConfirmHK)
         
+        var statusWidth = 71.0
+        if self.confirmHKStatus == .waitConfirmHK {
+            statusWidth = 71.0
+        } else if self.confirmHKStatus == .canConfirmHK {
+            statusWidth = 68.0
+        } else if self.confirmHKStatus == .haveConfirmHK {
+            statusWidth = 65.0
+        }
+        applicantNamesLabel.snp.updateConstraints { make in
+            make.right.equalTo(-18-statusWidth-18)
+        }
+        
         if self.confirmHKStatus == .waitConfirmHK {
             confirmInHKBtn.setTitle("待确认在港", for: .normal)
             confirmInHKBtn.setTitleColor(.mainTextColor, for: .normal)
@@ -172,7 +184,7 @@ class YHResignAppointedScheduleSingleItemView: UIView {
         
         applicantNamesLabel.snp.makeConstraints { make in
             make.left.equalTo(18)
-            make.right.equalTo(-18-71-5)
+            make.right.equalTo(-18-71-18)
             make.top.equalTo(lineView.snp.bottom).offset(18)
         }