Commit 04770ac6 authored by pete谢兆麟's avatar pete谢兆麟

续签结果逻辑补充

parent 8b25ffca
......@@ -205,8 +205,8 @@ class YHBaseViewModel {
return
}
YHOSSManager.share.updateToken {
YHOSSManager.share.getPublic(url: url, callBackBlock: { [weak self] success, error in
guard let _ = self else { return }
YHOSSManager.share.getPublic(url: url, callBackBlock: { success, error in
// guard let _ = self else { return }
DispatchQueue.main.async {
// 在这里执行需要在主线程上完成的任务
callBackBlock(success, error)
......
......@@ -48,7 +48,7 @@ class YHLookResignResultDataLettersModel: SmartCodable {
var user: String = "" //人信息
var result_file: String = ""
var confirm_in_hk: Int = 0
required init() {
}
}
......
......@@ -148,7 +148,7 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
make.right.equalTo(-18)
}
peopleValueLabel = {
docValueLabel = {
let label = UILabel()
label.textColor = UIColor.mainTextColor
let a = ASAttributedString.init("欧阳先生", .font(UIFont.PFSC_M(ofSize:14)), .foreground(UIColor.brandMainColor), .underline(.single), .action {
......@@ -158,8 +158,8 @@ class YHLookResignResultStateOneTableViewCell: UITableViewCell {
label.textAlignment = .right
return label
}()
centerView.addSubview(peopleValueLabel)
peopleValueLabel.snp.makeConstraints { make in
centerView.addSubview(docValueLabel)
docValueLabel.snp.makeConstraints { make in
make.left.equalTo(18)
make.top.equalTo(104)
make.height.equalTo(20)
......
......@@ -215,9 +215,11 @@ class YHLookResignResultItemView: UIImageView {
}
@objc private func handleTap(_ sender: AnyObject?) {
let viewModel = YHBaseViewModel()
viewModel.getRealUsefulUrl(dataSource?.result_file ?? "") { success in
self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"")
if dataSource?.confirm_in_hk == 1 {
let viewModel = YHBaseViewModel()
viewModel.getRealUsefulUrl(dataSource?.result_file ?? "") { success in
self.previewFileTool.openXLSXRemoteFile(urlString: success, fileName:"")
}
}
}
}
......
......@@ -78,7 +78,7 @@ class YHResignUploadDocListViewController: YHBaseViewController {
}
@objc func clickNextBtn() {
let vc = YHResignUploadDocListViewController()
let vc = YHLookResignResultViewController()
vc.orderId = orderId
vc.batchId = batchId
UIViewController.current?.navigationController?.pushViewController(vc)
......
......@@ -232,7 +232,7 @@ class YHOSSManager: NSObject, URLSessionDelegate {
callBackBlock(string, YHErrorModel())
}
return
})
}).waitUntilFinished()
}
}
......
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