Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2431,7 +2431,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2473,7 +2473,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHInformationPerfectListVC.swift

@@ -187,6 +187,11 @@ extension YHInformationPerfectListVC {
             if success == true {
                 let model =  self?.serviceCenterMainReqVM.allInfoScoreModel
                 YHSubmintAllInfoSuccessTipView.showCheckView(model: model) { agree in
+                    
+                    //1、刷新当前界面
+                    self?.loadData()
+                    
+                    //2、跳转其他界面
                     if agree == true {
                         self?.goScoreVC()
                     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactMainItemStatusModel.swift

@@ -38,12 +38,13 @@ class YHContactMainItemStatusModel {
 
 
 struct YHContactMainItemStatusModel2 :  SmartCodable {
-    var fill_info_step : Int = 0
+    var fill_info_step : Int = 0 //我的信息  当前第几步
+    var supplement_not_submit_num : Int = 0 //资料上传 待上传的数量
+    var scheme_position_switch : Int = 0 //方案定位是否开启 0未开启 1开启
+    var my_signature : Bool = false //是否开启我的签字
+    var my_document : Bool = false  //是否开启我的文书
 }
 
-
-
 struct YHContactInfoScoreModel :  SmartCodable {
-    var sum_score : String = ""
+    var sum_score : String = ""    
 }
-

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/PersonInfoList(个人信息预览)/VM/YHPreviewViewModel.swift

@@ -229,8 +229,20 @@ private extension YHPreviewViewModel {
                     let tmp4 = YHPreviewQuestionAndAnswerModel(question: "用人单位官网：", answer: model.company_website.defaultStringIfEmpty())
                     var title = "-"
                     if let item = model.location {
-                        title = item.country + "-"  + item.details
+//                        title = item.country + "-"  + item.details
+                        if item.country.contains("中国") {
+                            title = "国内 "
+                            if item.area.count > 1 {
+                                title = title + item.area[0] + "/" + item.area[1]
+                            }
+                        } else {
+                            title = "国外 " + item.country + "-" + item.foreign
+                        }
                     }
+                    
+                    
+                    
+                    
                     let tmp5 = YHPreviewQuestionAndAnswerModel(question: "工作地点：", answer: title)
                     let tmp6 = YHPreviewQuestionAndAnswerModel(question: "职位：", answer: model.position)
                     let tmp7 = YHPreviewQuestionAndAnswerModel(question: "入职年月：", answer: model.entry_time)
@@ -331,7 +343,7 @@ private extension YHPreviewViewModel {
                                 title = title + item.area[0] + "/" + item.area[1]
                             }
                         } else {
-                            title = "国外 " + item.country + item.foreign
+                            title = "国外 " + item.country + "-" + item.foreign
                         }
                     } else {
                         title = "--"
@@ -363,7 +375,7 @@ private extension YHPreviewViewModel {
                                 title = title + item.area[0] + "/" + item.area[1]
                             }
                         } else {
-                            title = "国外 " + item.country + item.foreign
+                            title = "国外 " + item.country + "-" + item.foreign
                         }
                     } else {
                         title = "--"