Commit eb811129 authored by pete谢兆麟's avatar pete谢兆麟

细节修改

parent 523f1bb2
...@@ -122,7 +122,6 @@ class YHTwoOptionAlertView: UIView { ...@@ -122,7 +122,6 @@ class YHTwoOptionAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -174,7 +174,6 @@ class YHAgreementAlertView: UIView { ...@@ -174,7 +174,6 @@ class YHAgreementAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -159,7 +159,6 @@ class YHServiceOrderAlertView: UIView { ...@@ -159,7 +159,6 @@ class YHServiceOrderAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -243,6 +243,7 @@ extension YHServiceCenterViewController { ...@@ -243,6 +243,7 @@ extension YHServiceCenterViewController {
self.model = model self.model = model
self.state = 0 self.state = 0
self.headIndex = 0 self.headIndex = 0
self.isCanSelectStep = false
} }
self.navigationController?.pushViewController(vc) self.navigationController?.pushViewController(vc)
} else { } else {
......
...@@ -62,6 +62,8 @@ extension YHServiceOrderListView { ...@@ -62,6 +62,8 @@ extension YHServiceOrderListView {
array.append(item) array.append(item)
} else if item.status == type { } else if item.status == type {
array.append(item) array.append(item)
} else if item.status == 4, type == 2 {
array.append(item)
} }
} }
self.arrDataForSeviceCenterProgress = array self.arrDataForSeviceCenterProgress = array
...@@ -252,7 +254,6 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource { ...@@ -252,7 +254,6 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
} else if model.type == 6 { } else if model.type == 6 {
let vc = YHMyDocumentsListViewController() let vc = YHMyDocumentsListViewController()
vc.orderId = orderID vc.orderId = orderID
vc.mobile = mobile
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
} else if model.type == 11 || model.type == 12 || model.type == 14 { } else if model.type == 11 || model.type == 12 || model.type == 14 {
......
...@@ -209,7 +209,6 @@ class YHAdopterCardExampleView: UIView { ...@@ -209,7 +209,6 @@ class YHAdopterCardExampleView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -110,7 +110,6 @@ class YHNoAdopterAlertView: UIView, UIGestureRecognizerDelegate { ...@@ -110,7 +110,6 @@ class YHNoAdopterAlertView: UIView, UIGestureRecognizerDelegate {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -16,7 +16,6 @@ class YHMyDocumentsListViewController: YHBaseViewController { ...@@ -16,7 +16,6 @@ class YHMyDocumentsListViewController: YHBaseViewController {
var tableView: UITableView! var tableView: UITableView!
var viewModel: YHMyDocumentsListViewModel? var viewModel: YHMyDocumentsListViewModel?
var orderId: Int = 0 var orderId: Int = 0
var mobile: String = ""
var arrIDs : [Int] = []//保存所有下载的id var arrIDs : [Int] = []//保存所有下载的id
//是否展示下载全部按钮 //是否展示下载全部按钮
var canSendEmailFlag : Bool = false { var canSendEmailFlag : Bool = false {
...@@ -89,7 +88,7 @@ extension YHMyDocumentsListViewController { ...@@ -89,7 +88,7 @@ extension YHMyDocumentsListViewController {
} }
func getData() { func getData() {
viewModel?.requestDocumentsList("\(orderId)", mobile, callBackBlock: {[weak self] success, error in viewModel?.requestDocumentsList("\(orderId)", callBackBlock: {[weak self] success, error in
guard let self = self else { return } guard let self = self else { return }
if success { if success {
guard let arr = self.viewModel?.mainModel?.docs else { return } guard let arr = self.viewModel?.mainModel?.docs else { return }
......
...@@ -183,7 +183,6 @@ class YHCheckEamilAlertView: UIView { ...@@ -183,7 +183,6 @@ class YHCheckEamilAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -12,9 +12,8 @@ class YHMyDocumentsListViewModel: YHBaseViewModel { ...@@ -12,9 +12,8 @@ class YHMyDocumentsListViewModel: YHBaseViewModel {
var mainModel: YHMyDocumentsModel? var mainModel: YHMyDocumentsModel?
// 请求文书列表 // 请求文书列表
func requestDocumentsList(_ orderId: String, _ mobile: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) { func requestDocumentsList(_ orderId: String, callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderId, let params: [String : Any] = ["order_id": orderId]
"mobile": mobile]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.listApi let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Documents.listApi
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
......
...@@ -234,7 +234,6 @@ class YHCommonAlertView: UIView { ...@@ -234,7 +234,6 @@ class YHCommonAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
if isFullGuestureEnabel { if isFullGuestureEnabel {
dismiss() dismiss()
} }
......
...@@ -256,7 +256,6 @@ class YHSignAppendStepView: UIView { ...@@ -256,7 +256,6 @@ class YHSignAppendStepView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -84,6 +84,9 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie ...@@ -84,6 +84,9 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie
cell.dataSource = model cell.dataSource = model
cell.clickBlock = { [weak self] model in cell.clickBlock = { [weak self] model in
guard let self = self else { return } guard let self = self else { return }
if model.age < 11 {
return
}
if indexPath.row == 0 { if indexPath.row == 0 {
if model.cert_type == "PASS_PORT" { if model.cert_type == "PASS_PORT" {
let vc = YHResignCertificateDetailPassPortViewController() let vc = YHResignCertificateDetailPassPortViewController()
......
...@@ -230,7 +230,7 @@ class YHResignCertificateView: UIView { ...@@ -230,7 +230,7 @@ class YHResignCertificateView: UIView {
explainLabel.textColor = UIColor(hex: 0x3cc694) explainLabel.textColor = UIColor(hex: 0x3cc694)
nextStepImageView.image = UIImage(named: "service_adopter_income_success") nextStepImageView.image = UIImage(named: "service_adopter_income_success")
} }
if dataSource.age < 12 { if dataSource.age < 11 {
explainLabel.text = "无需提供" explainLabel.text = "无需提供"
explainLabel.textColor = UIColor.mainTextColor18 explainLabel.textColor = UIColor.mainTextColor18
nextStepImageView.isHidden = true nextStepImageView.isHidden = true
...@@ -249,13 +249,15 @@ class YHResignCertificateView: UIView { ...@@ -249,13 +249,15 @@ class YHResignCertificateView: UIView {
} }
} }
if dataSource.cert_type == "PASS_PORT" { if dataSource.cert_type == "PASS_PORT" {
subTitleLabel.text = "(护照入境)" subTitleLabel.text = " (护照入境)"
} else if dataSource.cert_type == "HK_PASS_PORT" { } else if dataSource.cert_type == "HK_PASS_PORT" {
subTitleLabel.text = "(港澳通行证入境)" subTitleLabel.text = " (港澳通行证入境)"
} else { } else {
subTitleLabel.text = "" subTitleLabel.text = ""
} }
if dataSource.age < 11 {
subTitleLabel.text = " (未满11岁)"
}
} }
......
...@@ -206,7 +206,6 @@ class YHCardExampleView: UIView { ...@@ -206,7 +206,6 @@ class YHCardExampleView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -189,7 +189,6 @@ class YHDatePickView: UIView { ...@@ -189,7 +189,6 @@ class YHDatePickView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -213,7 +213,6 @@ class YHImagePickerView: UIView { ...@@ -213,7 +213,6 @@ class YHImagePickerView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -165,7 +165,6 @@ class YHSelectFileSheetView: UIView { ...@@ -165,7 +165,6 @@ class YHSelectFileSheetView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -111,7 +111,6 @@ class YHServiceMoreAlertView: UIView { ...@@ -111,7 +111,6 @@ class YHServiceMoreAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -111,7 +111,6 @@ class YHServiceStepAlertView: UIView { ...@@ -111,7 +111,6 @@ class YHServiceStepAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -195,7 +195,6 @@ class YHSubmintAllInfoSuccessTipView: UIView { ...@@ -195,7 +195,6 @@ class YHSubmintAllInfoSuccessTipView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -123,7 +123,6 @@ class YHSubmitAllInfoCheckView: UIView { ...@@ -123,7 +123,6 @@ class YHSubmitAllInfoCheckView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -61,7 +61,6 @@ class YHLoginOneLeadView: UIView { ...@@ -61,7 +61,6 @@ class YHLoginOneLeadView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
...@@ -127,7 +127,6 @@ class YHPrivacyAlertView: UIView { ...@@ -127,7 +127,6 @@ class YHPrivacyAlertView: UIView {
} }
@objc private func handleTap(_ sender: AnyObject?) { @objc private func handleTap(_ sender: AnyObject?) {
print("处理点击手势")
dismiss() dismiss()
} }
......
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