Merge commit '2d5acb60' into xiezhaolin

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/C/YHBasicInfoFillViewController.swift

@@ -55,9 +55,6 @@ extension YHBasicInfoFillViewController {
         bottomView.block = { tag in
             if tag == 0 {
                 //点击了保存按钮
-//                let arr = self.basicInfoVM.arrBasicInfoSessionDataForEdit
-//                printLog(arr)
-                
                 printLog("点击了保存按钮")
                 self.saveData()
             } else {
@@ -97,12 +94,36 @@ extension YHBasicInfoFillViewController {
     
     
     private func saveData() {
+        //保存
         submitAndSaveDataOp(isSaveFlag: true)
     }
     
     private func submitData() {
         //提交
-        submitAndSaveDataOp(isSaveFlag: false)
+        //1.校验
+        if dataIsOK() == true {
+            //提交数据
+            submitAndSaveDataOp(isSaveFlag: false)
+        } else {
+            homeTableView.reloadData()
+            YHHUD.flash(message: "请完善信息")
+        }
+    }
+    
+    //检查数据是否合法
+    private func dataIsOK() -> Bool {
+        var returnValue : Bool = true
+        
+        let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
+        for item in arr {
+            for (_,item0) in item.arrQuestionItem.enumerated() {
+                if (item0.answer == "Y" && item0.info.count < 1) || item0.answer == "" {
+                    item0.needCheckFlag = true
+                    returnValue = returnValue && false
+                }
+            }
+        }
+        return returnValue
     }
     
     private func submitAndSaveDataOp(isSaveFlag :  Bool) {
@@ -164,7 +185,6 @@ extension YHBasicInfoFillViewController {
                     arr = tArr
                 }
                 
-                
                 var applicant : [String : Any] = [:]
                 for (index0,item0) in item.arrQuestionItem.enumerated() {
                     if index0 == 0 {
@@ -182,7 +202,6 @@ extension YHBasicInfoFillViewController {
                 applicant.updateValue(item.model?.subset_name ?? "", forKey: "subset_name")
                 arr.append(applicant)
                 
-                
                 param.updateValue(arr, forKey: "child")
             } else if item.sessionTitle == "家庭背景" {
                 var applicant : [String : Any] = [:]
@@ -194,8 +213,6 @@ extension YHBasicInfoFillViewController {
                         printLog("其他数据没有处理")
                     }
                 }
-                applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.id ?? 0, forKey: "id")
-                applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.spouse?.subset_name ?? 0, forKey: "subset_name")
                 param.updateValue(applicant, forKey: "background")
             } else {
                 
@@ -204,9 +221,15 @@ extension YHBasicInfoFillViewController {
         
         printLog(param)
         
-        basicInfoVM.saveBasicInfo(params: param) { success, error in
+        self.basicInfoVM.saveBasicInfo(params: param) {[weak self] success, error in
             if success == true {
                 YHHUD.flash(message: "操作成功")
+                
+                if isSaveFlag == false {
+                    DispatchQueue.main.asyncAfter(deadline: .now() + 1.5) {
+                        self?.navigationController?.popViewController(animated: true)
+                    }
+                }
             } else {
                 let msg = error?.errorMsg ?? "操作失败"
                 YHHUD.flash(message: msg)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(流程)/BaseInformation(基本资料)/M/YHBasicInfoCellModel.swift

@@ -13,12 +13,16 @@ class YHBasicInfoCellModel {
     var answer   : String  = ""
     var info : String = ""
     
+    var needCheckFlag : Bool = false
+    
+    
     var model : backgroundModel?
     var type : Int  = 0 //0- 输入型  1-选择型
-    init(question: String, answer: String, info: String, type : Int = 0) {
+    init(question: String, answer: String, info: String, type : Int = 0, needCheckFlag : Bool = false) {
         self.question = question
         self.answer = answer
         self.info = info
         self.type = type
+        self.needCheckFlag = needCheckFlag
     }
 }

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

@@ -99,12 +99,15 @@ extension YHBasicInfoFillViewModel {
         
         do {
             //配偶
-            let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: dataModelForBasicInfo.spouse?.child_departure?.has ?? "", info: dataModelForBasicInfo.spouse?.child_departure?.info ?? "")
-            let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: dataModelForBasicInfo.spouse?.child_deny?.has ?? "", info: dataModelForBasicInfo.spouse?.child_deny?.info ?? "")
-            let arr = [model1,model2]
             
-            let sessionModel = YHBasicInfoSessionModel(sessionTitle: "配偶", arrQuestionItem: arr)
-            arrData.append(sessionModel)
+            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)
+            }
         }
         
         
@@ -128,11 +131,14 @@ extension YHBasicInfoFillViewModel {
         
         do {
             //家庭背景
-            let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: dataModelForBasicInfo.background?.background_member?.has ?? "", info: dataModelForBasicInfo.background?.background_member?.info ?? "",type: 1)
-            model1.model = dataModelForBasicInfo.background
-            let arr = [model1]
-            let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr)
-            arrData.append(sessionModel)
+            if let model = dataModelForBasicInfo.background {
+                let model1 = YHBasicInfoCellModel(question:"1、至少一名直系家庭成员（已婚配偶、父母、兄弟姊妹、子女）是现居于香港的香港永久性居民", answer: model.background_member?.has ?? "", info: model.background_member?.info ?? "",type: 1)
+                model1.model = model
+                let arr = [model1]
+                let sessionModel = YHBasicInfoSessionModel(sessionTitle: "家庭背景", arrQuestionItem: arr)
+                arrData.append(sessionModel)
+            }
+            
         }
         
         arrBasicInfoSessionDataForEdit = arrData
@@ -142,8 +148,8 @@ extension YHBasicInfoFillViewModel {
 extension YHBasicInfoFillViewModel {
     //获取基本资料信息
     func getBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
-//        createOrgBasiceInfoData()
-//        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
+        //        createOrgBasiceInfoData()
+        //        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
         
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
@@ -177,8 +183,6 @@ extension YHBasicInfoFillViewModel {
     //保存基本资料信息
     func saveBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
-        
-//        let strUrl = "http://192.168.25.21:10087/" + "infoflow/basics/update_basics"
         let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }

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()

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -59,7 +59,6 @@ extension YHLoginViewModel {
                 return
             }
             
-            
             if json.code == 200 {
                 if resultModel.token?.count != 0 {
                     //token 正常

galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

@@ -95,7 +95,7 @@ class YHNetRequest: NSObject {
         
         requestHeader.add(name:"sign",value:sign)
         requestHeader.add(name: "token", value: YHLoginManager.shared.userModel?.token ?? "-")
-//        testToken(&requestHeader) //for test hjl  使用固定token
+        testToken(&requestHeader) //for test hjl  使用固定token
         headers = requestHeader
     }
     

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/基本资料/basic_info_radio_0.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Ellipse 323@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Ellipse 323@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/基本资料/basic_info_radio_1.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Group 3040@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Group 3040@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}