// 家庭成员

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

@@ -235,7 +235,7 @@ extension YHFamilyMemberInfoListVC {
     // 请求家庭成员信息
     func requestFamilyInfo() {
         
-        self.familyRequest.getFamilyInfo(params: ["order_id": self.orderId]) { [weak self] detail, error in
+        self.familyRequest.getFamilyInfoList(orderId:orderId) { [weak self] detail, error in
             guard let self = self else { return }
             if let detail = detail {
                 familyMemberInfo = detail

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

@@ -10,17 +10,15 @@
 class YHFamilyRequestViewModel {
     
     //请求所有家庭成员信息
-     func getFamilyInfo(params:[String:Any], callBackBlock:@escaping (_ listInfo: YHFamilyMemberGroupInfo?,_ error:YHErrorModel?)->()) {
+     func getFamilyInfoList(orderId:Int, callBackBlock:@escaping (_ listInfo: YHFamilyMemberGroupInfo?,_ error:YHErrorModel?)->()) {
         
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Family.familyInfoApi
-         
+        let params = ["order_id": orderId]
          YHHUD.show(.progress(message: "数据加载中..."))
         
-        let _ = YHNetRequest.getRequest(url: strUrl, params:params) {[weak self] json, code in
+        let _ = YHNetRequest.getRequest(url: strUrl, params:params) { json, code in
             YHHUD.hide()
-            
-            guard let self = self else { return }
-             
+                         
             printLog("model 是 ==> \(json)")
             let dic = json.data
             
@@ -50,14 +48,12 @@ class YHFamilyRequestViewModel {
         }
 
        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
+       let _ = YHNetRequest.postRequest(url: strUrl, params:params) { json, code in
            
            if isShowLoading {
                YHHUD.hide()
            }
-           guard let self = self else { return }
            printLog("model 是 ==> \(json)")
            if json.code == NetWorkCode.success.rawValue {
                callBackBlock(true,nil)
@@ -144,8 +140,8 @@ class YHFamilyRequestViewModel {
     func requestFamilyMemberDetailInfo(memberType:YHFamilyMemberType, orderId:Int, callBack:((_ detail:YHFamilyMember?)->Void)?) {
         
         let params:[String:Any] =  ["order_id": orderId]
-        self.getFamilyInfo(params:params) { 
-            [weak self] listInfo, error in
+        self.getFamilyInfoList(orderId:orderId) {
+            listInfo, error in
             guard let callBack = callBack else { return }
             if let listInfo = listInfo {
                 if memberType == .spouse {
@@ -154,6 +150,8 @@ class YHFamilyRequestViewModel {
                     callBack(listInfo.father)
                 } else if memberType == .mother {
                     callBack(listInfo.mother)
+                } else {
+                    callBack(nil)
                 }
             }
         }