Skip to content

G
galaxy-iOS
Commit 1abfcb9b authored by pete谢兆麟's avatar pete谢兆麟
Browse files
Options

Merge commit 'b7c7c226' into xiezhaolin

parents a87f9b3f b7c7c226
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 184 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift
View file @ 1abfcb9b
......@@ -327,27 +327,30 @@ extension YHInformationPerfectListVC : UITableViewDelegate,UITableViewDataSource
let vc = YHMainApplicantInformationViewController()
vc.orderId = orderId ?? 0
navigationController?.pushViewController(vc)
} else if indexPath.row == 1 {
//家庭程序信息
let vc = YHFamilyMemberInfoVC(orderId: orderId ?? 0)
vc.orderId = 133971
vc.orderId = orderId ?? 0
navigationController?.pushViewController(vc)
} else if indexPath.row == 2 {
//基本信息
let vc = YHBasicInfoFillViewController()
vc.orderId = orderId
navigationController?.pushViewController(vc)
} else if indexPath.row == 3 {
//学历/专业资格
let vc = YHEducationInfoListVC()
// vc.orderId = orderId
vc.orderId = 133971
vc.orderId = orderId ?? 0
navigationController?.pushViewController(vc)
} else if indexPath.row == 4 {
//工作经历
let vc = YHWorkExperienceListViewController()
navigationController?.pushViewController(vc)
} else if indexPath.row == 5 {
//其他信息
let vc = YHOtherInfoFillViewController()
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterSecondViewController.swift
View file @ 1abfcb9b
......@@ -44,6 +44,10 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
loadData()
}
override func viewWillAppear(_ animated: Bool) {
super.viewWillAppear(animated)
loadData()
}
}
extension YHServiceCenterSecondViewController {
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift
View file @ 1abfcb9b
......@@ -87,6 +87,9 @@ extension YHBasicInfoFillViewController {
self.homeTableView.reloadData()
} else {
YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
DispatchQueue.main.asyncAfter(wallDeadline: .now() + 1.5) {[weak self] in
self?.navigationController?.popViewController(animated: true)
}
}
self.homeTableView.reloadData()
}
......@@ -135,10 +138,10 @@ extension YHBasicInfoFillViewController {
for (index0,item0) in item.arrQuestionItem.enumerated() {
if index0 == 0 {
let value = ["has":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_deny")
applicant.updateValue(value, forKey: "child_departure")
} else if index0 == 1 {
let value = ["has":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_departure")
applicant.updateValue(value, forKey: "child_deny")
} else {
printLog("其他数据没有处理")
}
......@@ -157,10 +160,10 @@ extension YHBasicInfoFillViewController {
for (index0,item0) in item.arrQuestionItem.enumerated() {
if index0 == 0 {
let value = ["has":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_deny")
applicant.updateValue(value, forKey: "child_departure")
} else if index0 == 1 {
let value = ["has":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
applicant.updateValue(value, forKey: "child_departure")
applicant.updateValue(value, forKey: "child_deny")
} else {
printLog("其他数据没有处理")
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift
View file @ 1abfcb9b
......@@ -147,9 +147,6 @@ extension YHBasicInfoFillViewModel {
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
// //http://192.168.25.21:10087 梁杰ip
// let strUrl = "http://192.168.25.21:10087/" + "infoflow/basics/get_basics"
let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
//1. json字符串 转 对象
......@@ -160,15 +157,22 @@ extension YHBasicInfoFillViewModel {
return
}
printLog("model 是 ==> \(model)")
let dic = model.data?.peel
guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
self.dataModelForBasicInfo = resultModel
//根据返回值 组装 真实的数据
callBackBlock(true,nil)
if model.code == 200 {
let dic = model.data?.peel
guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
self.dataModelForBasicInfo = resultModel
//根据返回值 组装 真实的数据
callBackBlock(true,nil)
} else {
let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
callBackBlock(false,error)
}
} failBlock: { err in
callBackBlock(false,err)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift
View file @ 1abfcb9b
......@@ -11,7 +11,8 @@ import SwifterSwift
import Toast_Swift
class YHEducationDetailVC: YHBaseViewController {
//【WARNING!】新添加 传orderId 已有信息传detailId
//【WARNING!】新添加 传orderId 已有信息传detailId和orderId
// 订单ID
var orderId: Int = 0
// 学历ID
......@@ -94,8 +95,6 @@ class YHEducationDetailVC: YHBaseViewController {
loadInfo()
if self.detailId != 0 { // 有学历ID则该学历已存在
getDetailInfo()
} else { // 该学历是新添加的
detailInfo.orderId = orderId
}
}
......@@ -112,7 +111,7 @@ class YHEducationDetailVC: YHBaseViewController {
let item01 = YHFormDetailItem(type: .educationStyle)
item01.placeHolder = "请选择授课形式".local
item01.tips = "请选择授课形式".local
item01.value = detailInfo.type
item01.value = detailInfo.teachingFormat
let item02 = YHFormDetailItem(type: .educationTime)
item02.placeHolder = "请选择年月".local
......@@ -128,12 +127,12 @@ class YHEducationDetailVC: YHBaseViewController {
let item04 = YHFormDetailItem(type: .educationMajor)
item04.placeHolder = "请输入专业".local
item04.tips = "请输入专业".local
item04.value = detailInfo.professional
item04.value = detailInfo.major
let item05 = YHFormDetailItem(type: .educationDegree)
item05.placeHolder = "请选择学位".local
item05.tips = "请选择学位".local
item05.value = detailInfo.background
item05.value = detailInfo.degree
let item06 = YHFormDetailItem(type: .degreeType)
item06.placeHolder = "请选择学位类型".local
......@@ -222,9 +221,9 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .educationMajor {
if let text = text, !text.isEmpty {
detailInfo.professional = text
detailInfo.major = text
} else {
detailInfo.professional = ""
detailInfo.major = ""
}
}
if isEditEnd {
......@@ -329,7 +328,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
YHFormPickerView.show(type: .edution, selectType: .education(.fullTime)) {
[weak self] selectType in
guard let self = self else { return }
detailInfo.type = selectType.title
detailInfo.teachingFormat = selectType.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false)
......@@ -358,7 +357,7 @@ extension YHEducationDetailVC : UITableViewDelegate, UITableViewDataSource {
YHFormPickerView.show(type: .degree, selectType: .degree(.bachelor)) {
[weak self] selectType in
guard let self = self else { return }
detailInfo.background = selectType.title
detailInfo.degree = selectType.title
loadInfo()
if detailId != 0 {
saveDetailInfo(isNeedPop: false)
......@@ -496,11 +495,11 @@ extension YHEducationDetailVC {
func checkIntegrity() -> Bool {
if detailInfo.college.isEmpty
|| detailInfo.type.isEmpty
|| detailInfo.teachingFormat.isEmpty
|| detailInfo.admissionTime.isEmpty
|| detailInfo.graduateTime.isEmpty
|| detailInfo.professional.isEmpty
|| detailInfo.background.isEmpty
|| detailInfo.major.isEmpty
|| detailInfo.degree.isEmpty
|| detailInfo.degreeType.isEmpty
|| detailInfo.schoolAddress.country.isEmpty
{
......@@ -521,21 +520,24 @@ extension YHEducationDetailVC {
func saveDetailInfo(isNeedPop:Bool) {
// detailInfo.toDictionary() 对于值为空的字段不会添加 而后台需要 所以如下处理
let dict:[String : Any] = ["verify": 0,
"id": detailInfo.id,
"order_id": detailInfo.orderId,
"admission_time": detailInfo.admissionTime,
"background": detailInfo.background,
"college": detailInfo.college,
"degree_type": detailInfo.degreeType,
"graduate_time": detailInfo.graduateTime,
"professional": detailInfo.professional,
"school_address_aboard": "",
"type": detailInfo.type,
"school_address": ["country": detailInfo.schoolAddress.country,
"area": detailInfo.schoolAddress.area,
"foreign": detailInfo.schoolAddress.foreign],
]
// let dict:[String : Any] = [
// "order_id":
// "id": detailInfo.id,
// "admission_time": detailInfo.admissionTime,
// "background": detailInfo.major,
// "college": detailInfo.college,
// "degree_type": detailInfo.degreeType,
// "graduate_time": detailInfo.graduateTime,
// "professional": detailInfo.major,
// "school_address_aboard": "",
// "type": detailInfo.teachingFormat,
// "school_address": ["country": detailInfo.schoolAddress.country,
// "area": detailInfo.schoolAddress.area,
// "foreign": detailInfo.schoolAddress.foreign],
// ]
guard var dict:[String:Any] = detailInfo.toDictionary() else { return }
dict["order_id"] = self.orderId
self.educationRequest.saveEducationInfo(params: dict) {
[weak self] success, error in
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift
View file @ 1abfcb9b
......@@ -156,10 +156,10 @@ class YHEducationInfoListVC: YHBaseViewController {
let questions = YHQuestionInfo.getEducationQuestion()
for questionInfo in questions {
if questionInfo.key == "qualification" {
questionInfo.answer = educationInfo.qualification
questionInfo.answer = educationInfo.isNameSame
} else if questionInfo.key == "graduate" {
questionInfo.answer = educationInfo.graduate
questionInfo.answer = educationInfo.isSpouseNameSame
}
arr2.append(questionInfo)
}
......@@ -256,7 +256,7 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
} else if detailItem.type == .addCertificateInfo { // 证书
let vc = YHQualificationDetailVC()
vc.orderId = String(self.orderId)
vc.orderId = self.orderId
self.navigationController?.pushViewController(vc)
}
return
......@@ -273,11 +273,9 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
var select0 = false
var select1 = false
if detailItem.answer == 1 {
select0 = true
} else if detailItem.answer == 2 {
select1 = true
if let answer = detailItem.answer {
select0 = answer
select1 = !answer
}
let answers = [YHFormChoiceItem(title: "是".local, isSelect: select0),YHFormChoiceItem(title: "否".local, isSelect: select1)]
......@@ -288,12 +286,12 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
guard let self = self else { return }
let selectItem:YHFormChoiceItem = arr[selectIndex]
let option = (selectItem.title == "是".local ? 1 : 2)
let option = (selectItem.title == "是".local ? true : false)
if detailItem.key == "qualification" {
self.educationInfo?.qualification = option
self.educationInfo?.isNameSame = option
} else if detailItem.key == "graduate" {
self.educationInfo?.graduate = option
self.educationInfo?.isSpouseNameSame = option
}
loadInfo()
}
......@@ -335,8 +333,8 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
let cell = tableView.dequeueReusableCell(withIdentifier: YHEducationInfoCell.cellReuseIdentifier, for: indexPath) as! YHEducationInfoCell
cell.titleLabel.text = eduInfo.college
cell.subTitleLabel.text = ""
if let professional = eduInfo.professional, let background = eduInfo.background {
cell.subTitleLabel.text = String("\(background)-\(professional)")
if let major = eduInfo.major, let degree = eduInfo.degree {
cell.subTitleLabel.text = String("\(degree)-\(major)")
}
cell.timeLabel.text = ""
if let admissionTime = eduInfo.admissionTime, let graduateTime = eduInfo.graduateTime {
......@@ -443,6 +441,7 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
if let eduList = educationInfo?.eduList, indexPath.row-1 < eduList.count {
let eduInfo = eduList[indexPath.row-1]
vc.detailId = eduInfo.id
vc.orderId = self.orderId
}
self.navigationController?.pushViewController(vc)
return
......@@ -451,7 +450,8 @@ extension YHEducationInfoListVC : UITableViewDelegate, UITableViewDataSource {
let vc = YHQualificationDetailVC()
if let quaList = educationInfo?.quaList, indexPath.row-1 < quaList.count {
let quaInfo = quaList[indexPath.row-1]
vc.detailId = String(quaInfo.id)
vc.detailId = quaInfo.id
vc.orderId = self.orderId
}
self.navigationController?.pushViewController(vc)
return
......@@ -489,7 +489,7 @@ extension YHEducationInfoListVC {
[weak self] success, error in
guard let self = self else { return }
if success {
educationInfo = self.educationRequest.educationInfo
educationInfo = self.educationRequest.listInfo
loadInfo()
}
}
......@@ -523,9 +523,9 @@ extension YHEducationInfoListVC {
func saveInfo() {
let params = ["go_next": 0,
"graduate": educationInfo?.graduate ?? 0,
"graduate": educationInfo?.isSpouseNameSame ?? 0,
"order_id": self.orderId,
"qualification": educationInfo?.qualification ?? 0]
"qualification": educationInfo?.isNameSame ?? 0] as [String : Any]
self.educationRequest.saveAllEducationInfo(params: params) {
[weak self] success, error in
......@@ -571,7 +571,7 @@ extension YHEducationInfoListVC {
}
// 检查所有问题是否有未答项
if educationInfo.qualification == 0 || educationInfo.graduate == 0 {
if educationInfo.isNameSame == nil || educationInfo.isSpouseNameSame == nil {
return false
}
return true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHEducationInfo.swift
View file @ 1abfcb9b
......@@ -10,21 +10,20 @@ import UIKit
import SmartCodable
class YHEducationListInfo: SmartCodable {
var orderId: Int = 0
var eduList: [YHEducationInfo]?
var eduCount: Int = 0
var quaList: [YHQualificationInfo]?
var quaCount: Int = 0
var qualification: Int = 0
var graduate: Int = 0
var isNameSame:Bool?
var isSpouseNameSame:Bool?
// 1=已婚,2=未婚,3=离婚,4=分居,5=丧偶,6=事实婚姻,7=鳏寡
var married: Int = 0
enum CodingKeys: String, CodingKey {
case orderId = "order_id"
case eduList = "edu_list"
case eduCount = "edu_count"
case quaList = "qua_list"
case quaCount = "qua_count"
case qualification = "qualification"
case graduate = "graduate"
case isNameSame = "is_name_same"
case isSpouseNameSame = "is_spouse_name_same"
case married = "married"
}
......@@ -35,20 +34,18 @@ class YHEducationListInfo: SmartCodable {
class YHEducationInfo: SmartCodable {
var id: Int = 0
var orderId: Int = 0
var college: String?
var background: String?
var professional: String?
var major: String?
var degree: String?
var admissionTime: String?
var graduateTime: String?
var vacantNum: Int = 0
enum CodingKeys: String, CodingKey {
case id = "id"
case orderId = "order_id"
case college = "college"
case background = "background"
case professional = "professional"
case major = "major"
case degree = "degree"
case admissionTime = "admission_time"
case graduateTime = "graduate_time"
case vacantNum = "vacant_num"
......@@ -61,13 +58,11 @@ class YHEducationInfo: SmartCodable {
class YHQualificationInfo: SmartCodable {
var id: Int = 0
var orderId: Int = 0
var qualification: String?
var vacantNum: Int = 0
enum CodingKeys: String, CodingKey {
case id = "id"
case orderId = "order_id"
case qualification = "qualification"
case vacantNum = "vacant_num"
}
......@@ -81,59 +76,27 @@ class YHQualificationInfo: SmartCodable {
class YHEducationDetailInfo: SmartCodable {
var id: Int = 0
var orderId: Int = 0
var college: String = ""
var isTop: Int = 0
var type: String = ""
var teachingFormat: String = ""
var admissionTime: String = ""
var graduateTime: String = ""
var background: String = ""
var professional: String = ""
var degree: String = ""
var major: String = ""
var degreeType: String = ""
var remark: String = ""
var average: String = ""
var schoolAddress: YHCollegeAddress = YHCollegeAddress()
var schoolAddressAboard: Int = 0
var oldId: Int = 0
var createdAt: String = ""
var updatedAt: String = ""
var deletedAt: String = ""
var isShow: Int = 0
var operatorName: String = ""
var operatorEnglishName: String = ""
var operatorId: Int = 0
var matchListing: Int = 0
var createFromAppid: Int = 0
var updateFromAppid: Int = 0
var customerCenterId: Int = 0
var isAboardSchool: Bool = false
enum CodingKeys: String, CodingKey {
case id = "id"
case orderId = "order_id"
case college = "college"
case isTop = "is_top"
case type = "type"
case teachingFormat = "teaching_format"
case admissionTime = "admission_time"
case graduateTime = "graduate_time"
case background = "background"
case professional = "professional"
case degree = "degree"
case major = "major"
case degreeType = "degree_type"
case remark = "remark"
case average = "average"
case schoolAddress = "school_address"
case schoolAddressAboard = "school_address_aboard"
case oldId = "old_id"
case createdAt = "created_at"
case updatedAt = "updated_at"
case deletedAt = "deleted_at"
case isShow = "is_show"
case operatorName = "operator_name"
case operatorEnglishName = "operator_english_name"
case operatorId = "operator_id"
case matchListing = "match_listing"
case createFromAppid = "create_from_appid"
case updateFromAppid = "update_from_appid"
case customerCenterId = "customer_center_id"
case isAboardSchool = "is_aboard_school"
}
required init() {
......@@ -169,52 +132,26 @@ class YHCollegeAddress: Codable {
}
class YHQualificationDetailInfo: SmartCodable {
var id: String = ""
var orderId: String = ""
var college: String = ""
var collegeAddress: YHCollegeAddress = YHCollegeAddress()
var collegeAddressAboard: Int = 0
var promulgation: String = ""
var qualification: String = ""
var remark: String = ""
var oldId: Int = 0
var createdAt: String = ""
var updatedAt: String = ""
var deletedAt: String = ""
var operatorName: String = ""
var operatorEnglishName: String = ""
var operatorId: Int = 0
var matchListing: Int = 0
var createFromAppid: Int = 0
var updateFromAppid: Int = 0
var customerCenterId: Int = 0
enum CodingKeys: String, CodingKey {
case id = "id"
case orderId = "order_id"
case college = "college"
case collegeAddress = "college_address"
case collegeAddressAboard = "college_address_aboard"
case promulgation = "promulgation"
case qualification = "qualification"
case remark = "remark"
case oldId = "old_id"
case createdAt = "created_at"
case updatedAt = "updated_at"
case deletedAt = "deleted_at"
case operatorName = "operator_name"
case operatorEnglishName = "operator_english_name"
case operatorId = "operator_id"
case matchListing = "match_listing"
case createFromAppid = "create_from_appid"
case updateFromAppid = "update_from_appid"
case customerCenterId = "customer_center_id"
}
var id: Int = 0
var certName: String = ""
var issuingAgent: String = ""
var issuingYear: Int = 0
var issuingAddr: YHCollegeAddress = YHCollegeAddress()
var isAboardAddr: Bool = false
enum CodingKeys: String, CodingKey {
case id = "id"
case certName = "cert_name"
case issuingAgent = "issuing_agent"
case issuingYear = "issuing_year"
case issuingAddr = "issuing_addr"
case isAboardAddr = "is_aboard_addr"
}
// 学校是否在国外 默认是在国内
func isCollegeInAboard() -> Bool {
if collegeAddress.country.isEmpty { return false }
if collegeAddress.country.contains("中国") {
if issuingAddr.country.isEmpty { return false }
if issuingAddr.country.contains("中国") {
return false
}
return true
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHEducationRequestViewModel.swift
View file @ 1abfcb9b
......@@ -10,7 +10,7 @@ import UIKit
class YHEducationRequestViewModel {
// 学历和专业信息
var educationInfo: YHEducationListInfo?
var listInfo: YHEducationListInfo?
// 学历详情信息
var educationDetailInfo: YHEducationDetailInfo?
// 专业详情信息
......@@ -21,7 +21,7 @@ class YHEducationRequestViewModel {
YHHUD.show(.progress(message: "数据加载中..."))
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Education.getEducationAndQulificationInfoApi
let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Education.getEducationAndQulificationInfoListApi
let _ = YHNetRequest.getRequest(url: strUrl, params:params) {[weak self] json, code in
......@@ -39,7 +39,7 @@ class YHEducationRequestViewModel {
callBackBlock(false,nil)
return
}
educationInfo = resultModel
listInfo = resultModel
callBackBlock(true,nil)
} failBlock: { err in
......@@ -191,7 +191,7 @@ class YHEducationRequestViewModel {
}
// 获取专业详情
func getQualificationDetailInfo(id:String, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
func getQualificationDetailInfo(id:Int, callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
YHHUD.show(.progress(message: "数据加载中..."))
......@@ -207,15 +207,21 @@ class YHEducationRequestViewModel {
return
}
printLog("model 是 ==> \(model)")
let dic = model.data?.peel as? [AnyHashable : Any]
guard let resultModel = YHQualificationDetailInfo.deserialize(dict: dic as? [AnyHashable : Any]) else {
if let dic = model.data?.peel as? [AnyHashable : Any] {
guard let quaDict = dic["qua_data"] as? [AnyHashable : Any] , let resultModel = YHQualificationDetailInfo.deserialize(dict:quaDict as? [AnyHashable : Any]) else {
callBackBlock(false,nil)
return
}
qualificationDetailInfo = resultModel
callBackBlock(true,nil)
return
} else {
callBackBlock(false,nil)
return
}
qualificationDetailInfo = resultModel
callBackBlock(true,nil)
} failBlock: { err in
callBackBlock(false,err)
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/Education&Qualification(学历专业资格填写)/M/YHQuestionInfo.swift
View file @ 1abfcb9b
......@@ -13,7 +13,7 @@ class YHQuestionInfo: SmartCodable, YHFormItemProtocol {
var key: String = ""
var question: String = ""
var answer: Int = 0
var answer: Bool?
enum CodingKeys: String, CodingKey {
case key = "key"
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift
View file @ 1abfcb9b
......@@ -112,6 +112,8 @@ extension YHServiceCenterMainViewModel {
}
printLog("model 是 ==> \(model)")
arrContactStausItmes = []
if model.code == 200 {
let dic = model.data?.peel
guard let resultModel = YHContactMainItemStatusModel2.deserialize(dict: dic as? [AnyHashable : Any]) else {
......
galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift
View file @ 1abfcb9b
......@@ -52,6 +52,7 @@ extension YHLoginViewModel {
"channel": "app",
"client": "super_app"]
let strUrl = "http://test.api.diymanager.galaxy-immi.com/" + "auth/login"
// let strUrl = "http://192.168.34.106:18088/" + "auth/login"
let _ = YHNetRequest.postRequest(url: strUrl, params: params) {[weak self] json, code in
//1. json字符串 转 对象
guard let self = self else { return }
......
galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift
View file @ 1abfcb9b
......@@ -52,12 +52,18 @@ class YHAllApiName {
}
struct Education {
// 获取学历及证书相关信息
static let getEducationAndQulificationInfoApi = "frontend/education/list"
// 获取教育和专业资格列表
// static let getEducationAndQulificationInfoApi = "frontend/education/list"
static let getEducationAndQulificationInfoListApi = "infoflow/getEducationList"
// 获取学历详情信息
static let getEducationDetailInfoApi = "frontend/education/detail"
// static let getEducationDetailInfoApi = "frontend/education/detail"
static let getEducationDetailInfoApi = "infoflow/getEducationDetail"
// 保存学历信息
static let saveEducationInfoApi = "frontend/education/save"
// static let saveEducationInfoApi = "frontend/education/save"
static let saveEducationInfoApi = "infoflow/saveEducationData"
// 删除学历
static let deleteEducationInfoApi = "frontend/education/del"
// 保存所有信息
......@@ -66,11 +72,13 @@ class YHAllApiName {
struct Qualification {
// 获取学历详情信息
static let getQualificationDetailInfoApi = "frontend/qualification/detail"
// static let getQualificationDetailInfoApi = "frontend/qualification/detail"
static let getQualificationDetailInfoApi = "infoflow/getQuaDetail"
// 删除专业
static let deleteQualificationInfoApi = "frontend/qualification/del"
// 保存专业
static let saveQualificationInfoApi = "frontend/qualification/save"
// 保存专业详情
// static let saveQualificationInfoApi = "frontend/qualification/save"
static let saveQualificationInfoApi = "infoflow/saveQualification"
}
......
galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift
View file @ 1abfcb9b
......@@ -14,8 +14,8 @@ class YHBaseUrlManager {
//开发环境
// static let baseUrlTest : String = "https://test-private-sphere.galaxy-immi.com/"
// static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
// static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/"
static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/"
// static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/" //智汇银河 - 微信小程序
static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/" //APP 使用域名
......
galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift
View file @ 1abfcb9b
......@@ -93,8 +93,8 @@ class YHNetRequest: NSObject {
print("sign = \(sign)")
requestHeader.add(name:"sign",value:sign)
requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-") //for test hjl
testToken(&requestHeader)
requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
// testToken(&requestHeader) //for test hjl 使用固定token
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