Skip to content

G
galaxy-iOS
Commit cfec4509 authored by Alex朱枝文's avatar Alex朱枝文
Browse files
Options

续签申请缴费调整

parent 7efc138d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 143 additions and 0 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ cfec4509
......@@ -36,6 +36,8 @@
0411CF1A2D22960900644D35 /* YHGCWorkExperienceListReasonTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF192D22960900644D35 /* YHGCWorkExperienceListReasonTableViewCell.swift */; };
0411CF1C2D2BA99500644D35 /* YHGCWorkExperienceListTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0411CF1B2D2BA99500644D35 /* YHGCWorkExperienceListTableViewCell.swift */; };
041938712D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041938702D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift */; };
041CCDF72D7ED9030015E7BC /* YHHKVisaRenewalPaymentInfoList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041CCDF62D7ED9030015E7BC /* YHHKVisaRenewalPaymentInfoList.swift */; };
041CCDF92D7EE8B90015E7BC /* YHVisaRenewalPayMemberCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 041CCDF82D7EE8B90015E7BC /* YHVisaRenewalPayMemberCell.swift */; };
04307B662D1942F500ED8E8D /* YHDynamicSheetPickerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B652D1942F500ED8E8D /* YHDynamicSheetPickerView.swift */; };
04307B682D19911800ED8E8D /* YHIncomeInfoEditCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B672D19911800ED8E8D /* YHIncomeInfoEditCell.swift */; };
04307B6A2D1A4C6500ED8E8D /* YHIncomeInfoSelectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04307B692D1A4C6500ED8E8D /* YHIncomeInfoSelectCell.swift */; };
......@@ -1286,6 +1288,8 @@
0411CF192D22960900644D35 /* YHGCWorkExperienceListReasonTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkExperienceListReasonTableViewCell.swift; sourceTree = "<group>"; };
0411CF1B2D2BA99500644D35 /* YHGCWorkExperienceListTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCWorkExperienceListTableViewCell.swift; sourceTree = "<group>"; };
041938702D2B722D00C7A52A /* YHGCCollegeSearchViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHGCCollegeSearchViewController.swift; sourceTree = "<group>"; };
041CCDF62D7ED9030015E7BC /* YHHKVisaRenewalPaymentInfoList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHKVisaRenewalPaymentInfoList.swift; sourceTree = "<group>"; };
041CCDF82D7EE8B90015E7BC /* YHVisaRenewalPayMemberCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHVisaRenewalPayMemberCell.swift; sourceTree = "<group>"; };
04307B652D1942F500ED8E8D /* YHDynamicSheetPickerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDynamicSheetPickerView.swift; sourceTree = "<group>"; };
04307B672D19911800ED8E8D /* YHIncomeInfoEditCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHIncomeInfoEditCell.swift; sourceTree = "<group>"; };
04307B692D1A4C6500ED8E8D /* YHIncomeInfoSelectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHIncomeInfoSelectCell.swift; sourceTree = "<group>"; };
......@@ -4335,6 +4339,7 @@
isa = PBXGroup;
children = (
045C0CB42D12CA5E00BD2DC0 /* YHHKVisaRenewalPaymentList.swift */,
041CCDF62D7ED9030015E7BC /* YHHKVisaRenewalPaymentInfoList.swift */,
045C0CB52D12CA5E00BD2DC0 /* YHHKVisaRenewalPersonType.swift */,
045C0CB62D12CA5E00BD2DC0 /* YHVisaRenewalItemDetailType.swift */,
045C0CB72D12CA5E00BD2DC0 /* YHVisaRenewalPaymentStatus.swift */,
......@@ -4361,6 +4366,7 @@
045C0CC62D12CA5E00BD2DC0 /* YHVisaRenewalPayMethodQrcodeCell.swift */,
045C0CC72D12CA5E00BD2DC0 /* YHVisaRenewalPayMethodUrlCell.swift */,
045C0CC82D12CA5E00BD2DC0 /* YHVisaRenewalPayOccupyingSpaceCell.swift */,
041CCDF82D7EE8B90015E7BC /* YHVisaRenewalPayMemberCell.swift */,
045C0CC92D12CA5E00BD2DC0 /* YHVisaRenewalPayStatusCell.swift */,
045C0CCA2D12CA5E00BD2DC0 /* YHVisaRenewalPayTipsCell.swift */,
045C0CCB2D12CA5E00BD2DC0 /* YHVisaRenewalResidenceActionCell.swift */,
......@@ -7298,6 +7304,7 @@
045C111B2D12CA5F00BD2DC0 /* YHSegmentView.swift in Sources */,
045C111C2D12CA5F00BD2DC0 /* YHCertificateFilterView.swift in Sources */,
045C111D2D12CA5F00BD2DC0 /* YHResignInfoValidTimeItemView.swift in Sources */,
041CCDF72D7ED9030015E7BC /* YHHKVisaRenewalPaymentInfoList.swift in Sources */,
045C111E2D12CA5F00BD2DC0 /* YHPreviewAcademicAndProfessionalQualificationViewController.swift in Sources */,
045C111F2D12CA5F00BD2DC0 /* YHWorkExperienceTableViewCell.swift in Sources */,
04307BAA2D1FF74500ED8E8D /* YHRecommendLiveListModel.swift in Sources */,
......@@ -7537,6 +7544,7 @@
045C11EC2D12CA5F00BD2DC0 /* YHMyDocumentsListViewController.swift in Sources */,
045C11ED2D12CA5F00BD2DC0 /* YHCertificateEntryBottomView.swift in Sources */,
045C11EE2D12CA5F00BD2DC0 /* YHAppointItem.swift in Sources */,
041CCDF92D7EE8B90015E7BC /* YHVisaRenewalPayMemberCell.swift in Sources */,
045C11EF2D12CA5F00BD2DC0 /* YHResignUploadTravelCardDetailViewModel.swift in Sources */,
045C11F02D12CA5F00BD2DC0 /* YHFamilyGroupModel.swift in Sources */,
045C11F12D12CA5F00BD2DC0 /* YHHomeAlertViewManager.swift in Sources */,
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/M/YHHKVisaRenewalPaymentInfoList.swift 0 → 100644
View file @ cfec4509
//
// YHHKVisaRenewalPaymentInfoList.swift
// galaxy
//
// Created by alexzzw on 2025/3/10.
// Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
//
import Foundation
import SmartCodable
class YHHKVisaRenewalPaymentInfoList: SmartCodable {
var payment_url: String = ""
var list: [YHHKVisaRenewalPaymentInfoItem] = []
required init() {
}
}
class YHHKVisaRenewalPaymentInfoItem: SmartCodable {
// 用户姓名
var name: String = ""
// 档案号
var file_num: String = ""
// 出生日期
var birthday: String = ""
// 缴费金额,2025-2-26之后的用区间
var fee_money: String = ""
required init() {
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/M/YHVisaRenewalItemDetailType.swift
View file @ cfec4509
......@@ -21,3 +21,13 @@ enum YHVisaRenewalItemDetailType {
case subRemark(_ remark: String)
case occupyingSpace
}
enum YHVisaRenewalInfoItemDetailType {
case sectionHeader(_ title: String, _ actionTitle: String? = nil, _ action: (() -> Void)? = nil)
case payMethodUrl(_ title: String, _ tips: String, _ url: String, _ action: (() -> Void)? = nil)
case payMethodQrcode(_ title: String, _ tips: String, _ qrcodeUrl: String)
case subHeader(_ title: String)
case subInfo(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ defaultMargin: CGFloat? = nil, _ showBottomLine: Bool = false, _ action: (() -> Void)? = nil)
case subContent(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ action: (() -> Void)? = nil)
case occupyingSpace
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/V/YHVisaRenewalPayMemberCell.swift 0 → 100644
View file @ cfec4509
//
// YHVisaRenewalPayMemberCell.swift
// galaxy
//
// Created by alexzzw on 2025/3/10.
// Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHVisaRenewalPayMemberCell: YHResignDocumentCell {
static let cellReuseIdentifier = "YHVisaRenewalPayMemberCell"
private lazy var iconView: UIView = {
let view = UIView()
view.backgroundColor = .brandMainColor
return view
}()
private lazy var infoTitleLabel: UILabel = {
let label = UILabel()
label.font = .PFSC_M(ofSize: 15)
label.textColor = .mainTextColor
return label
}()
override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
super.init(style: style, reuseIdentifier: reuseIdentifier)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
func setupCellInfo(title: String) {
infoTitleLabel.text = title
}
}
extension YHVisaRenewalPayMemberCell {
private func setupUI() {
updateCellCorner(.mid)
subContainerView.addSubview(iconView)
subContainerView.addSubview(infoTitleLabel)
iconView.setContentCompressionResistancePriority(.required, for: .horizontal)
infoTitleLabel.setContentCompressionResistancePriority(.defaultLow, for: .horizontal)
iconView.snp.makeConstraints { make in
make.left.equalToSuperview().offset(18)
make.width.equalTo(4)
make.height.equalTo(15)
make.centerY.equalTo(infoTitleLabel)
}
infoTitleLabel.snp.makeConstraints { make in
make.left.equalTo(iconView.snp.right).offset(12)
make.top.equalToSuperview().offset(20)
make.bottom.equalToSuperview().offset(-16)
make.right.equalToSuperview().offset(-18)
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/VM/YHHKVisaRenewalPaymentViewModel.swift
View file @ cfec4509
......@@ -55,4 +55,30 @@ class YHHKVisaRenewalPaymentViewModel: YHBaseViewModel {
callBackBlock(false, err)
}
}
func getPaymentInfo(id: Int, isEdit: Int, callBackBlock: @escaping (_ paymentListModel: YHHKVisaRenewalPaymentInfoList?, _ error: YHErrorModel?) -> () ) {
let params: [String : Any] = ["id": id,
"is_edit": isEdit
]
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignVisa.paymentInfo
let _ = YHNetRequest.postRequest(url: strUrl, params: params) { json, code in
//1. json字符串 转 对象
printLog("model 是 ==> \(json)")
if json.code == 200 {
guard let dic = json.data?.peel as? [String : Any], let resultModel = YHHKVisaRenewalPaymentInfoList.deserialize(from: dic) else {
let err = YHErrorModel(errorCode: YHErrorCode.dictParseError.rawValue, errorMsg: YHErrorCode.dictParseError.description())
callBackBlock(nil, err)
return
}
callBackBlock(resultModel, nil)
} else {
let err = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.isEmpty ? "" : json.msg)
callBackBlock(nil, err)
}
} failBlock: { err in
callBackBlock(nil, err)
}
}
}
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ cfec4509
......@@ -670,6 +670,8 @@ class YHAllApiName {
static let paymentList = "super-app/renewal-visa/payment-list"
// 确认在港
static let confirmInHK = "super-app/renewal-visa/confirm-in-hk"
// 续签缴费信息
static let paymentInfo = "super-app/order/customer/payment"
}
//续签旅行证件
......
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