服务中心 二级界面

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -45,6 +45,7 @@
 		A5573EE92B317C0100D98EC0 /* galaxyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EE82B317C0100D98EC0 /* galaxyTests.swift */; };
 		A5573EF32B317C0100D98EC0 /* galaxyUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */; };
 		A5573EF52B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */; };
+		A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */; };
 		A57F1F252B48F09200B644E6 /* ATAuthSDK_D.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 04808C032B4686510056D53C /* ATAuthSDK_D.framework */; };
 		A58951C52B398D1000225C19 /* Launch Screen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = A58951C42B398D1000225C19 /* Launch Screen.storyboard */; };
 		A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DB2B4564F7002C94D2 /* YHLoginViewController.swift */; };
@@ -193,6 +194,7 @@
 		A5573EEE2B317C0100D98EC0 /* galaxyUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = galaxyUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		A5573EF22B317C0100D98EC0 /* galaxyUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITests.swift; sourceTree = "<group>"; };
 		A5573EF42B317C0100D98EC0 /* galaxyUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = galaxyUITestsLaunchTests.swift; sourceTree = "<group>"; };
+		A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHContractMainItemStatusCell.swift; sourceTree = "<group>"; };
 		A58951C42B398D1000225C19 /* Launch Screen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = "Launch Screen.storyboard"; sourceTree = "<group>"; };
 		A5ACE8DB2B4564F7002C94D2 /* YHLoginViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHLoginViewController.swift; sourceTree = "<group>"; };
 		A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeView.swift; sourceTree = "<group>"; };
@@ -674,6 +676,7 @@
 			children = (
 				A5C382C92B5E1F4C00C5E65C /* YHLoginTipsView.swift */,
 				A5C382CB2B5EA11800C5E65C /* YHContractCell.swift */,
+				A56D2D602B62020C009C83A8 /* YHContractMainItemStatusCell.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -1043,6 +1046,7 @@
 				A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */,
 				A5ACE9552B4564F7002C94D2 /* YHTabBarViewController.swift in Sources */,
 				A5C5B3122B57B47D00A7C5D1 /* YHDavidCell0.swift in Sources */,
+				A56D2D612B62020C009C83A8 /* YHContractMainItemStatusCell.swift in Sources */,
 				0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */,
 				041B528F2B5E620E007EBCEB /* YHSingleLineInputCell.swift in Sources */,
 				A5ACE9402B4564F7002C94D2 /* String+Extension.swift in Sources */,

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

@@ -134,13 +134,13 @@ extension YHServiceCenterMainViewController : UITableViewDelegate,UITableViewDat
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        let cell = tableView.dequeueReusableCell(withIdentifier: YHContractCell.cellReuseIdentifier, for: indexPath) as! YHContractCell
-        cell.selectionStyle = .none
+        let cell0 = tableView.dequeueReusableCell(withClass: YHContractCell.self)
+        cell0.selectionStyle = .none
         
         if indexPath.section < self.serviceCenterMainReqVM.arrContactList.count {
-            cell.dataModel = self.serviceCenterMainReqVM.arrContactList[indexPath.section]
+            cell0.dataModel = self.serviceCenterMainReqVM.arrContactList[indexPath.section]
         }
-        return cell
+        return cell0
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {

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

@@ -11,14 +11,12 @@ import UIKit
 //服务中心
 class YHServiceCenterSecondViewController: YHBaseViewController {
     
-    private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
+//    private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
     private var unfoldFlag : Bool = true //是否展开
     private lazy var downArrowImagev : UIImageView =  {
-        
-        let imagV = UIImageView(frame: CGRect(x: KScreenWidth - 16 - 32, y: 16, width: 28, height: 28))
+        let imagV = UIImageView(frame: CGRect(x: KScreenWidth - 16 - 32, y: 17, width: 24, height: 24))
         imagV.image = UIImage(named: "service_center_down_arrow")
         imagV.contentMode = .scaleAspectFill
-//        view.addSubview(imagV)
         return imagV
     }()
     
@@ -30,31 +28,13 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
         
     }()
     
-    private let loginTipsView : YHLoginTipsView = {
-        let view = YHLoginTipsView()
-        view.viewType = 0
-        view.isHidden = true
-        return view
-    }()
-    
-    private let noDataView : YHLoginTipsView = {
-        let view = YHLoginTipsView()
-        view.viewType = 1
-        view.isHidden = true
-        return view
-    }()
-    
-    
     var homeTableView: UITableView = {
         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.register(YHContractCell.self,forCellReuseIdentifier: YHContractCell.cellReuseIdentifier)
-        tableView.register(UITableViewCell.self,forCellReuseIdentifier: "cell")
+        tableView.register(YHContractMainItemStatusCell.self,forCellReuseIdentifier: YHContractMainItemStatusCell.cellReuseIdentifier)
         return tableView
     }()
     
@@ -64,21 +44,16 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
         loadData()
     }
     
