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

救援中userphone可空

Browse Source
This commit is contained in:
ddisfriend
2025-06-25 10:28:26 +08:00
parent cb2faafb37
commit b485ccaf0c
4 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -58,6 +58,8 @@ fastlane/test_output
# Git LFS pointer files if used improperly # Git LFS pointer files if used improperly
*.lfs *.lfs
# fastlane
fastlane/report.xml
# 单元测试快照（可选） # 单元测试快照（可选）
# ReferenceImages/ # ReferenceImages/
# FailedTestImages/ # FailedTestImages/

2
OrderScheduling/HttpResponseModel/ResponseModel.swift
View File

@@ -77,7 +77,7 @@ class OrderListDataModel: Decodable {
var userOrderId : Int var userOrderId : Int
var taskOrderId : Int var taskOrderId : Int
var taskFlowId : Int var taskFlowId : Int
var userPhone : String var userPhone : String?
var auditFailReason : String? var auditFailReason : String?
var isSupplierSettle : SupplierSettleModel? var isSupplierSettle : SupplierSettleModel?
var supplierSettleRatio : SupplierSettleRatioModel? var supplierSettleRatio : SupplierSettleRatioModel?

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

@@ -906,11 +906,15 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
.disposed(by: cell!.disposeBag) .disposed(by: cell!.disposeBag)
cell?.contactButton.rx.tap cell?.contactButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: {[weak self] _ in
if let userPhone = model.userPhone {
SC.userOrderId = model.userOrderId SC.userOrderId = model.userOrderId
SC.orderCode = model.orderCode SC.orderCode = model.orderCode
SC.taskOrderId = model.taskOrderId SC.taskOrderId = model.taskOrderId
URLLINKS.openUrl(type: .phone, appending: model.userPhone) URLLINKS.openUrl(type: .phone, appending: userPhone)
}else{
self?.view.dd_makeToast("无联系电话")
}
}) })
.disposed(by: cell!.disposeBag) .disposed(by: cell!.disposeBag)
cell?.dispatchButton.rx.tap cell?.dispatchButton.rx.tap
@@ -1019,11 +1023,15 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
} }
cell?.contactButton.rx.tap cell?.contactButton.rx.tap
.observe(on: MainScheduler.instance) .observe(on: MainScheduler.instance)
.subscribe(onNext: { _ in .subscribe(onNext: {[weak self] _ in
if let userPhone = model.userPhone {
SC.userOrderId = model.userOrderId SC.userOrderId = model.userOrderId
SC.orderCode = model.orderCode SC.orderCode = model.orderCode
SC.taskOrderId = model.taskOrderId SC.taskOrderId = model.taskOrderId
URLLINKS.openUrl(type: .phone, appending: model.userPhone) URLLINKS.openUrl(type: .phone, appending: userPhone)
}else{
self?.view.dd_makeToast("无联系电话")
}
}) })
.disposed(by: cell!.disposeBag) .disposed(by: cell!.disposeBag)
cell?.dispatchButton.rx.tap cell?.dispatchButton.rx.tap

23
fastlane/report.xml
View File

@@ -1,23 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
<testsuite name="fastlane.lanes">
<testcase classname="fastlane.lanes" name="0: default_platform" time="0.00018">
</testcase>
<testcase classname="fastlane.lanes" name="1: gym" time="117.026451">
</testcase>
<testcase classname="fastlane.lanes" name="2: pgyer" time="23.061235">
</testcase>
</testsuite>
</testsuites>