// 提示语

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -514,15 +514,11 @@
 		041B52962B5E8E3B007EBCEB /* C */ = {
 			isa = PBXGroup;
 			children = (
-				04E86E0E2B70DE9400A35F4B /* YHSpouseInfoContainerVC.swift */,
+				04C8F4812B720DCD00ADF59B /* Child(子女) */,
+				04C8F4802B720DAB00ADF59B /* Spouse(配偶) */,
 				041B52972B5E8EA0007EBCEB /* YHFamilyMemberInfoVC.swift */,
-				041B52D52B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift */,
 				042FBBBA2B62806D00F9DE23 /* YHCertificateInfoController.swift */,
-				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
 				042FBBC22B63DA4C00F9DE23 /* YHParentInfoVC.swift */,
-				043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */,
-				042FBBC62B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift */,
-				042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */,
 				042FBBD52B67BDD500F9DE23 /* YHBrotherInfoVC.swift */,
 			);
 			path = C;
@@ -664,6 +660,26 @@
 			path = Localized;
 			sourceTree = "<group>";
 		};
+		04C8F4802B720DAB00ADF59B /* Spouse(配偶) */ = {
+			isa = PBXGroup;
+			children = (
+				04E86E0E2B70DE9400A35F4B /* YHSpouseInfoContainerVC.swift */,
+				041B52D52B5F899E007EBCEB /* YHSpousePrimaryInfoVC.swift */,
+				042FBBBE2B639F0300F9DE23 /* YHSpouseBasicInfoVC.swift */,
+			);
+			path = "Spouse(配偶)";
+			sourceTree = "<group>";
+		};
+		04C8F4812B720DCD00ADF59B /* Child(子女) */ = {
+			isa = PBXGroup;
+			children = (
+				043955222B70BC2500955D49 /* YHChildInfoContainerVC.swift */,
+				042FBBC62B64CFBF00F9DE23 /* YHChildPrimaryInfoVC.swift */,
+				042FBBCA2B65058000F9DE23 /* YHChildBasicInfoVC.swift */,
+			);
+			path = "Child(子女)";
+			sourceTree = "<group>";
+		};
 		4758815B24BAF3CAA24EC6A8 /* Pods */ = {
 			isa = PBXGroup;
 			children = (

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHChildBasicInfoVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Child(子女)/YHChildBasicInfoVC.swift

@@ -69,29 +69,40 @@ class YHChildBasicInfoVC: YHBaseViewController {
         let title0 = YHFormTitleItem(type: .childInfo)
         let item00 = YHFormDetailItem(type: .childName)
         item00.value = child.subsetName
-        item00.placeHolder = "请输入".local
+        item00.placeHolder = "请输入子女姓名".local
+        item00.tips = "请输入子女姓名".local
         let item01 = YHFormDetailItem(type: .everName, isNeed: false)
         item01.value = child.usedName
-        item01.placeHolder = "请输入".local
+        item01.tips = "请输入曾用名".local
+        item01.placeHolder = "请输入曾用名".local
         let item02 = YHFormDetailItem(type: .befourMarryFirstName, isNeed: false)
         item02.value = child.surname
-        item02.placeHolder = "请输入".local
+        item02.placeHolder = "请输入婚前姓氏".local
+        item02.tips = "请输入婚前姓氏".local
         let item03 = YHFormDetailItem(type: .gender)
         item03.value = child.sexName()
+        item03.tips = "请选择性别".local
         let item04 = YHFormDetailItem(type: .marriageState)
         item04.value = child.married
+        item04.tips = "请选择婚姻状况".local
         let item05 = YHFormDetailItem(type: .birthday)
         item05.value = child.birthday
+        item05.tips = "请选择出生日期".local
+        item05.placeHolder = "请选择出生日期".local
         let item06 = YHFormDetailItem(type: .birthNation)
         item06.value = String(child.isBirthOverSeas())
+        item06.tips = "请选择出生国家/地区".local
         let item07 = YHFormDetailItem(type: .birthCity)
         
         if child.isBirthOverSeas() {
             item07.value = child.birthPlace?.foreign
             item07.placeHolder = "请输入".local
+            item07.tips = "请输入出生城市".local
+
         } else {
             item07.value = child.birthPlace?.area?.joined(separator: ",")
-            item07.placeHolder = "请选择".local
+            item07.placeHolder = "请选择出生城市".local
+            item07.tips = "请选择出生城市".local
         }
         
         let arr0:[YHFormItemProtocol] = [title0, item00, item01, item02, item03, item04, item05, item06, item07]
@@ -100,13 +111,15 @@ class YHChildBasicInfoVC: YHBaseViewController {
         let title1 = YHFormTitleItem(type: .occupationInfo)
         let item10 = YHFormDetailItem(type: .occupation)
         item10.value = child.occupation
-        item10.placeHolder = "请选择".local
+        item10.tips = "请选择职业".local
+        item10.placeHolder = "请选择职业".local
         var arr1:[YHFormItemProtocol] = [title1, item10]
         
         if child.isNowHaveJob()  {
             let item11 = YHFormDetailItem(type: .occupationName)
             item11.value = child.occupationName
-            item11.placeHolder = "请输入".local
+            item10.tips = "请请输入职业名称".local
+            item11.placeHolder = "请请输入职业名称".local
             arr1.append(item11)
         }
         
@@ -115,22 +128,27 @@ class YHChildBasicInfoVC: YHBaseViewController {
         let title2 = YHFormTitleItem(type: .isPreviousMarriageChild)
         let item20 = YHFormDetailItem(type: .isPreviousMarriageChild)
         item20.value = String(child.isPreviousMarriageChild())
+        item20.tips = "请选择是否前次婚姻子女".local
         let arr2:[YHFormItemProtocol] = [title2, item20]
         
         // 在港信息
         let title3 = YHFormTitleItem(type: .inHongKongInfo)
         let item30 = YHFormDetailItem(type: .isNowInHK)
         item30.value = String(child.isNowInHK())
+        item30.tips = "请选择目前是否在港".local
+
         var arr3:[YHFormItemProtocol] = [title3, item30]
         
         
         if child.isNowInHK() { // 目前在港才显示 逗留期限和在港身份
             let item31 = YHFormDetailItem(type: .stayHKDate)
             item31.placeHolder = "请选择".local
+            item31.tips = "请选择获准逗留期限".local
             item31.value = child.childInHk?.info
             
             let item32 = YHFormDetailItem(type: .roleInHK)
             item32.placeHolder = "请选择".local
+            item32.tips = "请选择在港身份".local
             item32.value = child.hkIdentity
             
             arr3.append(contentsOf: [item31, item32])
@@ -140,11 +158,13 @@ class YHChildBasicInfoVC: YHBaseViewController {
         let title4 = YHFormTitleItem(type: .hkIdentityCardInfo)
         let item40 = YHFormDetailItem(type: .isHaveHkIdentityCard)
         item40.value = String(child.isHaveHKIdentityCard())
+        item40.tips = "请选择是否办理过香港身份证".local
         var arr4:[YHFormItemProtocol] = [title4, item40]
 
         if child.isHaveHKIdentityCard() { // 办理过香港身份证才显示证号
             let item41 = YHFormDetailItem(type: .hkIdentityCardNumber)
             item41.value = child.hkIdentityCard
+            item41.tips = "请输入香港身份证号".local
             arr4.append(item41)
         }
 
@@ -242,6 +262,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
                 cell.isMust = detailItem.isNeed
                 cell.placeHolder = detailItem.placeHolder
+                cell.setTips(detailItem.tips, isShow: detailItem.isShowTips)
                 cell.title = detailItem.getTitle()
                 cell.text = detailItem.value
                 cell.textChange = {
@@ -283,6 +304,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 cell.placeHolder = detailItem.placeHolder
                 cell.title = detailItem.getTitle()
                 cell.detail = detailItem.value
+                cell.setTips(detailItem.tips, isShow: detailItem.isShowTips)
                 return cell
             }
             
@@ -292,6 +314,7 @@ extension YHChildBasicInfoVC : UITableViewDelegate, UITableViewDataSource {
                 cell.isMust = detailItem.isNeed
                 cell.title = item.getTitle()
                 cell.answerArr = nil
+                cell.setTips(detailItem.tips, isShow: detailItem.isShowTips)
                 
                 if detailItem.type == .birthNation { // 出生国家
                     var select = false

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/YHSpousePrimaryInfoVC.swift → galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/FamilyMember(家庭成员信息表)/C/Spouse(配偶)/YHSpousePrimaryInfoVC.swift

@@ -67,6 +67,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController {
             let item10 = YHFormDetailItem(type: .nationOrArea)
             item10.value = spouse.nationality
             item10.placeHolder = "请选择".local
+            item10.tips = "请选择国家/地区".local
             let arr1:[YHFormItemProtocol] = [title1, item10]
             
             // 居住信息
@@ -96,6 +97,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController {
                                 item22.value = area.joined(separator: "/")
                             }
                             item22.placeHolder = "请选择城市".local
+                            item22.tips = "请请选择城市".local
                             item22.tips = "请选择城市".local
                             arr2.append(item22)
                         }
@@ -103,7 +105,7 @@ class YHSpousePrimaryInfoVC: YHBaseViewController {
                         let item23 = YHFormDetailItem(type: .detailAddress)
                         item23.value = address.details
                         item23.placeHolder = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
-                        item23.tips = "请填写详细地址".local
+                        item23.tips = (isLiveInChina ? "请填写小区、楼栋、单元室等".local : "请填写国外居住地".local)
                         arr2.append(item23)
                         
                         if !isLiveInChina {// 在国外
@@ -179,6 +181,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemDoubleChoiceCell.cellReuseIdentifier, for: indexPath) as! YHFormItemDoubleChoiceCell
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
+                cell.setTips(detailItem.tips, isShow: detailItem.isShowTips)
                 
                 var select = false
                 if let value = detailItem.value {
@@ -230,6 +233,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemSelectSheetCell.cellReuseIdentifier, for: indexPath) as! YHFormItemSelectSheetCell
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
+                cell.setTips(detailItem.tips, isShow: detailItem.isShowTips)
                 cell.placeHolder = detailItem.placeHolder
                 cell.detail = detailItem.value
                 return cell
@@ -239,6 +243,7 @@ extension YHSpousePrimaryInfoVC : UITableViewDelegate, UITableViewDataSource {
                 let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemInputTextCell.cellReuseIdentifier, for: indexPath) as! YHFormItemInputTextCell
                 cell.isMust = detailItem.isNeed
                 cell.title = detailItem.getTitle()
+                cell.setTips(detailItem.tips, isShow: detailItem.isShowTips)
                 cell.text = detailItem.value
                 cell.placeHolder = detailItem.placeHolder
                 cell.setTips(detailItem.tips, isShow:detailItem.isShowTips)

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

@@ -328,7 +328,9 @@ class YHFormDetailItem : YHFormItemProtocol {
     var isNeed: Bool = true
     
     var value: String?
+    // 灰色提示
     var placeHolder: String?
+    // 红色提示文字
     var tips:String?
     
     // 是否需要展示Tips