服务中心部分接口逻辑

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -611,6 +611,8 @@
 		04B9EE5A2C06CC3100A4018D /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */; };
 		04B9EE5B2C06CC3100A4018D /* YHOtherLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */; };
 		04BD83452CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 04BD83442CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf */; };
+		04BD83582CE32D93003A88DF /* YHServiceOrderTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BD83572CE32D93003A88DF /* YHServiceOrderTipsView.swift */; };
+		04BD835A2CE34032003A88DF /* YHServiceOrderGuideTipsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04BD83592CE34032003A88DF /* YHServiceOrderGuideTipsView.swift */; };
 		04C693622B723AB8004C1758 /* YHMySettingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693612B723AB8004C1758 /* YHMySettingViewController.swift */; };
 		04C693642B723B56004C1758 /* YHMySettingCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C693632B723B56004C1758 /* YHMySettingCell.swift */; };
 		04C85DDF2C364FE9008B20D6 /* YHAboutUsCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */; };
@@ -1599,6 +1601,8 @@
 		04B9EE582C06CC3100A4018D /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
 		04B9EE592C06CC3100A4018D /* YHOtherLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHOtherLoginViewController.swift; sourceTree = "<group>"; };
 		04BD83442CCA2009003A88DF /* AlimamaShuHeiTi-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "AlimamaShuHeiTi-Bold.ttf"; sourceTree = "<group>"; };
+		04BD83572CE32D93003A88DF /* YHServiceOrderTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderTipsView.swift; sourceTree = "<group>"; };
+		04BD83592CE34032003A88DF /* YHServiceOrderGuideTipsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderGuideTipsView.swift; sourceTree = "<group>"; };
 		04C693612B723AB8004C1758 /* YHMySettingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingViewController.swift; sourceTree = "<group>"; };
 		04C693632B723B56004C1758 /* YHMySettingCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMySettingCell.swift; sourceTree = "<group>"; };
 		04C85DDE2C364FE9008B20D6 /* YHAboutUsCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHAboutUsCell.swift; sourceTree = "<group>"; };
@@ -5133,6 +5137,8 @@
 				044EE2282C913D6400A2FE3A /* YHServiceCenterStepThreeTableHeadView.swift */,
 				044EE22C2C9184CD00A2FE3A /* YHServiceMoreAlertView.swift */,
 				044EE22E2C918D1400A2FE3A /* YHServiceStepAlertView.swift */,
+				04BD83572CE32D93003A88DF /* YHServiceOrderTipsView.swift */,
+				04BD83592CE34032003A88DF /* YHServiceOrderGuideTipsView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -5631,6 +5637,7 @@
 				044EE2482C93E49C00A2FE3A /* YHResignCertificateHKTableViewCell.swift in Sources */,
 				A5EF21372BA6E2D1005027E6 /* YHQuestionAndAnswerModel.swift in Sources */,
 				A567E5A52BD7643D00D5D5A0 /* YHHomeCollectionLayout.swift in Sources */,
+				04BD83582CE32D93003A88DF /* YHServiceOrderTipsView.swift in Sources */,
 				04A6715C2B9FE9EA00C1FB91 /* YHCertificateUploadContentListVC.swift in Sources */,
 				A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */,
 				045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
@@ -6357,6 +6364,7 @@
 				045EEEAA2B9F171A0022A143 /* YHWorkExampleViewController.swift in Sources */,
 				04256E1F2C7618A800A37BA4 /* YHAppointWarmTipsCell.swift in Sources */,
 				04256E132C75BD2700A37BA4 /* YHPayMemberContentItems.swift in Sources */,
