From 30727faca16893dcb98bf62340501d7f0e1f41e5 Mon Sep 17 00:00:00 2001
From: songzhiling <17630035658@163.com>
Date: Tue, 17 Jun 2025 14:45:41 +0800
Subject: [PATCH] =?UTF-8?q?fix(servicing):=20=E4=BC=98=E5=8C=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E7=A1=AE=E8=AE=A4=E4=B8=AD=E7=9A=84=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-增加对照片类型的判断，跳过特定类型的照片
- 修复照片上传路径为空时的提示对话框
- 优化地点信息获取后的提交逻辑
---
 .../order_confirm/real_order_confirm/OrderConfirmVm.kt       | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt b/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt
index c4358cf..38f6dff 100644
--- a/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt
+++ b/servicing/src/main/java/com/za/ui/servicing/order_confirm/real_order_confirm/OrderConfirmVm.kt
@@ -76,6 +76,9 @@ class OrderConfirmVm : IServicingVm<OrderConfirmVm.Action, OrderConfirmVm.UiStat
 		}
 
 		uiState.value.photoTemplateList?.forEach {
+			if (it.photoType == 2) {
+				return@forEach
+			}
 			if (it.doHaveFilm == 1 && it.photoUploadPath.isNullOrBlank()) {
 				showTipDialog("请拍摄${it.imageTitle}照片")
 				return
@@ -117,7 +120,7 @@ class OrderConfirmVm : IServicingVm<OrderConfirmVm.Action, OrderConfirmVm.UiStat
 		LoadingManager.showLoading()
 		ZdLocationManager.getSingleLocation(success = { it ->
 			LoadingManager.hideLoading()
-			doSubmit(tempPhotoList,it)
+			doSubmit(tempPhotoList, it)
 		}, failed = {
 			LoadingManager.hideLoading()
 			if (GlobalData.currentLocation != null) {