-    
-   
-    
-    
-    
 }
 
 extension YHServiceCenterSecondViewController {
     func loadData() {
-        self.serviceCenterMainReqVM.getContactList { success, error in
-            if success == true {
-                
-            }
-            self.homeTableView.reloadData()
-        }
+//        self.serviceCenterMainReqVM.getContactList { success, error in
+//            if success == true {
+//                
+//            }
+//            self.homeTableView.reloadData()
+//        }
     }
     
     func setupUI() {
@@ -92,34 +67,20 @@ extension YHServiceCenterSecondViewController {
             make.height.equalTo(216)
         }
         
-        view.addSubview(loginTipsView)
-        loginTipsView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview().offset(-64)
-            make.width.equalTo(KScreenWidth)
-        }
-        
-        view.addSubview(noDataView)
-        noDataView.snp.makeConstraints { make in
-            make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview().offset(-64)
-            make.width.equalTo(KScreenWidth)
-        }
         
+        homeTableView.delegate = self
+        homeTableView.dataSource = self
         view.addSubview(homeTableView)
         homeTableView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
-            make.bottom.equalToSuperview().offset(-k_Height_TabBar)
+            make.bottom.equalToSuperview()
         }
-        homeTableView.delegate = self
-        homeTableView.dataSource = self
+        
     }
     
     @objc func clickUnfoldView() {
         unfoldFlag = !unfoldFlag
-        
-        
         if unfoldFlag == true {
             UIView.animate(withDuration: 0.25) {
                 self.downArrowImagev.transform = CGAffineTransform.identity
@@ -142,7 +103,7 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
         
         if unfoldFlag == true {
-            return 1
+            return 10
         }
         return 0
     }
@@ -153,7 +114,7 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
     
     func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
         let view = UIView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height: 60))
-        view.backgroundColor = .white
+        view.backgroundColor = .clear
         
         let lable = UILabel(frame: CGRect(x: 16, y: 0, width: 200, height: 60))
         lable.text = "身份申请"
@@ -176,29 +137,17 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
     
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
-        return UITableView.automaticDimension
+        return YHContractMainItemStatusCell.cellHeight
     }
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
-        if indexPath.row == 0 {
-            let cell = tableView.dequeueReusableCell(withIdentifier: YHContractCell.cellReuseIdentifier, for: indexPath) as! YHContractCell
-            cell.selectionStyle = .none
-            
-            if indexPath.section < self.serviceCenterMainReqVM.arrContactList.count {
-                cell.dataModel = self.serviceCenterMainReqVM.arrContactList[indexPath.section]
-            }
-            return cell
-        }
-        return UITableViewCell()
+        let newCell = tableView.dequeueReusableCell(withClass: YHContractMainItemStatusCell.self)
+        newCell.selectionStyle = .none
+        return newCell
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
         tableView.deselectRow(at: indexPath, animated: true)
-        if indexPath.row == 0 {
-            printLog("点击了 0 row")
-            
-//            unfoldFlag = !unfoldFlag
-            
-        }
+        printLog("点击了 \(indexPath.section)section  --- \(indexPath.row)row")
     }
 }

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