+				04BD835A2CE34032003A88DF /* YHServiceOrderGuideTipsView.swift in Sources */,
 				A5FD63C12B62616D00D1D9DA /* YHInformationPerfectModel.swift in Sources */,
 				044F395C2CB8D58A007CA277 /* YHVisaRenewalPayInfoBaseCell.swift in Sources */,
 				A567E5A62BD7643D00D5D5A0 /* YHHomeSearchView.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHOrderDetailViewController.swift

@@ -13,6 +13,7 @@ class YHOrderDetailViewController: YHBaseViewController {
     var model: YHContactItemModel = YHContactItemModel()
     var tableView: UITableView!
     var viewModel: YHServiceOrderSearchViewModel = YHServiceOrderSearchViewModel()
+    let serviceCenterMainReqVM : YHServiceCenterViewModel = YHServiceCenterViewModel()
     var dataSource: [YHContactItemModel] = []
     
     lazy var noDataView: YHEmptyDataView = {
@@ -29,12 +30,13 @@ class YHOrderDetailViewController: YHBaseViewController {
     }
 
     func getData() {
+        serviceCenterMainReqVM.getContactList {[weak self] success, error in
+            guard let self = self else { return }
+            if success == true {
+                dataSource = serviceCenterMainReqVM.arrContactList
                 viewModel.getAssistList {[weak self] success, error in
                     guard let self = self else { return }
                     if success {
-                if model.id != -1 {
-                    dataSource.append(model)
-                }
                         for item in self.viewModel.arrContactList {
                             dataSource.append(item)
                         }
@@ -48,6 +50,10 @@ class YHOrderDetailViewController: YHBaseViewController {
                         }
                     }
                 }
+            } else {
+                YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+            }
+        }
     }
     
     func getWhiteList() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterViewController.swift

@@ -243,7 +243,7 @@ extension YHServiceCenterViewController {
 //        
 //        return
         var flag = true
-        if self.state == 1 || self.state == 3 {
+        if self.state == 3 {
            flag = false
         }
         YHServiceMoreAlertView.show(flag) {[weak self] index in
@@ -260,10 +260,16 @@ extension YHServiceCenterViewController {
                 }
                 self.navigationController?.pushViewController(vc)
             } else {
+                if self.state == 1 {
+                    let view = YHServiceOrderGuideTipsView.sheetView(serviceCenterMainReqVM.hasTTPS, model.product_type)
+                    view.show()
+                }
+                if self.state == 2 {
                     let view = YHOffivialApprovalGuildLineCheckView.sheetView()
                     view.show()
                 }
             }
+        }
         
     }
     
@@ -320,13 +326,11 @@ extension YHServiceCenterViewController {
         if serviceCenterMainReqVM.arrContactList.isEmpty {
             noDataView.isHidden = false
             homeTableView.isHidden = true
-            orderButton.isHidden = true
             titleLabel.setImage(UIImage(named: ""), for: .normal)
         } else {
             guard let model = serviceCenterMainReqVM.arrContactList.first else {
                 return
             }
-            orderButton.isHidden = false
             noDataView.isHidden = true
             homeTableView.isHidden = false
             if self.navigationController?.viewControllers.count != 2 && self.navigationController?.viewControllers.count != 1 {
@@ -386,6 +390,11 @@ extension YHServiceCenterViewController {
                 }
             }
             self.homeTableView.reloadData()
+            //首次显示指引
+            if let flag = UserDefaults.standard.string(forKey: "service_tip_show") {
+            } else {
+                YHServiceOrderTipsView.show()
+            }
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHContactItemModel.swift

@@ -17,4 +17,6 @@ struct YHContactItemModel : SmartCodable {
     var createTime : String = ""
     var type : String = ""
     var mobile: String = ""
+    var status: Int = 0
+    var product_type: Int = 0
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderTipsView.swift

+//
+//  YHServiceOrderTipsView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/11/12.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import AttributedString
+
+class YHServiceOrderTipsView: UIView {
+    var titleLabel: UIImageView!
+    var knowButton: UIButton!
+    var measageLabel: UILabel!
+
+    static func show() {
+        let view = YHServiceOrderTipsView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: KScreenHeight))
+        let window = UIApplication.shared.yhKeyWindow()
+        window?.addSubview(view)
+    }
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        backgroundColor = UIColor(hex: 0x000000).withAlphaComponent(0.7)
+        let tap = UITapGestureRecognizer(target: self, action: #selector(handleTap))
+        tap.delegate = self
+        addGestureRecognizer(tap)
+        setView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    func setView() {
+        backgroundColor = UIColor(hex: 0x0000, alpha: 0.5)
+        
+        titleLabel = {
+            let label = UIImageView()
+            label.image = UIImage(named: "service_center_tips_image")
+            return label
+        }()
+        addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(85)
+            make.height.equalTo(112)
+            make.width.equalTo(254)
+            make.right.equalTo(-20)
+        }
+        
+        knowButton = {
+            let button = UIButton(type: .custom)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 15)
+            button.contentHorizontalAlignment = .center
+            button.setTitle("我知道了", for: .normal)
+            button.setTitleColor( UIColor.white, for: .normal)
+            button.layer.cornerRadius = kCornerRadius3
+            button.layer.borderWidth = 1
+            button.layer.borderColor = UIColor.white.cgColor
+            button.clipsToBounds = true
+            button.addTarget(self, action: #selector(goNext), for: .touchUpInside)
+            return button
+        }()
+        addSubview(knowButton)
+        knowButton.snp.makeConstraints { make in
+            make.top.equalTo(298)
+            make.centerX.equalToSuperview()
+            make.height.equalTo(46)
+            make.width.equalTo(96)
+        }
+        
+        measageLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor.white
+            label.text = "点击右上方可以\n切换我的订单、查看申请操作指引"
+            label.numberOfLines = 0
+            label.textAlignment = .center
+            return label
+        }()
+        addSubview(measageLabel)
+        measageLabel.snp.makeConstraints { make in
+            make.right.equalTo(-21)
+            make.left.equalTo(21)
+            make.top.equalTo(242)
+            make.height.equalTo(44)
+
+        }
+            
+    }
+    
+    @objc private func handleTap(_ sender: AnyObject?) {
+        dismiss()
+    }
+    
+    @objc func dismiss() {
+        removeFromSuperview()
+        UserDefaults.standard.set(true, forKey: "service_tip_show")
+    }
+    
+    @objc func goNext() {
+        dismiss()
+    }
+}
+
+extension YHServiceOrderTipsView: UIGestureRecognizerDelegate {
+    func gestureRecognizer(_ gestureRecognizer:UIGestureRecognizer, shouldReceive touch:UITouch) -> Bool {
+        if touch.view == self {
+            return true
+        }
+        return false
+    }
+}
+
+

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

@@ -16,6 +16,7 @@ class YHServiceCenterViewModel: YHBaseViewModel {
     var arrDataForSeviceCenterProgress: [YHServiceCenterProgressModel] = []
     var mainModel: YHServiceCenterMainModel = YHServiceCenterMainModel()
     var url: String = ""
+    var hasTTPS: Bool = false
 }
 
 //请求接口
@@ -45,6 +46,11 @@ extension YHServiceCenterViewModel {
                     
                     DispatchQueue.main.async {
                         self.arrContactList = resultModel.orders
+                        for item in self.arrContactList {
+                            if item.product_type == 2 {
+                                self.hasTTPS = true
+                            }
+                        }
                         callBackBlock(true,nil)
                     }
                 }

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

@@ -126,7 +126,7 @@ class YHAllApiName {
     //order 模块
     struct Order {
         //合同列表
-        static let contractListApi = "infoflow/order/list"
+        static let contractListApi = "infoflow/order/list_v2"
         
         static let main = "super-app/order/process_v2"
         //合同填写进度

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_center_tips_image.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_center_tips_image@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_center_tips_image@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_guideline_bkg.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_order_guideline_bkg@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_order_guideline_bkg@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_guideline_one.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_order_guideline_one@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_order_guideline_one@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/主入口/service_order_guideline_two.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "service_order_guideline_two@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "service_order_guideline_two@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}