主页面接口逻辑

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -1170,6 +1170,7 @@
 		048D6AE12D5F17C400BC6F4C /* YHMembershipLevel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048D6AE02D5F17C400BC6F4C /* YHMembershipLevel.swift */; };
 		048D6AE32D6348F000BC6F4C /* YHMemberCenterCurrentPrivilegeCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048D6AE22D6348EF00BC6F4C /* YHMemberCenterCurrentPrivilegeCell.swift */; };
 		0497C7532D9BD21500A3E32A /* YHMakePlanViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0497C7522D9BD21500A3E32A /* YHMakePlanViewModel.swift */; };
+		0497C7552D9BD36700A3E32A /* YHMakePlanModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0497C7542D9BD36700A3E32A /* YHMakePlanModel.swift */; };
 		04A750D02D925FD400974E5F /* YHCustomerInformationQuestionnaireVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A750CF2D925FD400974E5F /* YHCustomerInformationQuestionnaireVC.swift */; };
 		04A750D22D93ABCE00974E5F /* YHSurveyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A750D12D93ABCE00974E5F /* YHSurveyTableViewCell.swift */; };
 		04A750D42D93DFED00974E5F /* YHSurveyQuestionType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04A750D32D93DFED00974E5F /* YHSurveyQuestionType.swift */; };
