// 家庭成员

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

@@ -161,6 +161,7 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
             guard let self = self else { return }
             if let targetStep = getStepForArrayIndex(index) {
                 currentStep = targetStep
+                spouse.step = targetStep
             }
             print("index:\(index)")
         }

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

@@ -336,6 +336,7 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
                 if formItem.type == .child {
                     if self.isChildsEditMode == .canCancel {
                         self.isChildsEditMode = .canEdit
+                        
                     } else if self.isChildsEditMode == .canEdit {
                         self.isChildsEditMode = .canCancel
                     }
@@ -343,6 +344,7 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
                 if formItem.type == .brother {
                     if self.isBrothersEditMode == .canCancel {
                         self.isBrothersEditMode = .canEdit
+                        
                     } else if self.isBrothersEditMode == .canEdit {
                         self.isBrothersEditMode = .canCancel
                     }
@@ -358,7 +360,7 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
             let detailItem = item as! YHFamilyMember
             let cell = tableView.dequeueReusableCell(withIdentifier: YHFormItemEnterDetailCell.cellReuseIdentifier, for: indexPath) as! YHFormItemEnterDetailCell
             cell.title = detailItem.getTitle()
-            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber > 0 ? .failColor : .labelTextColor2)
+            cell.detailLabel.textColor = (isNeedShowError && detailItem.notFillNumber != 0 ? .failColor : .labelTextColor2)
 
             if detailItem.notFillNumber > 0 {
                 cell.detailLabel.text = String(format: "有%d项未填写".local, detailItem.notFillNumber)

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

@@ -911,7 +911,7 @@ class YHFamilyMember: SmartCodable, YHFormItemProtocol {
     var finishFollow: Int = 0
     var step: Int = 0
     var isHandled: Int = 0
-    var notFillNumber: Int = 0
+    var notFillNumber: Int = -1
     var certificates: YHCertificates?
     var usedName: String = ""
     var hkIdentityOther: String = ""

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

@@ -45,7 +45,7 @@ class YHFamilyRequestViewModel {
        
        YHHUD.show(.progress(message: "数据加载中..."))
 
-       let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
+       let strUrl = "http://192.168.34.187:8808/" + YHAllApiName.Family.familyInfoApi
        
        let _ = YHNetRequest.postRequest(url: strUrl, params:params) {[weak self] json, code in
            

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

@@ -464,7 +464,14 @@ extension YHFormPickerView {
     
     func getSubType(_ title: String?) -> YHFormPickerViewSubType {
        
-       guard let title = title else { return .none }
+        guard let title = title, !title.isEmpty else {
+            
+            if let arr = dataDict[type], arr.count > 0 {
+                let item0:YHFormPickerViewItem = arr[0]
+                return item0.type
+            }
+            return .none
+        }
        
         switch type {