缴费申请页调整

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalApplicationVC.swift

@@ -47,57 +47,9 @@ class YHHKVisaRenewalApplicationVC: YHBaseViewController {
         view.register(YHVisaRenewalPayTipsCell.self, forCellReuseIdentifier: YHVisaRenewalPayTipsCell.cellReuseIdentifier)
         return view
     }()
-    
-    private lazy var guideButton: UIControl = {
-        let button = UIControl()
-        let titleLabel = UILabel()
-        titleLabel.text = "领取续签指引"
-        titleLabel.textColor = .mainTextColor
-        titleLabel.textAlignment = .center
-        titleLabel.font = UIFont.PFSC_R(ofSize: 11)
-        let image = UIImage(named: "resign_visa_pay_guide")
-        let imageView = UIImageView(image: image)
-        button.addSubview(titleLabel)
-        button.addSubview(imageView)
-        imageView.snp.makeConstraints { make in
-            make.top.equalToSuperview().offset(12)
-            make.centerX.equalToSuperview()
-            make.width.height.equalTo(24)
-        }
-        titleLabel.snp.makeConstraints { make in
-            make.top.equalTo(imageView.snp.bottom)
-            make.centerX.equalTo(imageView)
-        }
-        button.addTarget(self, action: #selector(clickGuideButton), for: .touchUpInside)
-        return button
-    }()
-    
-    private lazy var sureButton: UIButton = {
-        let button = UIButton(type: .custom)
-        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
-        button.setTitle("去上传旅行证件", for: .normal)
-        button.setTitle("去上传旅行证件", for: .highlighted)
-        button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-        button.setTitleColor( UIColor(hex:0xffffff), for: .highlighted)
-        button.setTitleColor( UIColor(hex:0xffffff), for: .disabled)
-        button.addTarget(self, action: #selector(clickSureButton), for: .touchUpInside)
-        button.layer.cornerRadius = kCornerRadius3
-        button.clipsToBounds = true
-        button.backgroundColor = .brandMainColor
-        button.alpha = 0.3
-        button.isEnabled = false
-        return button
-    }()
-    
-    private lazy var bottomView: UIView = {
-        let view = UIView()
-        view.backgroundColor = .white
-        return view
-    }()
-    
+        
     private lazy var datas: [[YHVisaRenewalItemDetailType]] = []
     
-    private var didShowGuideVC = false
     
     private lazy var viewModel = YHHKVisaRenewalPaymentViewModel()
     
@@ -122,18 +74,6 @@ class YHHKVisaRenewalApplicationVC: YHBaseViewController {
         super.viewWillAppear(animated)
         requestData()
     }
-    
-    override func viewDidAppear(_ animated: Bool) {
-        super.viewDidAppear(animated)
-        
-        if !didShowGuideVC {
-            didShowGuideVC = true
-            let didShowGuide = YHVisaRenewalGuideVC.didShowGuide
-            if !didShowGuide {
-                showGuideVC()
-            }
-        }
-    }
 }
 
 extension YHHKVisaRenewalApplicationVC {
@@ -154,35 +94,12 @@ extension YHHKVisaRenewalApplicationVC {
         gk_navBackgroundColor = .white
         view.backgroundColor = UIColor.contentBkgColor
         view.addSubview(tableView)
-        view.addSubview(bottomView)
-        bottomView.addSubview(sureButton)
-        bottomView.addSubview(guideButton)
-        
-        bottomView.snp.makeConstraints { make in
-            make.left.right.equalToSuperview()
-            make.bottom.equalToSuperview()
-            make.top.equalTo(view.safeAreaLayoutGuide.snp.bottom).offset(-64)
-        }
-        
-        guideButton.snp.makeConstraints { make in
-            make.left.equalToSuperview()
-            make.top.equalToSuperview()
-            make.height.equalTo(64)
-            make.width.equalTo(106)
-        }
-        
-        sureButton.snp.makeConstraints { make in
-            make.left.equalTo(guideButton.snp.right)
-            make.right.equalToSuperview().offset(-20)
-            make.top.equalToSuperview().offset(8)
-            make.height.equalTo(48)
-        }
         
         tableView.snp.makeConstraints { make in
             make.left.equalToSuperview()
             make.right.equalToSuperview()
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalTo(bottomView.snp.top)
+            make.bottom.equalToSuperview()
         }
         
         tableView.tableFooterView = UIView(frame: CGRect.init(x: 0, y: 0, width: KScreenWidth, height: kMargin))
@@ -217,7 +134,7 @@ extension YHHKVisaRenewalApplicationVC {
             //var confirmingPresenceSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("确认申请人在港", nil), .tips(confirmingPresenceTips)]
             //var actionMembers: [YHVisaRenewalItemDetailType] = []
             var paymentMembers: [YHVisaRenewalItemDetailType] = []
-            self.updateSureButtonState(false)
+//            self.updateSureButtonState(false)
             paymentListModel.list.forEach { [weak self] person in
                 guard let self = self else {
                     return
@@ -268,12 +185,12 @@ extension YHHKVisaRenewalApplicationVC {
                     case .approvalPending:
                         paymentMembers.append(.subRemark("续签申请暂未正式获批，请耐心等待"))
                     case .confirmingPresence:
-                        paymentMembers.append(.subInfo("档案号：", "-", nil))
+                        paymentMembers.append(.subInfo("临时档案号：", "-", nil))
                         paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
                         paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_hkd)港币（≈\(person.fee_rmb)人民币)", nil))
                         paymentMembers.append(.subRemark("请先确认用户完成确认在港"))
                     case .confirmedPresence:
-                        paymentMembers.append(.subInfo("档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
+                        paymentMembers.append(.subInfo("临时档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
                             guard let self = self else {
                                 return
                             }
@@ -290,7 +207,7 @@ extension YHHKVisaRenewalApplicationVC {
                     }
                     paymentMembers.append(.occupyingSpace)
                     paymentMembers.append(.subHeader(person.name, .paid))
-                    paymentMembers.append(.subInfo("档案号：", person.file_num, "复制", .mid, 12, true, { [weak self] in
+                    paymentMembers.append(.subInfo("临时档案号：", person.file_num, "复制", .mid, 12, true, { [weak self] in
                         guard let self = self else {
                             return
                         }
@@ -303,12 +220,12 @@ extension YHHKVisaRenewalApplicationVC {
                         }
                         self.gotoPreview(person.receipt)
                     }))
-                    self.updateSureButtonState(true)
+//                    self.updateSureButtonState(true)
                     
                 case .expired:
                     paymentMembers.append(.occupyingSpace)
                     paymentMembers.append(.subHeader(person.name, .expired))
-                    paymentMembers.append(.subInfo("档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
+                    paymentMembers.append(.subInfo("临时档案号：", person.file_num, "复制", .mid, nil, false, { [weak self] in
                         guard let self = self else {
                             return
                         }
@@ -362,11 +279,6 @@ extension YHHKVisaRenewalApplicationVC {
         }
     }
     
-    private func updateSureButtonState(_ isEnabled: Bool = false) {
-        sureButton.alpha = isEnabled ? 1 : 0.3
-        sureButton.isEnabled = isEnabled
-    }
-    
     private func showAlertView(confirmBlock: (() -> Void)?) {
         let alert = YHVisaRenewalPayConfirmingPresenceAlertView.alertView()
         alert.confirmBlock = {