// 我的证件

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListVC.swift

@@ -250,32 +250,11 @@ extension YHCertificateListVC {
             
                 self.viewModel.updateCertificateItem(supplementsId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
                     success, error in
-                    
-                    DispatchQueue.main.async {
-                        if success {
-                            YHHUD.flash(message: "上传成功")
-                            
-                        } else {
-                            var msg = "上传失败"
-                            if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
-                                msg = errorMsg
-                            }
-                            YHHUD.flash(message:msg)
-                        }
-                    }
                     self.requestList(status: self.status)
                     callBack?(success)
                 }
                 return
             }
-            //
-            DispatchQueue.main.async {
-                var msg = "上传图片失败"
-                if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
-                    msg = errorMsg
-                }
-                YHHUD.flash(message: msg)
-            }
             callBack?(false)
         }
     }
@@ -363,8 +342,9 @@ extension YHCertificateListVC {
         sheetView.uploadImageBlock = {
             [weak self] imgArr in
             guard let self = self else { return }
+            var successArr:[YHSelectImageItem] = []
+            var failArr:[YHSelectImageItem] = []
             let group = DispatchGroup()
-            var result = false
 
             YHHUD.show(.progress(message: "上传中..."))
             for item in imgArr {
@@ -373,7 +353,9 @@ extension YHCertificateListVC {
                     uploadImage(image, imageName:item.name, supplementInfo: supplementInfo) {
                         success in
                         if success {
-                            result = success
+                            successArr.append(item)
+                        } else {
+                            failArr.append(item)
                         }
                         group.leave()
                     }
@@ -382,10 +364,16 @@ extension YHCertificateListVC {
             
             // 等待所有任务完成
             group.notify(queue: .main) {
+                YHHUD.hide()
                 // 所有任务完成，回到主线程继续执行
                 print("所有任务完成")
-                YHHUD.hide()
-                if result { // 只要有一张照片上传成功即可进入详情
+                if imgArr.count == successArr.count {
+                    YHHUD.flash(message: "上传成功")
+                    
+                } else {
+                    YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
+                }
+                if successArr.count > 0 {
                     let vc = YHCertificateUploadContentListVC()
                     vc.orderId = self.orderId
                     vc.categoryInfo = self.categoryInfo

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateSearchViewController.swift

@@ -265,32 +265,12 @@ extension YHCertificateSearchViewController {
                 model.suffix = suffix
                 self.viewModel.updateCertificateItem(supplementsId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
                     success, error in
-                    
-                    DispatchQueue.main.async {
-                        if success {
-                            YHHUD.flash(message: "上传成功")
-                        } else {
-                            var msg = "上传失败"
-                            if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
-                                msg = errorMsg
-                            }
-                            YHHUD.flash(message:msg)
-                        }
-                    }
                     self.requestList(keyWord: self.searchBar.textField.text)
                     callBack?(success)
                     
                 }
                 return
             }
-            //
-            DispatchQueue.main.async {
-                var msg = "上传图片失败"
-                if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
-                    msg = errorMsg
-                }
-                YHHUD.flash(message: msg)
-            }
             callBack?(false)
         }
     }
@@ -377,8 +357,9 @@ extension YHCertificateSearchViewController {
         sheetView.uploadImageBlock = {
             [weak self] imgArr in
             guard let self = self else { return }
+            var successArr:[YHSelectImageItem] = []
+            var failArr:[YHSelectImageItem] = []
             let group = DispatchGroup()
-            var result = false
 
             YHHUD.show(.progress(message: "上传中..."))
             for item in imgArr {
@@ -387,7 +368,9 @@ extension YHCertificateSearchViewController {
                     uploadImage(image, imageName:item.name, supplementInfo: supplementInfo) {
                         success in
                         if success {
-                            result = success
+                            successArr.append(item)
+                        } else {
+                            failArr.append(item)
                         }
                         group.leave()
                     }
@@ -399,8 +382,14 @@ extension YHCertificateSearchViewController {
                 // 所有任务完成，回到主线程继续执行
                 print("所有任务完成")
                 YHHUD.hide()
-                if result { // 只要有一张照片上传成功即可进入详情
+                if imgArr.count == successArr.count {
+                    YHHUD.flash(message: "上传成功")
+                    
+                } else {
+                    YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
+                }
                 
+                if successArr.count > 0 {
                     let vc = YHCertificateUploadContentListVC()
                     vc.orderId = self.orderId
                     vc.categoryInfo = self.categoryInfo
@@ -408,7 +397,6 @@ extension YHCertificateSearchViewController {
                     self.navigationController?.pushViewController(vc)
                 }
             }
-            
         }
         sheetView.show()
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift

@@ -150,7 +150,8 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
             [weak self] imgArr in
             guard let self = self else { return }
             let group = DispatchGroup()
-            var result = false
+            var successArr:[YHSelectImageItem] = []
+            var failArr:[YHSelectImageItem] = []
 
             YHHUD.show(.progress(message: "上传中..."))
             for item in imgArr {
@@ -158,6 +159,11 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
                     group.enter()
                     uploadImage(image, imageName:item.name) {
                         success in
+                        if success {
+                            successArr.append(item)
+                        } else {
+                            failArr.append(item)
+                        }
                         group.leave()
                     }
                 }
@@ -167,6 +173,12 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
             group.notify(queue: .main) {
                 // 所有任务完成，回到主线程继续执行
                 print("所有任务完成")
+                if imgArr.count == successArr.count {
+                    YHHUD.flash(message: "上传成功")
+                    
+                } else {
+                    YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
+                }
                 YHHUD.hide()
             }
         }
@@ -587,30 +599,11 @@ extension YHCertificateUploadContentListVC {
                 self.viewModel.updateCertificateItem(supplementsId:supplementInfo.id, urlModel:model, operation: "add", rename: "") {
                     success, error in
                     
-                    DispatchQueue.main.async {
-                        if success {
-                            YHHUD.flash(message: "上传成功")
-                        } else {
-                            var msg = "上传失败"
-                            if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
-                                msg = errorMsg
-                            }
-                            YHHUD.flash(message:msg)
-                        }
-                    }
                     callBack?(success)
                     self.requestList()
                 }
                 return
             }
-            //
-            DispatchQueue.main.async {
-                var msg = "上传图片失败"
-                if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
-                    msg = errorMsg
-                }
-                YHHUD.flash(message: msg)
-            }
             callBack?(false)
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateUploadSheetView.swift

@@ -525,7 +525,7 @@ extension YHCertificateUploadSheetView: PHPickerViewControllerDelegate {
         let queue = DispatchQueue.global()
         var imageArr:[YHSelectImageItem] = []
 
-        
+        YHHUD.show(.progress(message:"加载中..."))
         for result in results {
             group.enter()
             // 此方法是异步操作
@@ -552,6 +552,7 @@ extension YHCertificateUploadSheetView: PHPickerViewControllerDelegate {
         // 等待所有任务完成
         group.notify(queue: .main) {
             // 所有任务完成，回到主线程继续执行
+            YHHUD.hide()
             print("所有任务完成")
             self.uploadImageBlock?(imageArr)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/VM/YHCertificateViewModel.swift

@@ -228,10 +228,7 @@ class YHCertificateViewModel: YHBaseViewModel {
         ]
     
         self.updateCertificates(params: params) {
-            
             [weak self] success, error in
-            YHHUD.hide()
-            
             guard let self = self else { return }
             callBack?(success, error)
         }