细节校验

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -921,7 +921,7 @@
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
-		04E86E222B81EA1000A35F4B /* WorkExperience */ = {
+		04E86E222B81EA1000A35F4B /* WorkExperience(工作经验) */ = {
 			isa = PBXGroup;
 			children = (
 				04E86E232B81EA1000A35F4B /* ViewModel */,
@@ -929,7 +929,7 @@
 				04E86E272B81EA1000A35F4B /* C */,
 				04E86E292B81EA1000A35F4B /* V */,
 			);
-			path = WorkExperience;
+			path = "WorkExperience(工作经验)";
 			sourceTree = "<group>";
 		};
 		04E86E232B81EA1000A35F4B /* ViewModel */ = {
@@ -1619,7 +1619,7 @@
 		A5C382C82B5E101E00C5E65C /* ServiceProcess(流程) */ = {
 			isa = PBXGroup;
 			children = (
-				04E86E222B81EA1000A35F4B /* WorkExperience */,
+				04E86E222B81EA1000A35F4B /* WorkExperience(工作经验) */,
 				04C693652B73183E004C1758 /* Education&Qualification(学历专业资格填写) */,
 				A5234E382B72346A00A33433 /* OtherInformation(其他信息) */,
 				A58556BB2B6BD81C003746B2 /* BaseInformation(基本资料) */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/M/YHFamilyMemberViewModel.swift

@@ -137,7 +137,7 @@ class YHFamilyMemberViewModel {
     
     // 上传方法
     func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/upload/storage"
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
         let boundary = UUID().uuidString
         let headers: HTTPHeaders = [
             "Content-type": "multipart/form-data; boundary=\(boundary)",
@@ -158,8 +158,9 @@ class YHFamilyMemberViewModel {
     }
     
     func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/storage/convertToPublicURL" + "?fileUrl=\(url)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
+        let param: [String: Any] = ["fileUrl": url]
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let _ = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/MainApplicantInformation(主申请人信息)/VM/YHMainApplicantInformationViewModel.swift

@@ -392,7 +392,7 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
     
     // 上传方法
     func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/upload/storage"
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
         let boundary = UUID().uuidString
         let headers: HTTPHeaders = [
             "Content-type": "multipart/form-data; boundary=\(boundary)",
@@ -413,8 +413,10 @@ class YHMainApplicantInformationViewModel: YHBaseViewModel {
     }
     
     func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/storage/convertToPublicURL" + "?fileUrl=\(url)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
+        let param: [String: Any] = ["fileUrl": url]
+
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let _ = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHCompanySelectViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/C/YHCompanySelectViewController.swift

@@ -32,6 +32,21 @@ class YHCompanySelectViewController: YHBaseViewController {
     
     func setView() {
         view.backgroundColor = .white
+        
+        let bgView = {
+            let view = UIView()
+            view.backgroundColor = UIColor(hex: 0xf8f9fb)
+            view.layer.cornerRadius = 21
+            return view
+        }()
+        view.addSubview(bgView)
+        bgView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 16)
+            make.height.equalTo(41)
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+        }
+        
         searchView = {
             let searchBar = UITextField()
             searchBar.placeholder = "请输入用人单位全称"
@@ -41,14 +56,15 @@ class YHCompanySelectViewController: YHBaseViewController {
             searchBar.layer.cornerRadius = 21
             searchBar.leftView = UIView(frame: CGRect(x: 0, y: 0, width: 16, height: 42))
             searchBar.leftViewMode = .always
+            searchBar.clearButtonMode = .always
             return searchBar
         }()
         view.addSubview(searchView)
         searchView.snp.makeConstraints { make in
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 16)
-            make.height.equalTo(42)
+            make.height.equalTo(41)
             make.left.equalTo(16)
-            make.right.equalTo(-16)
+            make.right.equalTo(-90)
         }
         
         sureButton = {
@@ -58,15 +74,15 @@ class YHCompanySelectViewController: YHBaseViewController {
             button.contentHorizontalAlignment = .center
             button.setTitle("保存", for: .normal)
             button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
-            button.layer.cornerRadius = 18
+            button.layer.cornerRadius = 16.5
             button.addTarget(self, action: #selector(submit), for: .touchUpInside)
             return button
         }()
         view.addSubview(sureButton)
         sureButton.snp.makeConstraints { make in
             make.centerY.equalTo(searchView.snp.centerY)
-            make.height.equalTo(36)
-            make.width.equalTo(80)
+            make.height.equalTo(33)
+            make.width.equalTo(66)
             make.right.equalTo(-16)
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkExperienceViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/C/YHWorkExperienceViewController.swift

@@ -198,16 +198,10 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
             if self.viewModel.mainModel.is_project_introduction == 1 {
                 return 1
             } else {
-                if viewModel.mainModel.not_need_upload_file == 1 {
-                    return 1
-                }
                 return 2
             }
         }
         if stepView.currentIndex == 4 {
-            if viewModel.mainModel.not_need_upload_file == 1 {
-                return 1
-            }
             return 2
         }
         return baseDataSource?.count ?? 0
@@ -252,6 +246,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
         } else if stepView.currentIndex == 2 {
             let cell = tableView.dequeueReusableCell(withClass: YHWorkHighlightsTableViewCell.self)
             cell.dataSource = viewModel.mainModel.highlights
+            cell.detailSwitch.isOn = viewModel.mainModel.is_project_introduction == 1
             cell.exampleBlock = {[weak self] in
                 guard let self = self else { return }
                 let mainVc = YHWorkExampleViewController()
@@ -348,6 +343,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                 } else {
                     let cell = tableView.dequeueReusableCell(withClass: YHWorkFileSyncTableViewCell.self)
                     cell.dataSource = fileDataSource
+                    cell.isHidden = viewModel.mainModel.not_need_upload_file == 1 && isShowMessageSelect
                     cell.addIntroductionBlock = { [weak self] in
                         guard let self = self else { return }
                         YHImagePickerView.show() {[weak self] image in
@@ -398,6 +394,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
             } else {
                 let cell = tableView.dequeueReusableCell(withClass: YHWorkFileSyncTableViewCell.self)
                 cell.dataSource = fileDataSource
+                cell.isHidden = viewModel.mainModel.not_need_upload_file == 1 && isShowMessageSelect
                 cell.addIntroductionBlock = { [weak self] in
                     guard let self = self else { return }
                     YHImagePickerView.show() {[weak self] image in
@@ -444,7 +441,7 @@ extension YHWorkExperienceViewController: UITableViewDelegate, UITableViewDataSo
                 guard let self = self else { return }
                 self.viewModel.updateModel(model)
                 let id = model.id
-                if id != .id1 && id != .id3 && id != .id4 && id != .id7 && id != .id8 && id != .id12 && id != .id14 && id != .id17 && id != .id17 && id != .id18 {
+                if id != .id1 && id != .id3 && id != .id4 && id != .id7 && id != .id8 && id != .id12 && id != .id14 && id != .id16 && id != .id17 && id != .id18 {
                     self.updateDataSource()
                 }
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/C/YHWorkIntroductionViewController.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/C/YHWorkIntroductionViewController.swift

@@ -281,14 +281,16 @@ class YHWorkIntroductionViewController: YHBaseViewController {
     }
     
     @objc func startClick() {
-        YHDatePickView.show(type: .yyyymmdd) { date in
+        view.endEditing(true)
+        YHDatePickView.show(type: .yyyymmdd, title: "请选择开始时间") { date in
             self.startTextField.text = date
             self.dataSource.project_start_time = date
         }
     }
      
     @objc func endClick() {
-        YHDatePickView.show(type: .yyyymmdd) { date in
+        view.endEditing(true)
+        YHDatePickView.show(type: .yyyymmdd, title: "请选择结束时间") { date in
             self.endTextField.text = date
             self.dataSource.project_end_time = date
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkExperienceViewModel.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/ViewModel/YHWorkExperienceViewModel.swift

@@ -22,7 +22,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let item1 = YHWorkExperienceModel(id: .id2, isNeed: true, title: "用人单位性质", isUserKeyBoard: false, prompts: "请输入", message: mainModel.industry, type: .nature, isShowPrompts: isShowPrompt, alertMessage:"请选择用人单位性质")
         let item2 = YHWorkExperienceModel(id: .id3, isNeed: false, title: "用人单位介绍", isUserKeyBoard: true, prompts: "如方便提供，请填写", message: mainModel.company_introduce)
         let item3 = YHWorkExperienceModel(id: .id4, isNeed: false, title: "用人单位官网", isUserKeyBoard: true, prompts: "如有，请输入官网链接", message: mainModel.company_website)
-        let item4 = YHWorkExperienceModel(id: .id5, isNeed: true, title: "出生国家/地区", isUserKeyBoard: false, prompts: nil, message: mainModel.location.country, type: .country, isShowPrompts: isShowPrompt, alertMessage:"请选择工作国家/地区")
+        let item4 = YHWorkExperienceModel(id: .id5, isNeed: true, title: "出生国家/地区", isUserKeyBoard: false, prompts: "请选择", message: mainModel.location.country, type: .country, isShowPrompts: isShowPrompt, alertMessage:"请选择工作国家/地区")
         var string = ""
         let array = mainModel.location.area
         for item in array {
@@ -34,7 +34,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
         let item7 = YHWorkExperienceModel(id: .id9, isNeed: true, title: "入职年月", isUserKeyBoard: false, prompts: "请选择", message: mainModel.entry_time, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择入职年月")
         let item8 = YHWorkExperienceModel(id: .id10, isNeed: true, title: "离职年月", isUserKeyBoard: false, prompts: "请选择", message: mainModel.departure_time, type: .time, isShowPrompts: isShowPrompt, alertMessage:"请选择离职年月")
         let item9 = YHWorkExperienceModel(id: .id11, isNeed: true, title: "工作证明文件", isUserKeyBoard: false, prompts: "请选择", message: mainModel.work_certificate, type: .certificate, isShowPrompts: isShowPrompt, alertMessage:"请选择工作证明文件")
-        let item10 = YHWorkExperienceModel(id: .id12, isNeed: false, title: "职责性质", isUserKeyBoard: true, prompts: "请选择", message: mainModel.duty, isShowPrompts: isShowPrompt, alertMessage:"请输入职责性质")
+        let item10 = YHWorkExperienceModel(id: .id12, isNeed: true, title: "职责性质", isUserKeyBoard: true, prompts: "请选择", message: mainModel.duty, isShowPrompts: isShowPrompt, alertMessage:"请输入职责性质")
         let item11 = YHWorkExperienceModel(id: .id13, isNeed: false, title: "相关工作经验是否属于国际工作经验", isUserKeyBoard: false, prompts: "", message: "\(mainModel.international_work_experience)", leftButtonString: "是", rightButtonString: "否")
         let addressCountry = mainModel.location.country
         var section = YHSectionWorkExperienceModel()
@@ -278,7 +278,7 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     
     // 上传方法
     func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/upload/storage"
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
         let boundary = UUID().uuidString
         let headers: HTTPHeaders = [
             "Content-type": "multipart/form-data; boundary=\(boundary)",
@@ -299,8 +299,9 @@ class YHWorkExperienceViewModel: YHBaseViewModel {
     }
     
     func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/storage/convertToPublicURL" + "?fileUrl=\(url)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
+        let param: [String: Any] = ["fileUrl": url]
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let _ = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience/ViewModel/YHWorkIntroductionViewModel.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/WorkExperience(工作经验)/ViewModel/YHWorkIntroductionViewModel.swift

@@ -56,7 +56,7 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
     
     // 上传方法
     func uploadImage(_ image: UIImage, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/upload/storage"
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.upload
         let boundary = UUID().uuidString
         let headers: HTTPHeaders = [
             "Content-type": "multipart/form-data; boundary=\(boundary)",
@@ -77,8 +77,9 @@ class YHWorkIntroductionViewModel: YHBaseViewModel {
     }
     
     func getPublicImageUrl(_ url: String, callBackBlock:@escaping (_ success: String?, _ error:YHErrorModel?)->()) {
-        let strUrl = "https://test-comserver.galaxy-immi.com/oss/storage/convertToPublicURL" + "?fileUrl=\(url)"
-        let _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, code in
+        let strUrl = YHBaseUrlManager.shared.curOssURL() + YHAllApiName.OOS.getPublic
+        let param: [String: Any] = ["fileUrl": url]
+        let _ = YHNetRequest.getRequest(url: strUrl, params: param) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let _ = self else { return }
             if json.code == 200 {

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -168,4 +168,9 @@ class YHAllApiName {
         //工作经验
         static let previewWorkExpInfoApi = "infoflow/work/preview"
     }
+    
+    struct OOS {
+        static let upload = "oss/upload/storage"
+        static let getPublic = "oss/storage/convertToPublicURL"
+    }
 }

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -17,6 +17,9 @@ class YHBaseUrlManager {
 //    static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/" //智汇银河 - 微信小程序
     static let baseUrlTest : String = "http://test.api.diymanager.galaxy-immi.com/" //APP 使用域名
     
+    static let baseOOSUrlTest : String = "https://test-comserver.galaxy-immi.com/"
+    static let baseOOSUrlRelease : String = "http://comserver.galaxy-immi.com" //APP 使用域名
+
     //正式环境
     static let baseUrlRelease : String = "http://test.api.diymanager.galaxy-immi.com/"
     
@@ -40,6 +43,14 @@ class YHBaseUrlManager {
 #endif
     }
     
+    func curOssURL() -> String {
+#if DEBUG
+        return urlForEditing ?? YHBaseUrlManager.baseOOSUrlTest
+#else
+        return YHBaseUrlManager.baseOOSUrlRelease
+#endif
+    }
+    
     // MARK: - 当前使用的url
     func h5URL() -> String {
 #if DEBUG