+//
+//  YHContractMainItemStatusCell.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/1/25.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+import SwifterSwift
+
+
+class YHContractMainItemStatusCell: UITableViewCell {
+    static let cellReuseIdentifier = "YHContractMainItemStatusCell"
+    static let cellHeight :CGFloat = 97.0
+    
+    var dataModel : YHContactItemModel? {
+        didSet {
+            updateUI()
+        }
+    }
+    
+    override func awakeFromNib() {
+        super.awakeFromNib()
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+    }
+    
+    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")
+    }
+    
+    private lazy var iconImageV : UIImageView = {
+        let nextImgV = UIImageView()
+        nextImgV.image = UIImage(named: "service_center_finish_info_icon")
+        nextImgV.contentMode = .scaleAspectFill
+        return nextImgV
+    }()
+    
+    private lazy var itemNameLable : UILabel = {
+        let lable = UILabel()
+        lable.textColor = UIColor(red: 0.133, green: 0.133, blue: 0.133, alpha: 1)
+        lable.font = UIFont(name: "PingFangSC-Medium", size: 17)
+        lable.text = "信息完善"
+        return lable
+    }()
+    
+    
+    private lazy var goUnfinishHoldView : UIView = {
+        let view = UIView()
+        view.layer.cornerRadius = 6
+        view.clipsToBounds = true
+        
+        let gradientLayer = CAGradientLayer()
+        gradientLayer.frame = bounds
+        gradientLayer.colors = [UIColor(red: 0.302, green: 0.624, blue: 0.973, alpha: 1),UIColor(red: 0.231, green: 0.525, blue: 0.969, alpha: 1)].map(\.cgColor)
+        gradientLayer.locations = [0,1].map { NSNumber(value: $0) }
+        gradientLayer.startPoint = CGPoint(x: 0.12, y: 0.25)
+        gradientLayer.endPoint = CGPoint(x: 0.38, y: 0.25)
+        view.layer.addSublayer(gradientLayer)
+        
+        let lable = UILabel()
+        lable.font = kFont(size: 14)
+        lable.text = "去完善"
+        lable.textAlignment = .center
+        lable.textColor = .white
+        view.addSubview(lable)
+        lable.snp.makeConstraints { make in
+            make.edges.equalTo(0)
+        }
+        return view
+    }()
+    
+    
+    
+    private lazy var gofinishHoldView : UIView = {
+        let view = UIView()
+        return view
+    }()
+    
+}
+
+extension YHContractMainItemStatusCell {
+    func updateUI() {
+//        contractNameLable.text = dataModel?.productName ?? "-"
+//        contractIdLable.text = dataModel?.orderSn ?? "-"
+    }
+    
+    func setupUI() {
+        let holdView = UIView()
+        holdView.backgroundColor = .white
+        holdView.layer.cornerRadius = 12
+        holdView.clipsToBounds = true
+        
+        backgroundColor = .clear
+        contentView.backgroundColor = .clear
+        
+        contentView.addSubview(holdView)
+        holdView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(16)
+            make.bottom.equalToSuperview()
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+        }
+        
+        holdView.addSubview(iconImageV)
+        iconImageV.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(26)
+            make.width.height.equalTo(34)
+        }
+        
+        
+        holdView.addSubview(itemNameLable)
+        itemNameLable.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.left.equalTo(iconImageV.snp.right).offset(14)
+            make.height.equalTo(24)
+            make.width.equalTo(80)
+        }
+        
+        
+        holdView.addSubview(goUnfinishHoldView)
+        goUnfinishHoldView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-16)
+            make.height.equalTo(34)
+            make.width.equalTo(76)
+        }
+//        goUnfinishHoldView.isHidden = true
+        
+        
+        gofinishHoldView.isHidden = true
+        holdView.addSubview(gofinishHoldView)
+        gofinishHoldView.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(-16)
+            make.width.equalTo(82)
+        }
+        
+        let nextImgV = UIImageView()
+        nextImgV.image = UIImage(named: "service_center_right_next_icon")
+        nextImgV.contentMode = .scaleAspectFill
+        gofinishHoldView.addSubview(nextImgV)
+        nextImgV.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalToSuperview()
+            make.width.height.equalTo(20)
+            
+        }
+        
+        let statusLable = UILabel(text: "已完成")
+        statusLable.textAlignment = .center
+        statusLable.font = kFont(name: "PingFang SC", size: 14)
+        statusLable.textColor = .black
+        gofinishHoldView.addSubview(statusLable)
+        statusLable.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(nextImgV.snp.left).offset(-2)
+            make.height.equalTo(20)
+            make.width.equalTo(42)
+        }
+        
+        
+        let statusIcon = UIImageView()
+        statusIcon.image = UIImage(named: "service_center_finish_icon")
+        statusIcon.contentMode = .scaleAspectFill
+        gofinishHoldView.addSubview(statusIcon)
+        statusIcon.snp.makeConstraints { make in
+            make.centerY.equalToSuperview()
+            make.right.equalTo(statusLable.snp.left).offset(-4)
+            make.width.height.equalTo(14)
+        }
+    }
+    
+}

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

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

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

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