Skip to content

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

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

parents 798eb99c 2f23ec49
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 82 deletions
galaxy/galaxy/Classes/Modules/Home(首页)/Life(生活)/V/YHlifeCollectionReusableView.swift
View file @ e941779c
......@@ -325,7 +325,9 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
}
@objc func actionClick() {
actionButton.isSelected = true
if actionButton.isSelected {
return
}
viewModel.postLiveBook(id: dataSource?.live_id ?? 0) { success, error in
if success {
YHHUD.flash(message: "预约成功")
......@@ -333,6 +335,6 @@ class YHlifeCollectionReusableViewTableViewCell: UITableViewCell {
YHHUD.flash(message: "预约失败")
}
}
actionButton.isSelected = true
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHInformationPerfectListVC.swift
View file @ e941779c
......@@ -268,7 +268,7 @@ extension YHInformationPerfectListVC {
YHMyNewSchemeViewController.shared.goToSchemePage()
} else if serviceCenterMainReqVM.application_type == 1 || serviceCenterMainReqVM.application_type == 2 || serviceCenterMainReqVM.application_type == 3 { // 高才ABC
let vc = YHGCMineSchemeViewController()
let vc = YHGCMineSchemeViewController(orderId: orderId ?? 0)
navigationController?.pushViewController(vc)
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceCenterViewController.swift
View file @ e941779c
......@@ -238,8 +238,10 @@ extension YHServiceCenterViewController {
}
@objc func pushOrderView() {
let flag = false
var flag = false
if self.state == 1 {
flag = true
}
YHServiceMoreAlertView.show(flag) {[weak self] index in
guard let self = self else { return }
if index == 1 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/OrderList(服务订单)/C/YHServiceOrderListViewController.swift
View file @ e941779c
......@@ -283,7 +283,7 @@ class YHServiceOrderListViewController: YHBaseViewController {
} else if type == 202 {
//高才我的方案
let vc = YHGCMineSchemeViewController()
let vc = YHGCMineSchemeViewController(orderId: orderId)
UIViewController.current?.navigationController?.pushViewController(vc)
} else if type == 203 {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/C/YHGCMineSchemeViewController.swift
View file @ e941779c
......@@ -37,6 +37,15 @@ class YHGCMineSchemeViewController: YHBaseViewController {
override var preferredStatusBarStyle: UIStatusBarStyle {
return .lightContent
}
private let orderId: Int
init(orderId: Int) {
self.orderId = orderId
super.init(nibName: nil, bundle: nil)
}
@MainActor required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
}
extension YHGCMineSchemeViewController: UITableViewDelegate, UITableViewDataSource {
......@@ -51,42 +60,29 @@ extension YHGCMineSchemeViewController: UITableViewDelegate, UITableViewDataSour
let cell = tableView.dequeueReusableCell(withClass: YHGCSchemeTableViewCell.self)
let model = dataSource[indexPath.row]
cell.dataSource = model
cell.schemeBlock = {
/*
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview"), model.title == "资料清单" {
let vc = YHMineCertificateEntryViewController()
vc.orderId = orderID as? Int ?? 0
UIViewController.current?.navigationController?.pushViewController(vc)
cell.schemeBlock = { [weak self] in
guard let self = self else {
return
}
if model.title == "资料清单" {
if self.reqSchemeVM.schemeModel?.certificate_skip_status == true {
let vc = YHMineCertificateEntryViewController()
vc.orderId = orderId
self.navigationController?.pushViewController(vc)
} else {
YHHUD.flash(message: "您的资料清单正在准备中，请耐心等待。")
}
}
*/
}
return cell
}
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.row == 0 {
return 199
} else if indexPath.row == 1 {
return 251
} else if indexPath.row == 2 {
return 190
}
return 0
return UITableView.automaticDimension
}
}
extension YHGCMineSchemeViewController {
func getData() {
let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：\n商业及贸易\n", lightMessage: "\n商业及贸易\n", subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。")
let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "(1)港澳通如未办理，请尽快办理好反馈过来；\n(2)如为国内学校，需要尽快办理学位认证报告；\n(3)如为海外学校，需提供成绩单副本")
let model3 = YHScemeItemModel(title: "文书清单", buttonTitle: "文书写作", mainMessage: "这是您的文书清单，包括推荐信、赴港计划书，我写好后会发在微信里，与您一起沟通进行哈。3周-4周左右完成，需要咱们共同配合完成的噢", lightMessage: "3周-4周")
dataSource = [model1, model2, model3]
tableView.reloadData()
}
func updateDataSource() {
}
func setView() {
view.backgroundColor = .contentBkgColor
tableView = {
......@@ -113,31 +109,27 @@ extension YHGCMineSchemeViewController {
}
func loadData() {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
let param = ["order_id": orderID]
reqSchemeVM.getMySchemeData(params: param) { [weak self] success, error in
guard let self = self else {
return
}
if success == true {
guard let model = self.reqSchemeVM.schemeModel else { return }
let param = ["order_id": orderId]
reqSchemeVM.getMySchemeData(params: param) { [weak self] success, error in
guard let self = self else {
return
}
if success == true {
guard let model = self.reqSchemeVM.schemeModel else { return }
let industry = model.industry.defaultStringIfEmpty()
let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：" + industry, lightMessage: industry, subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。", lightFont: UIFont.PFSC_B(ofSize: 16), hideTopLine: true)
let contentStr = model.content.reduce("") { partialResult, current in
partialResult.count > 0 ? partialResult + "\n" + current : partialResult + current
}
let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "按照您填报的学历信息， 证明文件如下：\(contentStr)")
self.dataSource = [model1, model2]
self.tableView.reloadData()
let type = YHGCApplicationType(rawValue: model.application_type) ?? .typeA
self.headView.update(type: type, name: model.username.defaultStringIfEmpty())
} else {
YHHUD.flash(message: error?.errorMsg ?? "请求出错")
let industry = model.industry.defaultStringIfEmpty()
let model1 = YHScemeItemModel(title: "职业界别", mainMessage: "根据您目前给来的材料，初步建议您申请的行业：\n" + industry, lightMessage: industry, subMessage: "后续会根据您文书准备的补充情况来最终确定，如有修改会再告知您。", lightFont: UIFont.PFSC_B(ofSize: 16))
let contentStr = model.content.reduce("") { partialResult, current in
partialResult.count > 0 ? partialResult + "\n" + current : partialResult + current
}
let model2 = YHScemeItemModel(title: "资料清单", buttonTitle: "资料清单", mainMessage: "这是您的资料清单，请您前往查看。请您在1-2周内上传基础类证件哦，需要重新办理的可以晚些提供。需要注意的点如下：", lightMessage: "1-2周内", subMessage: "按照您填报的学历信息， 证明文件如下：\(contentStr)")
self.dataSource = [model1, model2]
self.tableView.reloadData()
let type = YHGCApplicationType(rawValue: model.application_type) ?? .typeA
self.headView.update(type: type, name: model.username.defaultStringIfEmpty())
} else {
YHHUD.flash(message: error?.errorMsg ?? "请求出错")
}
} else {
printLog("error : orderID 为空")
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/M/YHGCMySchemeModel.swift
View file @ e941779c
......@@ -15,6 +15,7 @@ class YHGCMySchemeModel: SmartCodable {
var username : String = ""
var sex: Int = 0
var content: [String] = []
var certificate_skip_status: Bool = false
required init() {
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/V/YHGCSchemeTableHeadView.swift
View file @ e941779c
......@@ -68,7 +68,7 @@ class YHGCSchemeTableHeadView: UIView {
private lazy var titleCoverView: UIView = {
let view = UIView()
view.backgroundColor = .white
view.backgroundColor = .clear
return view
}()
......@@ -120,12 +120,6 @@ class YHGCSchemeTableHeadView: UIView {
return label
}()
private lazy var dashLineView: UIImageView = {
let view = UIImageView()
view.image = UIImage(named: "scheme_line_image")
return view
}()
override init(frame: CGRect) {
super.init(frame: frame)
backgroundColor = UIColor(hex: 0x070E33)
......@@ -158,7 +152,6 @@ class YHGCSchemeTableHeadView: UIView {
subContainerView.addSubview(applicationTypeResultLabel)
addSubview(dotView)
addSubview(infoDetailLabel)
addSubview(dashLineView)
centerImageView.snp.makeConstraints { make in
make.left.right.top.equalToSuperview()
make.height.equalTo(416)
......@@ -206,16 +199,10 @@ class YHGCSchemeTableHeadView: UIView {
make.top.equalTo(147)
}
dashLineView.snp.makeConstraints { make in
titleCoverView.snp.makeConstraints { make in
make.left.equalTo(28)
make.right.equalToSuperview().offset(-28)
make.top.equalTo(234)
make.height.equalTo(1)
}
titleCoverView.snp.makeConstraints { make in
make.left.right.equalTo(dashLineView)
make.top.equalTo(dashLineView.snp.bottom).offset(26)
make.height.equalTo(44)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/TTPS(高才)/MyScheme(我的方案)/V/YHGCSchemeTableViewCell.swift
View file @ e941779c
......@@ -98,14 +98,24 @@ class YHGCSchemeTableViewCell: UITableViewCell {
private func setupLayout() {
// Center View
contentView.addSubview(centerView)
// Line Image View
contentView.addSubview(lineImageView)
// Title View
contentView.addSubview(titleView)
// Title Label
centerView.addSubview(titleLabel)
// Title Button
centerView.addSubview(titleButton)
// Main Message Label
centerView.addSubview(mainMessageLabel)
// Sub Message Label
centerView.addSubview(subMessageLabel)
centerView.snp.makeConstraints { make in
make.left.equalTo(8)
make.right.equalTo(-8)
make.top.bottom.equalToSuperview()
}
// Line Image View
contentView.addSubview(lineImageView)
lineImageView.snp.makeConstraints { make in
make.left.equalTo(28)
make.top.equalTo(0)
......@@ -113,8 +123,6 @@ class YHGCSchemeTableViewCell: UITableViewCell {
make.right.equalTo(-28)
}
// Title View
contentView.addSubview(titleView)
titleView.snp.makeConstraints { make in
make.left.equalTo(28)
make.top.equalTo(29)
......@@ -122,17 +130,13 @@ class YHGCSchemeTableViewCell: UITableViewCell {
make.width.equalTo(3.5)
}
// Title Label
centerView.addSubview(titleLabel)
titleLabel.snp.makeConstraints { make in
make.centerY.equalTo(titleView)
make.left.equalTo(titleView.snp.right).offset(4)
make.height.equalTo(24)
make.width.equalTo(150)
}
// Title Button
centerView.addSubview(titleButton)
titleButton.snp.makeConstraints { make in
make.centerY.equalTo(titleView)
make.right.equalTo(-28)
......@@ -140,20 +144,17 @@ class YHGCSchemeTableViewCell: UITableViewCell {
make.width.equalTo(76)
}
// Main Message Label
centerView.addSubview(mainMessageLabel)
mainMessageLabel.snp.makeConstraints { make in
make.top.equalTo(69)
make.left.equalTo(28)
make.right.equalTo(-28)
}
// Sub Message Label
centerView.addSubview(subMessageLabel)
subMessageLabel.snp.makeConstraints { make in
make.top.equalTo(mainMessageLabel.snp.bottom).offset(12)
make.left.equalTo(28)
make.right.equalTo(-28)
make.bottom.equalToSuperview().offset(-26)
}
}
......
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