// 我的证件

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

@@ -107,6 +107,7 @@ class YHUploadContentVC: YHBaseViewController {
         sheetView.uploadImageBlock = {
             [weak self] image in
             guard let self = self else { return }
+            uploadImage(image)
         }
         sheetView.show()
     }
@@ -395,17 +396,85 @@ extension YHUploadContentVC {
         ]
         self.viewModel.updateCertificates(params: params) {
             
-            [weak self] success in
+            [weak self] success, error in
             guard let self = self else { return }
             
             if operation == "del" {
-                YHHUD.flash(message: success ? "删除成功" : "删除失败")
-            } else if operation == "rename" {
-                YHHUD.flash(message: success ? "重命名成功" : "重命名失败")
+                if success {
+                    YHHUD.flash(message: "删除成功")
+                } else {
+                    var msg = "删除失败"
+                    if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                        msg = errorMsg
+                    }
+                    YHHUD.flash(message:msg)
+                }
+                requestList()
+                return
+            }
+                 
+           if operation == "rename" {
+
+                if success {
+                    YHHUD.flash(message: "重命名成功")
+                } else {
+                    var msg = "重命名失败"
+                    if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                        msg = errorMsg
+                    }
+                    YHHUD.flash(message:msg)
+                }
+                requestList()
+                return
+            }
+            
+            if operation == "add" {
+                if success {
+                    YHHUD.flash(message: "添加成功")
+                } else {
+                    var msg = "添加失败"
+                    if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                        msg = errorMsg
+                    }
+                    YHHUD.flash(message:msg)
+                }
+                requestList()
+                return
             }
-            requestList()
         }
     }
     
+    func uploadImage(_ img: UIImage) {
+        
+        // 先OSS上传得到URL
+        YHHUD.show(.progress(message: "上传中..."))
+        self.viewModel.uploadImage(img) {
+            [weak self] url, error in
+            guard let self = self else { return }
+            YHHUD.hide()
+            if let url = url, !url.isEmpty {
+                let imgName = url.lastPathComponent
+                var suffix = "jpg"
+                let suffixName = url.pathExtension.lowercased()
+                if !suffixName.isEmpty {
+                    suffix = suffixName
+                }
+                
+                // 再调用业务接口
+                let model = YHContentUrl()
+                model.name = imgName
+                model.url = url
+                model.suffix = suffix
+                updateCertificateItem(model, operation: "add", rename: "")
+                return
+            }
+            //
+            var msg = "上传图片失败"
+            if let errorMsg = error?.errorMsg, !errorMsg.isEmpty {
+                msg = errorMsg
+            }
+            YHHUD.flash(message: msg)
+        }
+    }    
 }
 

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

@@ -451,8 +451,9 @@ extension YHCertificateUploadSheetView: (UIImagePickerControllerDelegate & UINav
     func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
         
         if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
-                uploadImageBlock?(image)
-                self.dismiss()
+        
+            uploadImageBlock?(image)
+            self.dismiss()
 
         } else {
             printLog("pick image wrong")

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

@@ -137,7 +137,7 @@ class YHCertificateViewModel: YHBaseViewModel {
     }
     
     // 上传/重命名/删除 证件
-    func updateCertificates(params:[String : Any], isSilient:Bool = false, callBack:@escaping ((Bool)->())) {
+    func updateCertificates(params:[String : Any], isSilient:Bool = false, callBack:@escaping ((Bool, YHErrorModel?)->())) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Certificate.certificateUploadApi
         
@@ -151,16 +151,17 @@ class YHCertificateViewModel: YHBaseViewModel {
                 YHHUD.hide()
             }
             if code == NetWorkCode.success.rawValue {
-                callBack(true)
+                callBack(true, nil)
             } else {
-                callBack(false)
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBack(false, error)
             }
             
         } failBlock: { err in
             if !isSilient {
                 YHHUD.hide()
             }
-            callBack(false)
+            callBack(false, err)
         }
     }
 }