Skip to content

G
galaxy-iOS
Commit b1d9c069 authored by David黄金龙's avatar David黄金龙
Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop 

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  // sheetView
  // 证书上传sheetView
  123
  我的签字详情接口调试

# Conflicts:
#	galaxy/galaxy.xcodeproj/project.pbxproj
parents fa0cfa66 4e278faa
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1166 additions and 925 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ b1d9c069
This source diff could not be displayed because it is too large. You can view the blob instead.
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift
View file @ b1d9c069
......@@ -179,6 +179,7 @@ extension YHServiceCenterMainViewController : UITableViewDelegate,UITableViewDat
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
tableView.deselectRow(at: indexPath, animated: true)
printLog("点击了 tableView Cell \(indexPath.section)")
//获取订单号
let orderId = serviceCenterMainReqVM.arrContactList[indexPath.section].id
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/C/YHMySignatureDetailViewController.swift 0 → 100644
View file @ b1d9c069
//
// YHMySignatureDetailViewController.swift
// galaxy
//
// Created by EDY on 2024/3/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHMySignatureDetailViewController: YHBaseViewController {
var bottomView: UIView!
var bottomButton: UIButton!
var tableView: UITableView!
var dataSource: [YHWorkItemListModel]?
var viewModel: YHMySignatureDetailViewModel?
var id: Int = 0
override func viewDidLoad() {
super.viewDidLoad()
viewModel = YHMySignatureDetailViewModel()
gk_navTitle = "我的签字"
setView()
getData()
// Do any additional setup after loading the view.
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
getData()
}
func getData() {
viewModel?.requestSignatureDetail("\(id)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.tableView.reloadData()
})
}
func updateDataSource() {
self.tableView.reloadData()
}
func setView() {
tableView = {
let tableView = UITableView(frame:.zero, style:.plain)
if #available(iOS 11.0, *) {
tableView.contentInsetAdjustmentBehavior = .never
}
tableView.backgroundColor = .clear
tableView.separatorStyle = .none
tableView.delegate = self
tableView.dataSource = self
tableView.register(cellWithClass: YHMySignatureListTableViewCell.self)
return tableView
}()
view.addSubview(tableView)
tableView.snp.makeConstraints { make in
make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
make.bottom.equalTo(-k_Height_safeAreaInsetsBottom() - 64)
make.left.right.bottom.equalTo(view)
}
bottomView = {
let bottom = UIView()
bottom.backgroundColor = .white
return bottom
}()
view.addSubview(bottomView)
bottomView.snp.makeConstraints { make in
make.left.right.bottom.equalToSuperview()
make.height.equalTo(k_Height_safeAreaInsetsBottom() + 64)
}
bottomButton = {
let button = UIButton(type: .custom)
// button.backgroundColor = UIColor(hex:0x2274ee)
button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
button.contentHorizontalAlignment = .center
button.setTitle("提交", for: .normal)
button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
button.layer.cornerRadius = kCornerRadius6
button.clipsToBounds = true
button.addTarget(self, action: #selector(submit), for: .touchUpInside)
return button
}()
bottomView.addSubview(bottomButton)
bottomButton.snp.makeConstraints { make in
make.right.equalTo(-16)
make.top.equalTo(8)
make.height.equalTo(48)
make.left.equalTo(16)
}
bottomButton.layoutIfNeeded()
bottomButton.addYinHeGradualLayer()
}
@objc func submit() {
}
}
extension YHMySignatureDetailViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHMySignatureListTableViewCell.self)
cell.backgroundColor = .clear
cell.contentView.backgroundColor = .clear
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return CGFloat(82)
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/C/YHMySignatureListViewController.swift
View file @ b1d9c069
......@@ -14,9 +14,7 @@ class YHMySignatureListViewController: YHBaseViewController {
var tableView: UITableView!
var dataSource: [YHWorkItemListModel]?
var viewModel: YHMySignatureListViewModel?
var isMore: Bool = false
var orderId: Int = 0
var showPrompt: Bool = false
override func viewDidLoad() {
super.viewDidLoad()
viewModel = YHMySignatureListViewModel()
......@@ -34,6 +32,7 @@ class YHMySignatureListViewController: YHBaseViewController {
func getData() {
viewModel?.requestSignatureList("\(orderId)", callBackBlock: {[weak self] success, error in
guard let self = self else { return }
self.tableView.reloadData()
})
}
......@@ -104,11 +103,12 @@ class YHMySignatureListViewController: YHBaseViewController {
extension YHMySignatureListViewController: UITableViewDelegate, UITableViewDataSource {
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
return 1
return viewModel?.mainModel?.list.count ?? 0
}
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
let cell = tableView.dequeueReusableCell(withClass: YHMySignatureListTableViewCell.self)
cell.dataSource = viewModel?.mainModel?.list[indexPath.row]
cell.backgroundColor = .clear
cell.contentView.backgroundColor = .clear
return cell
......@@ -117,5 +117,12 @@ extension YHMySignatureListViewController: UITableViewDelegate, UITableViewDataS
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
return CGFloat(82)
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let model = viewModel?.mainModel?.list[indexPath.row]
let vc = YHMySignatureDetailViewController()
vc.id = model?.id ?? 0
self.navigationController?.pushViewController(vc)
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/Model/YHMySignatureDetailModel.swift 0 → 100644
View file @ b1d9c069
//
// YHMySignatureDetailModel.swift
// galaxy
//
// Created by EDY on 2024/3/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHMySignatureDetailModel: YHBaseModel {
var id: Int = 0
var order_id: Int = 0
var doc_type: Int = 0
var doc_send: String = ""
var doc_type_name: String = ""
var doc_return: [String] = []
var doc_return_manual: [String] = []
var is_upload: Int = 0
var is_show_button: Bool = false
var status: Int = 0
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/V/YHMySignatureListTableViewCell.swift
View file @ b1d9c069
......@@ -12,6 +12,11 @@ class YHMySignatureListTableViewCell: UITableViewCell {
var centerView: UIView!
var titleLabel: UILabel!
var subTitleLabel: UILabel!
var dataSource: YHMySignatureModel? {
didSet {
updateAllViews()
}
}
override func awakeFromNib() {
super.awakeFromNib()
......@@ -53,7 +58,6 @@ class YHMySignatureListTableViewCell: UITableViewCell {
titleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_M(ofSize: 17)
label.text = "主申请人工作经历"
label.textColor = UIColor.mainTextColor
return label
}()
......@@ -67,7 +71,6 @@ class YHMySignatureListTableViewCell: UITableViewCell {
subTitleLabel = {
let label = UILabel()
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "(从最近一份全职工作开始，直至毕业后的第一份工作）"
label.textColor = UIColor.labelTextColor2
label.textAlignment = .right
return label
......@@ -82,7 +85,9 @@ class YHMySignatureListTableViewCell: UITableViewCell {
}
func updateAllViews() {
guard let dataSource = dataSource else { return }
titleLabel.text = dataSource.doc_name
subTitleLabel.text = "\(dataSource.doc_type)"
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/VM/YHMySignatureDetailViewModel.swift 0 → 100644
View file @ b1d9c069
//
// YHMySignatureDetailViewModel.swift
// galaxy
//
// Created by EDY on 2024/3/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHMySignatureDetailViewModel: YHBaseViewModel {
var mainModel: YHMySignatureDetailModel?
override init() {
super.init()
}
func requestSignatureDetail(_ id: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
// let params: [String : Any] = ["order_id": orderId]
let params: [String : Any] = ["id": id]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.detail
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHMySignatureDetailModel.deserialize(from: dic as? Dictionary) else {
callBackBlock(false,nil)
return
}
self.mainModel = result
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
callBackBlock(false, error)
}
} failBlock: { err in
callBackBlock(false, err)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MySignature(我的签字)/VM/YHMySignatureListViewModel.swift
View file @ b1d9c069
......@@ -10,25 +10,26 @@ import UIKit
class YHMySignatureListViewModel: YHBaseViewModel {
var mainModel: [YHWorkItemListModel]?
var mainModel: YHMySignatureListModel?
override init() {
super.init()
}
func requestSignatureList(_ orderId: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
let params: [String : Any] = ["order_id": orderId]
// let params: [String : Any] = ["order_id": orderId]
let params: [String : Any] = ["order_id": 134154]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.list
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in
let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
if json.code == 200 {
let dic = json.data
guard let result = YHWorkModel.deserialize(from: dic as? Dictionary) else {
guard let result = YHMySignatureListModel.deserialize(from: dic as? Dictionary) else {
callBackBlock(false,nil)
return
}
self.mainModel = result.list
self.mainModel = result
callBackBlock(true, nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ b1d9c069
......@@ -179,7 +179,8 @@ class YHAllApiName {
struct Signature {
// 签字列表
static let list = "/infoflow/my-sign/list"
static let list = "infoflow/my-sign/list"
// 签字详情
static let detail = "infoflow/my-sign/detail"
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_sheet_close.imageset/Contents.json 0 → 100644
View file @ b1d9c069
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Group 2848@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Group 2848@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/我的证书/my_cer_template.imageset/Contents.json 0 → 100644
View file @ b1d9c069
{
"images" : [
{
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "Frame@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "Frame@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
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