Merge branch 'develop' into duyu

# Conflicts:
#	galaxy/galaxy/Classes/Tools/NetWork/YHNetRequest.swift

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

@@ -55,14 +55,16 @@ extension YHBasicInfoFillViewController {
         bottomView.block = { tag in
             if tag == 0 {
                 //点击了保存按钮
-                printLog("点击了保存按钮")
+//                let arr = self.basicInfoVM.arrBasicInfoSessionDataForEdit
+//                printLog(arr)
                 
+                printLog("点击了保存按钮")
+                self.saveData()
             } else {
                 //点击了提交按钮
                 printLog("点击了提交按钮")
-                
+                self.submitData()
             }
-            
         }
         
         
@@ -70,29 +72,136 @@ extension YHBasicInfoFillViewController {
         homeTableView.dataSource = self
         view.addSubview(homeTableView)
         homeTableView.snp.makeConstraints { make in
-            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 15)
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
             make.bottom.equalTo(bottomView.snp.top)
             make.left.equalTo(kMargin)
             make.right.equalTo(-kMargin)
         }
     }
     
-    
     private func loadData() {
         guard let orderId = orderId else { return}
-        basicInfoVM.getBasicInfoData()
-        homeTableView.reloadData()
-//        let param = ["order_id":orderId]
-//        serviceCenterMainReqVM.getMyScoreDetail(params: param) { success, error in
-//            if success == true {
-//                
-//            } else {
-//                YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
-//            }
-//            self.homeTableView.reloadData()
-//        }
+        let param = ["order_id":orderId]
+        basicInfoVM.getBasicInfo(params: param) { success, error in
+            if success == true {
+                self.homeTableView.reloadData()
+            } else {
+                YHHUD.flash(message: error?.errorMsg ?? "发生错误,请重试")
+            }
+            self.homeTableView.reloadData()
+        }
+    }
+    
+    
+    private func saveData() {
+        //保存
+        let arr = basicInfoVM.arrBasicInfoSessionDataForEdit
+        
+        
+        var param : [String : Any] = ["order_id":orderId as Any,"save_type": "save"]
+        
+        for item in arr {
+            if item.sessionTitle == "主申请人" {
+                var applicant : [String : Any] = [:]
+                for (index0,item0) in item.arrQuestionItem.enumerated() {
+                    if index0 == 0 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "has_breaking_law")
+                    } else if index0 == 1 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "has_conviction")
+                    } else if index0 == 2 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "has_deny")
+                    } else if index0 == 3 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "has_departure")
+                    } else if index0 == 4 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "has_other_id")
+                    } else {
+                        printLog("其他数据没有处理")
+                    }
+                }
+                applicant.updateValue(basicInfoVM.dataModelForBasicInfo?.applicant?.id ?? 0, forKey: "id")
+                param.updateValue(applicant, forKey: "applicant")
+            } else if item.sessionTitle == "配偶" {
+                
+                var applicant : [String : Any] = [:]
+                for (index0,item0) in item.arrQuestionItem.enumerated() {
+                    if index0 == 0 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "child_deny")
+                    } else if index0 == 1 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "child_departure")
+                    } else {
+                        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: "spouse")
+            } else if item.sessionTitle.hasPrefix("子女") {
+                var arr : [[String:Any]] = []
+                if let tArr = param["child"] as? [[String : Any]] {
+                    arr = tArr
+                }
+                
+                
+                var applicant : [String : Any] = [:]
+                for (index0,item0) in item.arrQuestionItem.enumerated() {
+                    if index0 == 0 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "child_deny")
+                    } else if index0 == 1 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "child_departure")
+                    } else {
+                        printLog("其他数据没有处理")
+                    }
+                }
+                
+                applicant.updateValue(item.model?.id ?? 0, forKey: "id")
+                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] = [:]
+                for (index0,item0) in item.arrQuestionItem.enumerated() {
+                    if index0 == 0 {
+                        let value = ["answer":item0.answer,"info":item0.answer == "Y" ? item0.info : ""]
+                        applicant.updateValue(value, forKey: "background_member")
+                    } else {
+                        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 {
+                
+            }
+        }
+        
+        printLog(param)
+        
+        basicInfoVM.saveBasicInfo(params: param) { success, error in
+            if success == true {
+                YHHUD.flash(message: "保存成功")
+            } else {
+                let msg = error?.errorMsg ?? "保存失败"
+                YHHUD.flash(message: msg)
+            }
+        }
     }
     
