From 18e0c52fe6a3fb47102322fe43f4e4fce41c05e0 Mon Sep 17 00:00:00 2001 From: ddisfriend Date: Mon, 29 Dec 2025 11:59:19 +0800 Subject: [PATCH] bug fixed --- .../Rescue/View/IdentityAlertView.swift | 4 ++-- .../Rescue/ViewController/RescueController.swift | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OrderScheduling/Rescue/View/IdentityAlertView.swift b/OrderScheduling/Rescue/View/IdentityAlertView.swift index e7e455f..ae8357a 100644 --- a/OrderScheduling/Rescue/View/IdentityAlertView.swift +++ b/OrderScheduling/Rescue/View/IdentityAlertView.swift @@ -137,7 +137,7 @@ private extension IdentityAlertView { } // 立即确认按钮 - confirmButton.setTitle(isLast ? "放弃" : "立即确认", for: .normal) + confirmButton.setTitle("立即确认", for: .normal) confirmButton.setTitleColor(.white, for: .normal) confirmButton.titleLabel?.font = .boldSystemFont(ofSize: 16) confirmButton.backgroundColor = UIColor(red: 0xFF/255, green: 0x6B/255, blue: 0x50/255, alpha: 1) @@ -153,7 +153,7 @@ private extension IdentityAlertView { } // 稍后提醒按钮 - laterButton.setTitle("稍后提醒", for: .normal) + laterButton.setTitle(isLast ? "放弃" : "稍后提醒", for: .normal) laterButton.setTitleColor(UIColor(red: 0x99/255, green: 0x99/255, blue: 0x99/255, alpha: 1), for: .normal) laterButton.titleLabel?.font = .systemFont(ofSize: 14) laterButton.addTarget(self, action: #selector(handleLater), for: .touchUpInside) diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift index 5b36e74..0a5659e 100644 --- a/OrderScheduling/Rescue/ViewController/RescueController.swift +++ b/OrderScheduling/Rescue/ViewController/RescueController.swift @@ -197,19 +197,19 @@ extension RescueController { let entryName = "IdentityAlert" let entryView = IdentityAlertView(times: response?.data?.count ?? 0,totalTimes: 3, isLast: isLast) entryView.onLater = { - Entry.default.dismiss(name: entryName) - } - entryView.onConfirm = { Entry.default.dismiss(name: entryName,completion: { if isLast { RQ.giveUp(prameters: GiveUpParameters(supplierId: UserData.default.supplierId)) .subscribe(onSuccess: { _ in }) .disposed(by: self.disposeBag) - }else{ - if let supplierId = UserData.default.supplierId { - WEBTOOL.open(name: .managerPeople, appending: "&supplierId=\(supplierId)") - } + } + }) + } + entryView.onConfirm = { + Entry.default.dismiss(name: entryName,completion: { + if let supplierId = UserData.default.supplierId { + WEBTOOL.open(name: .managerPeople, appending: "&supplierId=\(supplierId)") } }) }