基本资料联调 --- 接口OK

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

@@ -32,6 +32,8 @@ class YHBasicInfoFillViewController: YHBaseViewController {
         //1.0
         initView()
         
+        
+        orderId = 6019 //for test hjl
         //2.0
         loadData()
     }

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

@@ -84,13 +84,13 @@ extension YHBasicInfoFillViewModel {
             //主申请人
             let model1 = YHBasicInfoCellModel(question: "1、是否曾在香港或其他地方因任何罪行或违法行为被定罪？", answer: dataModelForBasicInfo.applicant?.has_conviction?.has ?? "", info: dataModelForBasicInfo.applicant?.has_conviction?.info ?? "")
             
-            let model2 = YHBasicInfoCellModel(question: "2、是否曾在香港或其他地方被拒入境／递解／遣送或要求离境？", answer: dataModelForBasicInfo.applicant?.has_departure?.has ?? "", info: dataModelForBasicInfo.applicant?.has_departure?.has ?? "")
+            let model2 = YHBasicInfoCellModel(question: "2、是否曾在香港或其他地方被拒入境／递解／遣送或要求离境？", answer: dataModelForBasicInfo.applicant?.has_departure?.has ?? "", info: dataModelForBasicInfo.applicant?.has_departure?.info ?? "")
             
-            let model3 = YHBasicInfoCellModel(question: "3、是否曾被拒绝签发香港或其他地方的签证／进入许可？", answer: dataModelForBasicInfo.applicant?.has_deny?.has ?? "", info: dataModelForBasicInfo.applicant?.has_deny?.has ?? "")
+            let model3 = YHBasicInfoCellModel(question: "3、是否曾被拒绝签发香港或其他地方的签证／进入许可？", answer: dataModelForBasicInfo.applicant?.has_deny?.has ?? "", info: dataModelForBasicInfo.applicant?.has_deny?.info ?? "")
             
-            let model4 = YHBasicInfoCellModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "", info: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "")
+            let model4 = YHBasicInfoCellModel(question: "4、是否曾触犯香港或任何地方的入境法例？", answer: dataModelForBasicInfo.applicant?.has_breaking_law?.has ?? "", info: dataModelForBasicInfo.applicant?.has_breaking_law?.info ?? "")
             
-            let model5 = YHBasicInfoCellModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "", info: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "")
+            let model5 = YHBasicInfoCellModel(question: "5、是否曾经使用另一个姓名或身份申请香港入境签证/进入许可或进入香港？", answer: dataModelForBasicInfo.applicant?.has_other_id?.has ?? "", info: dataModelForBasicInfo.applicant?.has_other_id?.info ?? "")
             let arr = [model1,model2,model3,model4,model5]
             
             let sessionModel = YHBasicInfoSessionModel(sessionTitle: "主申请人", arrQuestionItem: arr)
@@ -99,8 +99,8 @@ extension YHBasicInfoFillViewModel {
         
         do {
             //配偶
-            let model1 = YHBasicInfoCellModel(question: "1、是否曾被拒绝入境/递解/遣送或要求离开香港?", answer: dataModelForBasicInfo.spouse?.child_departure?.has ?? "", info: dataModelForBasicInfo.spouse?.child_departure?.has ?? "")
-            let model2 = YHBasicInfoCellModel(question: "2、是否曾被拒绝签发签证／进入许可以入境香港？", answer: dataModelForBasicInfo.spouse?.child_deny?.has ?? "", info: dataModelForBasicInfo.spouse?.child_deny?.has ?? "")
+            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)
@@ -147,7 +147,11 @@ extension YHBasicInfoFillViewModel {
 //        callBackBlock(true,nil)//先返回数据 让界面展示相关的UI
         
         
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.basicInfoApi
+        //http://192.168.25.21:10087   梁杰ip
+        let strUrl = "http://192.168.25.21:10087/" + "basics/get_basics"
+        
+        
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard let self = self else { return }
@@ -174,8 +178,10 @@ extension YHBasicInfoFillViewModel {
     
     //保存基本资料信息
     func saveBasicInfo( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
-        let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in
+//        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Basics.updateBasicInfoApi
+        
+        let strUrl = "http://192.168.25.21:10087/" + "basics/update_basics"
+        let _ = YHNetRequest.postRequest(url: strUrl,params: params) { [weak self] json, code in
             //1. json字符串 转 对象
             guard self != nil else { return }
             guard let model = NetBaseModel.deserialize(dict: json) else {
@@ -184,15 +190,14 @@ extension YHBasicInfoFillViewModel {
                 return
             }
             printLog("model 是 ==> \(model)")
-//            let dic = model.data?.peel
-//            guard let resultModel = YHBasicInfoFillModel.deserialize(dict: dic as? [AnyHashable : Any]) else {
-//                callBackBlock(false,nil)
-//                return
-//            }
-//            
-//            self.dataModelForBasicInfo = resultModel
-            //根据返回值 组装 真实的数据
-            callBackBlock(true,nil)
+            if model.code == 200 {
+                callBackBlock(true,nil)
+            } else {
+                
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code),errorMsg: model.msg)
+                callBackBlock(false,error)
+                
+            }
         } failBlock: { err in
             callBackBlock(false,err)
         }

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

@@ -68,6 +68,7 @@ extension YHLoginViewModel {
                 return
             }
             
+            
             if model.code == 200 {
                 if resultModel.token?.count != 0 {
                     //token 正常
@@ -89,7 +90,6 @@ extension YHLoginViewModel {
                 let error : YHErrorModel = YHErrorModel(errorCode:Int32(model.code), errorMsg: model.msg)
                 callBackBlock(false,error)
             }
-            
         } failBlock: { err in
             callBackBlock(false,err)
         }

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -16,11 +16,8 @@ class YHBaseUrlManager {
 //    static let baseUrlTest : String = "https://test.api.gateway.galaxy-immi.com/"
     static let baseUrlTest : String = "https://test-api-gateway.galaxy-immi.com/"
 
-    
-
-    
     //正式环境
-    static let baseUrlRelease : String = "https://api.health.sleep321.com/"
+    static let baseUrlRelease : String = ""
     
     //h5开发环境
     static let h5UrlDev : String = ""