+    private func submitData() {
+        //提交
+        
+    }
 }
 
 // MARK: - delegates

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

@@ -11,10 +11,14 @@ import UIKit
 class YHBasicInfoCellModel {
     var question : String = ""
     var answer   : String  = ""
-    var additionDes : String = ""
-    init(question: String, answer: String, additionDes: String) {
+    var info : String = ""
+    
+    var model : backgroundModel?
+    var type : Int  = 0 //0- 输入型  1-选择型
+    init(question: String, answer: String, info: String, type : Int = 0) {
         self.question = question
         self.answer = answer
-        self.additionDes = additionDes
+        self.info = info
+        self.type = type
     }
 }

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

@@ -11,6 +11,8 @@ import UIKit
 class YHBasicInfoSessionModel {
     var sessionTitle : String = ""
     var arrQuestionItem : [YHBasicInfoCellModel] = []
+    
+    var model : SpouseModel?
     init(sessionTitle: String, arrQuestionItem: [YHBasicInfoCellModel]) {
         self.sessionTitle = sessionTitle
         self.arrQuestionItem = arrQuestionItem

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -43,4 +43,15 @@ class YHAllApiName {
         //提交 温馨提示信息
         static let submitSweetNotifyApi = "frontend/users/sweet-notify/submit"
     }
+    
+    
+    
+    //Basics
+    struct Basics {
+        //获取 基本资料信息
+        static let basicInfoApi = "frontend/basics/get_basics"
+        
+        //保存基本资料信息
+        static let  updateBasicInfoApi = "frontend/basics/update_basics"
+    }
 }

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

@@ -93,7 +93,7 @@ class YHNetRequest: NSObject {
         print("sign = \(sign)")
         
         requestHeader.add(name:"sign",value:sign)
-        requestHeader.add(name: "token", value: "eyJpdiI6Ik5aeEVDclZTK0FISEFBZUgxN2VkdGc9PSIsInZhbHVlIjoiRFRJOHlObzVrZlp4T2tVYW1MSE1ZK0Z3dXlyK3p4QlczNmxsTXdkdW5GQVY4Q2VqZlNNUDdrdVpsb0JcLytpYmJheUp2MWZTUE5pOWgrVWRLdEtIUkx4R1wvS3F6SmRSQ0dWeFVXanFINGkyRWNMTXB4TVlcLzhjXC9NSzVoMFwvZ1ZOaVIwb0VqWlo1VERPSHY2RWJhME1RdWtkXC8yanBQdm9lMWM4WXJVK1BnMDd6SncwVVlWMDNnbSswSnM3eVwveFRRck03M3pOaDFSc3g0UmlYMTJQdmZpSkhUWHVMa21RV2xRbXBkalVTTUFicmFaN2NVNXl1ZTJOeEJoKzhrMnZtdzdvM1U5Qmh4WXNiSEFERUpiZHNWNkxoM2ZkVVRUdFlMMU1MQnIyaWNxNSt4S1NocDVEbnNqeHphUCtVVk1qTlVnMk1ydVNPamJ0c2tDQ1wvWFk1SkxtSWtDMU9oT3ZqaFpuNU5aVUVicHpYVU56VnlqK01Cb20welJMbkQrcTFWOHFUbzlPK0RGdDRcLzJ1T094MjNjYTVZZmJcL2txRE93cEFUYzlKWWdVWE9cLzFnYnVwTFZ4VUtqMFQ5QlgzZitDQjhyNURpU3p0bktqblBicUxPekNBcWRWM0g0WklSOEc0T0RPVkNBMGZQdEtWV3ZqN3IrcHZDYm9UNjREdnA3U1RZY1Z1dFE3K1RRM2F2eGY0QXc2dGlha0RBUDVpVHdFWE53dzl2eVczVk9VNTJSa1Fzb1J4ZGd0c0RCdktPQ1FWOUQ5Y0krckQ3bFc4NkNJMHliSXlnNGtYU1ZCUHRZWTdCKzA5d1wvdldzWTlpeUdYaEg4eGhITHpRSUthMWpSVlZvZVhwZ3BvamxCTHFSUXJmQ1hQNThYbUNNanZnVGs0b3RDTUFmYkdsYTEzeEtnTXJpZVU0QnJHWDJoUk9sUklzaFFhUkJiNWk0Z2E0cUUwejU4RmF2RnE4Z2U0eEo3VmZ2SmFMTlVacFBvSFlZUmM2N3liVTdhTk5NWU9YS0xtalk3QUN3NWV2UTlPeE5hMmk0aHU4MSt0YjNJQytFczRMa2l6XC9jV0Jxc01QYU0yYXdTXC92RXBxTFNVOVd6SlwvRm9KM21jUHlcL2diRlMyU3REeEl0K1RxSjRuck8xaXlOaWY4NXVzMVBibXpVSEZJWkVZQnFUd2k5TUVJcDUwUEFjTmljTzYyaWFYaFkzZUtkR294d29LUzBUTFF1Y0xxbWtMNFF4ZlZkN2k4YktEUnRGekU3OEdaN2J3TUR4T2FpVHRKaGlqRWNcL2c5dlwvOUVEVmdLNUhBSk1wSGV5UXVoOFJydlczc09HU1EyeXI4SFZZQmJJQWx1cGFIaXhmK1VJNmdoNmwrOElMZXFxSHZtazQreW84RFBlOXFnVDI2bm1tZWl0K01OcU1DSGJEQXdnWW9Hc0ptWFVJbXVXdEpyT2FKUHprTzJ1MkxFSEViZGV4cFpuOWRXK3dUdVR4bmJHZ1VRRGJycFRBME5lWUtaT0JCYjViSWVvcVJ3RXllb2tQZ1VkUWFqVWo0UHQzMUQwWVMwZ05rTTU0Nk1QQUdxTm9rZFNISVYrTG5DWlArNkt5RkZxajdZN1luakRKQVdUaVpnOUhCUExYMEVKRXRRT3QyZTI4cU9TdlBrbWxVZkFLSWZFbXNha3lCZUhFRVpyTmxQOERjbVwvMytCc0JpNnZcL1Nvek9yR2pUWGF2XC9VMzN4OEY5T3VsdUNGRFNWbHZZMnBzNHhMeEdIR21majBOOUJNbEhlK1J4S3dFTnlJamdTeFQyTWlTTlhCUWxnSDF6VmNhWHIzVGpoREY5clB2XC9uZHZjSm1iTHZ1bjFIUUFRait6dUJlUk1WQ1FhdXFoN002YlQ5MVwvQVMzYzJJQ0RFR1czdEtqMFBTQT09IiwibWFjIjoiOGVlZjBmNTVmMzEwNjhkZjVmYTlkYzAwYzllMjJmNjUyZmRmN2U1ODFiZTIzNzRjMDVjMTNiOTNhOWRhMmVkYSJ9")
+        requestHeader.add(name: "token", value: "eyJpdiI6IlwvQVwvWnQ5N2lnbkx6WDVvVU8yUkFBUT09IiwidmFsdWUiOiJZVmVhV0hsTnFjYUlrUzBPOHRDcHh5eTE0RUEzVXVnSE00c1RkSmpjcENhK05nRkZHdWxLbzNSNXhJM1gwVzdySlJybTF2Q3VVelwvQ0N5YWxjcVgwNVR6eHFHd1hGRUE2eE9sUnlPbExZaTRWUDk0R3gxUGhDRFdTWmtPWUc4YWVcL0o2akdqODJRTFdLTkRvUmprbm5pdlo1Vm1keE5vdVwvc3lyRG5waHhTTGdWckZsUWNFaURtUFJyOHZ4SlwvVFd0VUloVEVvZDN6VHJQQklkbVwvZzBBb1wvM2VZXC9PampiYWx1YzRGQSs4OVBlTjgwYk4yaEFFSFNxUktiVkVieElVU283aHZwdkFuNHNJN0hoQWJLWm1tVEdHV0NOWGtxeWRjWHR4SGdHMytUbEh1S0FYbmNZUmtxWVYzUFdtc214amJHUGFNRW9iRHI4MEdwdlpiYlZRUmhIMWE0V2ZOcnJNNno0bGd4bGp1azZDSXVtcld6bFdLb0VmWVpOU25JUm8rUU0xMVlYWlZxUGQyS2xjUzJrR21VaExhdG5zbGM3cjZzRmlHbW4zZFNrTllOXC9OWWsxKzcyM3Vrdko3eFlYem5HWDkySnFVRGZKajBEVzRwZXcwRFpaWDJpMDVZQk1vSG8wTDJxazBWdWFJZXFEWUtIRU81aFFtZGtXRzZGdVZsQ1BZbDBKb2IzRkRwT2tPcVA5cXp4TTk1ZzJaTGUreStteUVDWldvc0RDXC9GWjJObytGblR3dVhVdzF6dE51b3NMTlMxYVNhVVp0MTk4aGFSVE9vYUp5OEl5SWo2TFlydElvRUhlbGFLU1U1RjFESVwvTFwvaE1ubWhid0RJd3NzVmRBeEd5ZytPam5kUFlqdnpQVCswNVk4SVdDZ21CODFETG1PemduR3g5cW5mNU5WOU56Mzhxalk2bUFCVld2eDZhSE5EUlI2NnIxRkhmOU94dmQrYXZzRU9UNFJBZWVCcmVwMGQ1dlRsSmdvbGpPa1dPVVwvTWIrd2ZlVURiZ3NOMnhQR1RZYk5Hc25OQWlIcEVQXC80YllpSnlsSEZDVWdERVdQS1RoRzBpSTB4Rjh4Y1hscmZBUUhCdm5pc0ZOa0NxVjd1S3VBRUVMeDU0aWNMc1FzZ0JWeWlDTWZVK2dHOG81czBCanFBekdCYTFWRzBic3AyVmMycDZRNGhjVGcxZEEzMllYZ2oyQ0MrXC9IRFU3UHFUeUhzNFQwTmkrbW9EK0dST2M0RFF0Nk5CbkN0RjdNemc4TEt0cDgwbVRsUlwvQkp5N3RDR01OQURSUXc3OWNCWjY4bU93ZmtyaDI2SmtRV3YwdVBJTFBCRkJHZVl6ODJnbE41VnpYZVBoZXd6b0lcL2NIQVpqZEhLNktSZDRXS2VtbEZWTUk2TFpDK0grV1lsNGJ0ekVuU1hcLzh3bUdOTWo0REx5SXBcL3JueGxENUM1eFRXQ0J5VTkyQUJrZ1hZUFJZeE0xRTRDNER6V2tjN0FmckExanZJWHg3cHFWRWowdTJGS2hPdUtrWk9DZTdsYzhha3ZRSGY1MDNIeGE2WWRrK1RZQU1uUXUxR09kZ1ExbjNZc3dXb00zVDRTa2R5Y1hYRXRDRmhlZnV0RVQxRzRzNWxhOVBsVmZrSlZzakhaMkVkcmttMkU2RXVaTmpBS2c4RkVQR3JlVDcxNWJoR3prTzlsZXRrRWR2c1pIaWx4MFIrMm5scXZ4T2JcL0lzK29PYzc4MDBaRVg3c2ZJdUJPWjRHOTA3cjg4eDNzXC8xUkVIY3VQWmpxVmUyY1BDRGFNYlVXY3BvT1Q1cXZCXC9wXC9rMGllXC81MkxUaG1QXC85ZjhER1M0aDREVlpuaVdqOTd0clpwSUY3cWdvV3FiN3pUbTVmMHlhXC85WnNPS1JJdm5vc05CMEtXdVE9PSIsIm1hYyI6ImViMTE5NmQyMjVmOTgxMmYzMjQ5NGI0M2I2NDAwNWQ2OWE5YTNlMzVhODcyMzAxZTU1NzVkNWU3Y2M5YTU3ZjgifQ==")
 
         headers = requestHeader
     }

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

+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

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

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/基本资料/basic_info_check_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
+  }
+}

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

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