Merge branch '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into 630-dev

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  文书 签字OSS失败逻辑添加
  头像链接地址

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsDetailViewController.swift

@@ -675,17 +675,17 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
                                 print("所有任务完成")
                                 if imgArr.count == successArr.count {
                                     YHHUD.flash(message: "上传成功")
-                                    var action = 1
-                                    if self.oldUrl?.count != 0 {
-                                        action = 2
-                                    }
-                                    self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
-                                        guard let self = self else { return }
-                                        self.getData()
-                                    }
                                 } else {
                                     YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
                                 }
+                                var action = 1
+                                if self.oldUrl?.count != 0 {
+                                    action = 2
+                                }
+                                self.viewModel.requestFileAction("\(self.viewModel.mainModel?.writing_document.doc_sign.id ?? 0)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
+                                    guard let self = self else { return }
+                                    self.getData()
+                                }
                             }
                         }
                         sheetView.show()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift

@@ -516,19 +516,18 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
                             print("所有任务完成")
                             if imgArr.count == successArr.count {
                                 YHHUD.flash(message: "上传成功")
-                                var action = 1
-                                if self.oldUrl?.count != 0 {
-                                    action = 2
-                                }
-                                //sleep(1) 后端性能问题 不能并发调用接口
-                                self.viewModel.requestFileAction("\(self.id)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
-                                    guard let self = self else { return }
-                                    self.getData()
-                                }
                             } else {
                                 YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
                             }
-                            
+                            var action = 1
+                            if self.oldUrl?.count != 0 {
+                                action = 2
+                            }
+                            //sleep(1) 后端性能问题 不能并发调用接口
+                            self.viewModel.requestFileAction("\(self.id)", action, successArr, self.oldUrl ?? "") {[weak self] success, error in
+                                guard let self = self else { return }
+                                self.getData()
+                            }
                         }
                     }
                     sheetView.show()

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditBaseUserInfoViewController.swift

@@ -140,7 +140,8 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
             self.photoImageView.image = image
             self.viewModel.uploadImage(image, true) {[weak self] success, error in
                 guard let self = self else { return }
-                self.model.avatar = success ?? ""
+                viewModel.model.avatar = success ?? ""
+                
                 if self.viewModel.isCanNext(step: 1) {
                     nextButton.isEnabled = true
                     nextButton.backgroundColor =  UIColor.brandMainColor