服务中心 列表page

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -244,6 +244,8 @@
 		048097712BA18D66000B9DCA /* YHCertificateSearchBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */; };
 		048787D12BCE61B20036E221 /* YHServiceNoOrderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */; };
 		048787D32BCE6B7D0036E221 /* YHServiceOrderAlertView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D22BCE6B7D0036E221 /* YHServiceOrderAlertView.swift */; };
+		048787D52BCE880B0036E221 /* YHServiceOrderListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */; };
+		048787D72BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */; };
 		048B2A442BC7901900A93BF0 /* YHHomeWebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048B2A432BC7901900A93BF0 /* YHHomeWebViewModel.swift */; };
 		048B2A462BC7912400A93BF0 /* YHWebModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048B2A452BC7912400A93BF0 /* YHWebModel.swift */; };
 		048B2A482BC7CE4800A93BF0 /* YHFourKingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 048B2A472BC7CE4800A93BF0 /* YHFourKingViewController.swift */; };
@@ -690,6 +692,8 @@
 		048097702BA18D66000B9DCA /* YHCertificateSearchBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateSearchBar.swift; sourceTree = "<group>"; };
 		048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceNoOrderView.swift; sourceTree = "<group>"; };
 		048787D22BCE6B7D0036E221 /* YHServiceOrderAlertView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderAlertView.swift; sourceTree = "<group>"; };
+		048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderListViewController.swift; sourceTree = "<group>"; };
+		048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceOrderProgressTableViewCell.swift; sourceTree = "<group>"; };
 		048B2A432BC7901900A93BF0 /* YHHomeWebViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeWebViewModel.swift; sourceTree = "<group>"; };
 		048B2A452BC7912400A93BF0 /* YHWebModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWebModel.swift; sourceTree = "<group>"; };
 		048B2A472BC7CE4800A93BF0 /* YHFourKingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFourKingViewController.swift; sourceTree = "<group>"; };
@@ -2103,6 +2107,7 @@
 			isa = PBXGroup;
 			children = (
 				A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
+				048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */,
 				044413FC2BC386DA00784A14 /* YHServiceViewController.swift */,
 				044413FE2BC391F000784A14 /* YHServiceListViewController.swift */,
 				044414002BC3979800784A14 /* YHServerHKLifeViewController.swift */,
@@ -2130,6 +2135,7 @@
 				049AC4C72BC513AB00F857F4 /* YHOrderListView.swift */,
 				049AC4C92BC5141600F857F4 /* YHServerNoOrderView.swift */,
 				048787D02BCE61B20036E221 /* YHServiceNoOrderView.swift */,
+				048787D62BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2483,6 +2489,7 @@
 				044867B82BA1C75700DFAD4A /* YHCertificateUploadFailTipsView.swift in Sources */,
 				045EEF002B9F171A0022A143 /* YHFormItemEnterDetailCell.swift in Sources */,
 				A5ACE9362B4564F7002C94D2 /* YHNetworkStatusManager.swift in Sources */,
+				048787D52BCE880B0036E221 /* YHServiceOrderListViewController.swift in Sources */,
 				A5D0012A2BABC84A001F003C /* YHFileListHeaerView.swift in Sources */,
 				044414052BC3B9DE00784A14 /* YHServiceTableFootView.swift in Sources */,
 				045EEEEF2B9F171A0022A143 /* YHCertificateInfoController.swift in Sources */,
@@ -2717,6 +2724,7 @@
 				045EEEB52B9F171A0022A143 /* YHWorkIntroductionItemView.swift in Sources */,
 				045EEF202B9F171A0022A143 /* YHCardExampleView.swift in Sources */,
 				04A6715E2B9FFCA700C1FB91 /* YHCertificateNameCell.swift in Sources */,
+				048787D72BCE96F50036E221 /* YHServiceOrderProgressTableViewCell.swift in Sources */,
 				04EA23082BB50753009DA928 /* YHDocumentMessageTableViewCell.swift in Sources */,
 				045EEE8E2B9F171A0022A143 /* YHPreviewInfoWorkSummaryView.swift in Sources */,
 				045EEECE2B9F171A0022A143 /* YHScoreDetailViewController.swift in Sources */,

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

