From b485ccaf0c0c2eaeaf4ff84c75a5c934426bcb5b Mon Sep 17 00:00:00 2001
From: ddisfriend <chemailaddress2@gmail.com>
Date: Wed, 25 Jun 2025 10:28:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=91=E6=8F=B4=E4=B8=ADuserphone=E5=8F=AF?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 ++
 .../HttpResponseModel/ResponseModel.swift     |  2 +-
 .../ViewController/RescueController.swift     | 28 ++++++++++++-------
 fastlane/report.xml                           | 23 ---------------
 4 files changed, 21 insertions(+), 34 deletions(-)
 delete mode 100644 fastlane/report.xml

diff --git a/.gitignore b/.gitignore
index 4fef7df..932c6e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,6 +58,8 @@ fastlane/test_output
 # Git LFS pointer files if used improperly
 *.lfs
 
+# fastlane
+fastlane/report.xml
 # 单元测试快照（可选）
 # ReferenceImages/
 # FailedTestImages/
\ No newline at end of file
diff --git a/OrderScheduling/HttpResponseModel/ResponseModel.swift b/OrderScheduling/HttpResponseModel/ResponseModel.swift
index 381bef8..f963123 100644
--- a/OrderScheduling/HttpResponseModel/ResponseModel.swift
+++ b/OrderScheduling/HttpResponseModel/ResponseModel.swift
@@ -77,7 +77,7 @@ class OrderListDataModel: Decodable {
     var userOrderId : Int
     var taskOrderId : Int
     var taskFlowId : Int
-    var userPhone : String
+    var userPhone : String?
     var auditFailReason : String?
     var isSupplierSettle : SupplierSettleModel?
     var supplierSettleRatio : SupplierSettleRatioModel?
diff --git a/OrderScheduling/Rescue/ViewController/RescueController.swift b/OrderScheduling/Rescue/ViewController/RescueController.swift
index 6bd4320..fc157de 100644
--- a/OrderScheduling/Rescue/ViewController/RescueController.swift
+++ b/OrderScheduling/Rescue/ViewController/RescueController.swift
@@ -906,11 +906,15 @@ extension RescuePendingDispatchController : UITableViewDelegate,UITableViewDataS
             .disposed(by: cell!.disposeBag)
         cell?.contactButton.rx.tap
             .observe(on: MainScheduler.instance)
-            .subscribe(onNext: { _ in
-                SC.userOrderId = model.userOrderId
-                SC.orderCode = model.orderCode
-                SC.taskOrderId = model.taskOrderId
-                URLLINKS.openUrl(type: .phone, appending: model.userPhone)
+            .subscribe(onNext: {[weak self] _ in
+                if let userPhone = model.userPhone {
+                    SC.userOrderId = model.userOrderId
+                    SC.orderCode = model.orderCode
+                    SC.taskOrderId = model.taskOrderId
+                    URLLINKS.openUrl(type: .phone, appending: userPhone)
+                }else{
+                    self?.view.dd_makeToast("无联系电话")
+                }
             })
             .disposed(by: cell!.disposeBag)
         cell?.dispatchButton.rx.tap
@@ -1019,11 +1023,15 @@ extension RescueIsIngController : UITableViewDelegate,UITableViewDataSource {
         }
         cell?.contactButton.rx.tap
             .observe(on: MainScheduler.instance)
-            .subscribe(onNext: { _ in
-                SC.userOrderId = model.userOrderId
-                SC.orderCode = model.orderCode
-                SC.taskOrderId = model.taskOrderId
-                URLLINKS.openUrl(type: .phone, appending: model.userPhone)
+            .subscribe(onNext: {[weak self] _ in
+                if let userPhone = model.userPhone {
+                    SC.userOrderId = model.userOrderId
+                    SC.orderCode = model.orderCode
+                    SC.taskOrderId = model.taskOrderId
+                    URLLINKS.openUrl(type: .phone, appending: userPhone)
+                }else{
+                    self?.view.dd_makeToast("无联系电话")
+                }
             })
             .disposed(by: cell!.disposeBag)
         cell?.dispatchButton.rx.tap
diff --git a/fastlane/report.xml b/fastlane/report.xml
deleted file mode 100644
index df09bf2..0000000
--- a/fastlane/report.xml
+++ /dev/null
@@ -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>