Commit e768a46c authored by David黄金龙's avatar David黄金龙

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失败逻辑添加
  头像链接地址
parents 3f406535 d86abd50
...@@ -675,6 +675,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -675,6 +675,9 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") YHHUD.flash(message: "上传成功")
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
var action = 1 var action = 1
if self.oldUrl?.count != 0 { if self.oldUrl?.count != 0 {
action = 2 action = 2
...@@ -683,9 +686,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -683,9 +686,6 @@ extension YHMyDocumentsDetailViewController: UITableViewDelegate, UITableViewDat
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
} }
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
} }
} }
sheetView.show() sheetView.show()
......
...@@ -516,6 +516,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -516,6 +516,9 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
print("所有任务完成") print("所有任务完成")
if imgArr.count == successArr.count { if imgArr.count == successArr.count {
YHHUD.flash(message: "上传成功") YHHUD.flash(message: "上传成功")
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
var action = 1 var action = 1
if self.oldUrl?.count != 0 { if self.oldUrl?.count != 0 {
action = 2 action = 2
...@@ -525,10 +528,6 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat ...@@ -525,10 +528,6 @@ extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDat
guard let self = self else { return } guard let self = self else { return }
self.getData() self.getData()
} }
} else {
YHHUD.flash(message: "\(successArr.count)张照片上传成功\n\(failArr.count)张照片上传失败")
}
} }
} }
sheetView.show() sheetView.show()
......
...@@ -140,7 +140,8 @@ class YHEditBaseUserInfoViewController: YHBaseViewController { ...@@ -140,7 +140,8 @@ class YHEditBaseUserInfoViewController: YHBaseViewController {
self.photoImageView.image = image self.photoImageView.image = image
self.viewModel.uploadImage(image, true) {[weak self] success, error in self.viewModel.uploadImage(image, true) {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
self.model.avatar = success ?? "" viewModel.model.avatar = success ?? ""
if self.viewModel.isCanNext(step: 1) { if self.viewModel.isCanNext(step: 1) {
nextButton.isEnabled = true nextButton.isEnabled = true
nextButton.backgroundColor = UIColor.brandMainColor nextButton.backgroundColor = UIColor.brandMainColor
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment