处理 我的 界面

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/VM/YHServiceCenterMainViewModel.swift

@@ -175,21 +175,6 @@ extension YHServiceCenterMainViewModel {
                     model.isFinished = true
                     arrContactStausItmes.append(model)
                     
-<<<<<<< HEAD
-                    
-                   
-//                    if resultModel.supplement_not_submit_num > 0 {
-//                        let model2 = YHContactMainItemStatusModel()
-//                        model2.type = 2
-//                        model2.isFinished = false
-//                        arrContactStausItmes.append(model2)
-//                    } else {
-//                        let model2 = YHContactMainItemStatusModel()
-//                        model2.type = 2
-//                        model2.isFinished = true
-//                        arrContactStausItmes.append(model2)
-//                    }
-=======
                     //我的证件
                     if resultModel.supplement_not_submit_num > 0 {
                         let model2 = YHContactMainItemStatusModel()
@@ -202,43 +187,22 @@ extension YHServiceCenterMainViewModel {
                         model2.isFinished = true
                         arrContactStausItmes.append(model2)
                     }
->>>>>>> develop
-                    
-                   
-                   
                     
                     if resultModel.my_document {
                         //我的文书
-<<<<<<< HEAD
-//                        let model4 = YHContactMainItemStatusModel()
-//                        model4.type = 4
-//                        model4.isFinished = true
-//                        arrContactStausItmes.append(model4)
-//                    }
-=======
                         let model4 = YHContactMainItemStatusModel()
                         model4.type = 4
                         model4.isFinished = true
                         arrContactStausItmes.append(model4)
                     }
->>>>>>> develop
                    
                     if resultModel.my_signature {
-                    
                         //我的签字
-<<<<<<< HEAD
-//                        let model5 = YHContactMainItemStatusModel()
-//                        model5.type = 5
-//                        model5.isFinished = true
-//                        arrContactStausItmes.append(model5)
-//                    }
-=======
                         let model5 = YHContactMainItemStatusModel()
                         model5.type = 5
                         model5.isFinished = true
                         arrContactStausItmes.append(model5)
                     }
->>>>>>> develop
                     
                     
                     //我的评分
@@ -249,10 +213,10 @@ extension YHServiceCenterMainViewModel {
                     
                     if resultModel.scheme_position_switch == 1 {
                         //我的方案
-//                        let model6 = YHContactMainItemStatusModel()
-//                        model6.type = 6
-//                        model6.isFinished = true
-//                        arrContactStausItmes.append(model6)
+                        let model6 = YHContactMainItemStatusModel()
+                        model6.type = 6
+                        model6.isFinished = true
+                        arrContactStausItmes.append(model6)
                         
                     }
                 } else {

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -240,55 +240,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             vc.modalPresentationStyle = .custom
             self.navigationController?.present(vc, animated: true)
             return
-<<<<<<< HEAD
-        } else {
-            
-            let vc = YHTestViewController()
-            self.navigationController?.pushViewController(vc)
-            YHHUD.flash(message: "已登录: 功能完善中...")
-        }
-        return
-        
-<<<<<<< HEAD
-//        let item: PersonalModuleItem = items[indexPath.row];
-//        // 预览文件预研 杜宇todo
-//        if item.title == "我的消息" {
-//            YHHUD.flash(message: "预览image")
-//            self.openXLSXRemoteFile(urlString: "https://upload-cdn.galaxy-immi.com/crm/production/1620280305822.jpg")
-//        } else if item.title == "我的进度" {
-//            YHHUD.flash(message: "预览pdf")
-//            self.openXLSXRemoteFile(urlString: "https://upload-cdn.galaxy-immi.com/crm/production/1620271660487.pdf")
-//        } else if item.title == "积分中心" {
-//            YHHUD.flash(message: "预览xlsx")
-//            self.openXLSXRemoteFile(urlString: "https://test-cdn.galaxy-immi.com/4001001/8979989729091623170120240321152216.xlsx?Expires=1711007546&OSSAccessKeyId=LTAI5tNFvK2xGRrBeJ2z8R2j&Signature=UfM6tRcws5ObN4rp/3ZESEWbM2E%3D&v=1711005746")
-//        } else if item.title == "推荐有理" {
-//            
-//        } else if item.title == "我的海报" {
-//            
-//        } else if item.title == "我的测评码" {
-//            
-//        }
-=======
-        let item: PersonalModuleItem = items[indexPath.row];
-        // 预览文件预研 杜宇todo
-        if item.title == "我的消息" {
-            
-        } else if item.title == "我的进度" {
-            
-        } else if item.title == "积分中心" {
-            
-        } else if item.title == "推荐有理" {
-            
-        } else if item.title == "我的海报" {
-            
-        } else if item.title == "我的测评码" {
-            
-=======
->>>>>>> develop
-        }
->>>>>>> develop
-        
-        
             let item: PersonalModuleItem = items[indexPath.row]
             switch item.type {
             case .myMessage://我的消息
@@ -346,9 +297,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             
             return UIView()
         }
-}
+    }
     
-extension YHMyViewController {
+    extension YHMyViewController {
         
         func randomAlphanumericString(_ length: Int) -> String {
             let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
@@ -372,4 +323,4 @@ extension YHMyViewController {
                 headerView.nickName =  "登录/注册"
             }
         }
-}
+    }