Skip to content

G
galaxy-iOS
Commit 0c65e3bb 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 d83f3537 21eb5862
Hide whitespace changes
Inline Side-by-side
Showing with 371 additions and 33 deletions
galaxy/galaxy.xcodeproj/project.pbxproj
View file @ 0c65e3bb
......@@ -297,6 +297,7 @@
A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; };
A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */; };
A5FD63BD2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */; };
A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */; };
A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5FD63C02B62616D00D1D9DA /* YHInformationPerfectModel.swift */; };
......@@ -634,6 +635,7 @@
A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; };
A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCustomTextView.swift; sourceTree = "<group>"; };
A5FD63BC2B623C2C00D1D9DA /* YHInformationPerfectListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectListVC.swift; sourceTree = "<group>"; };
A5FD63BE2B6250BC00D1D9DA /* YHInformationPerfectCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectCell.swift; sourceTree = "<group>"; };
A5FD63C02B62616D00D1D9DA /* YHInformationPerfectModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHInformationPerfectModel.swift; sourceTree = "<group>"; };
......@@ -888,6 +890,7 @@
045EEDF02B9F171A0022A143 /* V */ = {
isa = PBXGroup;
children = (
A5F8AC072B9F414000A21EFA /* YHCustomTextView.swift */,
045EEDF12B9F171A0022A143 /* YHOtherResidenceFillView.swift */,
045EEDF22B9F171A0022A143 /* YHOtherInfoFillCell.swift */,
045EEDF32B9F171A0022A143 /* YHOtherPickerView.swift */,
......@@ -2229,6 +2232,7 @@
045EEF1F2B9F171A0022A143 /* YHDatePickView.swift in Sources */,
045EEE972B9F171A0022A143 /* YHPreviewInfoWorkExpView.swift in Sources */,
04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */,
A5F8AC082B9F414000A21EFA /* YHCustomTextView.swift in Sources */,
A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */,
045EEECC2B9F171A0022A143 /* YHScoreResultModel.swift in Sources */,
045EEEDC2B9F171A0022A143 /* YHQualificationDetailVC.swift in Sources */,
......@@ -2399,7 +2403,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......@@ -2441,7 +2445,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
CURRENT_PROJECT_VERSION = 2;
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 0c65e3bb
......@@ -394,7 +394,6 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
}
private func handleJumpLogicDebug(tapIndex : Int) {
// if self.serviceCenterMainReqVM.myInfoFillStep > 6 {
// goInfoListVCOp(index:tapIndex)
// return
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/C/YHOtherInfoFillViewController.swift
View file @ 0c65e3bb
......@@ -159,12 +159,28 @@ extension YHOtherInfoFillViewController {
if model.language_detail?.levelDes.isEmpty == true {
returnValue = false
return returnValue
} else {
if let language = model.language_detail,language.level == 4 {
if language.name.isEmpty || language.remark.isEmpty {
returnValue = false
return returnValue
}
}
}
//3.专业技能行业
if model.profession?.optionDes.isEmpty == true {
returnValue = false
return returnValue
} else {
if let language = model.profession,language.option == 15 {
if language.remark.isEmpty {
returnValue = false
return returnValue
}
}
}
//4.辅助资料
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHCustomTextView.swift 0 → 100644
View file @ 0c65e3bb
//
// YHCustomTextView.swift
// galaxy
//
// Created by davidhuangA on 2024/3/11.
// Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
//
import UIKit
class YHCustomTextView: UIView, UITextViewDelegate {
override init(frame: CGRect) {
super.init(frame: frame)
setupUI()
}
required init?(coder: NSCoder) {
fatalError("init(coder:) has not been implemented")
}
typealias Block = (String) -> ()
var block: Block?
lazy var tipsLabel: UILabel = {
let label = UILabel()
label.textColor = .placeHolderColor
label.textAlignment = .left
label.numberOfLines = 0
label.font = UIFont.PFSC_R(ofSize: 14)
label.lineBreakMode = .byCharWrapping
label.text = "请输入中文之外的语种"
return label
}()
lazy var noTextTipsLable: UILabel = {
let label = UILabel()
label.textColor = .failColor
label.font = UIFont.PFSC_R(ofSize: 12)
label.text = "无数据时候的提示"
return label
}()
private lazy var bottomLine : UIView = {
let view = UIView()
view.backgroundColor = .clear//UIColor(hex: 0xF0F0F0)
return view
}()
private lazy var additionHoldView : UIView = {
let view = UIView()
view.backgroundColor = UIColor.contentBkgColor
view.layer.cornerRadius = kCornerRadius6
view.clipsToBounds = true
return view
}()
var myTextView : UITextView!
var needCheckFlag : Bool = false {
didSet {
layoutMyUI()
}
}
override func layoutSubviews() {
super.layoutSubviews()
layoutMyUI()
}
}
private extension YHCustomTextView {
func setupUI() {
backgroundColor = .clear
addSubview(additionHoldView)
additionHoldView.snp.makeConstraints { make in
make.top.equalToSuperview()
make.left.right.equalToSuperview()
make.height.equalTo(44)
}
let textView : UITextView = UITextView()
textView.backgroundColor = .clear
textView.font = UIFont.PFSC_R(ofSize: 14)
additionHoldView.addSubview(textView)
textView.snp.makeConstraints { make in
make.edges.equalTo(0)
}
myTextView = textView
myTextView.delegate = self
myTextView.contentInset = UIEdgeInsets(top: 12, left: 12, bottom: 12, right: 12)
additionHoldView.addSubview(tipsLabel)
tipsLabel.snp.makeConstraints { make in
make.top.equalTo(14)
make.left.equalTo(16)
make.right.equalTo(-12)
}
addSubview(noTextTipsLable)
noTextTipsLable.snp.makeConstraints { make in
make.top.equalTo(additionHoldView.snp.bottom).offset(6)
make.left.right.equalToSuperview()
make.height.equalTo(20)
}
noTextTipsLable.isHidden = true
addSubview(bottomLine)
bottomLine.snp.makeConstraints { make in
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.top.equalTo(noTextTipsLable.snp.bottom).offset(12)
make.bottom.equalToSuperview()
}
}
private func layoutMyUI() {
noTextTipsLable.snp.removeConstraints()
bottomLine.snp.removeConstraints()
if myTextView.text.isEmpty {
tipsLabel.isHidden = false
} else {
tipsLabel.isHidden = true
}
if needCheckFlag == true,myTextView.text.isEmpty {
noTextTipsLable.isHidden = false
noTextTipsLable.snp.remakeConstraints { make in
make.top.equalTo(additionHoldView.snp.bottom).offset(6)
make.left.right.equalToSuperview()
make.height.equalTo(20)
}
bottomLine.snp.remakeConstraints { make in
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.top.equalTo(noTextTipsLable.snp.bottom).offset(12)
make.bottom.equalToSuperview()
}
} else {
noTextTipsLable.isHidden = true
bottomLine.snp.remakeConstraints { make in
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.top.equalTo(additionHoldView.snp.bottom).offset(12)
make.bottom.equalToSuperview()
}
}
}
}
extension YHCustomTextView : UITextFieldDelegate {
internal func textViewDidChange(_ textView: UITextView) {
if textView.text == "" {
tipsLabel.isHidden = false
} else {
tipsLabel.isHidden = true
}
self.block?(textView.text)
}
func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {
if !text.isEmpty {
if textView.text.count > 999 {
return false
}
}
return true
}
}
extension YHCustomTextView {
func updateUI(title : String,value : String, type : YHOtherTextViewItemType = .unknowAwards) {
myTextView.text = value
if value.count > 0 {
tipsLabel.isHidden = true
} else {
tipsLabel.isHidden = false
}
layoutMyUI()
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherInfoFillCell.swift
View file @ 0c65e3bb
......@@ -175,8 +175,6 @@ extension YHOtherInfoFillCell {
lastTargetView = residenceView
}
//添加按钮
holdView1.addSubview(addBtn)
addBtn.layer.addSublayer(dotLineLayer)
......@@ -216,9 +214,15 @@ extension YHOtherInfoFillCell {
let view = languageView
view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:dataModel.language_detail?.levelDes ?? "")
view.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:dataModel.language_detail?.levelDes ?? "",firstTxt: dataModel.language_detail?.name ?? "",secondTxt: dataModel.language_detail?.remark ?? "")
view.needCheckFlag = dataModel.needCheckFlag
view.type = 2
view.textBlock = {firstTxt,secondTxt in
self.dataModel?.language_detail?.name = firstTxt
self.dataModel?.language_detail?.remark = secondTxt
}
holdView2.addSubview(view)
view.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
......@@ -256,9 +260,13 @@ extension YHOtherInfoFillCell {
let view = skillView
view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: dataModel.profession?.optionDes ?? "")
view.updateKeyName(name: "最能代表你的专业技能的行业", keyValue: dataModel.profession?.optionDes ?? "",firstTxt: dataModel.profession?.remark ?? "")
view.needCheckFlag = dataModel.needCheckFlag
view.type = 2
view.textBlock = { firstTxt,secondTxt in
self.dataModel?.profession?.remark = firstTxt
}
holdView3.addSubview(view)
view.snp.makeConstraints { make in
make.top.equalTo(sessionView.snp.bottom)
......@@ -415,6 +423,8 @@ extension YHOtherInfoFillCell {
self.dataModel?.language_detail?.level = Int(item.index) ?? 0
self.dataModel?.language_detail?.levelDes = item.title
self.languageView.updateKeyName(name: "您的语言水平与下列哪一项符合", keyValue:self.dataModel?.language_detail?.levelDes ?? "")
self.block?()
}
}
......@@ -424,6 +434,8 @@ extension YHOtherInfoFillCell {
self.dataModel?.profession?.option = Int(item.index) ?? 0
self.dataModel?.profession?.optionDes = item.title
self.skillView.updateKeyName(name: "最能代表你的专业技能的行业", keyValue:self.dataModel?.profession?.optionDes ?? "")
self.block?()
}
}
}
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/OtherInformation(其他信息)/V/YHOtherSelecteItemView.swift
View file @ 0c65e3bb
......@@ -40,6 +40,11 @@ class YHOtherSelecteItemView: UIView {
var block: ItemBlock?
typealias TextViewBlock = (_ firstTxt: String, _ secondTxt: String) -> ()
var textBlock: TextViewBlock?
lazy var longTimeButton = {
let button = UIButton(type: .custom)
button.setImage(UIImage(named: "main_time_normal"), for: .normal)
......@@ -119,9 +124,10 @@ class YHOtherSelecteItemView: UIView {
return view
}()
let firstTextView : YHCustomTextView = YHCustomTextView()
let secondTextView : YHCustomTextView = YHCustomTextView()
private let rightIcon = UIImageView()
override func layoutSubviews() {
super.layoutSubviews()
......@@ -164,6 +170,17 @@ extension YHOtherSelecteItemView {
make.height.equalTo(32)
make.width.equalTo(43)
}
addSubview(firstTextView)
addSubview(secondTextView)
firstTextView.block = { text in
self.textBlock?(self.firstTextView.myTextView.text,self.secondTextView.myTextView.text)
}
secondTextView.block = { text in
self.textBlock?(self.firstTextView.myTextView.text,self.secondTextView.myTextView.text)
}
}
@objc func longTimeButtonClick() {
......@@ -179,7 +196,7 @@ extension YHOtherSelecteItemView {
}
extension YHOtherSelecteItemView {
func updateKeyName(name : String, keyValue : String) {
func updateKeyName(name : String, keyValue : String,firstTxt:String = "",secondTxt: String = "") {
if type == 1 {
noTextTipsLable.text = "请选择" + name
......@@ -189,21 +206,22 @@ extension YHOtherSelecteItemView {
title = name
textField.text = keyValue
firstTextView.myTextView.text = firstTxt
secondTextView.myTextView.text = secondTxt
secondTextView.layoutIfNeeded()
layoutMyUI()
}
func layoutMyUI() {
titleLabel.snp.removeConstraints()
subHoldView.snp.removeConstraints()
bottomLine.snp.removeConstraints()
noTextTipsLable.snp.removeConstraints()
if type == 1 {
if needCheckFlag == true {
titleLabel.snp.remakeConstraints { make in
make.top.equalToSuperview().offset(kMargin)
......@@ -346,6 +364,12 @@ extension YHOtherSelecteItemView {
make.left.equalToSuperview()
}
firstTextView.isHidden = true
secondTextView.isHidden = true
firstTextView.snp.removeConstraints()
secondTextView.snp.removeConstraints()
bottomLine.snp.removeConstraints()
if textField.isEmpty == true {
noTextTipsLable.isHidden = false
noTextTipsLable.snp.remakeConstraints { make in
......@@ -364,10 +388,50 @@ extension YHOtherSelecteItemView {
}
else {
noTextTipsLable.isHidden = true
var lastView : UIView = subHoldView
if let text = textField.text,text.contains("其他") {
firstTextView.noTextTipsLable.text = "请输入其他专业技能的行业"
firstTextView.tipsLabel.text = "请输入其他专业技能的行业"
firstTextView.isHidden = false
firstTextView.snp.remakeConstraints { make in
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
firstTextView.needCheckFlag = needCheckFlag
lastView = firstTextView
} else if let text = textField.text,text.contains("中文及另一种外语") {
firstTextView.isHidden = false
secondTextView.isHidden = false
firstTextView.noTextTipsLable.text = "请输入中文之外的语种"
firstTextView.tipsLabel.text = "请输入中文之外的语种"
firstTextView.snp.remakeConstraints { make in
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
secondTextView.noTextTipsLable.text = "请输入2年内获取的证书及分数"
secondTextView.tipsLabel.text = "请输入2年内获取的证书及分数"
secondTextView.snp.remakeConstraints { make in
make.top.equalTo(firstTextView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
firstTextView.needCheckFlag = needCheckFlag
secondTextView.needCheckFlag = needCheckFlag
lastView = secondTextView
} else {
}
bottomLine.snp.removeConstraints()
bottomLine.snp.remakeConstraints { make in
make.top.equalTo(subHoldView.snp.bottom).offset(kMargin)
make.bottom.left.right.equalToSuperview()
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
}
} else {
......@@ -386,10 +450,56 @@ extension YHOtherSelecteItemView {
make.left.equalToSuperview()
}
firstTextView.snp.removeConstraints()
secondTextView.snp.removeConstraints()
firstTextView.isHidden = true
secondTextView.isHidden = true
var lastView : UIView = subHoldView
if let text = textField.text,text.contains("其他") {
firstTextView.noTextTipsLable.text = "请输入其他专业技能的行业"
firstTextView.tipsLabel.text = "请输入其他专业技能的行业"
firstTextView.isHidden = false
firstTextView.snp.remakeConstraints { make in
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
firstTextView.needCheckFlag = needCheckFlag
lastView = firstTextView
} else if let text = textField.text,text.contains("中文及另一种外语") {
firstTextView.isHidden = false
secondTextView.isHidden = false
firstTextView.noTextTipsLable.text = "请输入中文之外的语种"
firstTextView.tipsLabel.text = "请输入中文之外的语种"
firstTextView.snp.remakeConstraints { make in
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
secondTextView.noTextTipsLable.text = "请输入2年内获取的证书及分数"
secondTextView.tipsLabel.text = "请输入2年内获取的证书及分数"
secondTextView.snp.remakeConstraints { make in
make.top.equalTo(firstTextView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
}
firstTextView.needCheckFlag = needCheckFlag
secondTextView.needCheckFlag = needCheckFlag
lastView = secondTextView
} else {
}
bottomLine.snp.removeConstraints()
bottomLine.snp.remakeConstraints { make in
make.top.equalTo(subHoldView.snp.bottom).offset(kMargin)
make.bottom.left.right.equalToSuperview()
make.top.equalTo(lastView.snp.bottom).offset(kMargin)
make.left.right.equalToSuperview()
make.height.equalTo(0.5)
make.bottom.equalToSuperview()
}
}
} else {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift
View file @ 0c65e3bb
......@@ -246,7 +246,7 @@ private extension YHPreviewViewModel {
let tmp14 = YHPreviewQuestionAndAnswerModel(question: "下属管理人数：", answer:String(model.company_manage_total))
let tmp15 = YHPreviewQuestionAndAnswerModel(question: "公司营业额/港元(近一年)：", answer:String(model.turnover).defaultStringIfEmpty())
let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.administrative_level), type: .level)
let tempppp0 = YHConstantArrayData.getShowNameBy(indexStr: String(model.professional_level), type: .level)
let tmp16 = YHPreviewQuestionAndAnswerModel(question: "职业水平类别：", answer:tempppp0)
arr1.append(contentsOf: [tmp1,tmp2,tmp3,tmp4,tmp5,tmp6,tmp7,tmp8,tmp9,tmp10,tmp11,tmp12,tmp13,tmp14,tmp15,tmp16])
}
......@@ -466,7 +466,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -490,7 +490,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -518,7 +518,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -562,7 +562,7 @@ private extension YHPreviewViewModel {
let answer1 = model.has_departure?.has == "Y" ? "是" : "否"
let remark1 = answer1 == "是" ? (model.has_conviction?.info ?? "") : nil
let remark1 = answer1 == "是" ? (model.has_departure?.info ?? "") : nil
let tmp1 = YHPreviewQuestionAndAnswerModel(question: "2、是否曾在香港或其他地方被拒入境/递解/遣送或要求离境？", answer: answer1,remark: remark1)
......@@ -937,7 +937,7 @@ private extension YHPreviewViewModel {
var arrTemp : [YHPreviewInfoSessionModel] = []
do {
if model.follow == 0 {
if model.follow != 1 {
do {
//随行信息 - 否
let tmp0 = YHPreviewQuestionAndAnswerModel(question: "是否随行至香港：", answer: "否")
......@@ -1119,7 +1119,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -1143,7 +1143,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp7 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -1171,7 +1171,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -1438,7 +1438,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp3 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......@@ -1473,7 +1473,7 @@ private extension YHPreviewViewModel {
if model.nationality != "中国-China" {
//护照及其他旅行证件
var str = String(model.certificates.passport.passPortType)//for test hjl todo
var str = YHConstantArrayData.getShowNameBy(indexStr: String(model.certificates.passport.passPortType), type: .idType)
let tmp8 = YHPreviewQuestionAndAnswerModel(question: "证件类别：", answer: str)
str = model.certificates.passport.number
......@@ -1490,7 +1490,7 @@ private extension YHPreviewViewModel {
str = ""
} else {
if str == "8888-01-01" {
str = "至今"
str = "长期"
}
}
let tmp12 = YHPreviewQuestionAndAnswerModel(question: "届满日期：", answer: str.defaultStringIfEmpty())
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 0c65e3bb
......@@ -95,14 +95,13 @@ class YHNetRequest: NSObject {
requestHeader.add(name:"sign",value:sign)
requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
// testToken(&requestHeader) //for test hjl 使用测试token
headers = requestHeader
}
private func testToken(_ requestHeader:inout HTTPHeaders) {
//金龙的账号
requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
}
// private func testToken(_ requestHeader:inout HTTPHeaders) {
// //金龙的账号
// requestHeader.add(name: "token", value: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MTE2MDcwNjQsImkiOjE0NDg0MTczMjc0MjE2LCJ1Ijoi6ZO25rKz6ZuG5ZuiIiwiciI6InN1cGVyX2FwcCJ9.KwTWdaLy5UG4LLs6i-D9ne0RflRTT5v4zvu-66yihDE")
// }
///  链式语法
func url(_ url:String?) -> Self{
......
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