家庭信息

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

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

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

@@ -66,7 +66,9 @@ class YHSpouseInfoContainerVC: YHBaseViewController, YHSpouseInfoVCProtocol {
     }()
     
     var bottomView: YHSaveAndSubmitView = {
-        return YHSaveAndSubmitView.createView()
+        let view = YHSaveAndSubmitView.createView()
+        view.changeRightBtnTitle("下一步")
+        return view
     }()
         
     let primaryInfoVC =  YHSpousePrimaryInfoVC()

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

@@ -249,7 +249,7 @@ extension YHFamilyMemberInfoVC {
     // 添加兄弟姐妹子女
     func addFamilyMember(_ type:YHFamilyMemberType) {
         
-        let dict:[String: Any] = ["orderId":self.orderId,
+        let dict:[String: Any] = ["order_id":self.orderId,
                                   "relation":String(type.rawValue),
                                   "step":0,
                                   "next":false,
@@ -543,6 +543,7 @@ extension YHFamilyMemberInfoVC : UITableViewDelegate, UITableViewDataSource {
              if detailItem.relationType == .father || detailItem.relationType == .mother {
              let vc = YHParentInfoVC()
              vc.parentInfo = detailItem
+             vc.orderId = orderId
              self.navigationController?.pushViewController(vc)
              return
              }

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

@@ -11,6 +11,7 @@ import UIKit
 class YHParentInfoVC: YHBaseViewController {
     
     var parentInfo: YHFamilyMember?
+    var orderId: Int = 0
     var items:[[YHFormItemProtocol]] = [[YHFormItemProtocol]]()
     let familyRequest:YHFamilyRequestViewModel = YHFamilyRequestViewModel()
     // 是否显示未填写错误提示
@@ -581,29 +582,27 @@ extension YHParentInfoVC {
     
     func submitInfo() {
         
-        let isChecked = checkIntegrity()
-        isNeedShowError = !isChecked
-        
-        self.tableView .reloadData()
-        
-        if !isChecked {
-            YHHUD.flash(message: "资料还未填完")
-            return
-        }
+//        let isChecked = checkIntegrity()
+//        isNeedShowError = !isChecked
+//        
+//        self.tableView .reloadData()
+//        
+//        if !isChecked {
+//            YHHUD.flash(message: "资料还未填完")
+//            return
+//        }
         
         guard let parentInfo = parentInfo else { return }
         guard let info = parentInfo.toDictionary() else { return }
         
-        let dict:[String: Any] = ["orderId":parentInfo.orderId,
-                                  "relation":parentInfo.relationType.rawValue,
+        let dict:[String: Any] = ["order_id":orderId,
+                                  "relation":parentInfo.relation,
                                   "step":parentInfo.step,
                                   "next":false,
                                   "info":info]
         
         self.familyRequest.addOrSaveFamilyMember(params:dict) { success, error in
-            if success {
-                
-            }
+            YHHUD.flash(message:  success ? "保存成功" : "保存失败")
         }
     }
     

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

@@ -157,7 +157,7 @@ class YHFormItemSelectSheetCell: UITableViewCell {
         arrowImgView.snp.makeConstraints { make in
             make.size.equalTo(CGSizeMake(20, 20))
             make.right.equalToSuperview().offset(-horizonalGap)
-            make.centerY.equalTo(detailLabel)
+            make.top.equalTo(titleLabel)
         }
         
         topLine.snp.makeConstraints { make in

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

@@ -140,6 +140,10 @@ class YHSaveAndSubmitView: UIView {
         }
     }
     
+    func changeRightBtnTitle(_ title:String?) {
+        submitBtn.setTitle(title, for: .normal)
+    }
+    
     @objc func didClickSubmitBtn() {
         if let submitBlock = submitBlock {
             submitBlock()