@@ -2473,6 +2474,7 @@
 		048D6AE02D5F17C400BC6F4C /* YHMembershipLevel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMembershipLevel.swift; sourceTree = "<group>"; };
 		048D6AE22D6348EF00BC6F4C /* YHMemberCenterCurrentPrivilegeCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMemberCenterCurrentPrivilegeCell.swift; sourceTree = "<group>"; };
 		0497C7522D9BD21500A3E32A /* YHMakePlanViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanViewModel.swift; sourceTree = "<group>"; };
+		0497C7542D9BD36700A3E32A /* YHMakePlanModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMakePlanModel.swift; sourceTree = "<group>"; };
 		04A750CF2D925FD400974E5F /* YHCustomerInformationQuestionnaireVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCustomerInformationQuestionnaireVC.swift; sourceTree = "<group>"; };
 		04A750D12D93ABCE00974E5F /* YHSurveyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSurveyTableViewCell.swift; sourceTree = "<group>"; };
 		04A750D32D93DFED00974E5F /* YHSurveyQuestionType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHSurveyQuestionType.swift; sourceTree = "<group>"; };
@@ -6716,6 +6718,7 @@
 		04B00FB22D9A420F00F640C5 /* M */ = {
 			isa = PBXGroup;
 			children = (
+				0497C7542D9BD36700A3E32A /* YHMakePlanModel.swift */,
 			);
 			path = M;
 			sourceTree = "<group>";
@@ -8227,6 +8230,7 @@
 				045C133D2D12CA5F00BD2DC0 /* YHBannerModel.swift in Sources */,
 				045C133E2D12CA5F00BD2DC0 /* YHLiveModel.swift in Sources */,
 				045C133F2D12CA5F00BD2DC0 /* YHResignCertificateDetailPassPortViewController.swift in Sources */,
+				0497C7552D9BD36700A3E32A /* YHMakePlanModel.swift in Sources */,
 				045C13402D12CA5F00BD2DC0 /* YHVideoPlaySettingVC.swift in Sources */,
 				045C13412D12CA5F00BD2DC0 /* YHResignAppointTimeViewController.swift in Sources */,
 				045C13422D12CA5F00BD2DC0 /* YHHeadView.swift in Sources */,

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/M/YHMakePlanModel.swift

+//
+//  YHMakePlanModel.swift
+//  galaxy
+//
+//  Created by EDY on 2025/4/1.
+//  Copyright © 2025 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SmartCodable
+
+struct YHMakePlanModel: SmartCodable {
+    var basic: [YHMakePlanMainModel] = []
+    var work: [YHMakePlanMainModel] = []
+    var live: [YHMakePlanMainModel] = []
+    var invest: [YHMakePlanMainModel] = []
+}
+
+struct YHMakePlanMainModel: SmartCodable {
+    var product_id: Int = -1
+    var cover_img: String = ""
+    var product_name: String = ""
+    var product_desc: String = ""
+    var price: String = ""
+    var is_add_cart: Bool = true
+    var sub_product: [YHMakePlanSubModel] = []
+}
+
+struct YHMakePlanSubModel: SmartCodable {
+    var product_id: Int = -1
+    var cover_img: String = ""
+    var product_name: String = ""
+    var product_desc: String = ""
+    var price: String = ""
+    var is_add_cart: Bool = true
+}

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/VM/YHMakePlanViewModel.swift

@@ -9,81 +9,26 @@
 import UIKit
 
 class YHMakePlanViewModel: YHBaseViewModel {
-    var arrContactList: [YHContactItemModel] = []
+    var makePlanModel: YHMakePlanModel = YHMakePlanModel()
 
-    // 请求白名单
-    func getWhitelist(callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.bywhitelist
+    // 请求产品列表
+    func getProductList(callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.ResignPlan.productListApi
         _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, _ in
             // 1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String: Any], let data = dic["Data"] as? [Any], let result = [YHServiceSearchModel].deserialize(from: data) else {
+                guard let dic = json.data?.peel as?  [String: Any], let data = dic["Data"] as? [String : Any], let result = YHMakePlanModel.deserialize(from: data) else {
                     callBackBlock(false, nil)
                     return
                 }
-                if result.count != 0, let model = result.first, model.dictionary_code.count != 0 {
-                    callBackBlock(true, nil)
-                } else {
-                    callBackBlock(false, nil)
-                }
-            } else {
-                let error: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
-                callBackBlock(false, error)
-            }
-        } failBlock: { err in
-            callBackBlock(false, err)
-        }
-    }
-    
-    // 请求合同项
-    func getSearchList(_ order: String, callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
-        let params: [String: Any] = ["order_sn": order]
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.byorderid
-        _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, _ in
-            // 1. json字符串 转 对象
-            guard let self = self else { return }
-            if json.code == 200 {
-                guard let dic = json.data?.peel as? [Any], let resultModel = [YHContactItemModel].deserialize(from: dic) else {
-                    self.arrContactList = []
-                    callBackBlock(false, nil)
-                    return
-                }
-                let lastArray = resultModel.compactMap { $0 }
-                self.arrContactList = lastArray
-                callBackBlock(true, nil)
-            } else {
-                self.arrContactList = []
-                let error: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
-                callBackBlock(false, error)
-            }
-        } failBlock: { err in
-            self.arrContactList = []
-            callBackBlock(false, err)
-        }
-    }
-    
-    func getAssistList(callBackBlock: @escaping (_ success: Bool, _ error: YHErrorModel?) -> Void) {
-        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.assist
-        _ = YHNetRequest.getRequest(url: strUrl) { [weak self] json, _ in
-            // 1. json字符串 转 对象
-            guard let self = self else { return }
-            if json.code == 200 {
-                guard let dic = json.data?.peel as? [String: Any], let data = dic["orders"] as? [Any], let resultModel = [YHContactItemModel].deserialize(from: data) else {
-                    self.arrContactList = []
-                    callBackBlock(false, nil)
-                    return
-                }
-                let lastArray = resultModel.compactMap { $0 }
-                self.arrContactList = lastArray
+                self?.makePlanModel = result
                 callBackBlock(true, nil)
             } else {
-                self.arrContactList = []
                 let error: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.count > 0 ? json.msg : "数据错误")
                 callBackBlock(false, error)
             }
         } failBlock: { err in
-            self.arrContactList = []
             callBackBlock(false, err)
         }
     }

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

@@ -755,6 +755,7 @@ class YHAllApiName {
     // 续签方案
     struct ResignPlan {
         static let planlistApi = "super-app/renewal/advice/get-renewal-plan"
+        static let productListApi = "super-app/renewal/advice/get-renewal-product-list"
     }
 
     // 问卷