Skip to content

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

Merge branch 'develop' into duyu

parents 5fd88a95 fe67c63a
Hide whitespace changes
Inline Side-by-side
Showing with 320 additions and 105 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherPickerView.swift
View file @ 7b491df9
...@@ -16,6 +16,16 @@ enum YHOtherPickerViewType: Int { ...@@ -16,6 +16,16 @@ enum YHOtherPickerViewType: Int {
case language case language
// 专业技能行业 // 专业技能行业
case professionalSkill case professionalSkill
// 用人单位性质
case nature
// 工作证明文件
case certificate
// 行政架构层级
case structure
// 职位水平类别
case level
// 高管证明文件
case prove
} }
...@@ -224,6 +234,16 @@ class YHOtherPickerView: UIView { ...@@ -224,6 +234,16 @@ class YHOtherPickerView: UIView {
return "选择语言能力" return "选择语言能力"
case .professionalSkill: case .professionalSkill:
return "选择专业技能行业" return "选择专业技能行业"
case .nature:
return "用人单位性质"
case .certificate:
return "工作证明"
case .structure:
return "行政架构层级"
case .level:
return "职位水平类别"
case .prove:
return "高管证明文件"
default: default:
return "请选择" return "请选择"
} }
...@@ -239,13 +259,13 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -239,13 +259,13 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
return arrData.count return arrData.count
} }
// func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? { // func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
// if 0 <= row && row < arrData.count { // if 0 <= row && row < arrData.count {
// let item :YHOtherPickerViewItemData = arrData[row] // let item :YHOtherPickerViewItemData = arrData[row]
// return item.title // return item.title
// } // }
// return "" // return ""
// } // }
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) { func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
if 0 <= row && row < arrData.count { if 0 <= row && row < arrData.count {
...@@ -257,34 +277,62 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource { ...@@ -257,34 +277,62 @@ extension YHOtherPickerView: UIPickerViewDelegate, UIPickerViewDataSource {
} }
func pickerView(_ pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat { func pickerView(_ pickerView: UIPickerView, rowHeightForComponent component: Int) -> CGFloat {
return 70
switch type {
case .nature,.certificate,.structure,.level,.prove:
return 50
default:
return 70
}
} }
func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView { func pickerView(_ pickerView: UIPickerView, viewForRow row: Int, forComponent component: Int, reusing view: UIView?) -> UIView {
let label = UILabel() switch type {
label.textColor = UIColor.mainTextColor case .nature,.certificate,.structure,.level,.prove:
label.font = UIFont.PFSC_M(ofSize: 14) let label = UILabel()
label.numberOfLines = 0 label.textColor = UIColor.mainTextColor
if 0 <= row && row < arrData.count { label.font = UIFont.PFSC_M(ofSize: 14)
label.textAlignment = .center
let item :YHOtherPickerViewItemData = arrData[row] let item :YHOtherPickerViewItemData = arrData[row]
if item.subTitle.count > 0 { let a: ASAttributedString = .init(NSAttributedString(string: item.title), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
let a: ASAttributedString = .init(NSAttributedString(string: (item.title + "\n")), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor)) label.attributed.text = a
let b: ASAttributedString = .init(NSAttributedString(string: item.subTitle), .font(UIFont.PFSC_R(ofSize: 11)),.foreground(UIColor.labelTextColor2))
label.attributed.text = a + b
// 选中背景色
} else { if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
let a: ASAttributedString = .init(NSAttributedString(string: item.title), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor)) pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)
label.attributed.text = a }
return label
default:
let label = UILabel()
label.textColor = UIColor.mainTextColor
label.font = UIFont.PFSC_M(ofSize: 14)
label.numberOfLines = 0
if 0 <= row && row < arrData.count {
let item :YHOtherPickerViewItemData = arrData[row]
if item.subTitle.count > 0 {
let a: ASAttributedString = .init(NSAttributedString(string: (item.title + "\n")), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
let b: ASAttributedString = .init(NSAttributedString(string: item.subTitle), .font(UIFont.PFSC_R(ofSize: 11)),.foreground(UIColor.labelTextColor2))
label.attributed.text = a + b
} else {
let a: ASAttributedString = .init(NSAttributedString(string: item.title), .font(UIFont.PFSC_M(ofSize: 14)),.foreground(UIColor.mainTextColor))
label.attributed.text = a
}
}
// 选中背景色
if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)
} }
return label
} }
// 选中背景色
if #available(iOS 14.0, *), pickerView.subviews.count > 1 {
pickerView.subviews[1].backgroundColor = UIColor(hex: 0x4487F9, alpha: 0.06)
}
return label
} }
} }
...@@ -312,6 +360,46 @@ extension YHOtherPickerView { ...@@ -312,6 +360,46 @@ extension YHOtherPickerView {
title = getTitle(type: type) title = getTitle(type: type)
return return
case .nature:
let arr = YHOtherInfoFillViewModel.arrNature
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
case .certificate:
let arr = YHOtherInfoFillViewModel.arrCertificate
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
case .structure:
let arr = YHOtherInfoFillViewModel.arrStructure
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
case .level:
let arr = YHOtherInfoFillViewModel.arrLevel
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
case .prove:
let arr = YHOtherInfoFillViewModel.arrProve
arrData.removeAll()
arr.forEach { item in
let model = YHOtherPickerViewItemData(title: item["title"] ?? "-", subTitle: "", index: item["id"] ?? "-")
arrData.append(model)
}
title = getTitle(type: type)
default: default:
return return
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/VM/YHOtherInfoFillViewModel.swift
View file @ 7b491df9
...@@ -132,6 +132,120 @@ class YHOtherInfoFillViewModel: YHBaseViewModel { ...@@ -132,6 +132,120 @@ class YHOtherInfoFillViewModel: YHBaseViewModel {
"dec": "" "dec": ""
], ],
] ]
static let arrNature : [[String : String]] = [
[ "title": "有限责任公司",
"id": "有限责任公司"
],
[ "title": "股份有限公司",
"id": "股份有限公司"
],
[ "title": "跨国有限责任公司",
"id": "跨国有限责任公司"
],
[ "title": "跨国股份有限公司",
"id": "跨国股份有限公司"
],
[ "title": "上市公司",
"id": "上市公司"
],
[ "title": "上市跨国公司",
"id": "上市跨国公司"
],
[ "title": "教育机构",
"id": "教育机构"
],
[ "title": "半公营企业",
"id": "半公营企业"
],
[ "title": "政府机构",
"id": "政府机构"
],
[ "title": "跨国合伙企业",
"id": "跨国合伙企业"
],
[ "title": "跨国个人独资企业",
"id": "跨国个人独资企业"
],
[ "title": "个人独资企业",
"id": "个人独资企业"
],
[ "title": "国家/政府间组织",
"id": "国家/政府间组织"
],
[ "title": "志愿/慈善/宗教团体",
"id": "志愿/慈善/宗教团体"
],
[ "title": "其他（请备注）",
"id": "其他（请备注）"
]
]
static let arrCertificate : [[String : String]] = [
["id": "盖章并签字的推荐信 (证明效果最强)",
"title": "盖章并签字的推荐信 (证明效果最强)"
],
["id": "签字的推荐信+盖章的工作证明",
"title": "签字的推荐信+盖章的工作证明"
],
["id": "仅有签字的推荐信",
"title": "仅有签字的推荐信"
],
["id": "仅有社保记录/劳动合同/工牌等",
"title": "仅有社保记录/劳动合同/工牌等"
],
["id": "仅提供声明书解释",
"title": "仅提供声明书解释"
],
["id": "仅有工作证明",
"title": "仅有工作证明"
]
]
static let arrStructure : [[String : String]] = [
["title": "组织架构最顶级",
"id": "1"
],
["title": "组织架构第二层级",
"id": "2"
],
["title": "组织架构第三层级",
"id": "3"
],
["title": "组织架构第四层级",
"id": "4"
],
["title": "以上都不是",
"id": "5"
]
]
static let arrLevel : [[String : String]] = [
["title": "高级经理人",
"id": "1"
],
["title": "中级经理人",
"id": "2"
],
["title": "初级经理人",
"id": "3"
],
["title": "专业人士",
"id": "4"
],
["title": "半专业人士",
"id": "5"
],
["title": "其他",
"id": "6"
]
]
static let arrProve : [[String : String]] = [
["title": "盖章且签字的组织架构图和审计报告",
"id": "盖章且签字的组织架构图和审计报告"
]
]
} }
extension YHOtherInfoFillViewModel { extension YHOtherInfoFillViewModel {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/V/YHWorkExperienceItemView.swift
View file @ 7b491df9
...@@ -145,21 +145,40 @@ class YHWorkExperienceItemView: UIView { ...@@ -145,21 +145,40 @@ class YHWorkExperienceItemView: UIView {
nextStepImageView.isHidden = true nextStepImageView.isHidden = true
centerButton.isHidden = true centerButton.isHidden = true
} else { } else {
// if let type = dataSource.type { if let type = dataSource.type {
// switch type { switch type {
// case .normal: break case .normal:
// case .address: break break
// case .time: break case .unit:
// case .image: break break
// case .id: case .nature:
// messageTextField.text = YHFormPickerViewSubType.certificate(YHPickerViewCertificateType(rawValue: dataSource.message?.int ?? 0) ?? .chineseStatelessTravelPassport).title break
// case .country: break case .country:
// case .sex: break
// messageTextField.text = YHFormPickerViewSubType.gender(YHPickerViewGenderType(rawValue: dataSource.message?.int ?? 0) ?? .female).title case .address:
// case .marry: break
// messageTextField.text = YHFormPickerViewSubType.marriage(YHPickerViewMarriageType(rawValue: dataSource.message?.int ?? 0) ?? .unmarriage).title case .time:
// } break
// } case .certificate:
break
case .structure:
let arr = YHOtherInfoFillViewModel.arrStructure
arr.forEach { item in
if item["id"] == dataSource.message {
messageTextField.text = item["title"]
}
}
case .level:
let arr = YHOtherInfoFillViewModel.arrLevel
arr.forEach { item in
if item["id"] == dataSource.message {
messageTextField.text = item["title"]
}
}
case .prove:
break
}
}
nextStepImageView.isHidden = false nextStepImageView.isHidden = false
centerButton.isHidden = false centerButton.isHidden = false
} }
...@@ -256,35 +275,12 @@ class YHWorkExperienceItemView: UIView { ...@@ -256,35 +275,12 @@ class YHWorkExperienceItemView: UIView {
UIViewController.current?.present(addressPicker, animated: true, completion: nil) UIViewController.current?.present(addressPicker, animated: true, completion: nil)
case .time: case .time:
YHDatePickView.show(type: .yyyymm) { date in YHDatePickView.show(type: .yyyymm) { date in
// let arr = date.components(separatedBy: YHDatePickView.separator)
// [yyyy, mm, dd] eg ["2024", "01", "20"]
self.dataSource?.message = date self.dataSource?.message = date
self.updateAllViews() self.updateAllViews()
if let block = self.block { if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel()) block(self.dataSource ?? YHWorkExperienceModel())
} }
} }
// case .image:
// let view = YHImagePickerView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
// view.backImage = { [weak self] image in
// guard let self = self else { return }
// self.updateAllViews()
// if let block = block {
// block(dataSource ?? YHWorkExperienceModel())
// }
// }
// let window = UIApplication.shared.yhKeyWindow()
// window?.addSubview(view)
// case .id:
// YHFormPickerView.show(type: .certificate, selectTitle: "公务通行证") { selectType in
// // 选择类型的标题
// self.dataSource?.message = selectType.title
// self.dataSource?.value = ["\(selectType.index)"]
// self.updateAllViews()
// if let block = self.block {
// block(self.dataSource ?? YHWorkExperienceModel())
// }
// }
case .country: case .country:
let vc = YHSelectCountryViewController() let vc = YHSelectCountryViewController()
vc.backLocationStringController = { (country) in vc.backLocationStringController = { (country) in
...@@ -295,26 +291,6 @@ class YHWorkExperienceItemView: UIView { ...@@ -295,26 +291,6 @@ class YHWorkExperienceItemView: UIView {
} }
} }
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
// case .sex:
// YHFormPickerView.show(type: .gender, selectType: .gender(.female)) { selectType in
// // 选择类型的标题
// self.dataSource?.message = selectType.title
// self.dataSource?.value = ["\(selectType.index)"]
// self.updateAllViews()
// if let block = self.block {
// block(self.dataSource ?? YHWorkExperienceModel())
// }
// }
// case .marry:
// YHFormPickerView.show(type: .marriage, selectType: .marriage(.divorced)) { selectType in
// // 选择类型的标题
// self.dataSource?.message = selectType.title
// self.dataSource?.value = ["\(selectType.index)"]
// self.updateAllViews()
// if let block = self.block {
// block(self.dataSource ?? YHWorkExperienceModel())
// }
// }
case .unit: case .unit:
let vc = YHCompanySelectViewController() let vc = YHCompanySelectViewController()
vc.backLocationStringController = { (country) in vc.backLocationStringController = { (country) in
...@@ -326,15 +302,52 @@ class YHWorkExperienceItemView: UIView { ...@@ -326,15 +302,52 @@ class YHWorkExperienceItemView: UIView {
} }
UIViewController.current?.navigationController?.pushViewController(vc) UIViewController.current?.navigationController?.pushViewController(vc)
case .nature: case .nature:
break YHOtherPickerView.show(type: .nature) {[weak self] data in
guard let self = self else { return }
self.dataSource?.message = data.title
self.updateAllViews()
if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel())
}
}
case .certificate: case .certificate:
break YHOtherPickerView.show(type: .certificate) {[weak self] data in
guard let self = self else { return }
self.dataSource?.message = data.title
self.updateAllViews()
if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel())
}
}
case .structure: case .structure:
break YHOtherPickerView.show(type: .structure) {[weak self] data in
guard let self = self else { return }
self.dataSource?.message = data.title
self.dataSource?.value = [data.index]
self.updateAllViews()
if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel())
}
}
case .level: case .level:
break YHOtherPickerView.show(type: .level) {[weak self] data in
guard let self = self else { return }
self.dataSource?.message = data.title
self.dataSource?.value = [data.index]
self.updateAllViews()
if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel())
}
}
case .prove: case .prove:
break YHOtherPickerView.show(type: .prove) {[weak self] data in
guard let self = self else { return }
self.dataSource?.message = data.title
self.updateAllViews()
if let block = self.block {
block(self.dataSource ?? YHWorkExperienceModel())
}
}
} }
} }
} }
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkExperienceViewModel.swift
View file @ 7b491df9
...@@ -34,7 +34,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel { ...@@ -34,7 +34,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
let item7 = YHWorkExperienceModel(id: .id9, isNeed: true, title: "入职年月", isUserKeyBoard: false, prompts: "请选择", message: mainModel.entry_time ?? "", type: .time) let item7 = YHWorkExperienceModel(id: .id9, isNeed: true, title: "入职年月", isUserKeyBoard: false, prompts: "请选择", message: mainModel.entry_time ?? "", type: .time)
let item8 = YHWorkExperienceModel(id: .id10, isNeed: true, title: "离职年月", isUserKeyBoard: false, prompts: "请选择", message: mainModel.departure_time ?? "", type: .time) let item8 = YHWorkExperienceModel(id: .id10, isNeed: true, title: "离职年月", isUserKeyBoard: false, prompts: "请选择", message: mainModel.departure_time ?? "", type: .time)
let item9 = YHWorkExperienceModel(id: .id11, isNeed: true, title: "工作证明文件", isUserKeyBoard: false, prompts: "请选择", message: mainModel.work_certificate ?? "", type: .certificate) let item9 = YHWorkExperienceModel(id: .id11, isNeed: true, title: "工作证明文件", isUserKeyBoard: false, prompts: "请选择", message: mainModel.work_certificate ?? "", type: .certificate)
let item10 = YHWorkExperienceModel(id: .id12, isNeed: false, title: "职责性质", isUserKeyBoard: false, prompts: "请选择", message: mainModel.duty ?? "") let item10 = YHWorkExperienceModel(id: .id12, isNeed: false, title: "职责性质", isUserKeyBoard: true, prompts: "请选择", message: mainModel.duty ?? "")
let item11 = YHWorkExperienceModel(id: .id13, isNeed: false, title: "相关工作经验是否属于国际工作经验", isUserKeyBoard: false, prompts: "", message: "\(mainModel.international_work_experience ?? 0)", leftButtonString: "是", rightButtonString: "否") let item11 = YHWorkExperienceModel(id: .id13, isNeed: false, title: "相关工作经验是否属于国际工作经验", isUserKeyBoard: false, prompts: "", message: "\(mainModel.international_work_experience ?? 0)", leftButtonString: "是", rightButtonString: "否")
let addressCountry = mainModel.location?.country ?? "" let addressCountry = mainModel.location?.country ?? ""
var section = YHSectionWorkExperienceModel() var section = YHSectionWorkExperienceModel()
......
galaxy/galaxy/Classes/Modules/Login(登录)/V/YHLoginPrivacyView.swift
View file @ 7b491df9
...@@ -62,6 +62,7 @@ class YHLoginPrivacyView: UIView { ...@@ -62,6 +62,7 @@ class YHLoginPrivacyView: UIView {
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("《隐私协议》", for: .normal) button.setTitle("《隐私协议》", for: .normal)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal) button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
button.addTarget(self, action: #selector(firstUrlClick), for: .touchUpInside)
return button return button
}() }()
addSubview(serviceButton) addSubview(serviceButton)
...@@ -91,6 +92,7 @@ class YHLoginPrivacyView: UIView { ...@@ -91,6 +92,7 @@ class YHLoginPrivacyView: UIView {
button.contentHorizontalAlignment = .center button.contentHorizontalAlignment = .center
button.setTitle("《用户条款》", for: .normal) button.setTitle("《用户条款》", for: .normal)
button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal) button.setTitleColor(UIColor(hex: 0x2f7ef6), for: .normal)
button.addTarget(self, action: #selector(secondUrlClick), for: .touchUpInside)
return button return button
}() }()
addSubview(privacyButton) addSubview(privacyButton)
...@@ -106,4 +108,16 @@ class YHLoginPrivacyView: UIView { ...@@ -106,4 +108,16 @@ class YHLoginPrivacyView: UIView {
agreeButton.isSelected = !agreeButton.isSelected agreeButton.isSelected = !agreeButton.isSelected
isAgree = agreeButton.isSelected isAgree = agreeButton.isSelected
} }
@objc func firstUrlClick() {
let vc = YHWebViewViewController()
vc.url = url
UIViewController.current?.navigationController?.pushViewController(vc)
}
@objc func secondUrlClick() {
let vc = YHWebViewViewController()
vc.url = url
UIViewController.current?.navigationController?.pushViewController(vc)
}
} }
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift
View file @ 7b491df9
...@@ -23,7 +23,6 @@ extension YHLoginViewModel { ...@@ -23,7 +23,6 @@ extension YHLoginViewModel {
let params: [String : Any] = ["type": "Phone", let params: [String : Any] = ["type": "Phone",
"value": phone, "value": phone,
"extend":"register"] "extend":"register"]
let strUrl = "http://test-cuser.galaxy-immi.com/" + "user/verify-code" let strUrl = "http://test-cuser.galaxy-immi.com/" + "user/verify-code"
let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
guard let self = self else { return } guard let self = self else { return }
...@@ -51,7 +50,6 @@ extension YHLoginViewModel { ...@@ -51,7 +50,6 @@ extension YHLoginViewModel {
"sms_code": code, "sms_code": code,
"channel": "app", "channel": "app",
"client": "super_app"] "client": "super_app"]
let strUrl = "http://test.api.diymanager.galaxy-immi.com/" + "auth/login" let strUrl = "http://test.api.diymanager.galaxy-immi.com/" + "auth/login"
let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
//1. json字符串 转 对象 //1. json字符串 转 对象
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 7b491df9
...@@ -93,18 +93,6 @@ class YHNetRequest: NSObject { ...@@ -93,18 +93,6 @@ class YHNetRequest: NSObject {
print("sign = \(sign)") print("sign = \(sign)")
requestHeader.add(name:"sign",value:sign) requestHeader.add(name:"sign",value:sign)
//杜宇的账号
// requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
//明杰的账号
// requestHeader.add(name: "token", value: "eyJpdiI6InM0a3dcL1hQYUtPOENKOXNJYzRoMHJnPT0iLCJ2YWx1ZSI6Ik12dW9PUWI2SGRIZDF1cGVrREZ0b2tyd3ZLeUJkVXp5am9vRWhhYVVNRnRyT0FNNWdlNW9cL1BpMFBSS1RKd3B6Y2dyaVM0aHV0NXlIcXJkc1MxdG11d3hMZ3RsZHJ4aGNiRnZLZDJ0Q0NSYndUMUNuODRaYW1lQk1KZ0FqTFFVbTZ1TllMTGdtY1dlV0ZkRm5TeW9Vc1FYY09ZMFMrbGo4TmRnZ0syOWRhUFFRbjBjWDFDKzEwQWxLWjExNWJ5R3VxRGNEbWN0K0Z6Z1VieFIrMmdSbTZ6dU9CZGdFcDJlTktPMTY2cHYyeGhKVXpSNVhxT0VTQjRCa05OTE9aalQzWVFPczRpS1lldk16Zk9BUmZYbnRybDVoVXdRZWM3V1BUV3J0NkIxRHBCT3JDd1czQ0Q3YjU4cnVxVE5Lb0ZnbnlmMWN1RU9ocnU1ZE5pUmVDS21CbmhWTDdxTmYrRCtNNHZLQzdNXC9Bb0lRWXdNcE5HNW5ielwvWGtCZmpKNlNHWW9MaE94TXNSOURlemVSSkNkUXVveFJkUHVWbFIyeXNVZFJ3K0pXNElUWVhLSXpvUGNQek1cLzRBc3BaRE1lUVdKSENCS0FJdjFyeUVBSnNXeTZcL0RNajJIeFF0QUdndzBWRllOQ2R5UzZMK3lqdFZTanRxbXhmeGFrRVRJOE95enA1cUl0VzVjUytpVnBkRTFXMm9uQytobG1vWTlRQWhvNGN4THdRSTUyS0tub29xK25VZkNIb1FVOEh6YktGbjgzdjQ0NlA1cVc0aWNqYWp6OElSb3Vlb0ZPWmVzdVRLQW5SejVJa09kUDIrZW5jbmVtTzYyOFwvQnRTV3ExZVFhOWh4XC9BbDUxaHNRSDlIXC96QThkVGlBcEVkOUZCelBIV21WVXZ0OFlQaWtsclFPOXJzOXFoeGc1QXcyeEgwU2NqcWxXb2g4aTJBK2tCZkxoNjBTU1VrNDEwWWxVUW50STcyMFwvQjlCU2lxc3RSRGFOemdJTDN5NGRhN1RLSHVXVlFVRHdWN1dIVGppTVFNZEkzMWU4ckpXZ1lcL3BKRENnZGpuR0ZaTlpBVFowMVRWc1dpOFEzcERUY3RjXC9nUGYrTkxLdkFGSlc3b0dSUWVuQkRVR2tzZVN2UDFEdCtKNnNMMHNQZnJaT0tGV293OHMxXC9WZ1V5Z0dmM1VLeFM5QVdvVGVcL2IrS0Y3M0Zya0tQbXl6ZTNkWm00V1hZUUdiY3p5UVwvZWthUVlkNGV6cVlNaDMwazJNS0FoejlLT3FlZlBzWklnWkRZclhwUmFqTzk1VWF2eHJ1c1pqYzI2eThqOEJVZDZIbUt1dE81VjZoM0xiWm1NOVBrcjlhM1djOUJvb3VLTjJ2VTJvMzd3MHA1cmRuSWxTMGgzclYrUHF0NnFRN1BPSE4rM1ZTWWF5VlBTWE56aTV0U3Y5M0NrcDNBYVFHTTJvOUsyR1Y4S2k3N05CZUFDMk4xUVwvVWZKSUdiMjdmOXIxSXZjSTdvaGhMSHFISk12N2xDdlRrZUloaVBMS0cyMkVrclhcL3loenQ1MTF2V0lORDZyVmZMaytiWVJyMnk4SzhDRktQSFRQR1FoTFpQZHBzUllRbUUza3NaXC9lMXFSSFZud05JTWo1UkVTTXZjZmZucUF3Mzh2OVpkT2QyaVQ2VXRFVHltRW1MQjlzaHh1Ym02YW1LRUphSVNUeEltMWN5WGxRdlgzSE96V0ErbDdldnQ0ZkRjdGxsQVVpRFZCdnlMSnVrSW5aS3BrT3FRbDh0NWR0TWoxdjNMb3ZUVEJwbkVMbzJjeHRibGJJTGlMOHhSU0tNaTk5VHJxSk9xanRIOTMreVVmZm5lXC82SThIXC9iVXFudW9VOVd1S1RNYlwvbzF5b2V0bDVtRWNkalBTdkVVRGFPVlE9PSIsIm1hYyI6IjNkOTZlZDhiOTVlNmUxZmVlMzZmNDIyYmMzYTc4N2Y2ZmE0ZTI3MGI2YjQxZGVkZGRmMTY0N2IyOGZiM2RhNjYifQ==")
//金龙的账号
// requestHeader.add(name: "token", value: "eyJpdiI6IlwvcVM1VkFpcSs3amtVbTB2Mzh0SWl3PT0iLCJ2YWx1ZSI6IisrRVlDN1p4RkFETG56Y2M2Wmo5OVBXbzhseDJcL3NRRWhCTG02UGZ0b1pPODh6M2pqZCtFUVNWcDJmOHE5eFI0K3U5TnZ3cjI1MnkrbDZpUElsNGZ3WEZWNTJ3bGt4NFQ2enBOK2h4bE41NHZWeFBkSEF3bjlHZG44dlRQYXhrQXpvNmpFSWowNDZPcjRUcFFGZDNleWs4NEU1bG5Lb0FuelU3Slg5VjdcL2g1aU93U01wbGdZU2tUbWhYRUdUaUEzWW1pUUNGbjBkS1NaM09LTGxTeDZ0QVB1dEJZaTRjaVhBXC9scXdzS3djZGNUamgwR3NwbWdwMDkzeE90UVV0cnlBTUVxSHZuclZxN1dIdzZueTY0dEJKMERWcTE1NlVNckdLNE9jMHkrbVZqRm14QXp0aVd3bUhwOEdHQklXVzREdUhrNFI4WW0ybVNDTXhqeDdnTlwvVzhrZlwvQW9EelVOSzZGVFZIWlpcL2dNdjVGa1o0ampQWks2dmk4V1JDWjJjbU5vVFwvZjd4NXlUdWp1ZVVYcXdjK0E1MzQyYTd4WHdGRitsQ0NQMjJmNGUyM0piaXJPcTRYNmhqSm9EMmVLZ0RscHpqRlU5WEtYUE9PSTBsM3FBK09jYVdtZHlpWnJSbWtFUXZYdGNCSlZvTUxmTFlLWm9SUURieW5TbWE3RGFHUXlYTkI0OWo5eVVLODVcL0ZXMGxkaHpibm1Fa2Z2ZmZ3N2V0SWQxREZqQ1MyV3JaWjZkc2RHbVRkTmoyTW9oOHdcL1BBRCt2WHo4V0hJdzdiNFlYWlBSTUNIOCtxNXp3dStveks4SGNqR0x6SjBmcThBSXhtSklYT2d4ZEFtck9ibzExazVuXC8wT2NCRW1sXC9kbnRaaTRYV3dPVjVwQlVpOFcwTktDUFkxdkUxZWJnSkxvXC84XC9BRHNhaUttUnZ0c2dhYTF2VXFtQkcwdkFLeHJZR29qQkxtRFhpZW1tK2dOU1hYVGRmRWM4U0xhY3lSRW01bTdJS3ZCdUF6Z051OUNVekNrWjUxN0diZ3R6T3BySytqWktCcmRxcldnOEZLQzMrRTlLWWZSaTU2OTlTVkZoZFErSHRBSldRVW9HSnB3OGR5S0l2V2U0anE5NU9kWVIrNmFBWkc4UnlBVDBwQmxBNjRySzBITzluZnZVNWJJOGQ4MmJPeU1PSklmSkdncXpJQ3BcL1BkaUswZkJZSlVid0UydUxkWEhKcWtkWmV2dml0Rkh4cnQxNENwVDdVb0x0eUFBXC9VMmlPTDI0OVJ4VHpHMEN6RENWa3hORG9RTXhTcDM1M0xHdE5pcWx1dU55YzBHKzZxOWdEYVcreSt3dmdGaG9kaDQrMXhsTTd0ZFl1OTMySlNxNTRxXC9uVzBvR3RrK3AxZGxaZmJma0ZQMkxlRUlwXC83OHE4T2hTMkF0U2wrdXlzalJXaEhXSnNDMEZqWmt6RGNKbFhUblpcL3lyRGxnQW9nanNja1FsYlwvZUpDUmJtWVhsZzIzY3lUSDhudWRvRmp5TkpJbEN5WEZTTFA4OGpoUVVkdHRqcHFsWVZkXC85d1hIUEpGMkZRbHAyeFphWTJud2FZejRCdkFUK0lSTDlicnZiUDFcL3lhMEFPQVFYQTMxdXJla0tpbDdibmkycGxOU05wY1ZjeTZzdTN0NjdLNk9IUHhOYTZnaUR3VW1iVXJEbmJvMmN3WTZYUFllbHd2Y0J2cnVsUzVvVitHMFFxSGFzc2x3K2ErVUpaaFZkbHVqRG5Ua3NzTTNSZTNRdGtwNnFiS2wyRkVTUEJVVjluZ1ZGN3RHT0VWQjR4MVpXNnBFWnU2bHU1Z2dqOUNuMlNwMUljXC9ZZk5EWjhiXC9sdUVnVUhYelJSQVwvK1FXcytPb3ZYMXZrVVBScmN5YU0rNWR3a0pqcm1BPT0iLCJtYWMiOiJhOGM2NjQwNDVjYjNmMjhiZjI5MWU5YTdiODE0MGVkOGQ2YzIzNWVkYjUzYjkwNjU3OTFiN2U5YTliZWQ1NGQ1In0")
requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-") requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
headers = requestHeader headers = requestHeader
} }
......
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