+//
+//  YHServiceOrderListView.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import JXSegmentedView
+
+class YHServiceOrderListView: YHBaseViewController {
+    private let viewModel : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+
+    var orderID: Int = 0
+    var type: Int = 0
+    var homeTableView: UITableView!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupUI()
+    }
+    
+    override func viewWillAppear(_ animated: Bool) {
+        super.viewWillAppear(animated)
+        loadData()
+    }
+}
+
+extension YHServiceOrderListView {
+    func loadData() {
+        viewModel.getServiceCenterProgressList(orderID, type) {[weak self] success, error in
+            guard let self = self else { return }
+            self.homeTableView.reloadData()
+        }
+    }
+    
+    func setupUI() {
+        gk_navBarAlpha = 0
+        gk_navigationBar.isHidden = true
+        homeTableView = {
+            let tableView = UITableView(frame: .zero, style: .grouped)
+            tableView.backgroundColor = .clear
+            tableView.separatorStyle = .none
+            tableView.showsHorizontalScrollIndicator = false
+            tableView.showsVerticalScrollIndicator = false
+            tableView.rowHeight = UITableView.automaticDimension
+            tableView.estimatedRowHeight = 81.0
+            tableView.dataSource = self
+            tableView.delegate = self
+            tableView.register(cellWithClass: YHServiceOrderProgressTableViewCell.self)
+            return tableView
+        }()
+        view.addSubview(homeTableView)
+        homeTableView.snp.makeConstraints { make in
+            make.top.right.left.bottom.equalToSuperview()
+        }
+    }
+}
+
+extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
+    func numberOfSections(in tableView: UITableView) -> Int {
+        return self.viewModel.arrDataForSeviceCenterProgress.count
+    }
+
+    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+
+        return 1
+    }
+
+    func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
+        return kMargin
+    }
+
+    func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
+        let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: kMargin))
+        return view
+    }
+
+    func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
+        return 0
+    }
+
+    func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
+        return UIView()
+    }
+
+
+    func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
+        return 144
+    }
+
+    func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
+        let cell0 = tableView.dequeueReusableCell(withClass: YHServiceOrderProgressTableViewCell.self)
+        cell0.selectionStyle = .none
+
+        if indexPath.section < self.viewModel.arrDataForSeviceCenterProgress.count {
+            cell0.dataModel = self.viewModel.arrDataForSeviceCenterProgress[indexPath.section]
+        }
+        return cell0
+    }
+
+    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
+//        tableView.deselectRow(at: indexPath, animated: true)
+//        printLog("点击了 tableView Cell \(indexPath.section)")
+//
+//
+//        //获取订单号
+//        let orderId = viewModel.arrContactList[indexPath.section].id
+//        UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
+//        UserDefaults.standard.synchronize()
+//
+//        let vc = YHServiceCenterSecondViewController()
+//        vc.orderId = orderId
+//        vc.mobile = viewModel.arrContactList[indexPath.section].mobile
+//        self.navigationController?.pushViewController(vc)
+    }
+}
+
+
+extension YHServiceOrderListView: JXSegmentedListContainerViewListDelegate {
+    func listView() -> UIView {
+        return view
+    }
+    
+    func listWillAppear() {
+        loadData()
+    }
+}

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

