Commit 862cfdaf authored by Steven杜宇's avatar Steven杜宇

// 续签

parent 202cc07d
...@@ -366,7 +366,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -366,7 +366,7 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
//续签资料管理 //续签资料管理
let vc = YHResinMaterialManageContainerVC() let vc = YHResinMaterialManageContainerVC()
vc.orderId = orderID vc.orderId = orderID
vc.id = stepID vc.batchId = stepID
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} else if model.type == 32 { } else if model.type == 32 {
......
...@@ -29,12 +29,17 @@ protocol YHRealNameDelegate: AnyObject { ...@@ -29,12 +29,17 @@ protocol YHRealNameDelegate: AnyObject {
class YHRealNameHelper { class YHRealNameHelper {
// 实名回调地址
static let callbackScheme = "esign://demo" static let callbackScheme = "esign://demo"
// 实名的回调跟 生成实名H5链接的入参redirectUrl相关
static let realnameCallback = "esign://demo/realBack" static let realnameCallback = "esign://demo/realBack"
// 签署的appScheme 入参
static let signCallback = "esign://demo/signBack" static let signCallback = "esign://demo/signBack"
static let jumpToAlipay = "alipays://platformapi/startapp?appId=20000067&url=" static let jumpToAlipay = "alipays://platformapi/startapp?appId=20000067&url="
// 签署H5回调的结果 会根据redirectUrl入参变化,需要同步
static let signResultWebCloseJSFunction = "jsbridge://signCallback" static let signResultWebCloseJSFunction = "jsbridge://signCallback"
// // 实名H5回调的结果 会根据redirectUrl入参变化,需要同步
static let realResultWebCloseJSFunction = "esign://demo/realBack" static let realResultWebCloseJSFunction = "esign://demo/realBack"
@discardableResult @discardableResult
......
...@@ -13,7 +13,7 @@ class YHResignMaterialListVC: YHBaseViewController { ...@@ -13,7 +13,7 @@ class YHResignMaterialListVC: YHBaseViewController {
// 订单id // 订单id
var orderId: Int = 0 var orderId: Int = 0
// 批次id // 批次id
var id: Int = 0 var batchId: Int = 0
var viewModel: YHResignMaterialViewModel = YHResignMaterialViewModel() var viewModel: YHResignMaterialViewModel = YHResignMaterialViewModel()
var items:[YHResignMaterialInfo] = [] { var items:[YHResignMaterialInfo] = [] {
...@@ -146,7 +146,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource { ...@@ -146,7 +146,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource {
let vc = YHResignMaterialUploadVC() let vc = YHResignMaterialUploadVC()
vc.materialId = item.id vc.materialId = item.id
vc.orderId = self.orderId vc.orderId = self.orderId
vc.id = self.id vc.batchId = self.batchId
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
return return
...@@ -155,7 +155,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource { ...@@ -155,7 +155,7 @@ extension YHResignMaterialListVC: UITableViewDelegate, UITableViewDataSource {
let vc = YHResignMaterialUploadVC() let vc = YHResignMaterialUploadVC()
vc.materialId = item.id vc.materialId = item.id
vc.orderId = self.orderId vc.orderId = self.orderId
vc.id = self.id vc.batchId = self.batchId
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} }
} }
......
...@@ -16,7 +16,7 @@ class YHResignMaterialUploadVC: YHBaseViewController { ...@@ -16,7 +16,7 @@ class YHResignMaterialUploadVC: YHBaseViewController {
// 订单id // 订单id
var orderId: Int = 0 var orderId: Int = 0
// 批次id // 批次id
var id: Int = 0 var batchId: Int = 0
var materialId : Int = 0 var materialId : Int = 0
var materialModel: YHMaterialModel = YHMaterialModel() { var materialModel: YHMaterialModel = YHMaterialModel() {
...@@ -592,7 +592,7 @@ extension YHResignMaterialUploadVC { ...@@ -592,7 +592,7 @@ extension YHResignMaterialUploadVC {
func requestMaterialDetail() { func requestMaterialDetail() {
YHHUD.show(.progress(message: "加载中...")) YHHUD.show(.progress(message: "加载中..."))
viewModel.getMaterialDeal(orderId: orderId, id: id, materialId: materialId) { viewModel.getMaterialDeal(orderId: orderId, id: batchId, materialId: materialId) {
[weak self] success, error in [weak self] success, error in
YHHUD.hide() YHHUD.hide()
guard let self = self else { return } guard let self = self else { return }
......
...@@ -16,7 +16,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController { ...@@ -16,7 +16,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
// 订单id // 订单id
var orderId: Int = 0 var orderId: Int = 0
// 批次id // 批次id
var id: Int = 0 var batchId: Int = 0
var titles = ["全部", "待上传(0)", "已驳回(0)", "审核中(0)", "已完成(0)"] var titles = ["全部", "待上传(0)", "已驳回(0)", "审核中(0)", "已完成(0)"]
...@@ -32,7 +32,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController { ...@@ -32,7 +32,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
func createListVC() -> YHResignMaterialListVC { func createListVC() -> YHResignMaterialListVC {
let vc0 = YHResignMaterialListVC() let vc0 = YHResignMaterialListVC()
vc0.orderId = self.orderId vc0.orderId = self.orderId
vc0.id = self.id vc0.batchId = self.batchId
return vc0 return vc0
} }
...@@ -121,7 +121,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController { ...@@ -121,7 +121,7 @@ class YHResinMaterialManageContainerVC: YHBaseViewController {
func requestData() { func requestData() {
let params: [String : Any] = ["order_id" : orderId, let params: [String : Any] = ["order_id" : orderId,
"id" : id] "id" : batchId]
viewModel.getMaterialList(param: params) { success, error in viewModel.getMaterialList(param: params) { success, error in
for (index, vc) in self.itemVCs.enumerated() { for (index, vc) in self.itemVCs.enumerated() {
if index == 0 { if index == 0 {
......
...@@ -561,7 +561,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource { ...@@ -561,7 +561,7 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
if let orderId = Int(msg.orderId) { if let orderId = Int(msg.orderId) {
let vc = YHResinMaterialManageContainerVC() let vc = YHResinMaterialManageContainerVC()
vc.orderId = orderId vc.orderId = orderId
vc.id = self.serviceCenterViewModel.mainModel.master_id vc.batchId = self.serviceCenterViewModel.mainModel.master_id
navigationController?.pushViewController(vc) navigationController?.pushViewController(vc)
} }
......
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