dezhong/OrderScheduling
18
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug fixed

Browse Source
This commit is contained in:
ddisfriend
2025-12-29 11:59:19 +08:00
parent 599077de2d
commit 18e0c52fe6
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OrderScheduling/Rescue/View/IdentityAlertView.swift
View File

@@ -137,7 +137,7 @@ private extension IdentityAlertView {
} }
// 立即确认按钮 // 立即确认按钮
confirmButton.setTitle(isLast ? "放弃" : "立即确认", for: .normal) confirmButton.setTitle("立即确认", for: .normal)
confirmButton.setTitleColor(.white, for: .normal) confirmButton.setTitleColor(.white, for: .normal)
confirmButton.titleLabel?.font = .boldSystemFont(ofSize: 16) confirmButton.titleLabel?.font = .boldSystemFont(ofSize: 16)
confirmButton.backgroundColor = UIColor(red: 0xFF/255, green: 0x6B/255, blue: 0x50/255, alpha: 1) 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.setTitleColor(UIColor(red: 0x99/255, green: 0x99/255, blue: 0x99/255, alpha: 1), for: .normal)
laterButton.titleLabel?.font = .systemFont(ofSize: 14) laterButton.titleLabel?.font = .systemFont(ofSize: 14)
laterButton.addTarget(self, action: #selector(handleLater), for: .touchUpInside) laterButton.addTarget(self, action: #selector(handleLater), for: .touchUpInside)

14
OrderScheduling/Rescue/ViewController/RescueController.swift
View File

@@ -197,19 +197,19 @@ extension RescueController {
let entryName = "IdentityAlert" let entryName = "IdentityAlert"
let entryView = IdentityAlertView(times: response?.data?.count ?? 0,totalTimes: 3, isLast: isLast) let entryView = IdentityAlertView(times: response?.data?.count ?? 0,totalTimes: 3, isLast: isLast)
entryView.onLater = { entryView.onLater = {
Entry.default.dismiss(name: entryName)
}
entryView.onConfirm = {
Entry.default.dismiss(name: entryName,completion: { Entry.default.dismiss(name: entryName,completion: {
if isLast { if isLast {
RQ.giveUp(prameters: GiveUpParameters(supplierId: UserData.default.supplierId)) RQ.giveUp(prameters: GiveUpParameters(supplierId: UserData.default.supplierId))
.subscribe(onSuccess: { _ in .subscribe(onSuccess: { _ in
}) })
.disposed(by: self.disposeBag) .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)")
} }
}) })
} }