+//
+//  YHServiceOrderProgressTableViewCell.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/16.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHServiceOrderProgressTableViewCell: UITableViewCell {
+    var titleLabel: UILabel!
+    var messageLabel: UILabel!
+    var buttonLabel: UILabel!
+    var progressImageView: UIImageView!
+    var progressLabel: UILabel!
+    var progress: UIView!
+    var dataModel : YHServiceCenterProgressModel? {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        // Initialization code
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+    override init(style: UITableViewCell.CellStyle, reuseIdentifier: String?) {
+        super.init(style: style, reuseIdentifier: reuseIdentifier)
+        setupUI()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+}
+
+extension YHServiceOrderProgressTableViewCell {
+    func updateUI() {
+        guard let model = dataModel else { return }
+        messageLabel.text = "您还有" + "\(model.num)" + "份信息待填写哦~"
+        // 1 证件 2 信息完善 3 我的评分 4 我的方案 5 我的签字 6我的文书
+        if model.type == 1 {
+            titleLabel.text = "我的证件"
+        }
+        if model.type == 2 {
+            titleLabel.text = "我的信息"
+        }
+        if model.type == 3 {
+            titleLabel.text = "我的评分"
+        }
+        if model.type == 4 {
+            titleLabel.text = "我的方案"
+        }
+        if model.type == 5 {
+            titleLabel.text = "我的签字"
+        }
+        if model.type == 6 {
+            titleLabel.text = "我的文书"
+        }
+        // 0未知 1待开始 2进行中 3 已完成
+        if model.status == 1 {
+            buttonLabel.text = "待开始"
+        }
+        if model.status == 2 {
+            buttonLabel.text = "进行中"
+        }
+        if model.status == 3 {
+            buttonLabel.text = "已完成"
+        }
+        progressLabel.text = "\(model.percentage)"
+//        contractNameLable.text = dataModel?.productName ?? "-" + " - " + (dataModel?.username ?? "-")
+//        let str = "合同编号：" + (dataModel?.orderSn ?? "-")
+//        contractIdLable.text = str
+    }
+    
+    func setupUI() {
+        let holdView = UIView()
+        holdView.backgroundColor = .white
+        holdView.layer.cornerRadius = kCornerRadius6
+        holdView.clipsToBounds = true
+        
+        backgroundColor = .clear
+        contentView.backgroundColor = .clear
+        
+        contentView.addSubview(holdView)
+        holdView.snp.makeConstraints { make in
+            make.top.bottom.equalToSuperview()
+            make.left.equalTo(kMargin)
+            make.right.equalTo(-kMargin)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        holdView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(21)
+            make.left.equalTo(21)
+            make.height.equalTo(24)
+        }
+        
+        messageLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 13)
+            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        holdView.addSubview(messageLabel)
+        messageLabel.snp.makeConstraints { make in
+            make.top.equalTo(49)
+            make.left.equalTo(21)
+            make.height.equalTo(18)
+        }
+        
+        buttonLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 13)
+            label.textColor = .white
+            label.backgroundColor = UIColor.brandMainColor
+            label.layer.cornerRadius = kCornerRadius4
+            return label
+        }()
+        holdView.addSubview(buttonLabel)
+        buttonLabel.snp.makeConstraints { make in
+            make.bottom.equalTo(-19)
+            make.left.equalTo(21)
+            make.height.equalTo(27)
+            make.width.equalTo(57)
+        }
+        
+        progressImageView = {
+            let view = UIImageView()
+            return view
+        }()
+        holdView.addSubview(progressImageView)
+        progressImageView.snp.makeConstraints { make in
+            make.top.equalTo(24)
+            make.right.equalTo(-32)
+            make.height.equalTo(80)
+            make.width.equalTo(80)
+        }
+        
+        progressLabel = {
+            let label = UILabel()
+//            label.font = UIFont.PFSC_M(ofSize: 13)
+//            label.textColor = UIColor.mainTextColor
+            return label
+        }()
+        holdView.addSubview(progressLabel)
+        progressLabel.snp.makeConstraints { make in
+            make.center.equalTo(progressImageView.snp.center)
+            make.width.equalTo(36)
+            make.height.equalTo(29)
+        }
+    }
+}

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

@@ -34,14 +34,16 @@ class YHServiceCenterMainViewModel: YHBaseViewModel {
 //请求接口
 extension YHServiceCenterMainViewModel {
     //服务中心进度列表
-    func getServiceCenterProgressList( params:[String : Any],callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
+    func getServiceCenterProgressList(_ orderId: Int, _ type: Int,callBackBlock:@escaping (_ success: Bool,_ error:YHErrorModel?)->()) {
         
         /*
          orderId integer 订单id 可选
          status integer 可选   0全部 1待开始 2进行中 3 已完成
          let arr = ["orderId":id,"status"]
          */
-        
+        let params: [String : Any] = ["orderId": orderId,
+                                      "status": type]
+
         let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Order.serviceCenterProgressApi
         
         let _ = YHNetRequest.getRequest(url: strUrl,params: params) { [weak self] json, code in

galaxy/galaxy/Classes/Modules/Mine（我的）/ViewModel/YHMyLikeViewModel.swift

@@ -12,7 +12,7 @@ class YHMyLikeViewModel: YHBaseViewModel {
     var arrHomeNewsData: [YHHomeListModel]?
     var likeCollectCountInfo: YHCollectionModel =  YHCollectionModel()
     private var curPageIndex : Int = 1
-    private var page_Size : Int = 6
+    private var page_Size : Int = 10
     private var totalCount : Int = 0
     var hasMoreForHomeNews : Bool = true
 }

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

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

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

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