1、 2处提示

2、基本资料 配偶位置

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/BaseInformation(基本资料)/VM/YHBasicInfoFillViewModel.swift

@@ -99,6 +99,19 @@ extension YHBasicInfoFillViewModel {
             }
         }
         
+        do {
+            //配偶
+            if let spouse = dataModelForBasicInfo.spouse {
+                let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: spouse.child_departure?.has ?? "", info: spouse.child_departure?.info ?? "")
+                
+                let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: spouse.child_deny?.has ?? "", info: spouse.child_deny?.info ?? "")
+                let arr = [model1,model2]
+                
+                let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
+                arrData.append(sessionModel)
+            }
+        }
+        
         do {
             //子女 - xxx
             if let arrChild = dataModelForBasicInfo.child {
@@ -117,18 +130,7 @@ extension YHBasicInfoFillViewModel {
         }
         
         
-        do {
-            //配偶
-            if let spouse = dataModelForBasicInfo.spouse {
-                let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: spouse.child_departure?.has ?? "", info: spouse.child_departure?.info ?? "")
-                
-                let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: spouse.child_deny?.has ?? "", info: spouse.child_deny?.info ?? "")
-                let arr = [model1,model2]
         
-                let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
-                arrData.append(sessionModel)
-            }
-        }
         
         do {
             //家庭背景

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/WorkExperience(工作经验)/V/YHWorkExperienceTextItemView.swift

@@ -122,10 +122,13 @@ class YHWorkExperienceTextItemView: UIView {
     }
     
     @objc func showPrompts() {
-        if dataSource?.id == .id18 {
-            return
+        if dataSource?.id == .id3 {
+            YHWholeScreenTipsView.show(type: .company, targetView: nextStepImageView)
+            
+        } else if dataSource?.id == .id4 {
+            YHWholeScreenTipsView.show(type: .officialWebsite, targetView: nextStepImageView)
         }
-        YHWholeScreenTipsView.show(type: .residenceInfo, targetView: nextStepImageView)
+        
     }
 }
 

galaxy/galaxy/Classes/Tools/Helper/YHWholeScreenTipsView.swift

@@ -13,6 +13,7 @@ enum YHWholeScreenTipsViewType : Int {
     case residenceInfo //居住信息
     case degreeType //学位类型
     case company //用人单位介绍
+    case officialWebsite //用人单位官网
 }
 
 
@@ -63,6 +64,8 @@ class YHWholeScreenTipsView: UIView {
             return "该内容在学位证上，通常是授予后面，如授予“理学”学士学位，则填理学"
         case .company:
             return "可先填写用人单位名称，选择指定的用人单位后，系统将为您自动填写单位介绍"
+        case .officialWebsite:
+            return "可先填写用人单位名称，选择指定的用人单位后，系统将为您自动填写单位官网"
         default:
             return "--"
         }