标签保存

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/C/YHEditInterestViewController.swift

@@ -38,14 +38,20 @@ class YHEditInterestViewController: YHBaseViewController {
     
     func getData() {
         viewModel.model = model
+        for item in model.draftTopics {
+            let model = YHInterestModel(name: item, isNormal: false, isSelect: false)
+            self.likeItems.insert(model, at: likeItems.count - 1)
+        }
+        
         for item in model.topics {
             if let index = normalItems.firstIndex(where: {$0.name == item}) {
                 normalItems[index].isSelect = !normalItems[index].isSelect
-            } else {
-                let model = YHInterestModel(name: item, isNormal: false, isSelect: true)
-                self.likeItems.insert(model, at: likeItems.count - 1)
+            }
+            if let index = likeItems.firstIndex(where: {$0.name == item}) {
+                likeItems[index].isSelect = !likeItems[index].isSelect
             }
         }
+        
         collectionView.reloadData()
     }
     
@@ -121,6 +127,7 @@ class YHEditInterestViewController: YHBaseViewController {
     
     @objc func nextStep() {
         var topics: [String] = []
+        var draftTopics: [String] = []
         for item in normalItems {
             if item.isSelect {
                 topics.append(item.name)
@@ -130,8 +137,12 @@ class YHEditInterestViewController: YHBaseViewController {
             if like.isSelect && like.name != "+自定义" {
                 topics.append(like.name)
             }
+            
+            if like.name != "+自定义" {
+                draftTopics.append(like.name)
+            }
         }
-        viewModel.requestSaveTopics(topics: topics) {[weak self] success, error in
+        viewModel.requestSaveTopics(topics: topics, draft_topics: draftTopics) {[weak self] success, error in
             guard let self = self else { return }
             if success {
                 self.navigationController?.popViewController(animated: true)

galaxy/galaxy/Classes/Modules/Mine（我的）/MyCard(我的名片)/VM/YHEditViewModel.swift

@@ -204,8 +204,8 @@ class YHEditViewModel: YHBaseViewModel {
         }
     }
     
-    func requestSaveTopics(topics: [String], callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
-        let interest: [String: Any] = ["topics": topics, "is_update": true]
+    func requestSaveTopics(topics: [String], draft_topics: [String], callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
+        let interest: [String: Any] = ["topics": topics, "is_update": true, "draft_topics": draft_topics]
         let params: [String: Any] = ["interest": interest]
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.People.cardSave
         let _ = YHNetRequest.postRequest(url: strUrl, params: params) { [weak self] json, code in