Skip to content

G
galaxy-iOS
Commit e4613f9f authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

// 证件上传参数优化

parent 918e99ad
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 31 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateListVC.swift
View file @ e4613f9f
......@@ -118,9 +118,9 @@ extension YHCertificateListVC: UITableViewDelegate, UITableViewDataSource {
}
// 非待上传的进入详情
let vc = YHCertificateUploadContentListVC()
vc.orderId = orderId
vc.categoryInfo = categoryInfo
vc.supplementInfo = item
vc.orderId = orderId ?? 0
vc.categoryId = categoryInfo.categoryId
vc.supplementId = item.id
self.navigationController?.pushViewController(vc)
}
}
......@@ -298,9 +298,9 @@ extension YHCertificateListVC {
// 待上传的进入详情
DispatchQueue.main.async {
let vc = YHCertificateUploadContentListVC()
vc.orderId = self.orderId
vc.categoryInfo = self.categoryInfo
vc.supplementInfo = supplementInfo
vc.orderId = self.orderId ?? 0
vc.categoryId = self.categoryInfo.categoryId
vc.supplementId = supplementInfo.id
self.navigationController?.pushViewController(vc)
}
}
......@@ -347,9 +347,9 @@ extension YHCertificateListVC {
YHHUD.flash(message: "\(ossArr.count)张照片上传成功\n\(targetImgArr.count-ossArr.count)张照片上传失败")
}
let vc = YHCertificateUploadContentListVC()
vc.orderId = self.orderId
vc.categoryInfo = self.categoryInfo
vc.supplementInfo = supplementInfo
vc.orderId = self.orderId ?? 0
vc.categoryId = self.categoryInfo.categoryId
vc.supplementId = supplementInfo.id
self.navigationController?.pushViewController(vc)
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateSearchViewController.swift
View file @ e4613f9f
......@@ -155,9 +155,9 @@ extension YHCertificateSearchViewController: UITableViewDelegate, UITableViewDat
}
// 非待上传的进入详情
let vc = YHCertificateUploadContentListVC()
vc.orderId = orderId
vc.categoryInfo = categoryInfo
vc.supplementInfo = item
vc.orderId = orderId ?? 0
vc.categoryId = self.categoryInfo?.categoryId ?? 0
vc.supplementId = item.id
self.navigationController?.pushViewController(vc)
}
}
......@@ -311,9 +311,9 @@ extension YHCertificateSearchViewController {
// 待上传的进入详情
DispatchQueue.main.async {
let vc = YHCertificateUploadContentListVC()
vc.orderId = self.orderId
vc.categoryInfo = self.categoryInfo
vc.supplementInfo = supplementInfo
vc.orderId = self.orderId ?? 0
vc.categoryId = self.categoryInfo?.categoryId ?? 0
vc.supplementId = supplementInfo.id
self.navigationController?.pushViewController(vc)
}
}
......@@ -356,9 +356,9 @@ extension YHCertificateSearchViewController {
if success {
let vc = YHCertificateUploadContentListVC()
vc.orderId = self.orderId
vc.categoryInfo = self.categoryInfo
vc.supplementInfo = supplementInfo
vc.orderId = self.orderId ?? 0
vc.categoryId = self.categoryInfo?.categoryId ?? 0
vc.supplementId = supplementInfo.id
self.navigationController?.pushViewController(vc)
if ossArr.count == targetImgArr.count {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHCertificateUploadContentListVC.swift
View file @ e4613f9f
......@@ -12,23 +12,25 @@ import AttributedString
class YHCertificateUploadContentListVC: YHBaseViewController {
var orderId : Int!
var categoryInfo: YHCategoryData!
var supplementInfo: YHSupplementInfo! {
// 进入该页面以下三个参数必传
var orderId : Int = 0
var categoryId: Int = 0
var supplementId: Int = 0
private var categoryInfo = YHCategoryData()
private var supplementInfo = YHSupplementInfo() {
didSet {
templateArr.removeAll()
if let uploadInfo = supplementInfo {
if uploadInfo.templateInfo.materialPath.count > 0 {
let template = uploadInfo.templateInfo.materialPath[0]
if supplementInfo.templateInfo.materialPath.count > 0 {
let template = supplementInfo.templateInfo.materialPath[0]
template.type = 0
templateArr.append(template)
}
if uploadInfo.templateInfo.guideFilePath.count > 0 {
let guide = uploadInfo.templateInfo.guideFilePath[0]
if supplementInfo.templateInfo.guideFilePath.count > 0 {
let guide = supplementInfo.templateInfo.guideFilePath[0]
guide.type = 1
templateArr.append(guide)
}
}
self.tableView.reloadData()
}
}
......@@ -95,7 +97,9 @@ class YHCertificateUploadContentListVC: YHBaseViewController {
createUI()
items.removeAll()
items.append(contentsOf: supplementInfo.contentUrl)
if supplementInfo.contentUrl.count > 0 {
items.append(contentsOf: supplementInfo.contentUrl)
}
tableView.reloadData()
requestList()
......@@ -614,11 +618,11 @@ extension YHCertificateUploadContentListVC {
func requestList() {
let params:[String:Any] = [
"order_id" : orderId ?? 0,
"order_id" : orderId,
"node": "1",
"state": "1",
"category_id": categoryInfo.categoryId,
"supplement_ids": supplementInfo.id]
"category_id": categoryId,
"supplement_ids": supplementId]
print(params)
viewModel.getCertificateList(params: params) {
......
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