Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  我的订单详情开发

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -284,6 +284,7 @@
 		04C8F4832B7216D800ADF59B /* YHUserInfoHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */; };
 		04CC2EF02BC3DDB2000305DD /* YHServiceBannerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */; };
 		04D5C5662B8ED92600190021 /* YHBaseModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04D5C5652B8ED92600190021 /* YHBaseModel.swift */; };
+		04E41DE82BD240570077EAE3 /* YHOrderDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */; };
 		04E86E092B707ACE00A35F4B /* YHPhoneLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */; };
 		04E86E0B2B70C13300A35F4B /* YHCodeSueecssViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */; };
 		04E86E0D2B70D51D00A35F4B /* YHWebViewViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */; };
@@ -734,6 +735,7 @@
 		04C8F4822B7216D800ADF59B /* YHUserInfoHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHUserInfoHeaderView.swift; sourceTree = "<group>"; };
 		04CC2EEF2BC3DDB2000305DD /* YHServiceBannerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceBannerView.swift; sourceTree = "<group>"; };
 		04D5C5652B8ED92600190021 /* YHBaseModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBaseModel.swift; sourceTree = "<group>"; };
+		04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHOrderDetailViewController.swift; sourceTree = "<group>"; };
 		04E86E082B707ACE00A35F4B /* YHPhoneLoginViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHPhoneLoginViewController.swift; sourceTree = "<group>"; };
 		04E86E0A2B70C13300A35F4B /* YHCodeSueecssViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCodeSueecssViewController.swift; sourceTree = "<group>"; };
 		04E86E0C2B70D51D00A35F4B /* YHWebViewViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHWebViewViewController.swift; sourceTree = "<group>"; };
@@ -2109,6 +2111,7 @@
 			isa = PBXGroup;
 			children = (
 				A5ACE9192B4564F7002C94D2 /* YHServiceCenterMainViewController.swift */,
+				04E41DE72BD240570077EAE3 /* YHOrderDetailViewController.swift */,
 				048787D42BCE880B0036E221 /* YHServiceOrderListViewController.swift */,
 				044413FC2BC386DA00784A14 /* YHServiceViewController.swift */,
 				044413FE2BC391F000784A14 /* YHServiceListViewController.swift */,
@@ -2584,6 +2587,7 @@
 				04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
 				A582B2412BB95998009D098C /* YHHKPlanTipsCell.swift in Sources */,
 				A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */,
+				04E41DE82BD240570077EAE3 /* YHOrderDetailViewController.swift in Sources */,
 				A5FD63C52B637EE000D1D9DA /* YHSubmitAllInfoCheckView.swift in Sources */,
 				045EEF222B9F171A0022A143 /* YHImagePickerView.swift in Sources */,
 				A5ACE9442B4564F7002C94D2 /* Array+Extension.swift in Sources */,

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

+//
+//  YHOrderDetailViewController.swift
+//  galaxy
+//
+//  Created by EDY on 2024/4/19.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHOrderDetailViewController: YHBaseViewController {
+    var centerView: UIView!
+    var titleLabel: UILabel!
+    var lineView: UIView!
+    var orderLabel: UILabel!
+    var orderNumLabel: UILabel!
+    var phoneLabel: UILabel!
+    var phoneNumLabel: UILabel!
+    var copyButton: UIButton!
+
+    
+    var model: YHContactItemModel = YHContactItemModel()
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setView()
+        // Do any additional setup after loading the view.
+    }
+
+    func setView() {
+        gk_navTitle = "我的订单"
+        gk_navBackgroundColor = UIColor.white
+        gk_navBarAlpha = 1
+        
+        centerView = {
+            let view = UIView()
+            view.backgroundColor = .white
+            view.layer.cornerRadius = kCornerRadius8
+            view.masksToBounds = true
+            return view
+        }()
+        view.addSubview(centerView)
+        centerView.snp.makeConstraints { make in
+            make.top.equalTo(k_Height_NavigationtBarAndStatuBar + 16)
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.height.equalTo(149)
+        }
+        
+        titleLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 17)
+            label.textColor = UIColor.mainTextColor
+            label.text = model.productName
+            return label
+        }()
+        centerView.addSubview(titleLabel)
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(18)
+            make.left.equalTo(16)
+            make.height.equalTo(24)
+        }
+        
+        lineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        centerView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.top.equalTo(54.5)
+            make.left.equalTo(16)
+            make.right.equalTo(-16)
+            make.height.equalTo(1)
+        }
+        
+        orderLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor(hex: 0x121A26).withAlphaComponent(0.5)
+            label.text = "合同编号： "
+            return label
+        }()
+        centerView.addSubview(orderLabel)
+        orderLabel.snp.makeConstraints { make in
+            make.top.equalTo(72.5)
+            make.left.equalTo(16)
+            make.height.equalTo(20)
+        }
+        
+        phoneLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor(hex: 0x121A26).withAlphaComponent(0.5)
+            label.text = "签约手机号："
+            return label
+        }()
+        centerView.addSubview(phoneLabel)
+        phoneLabel.snp.makeConstraints { make in
+            make.top.equalTo(110.5)
+            make.left.equalTo(16)
+            make.height.equalTo(20)
+        }
+        
+        orderNumLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor(hex: 0x121A26)
+            label.text = model.orderSn
+            label.textAlignment = .right
+            return label
+        }()
+        centerView.addSubview(orderNumLabel)
+        orderNumLabel.snp.makeConstraints { make in
+            make.top.equalTo(72.5)
+            make.right.equalTo(-58)
+            make.height.equalTo(20)
+        }
+        
+        phoneNumLabel = {
+            let label = UILabel()
+            label.font = UIFont.PFSC_M(ofSize: 14)
+            label.textColor = UIColor(hex: 0x121A26)
+            label.text = model.mobile
+            label.textAlignment = .right
+            return label
+        }()
+        centerView.addSubview(phoneNumLabel)
+        phoneNumLabel.snp.makeConstraints { make in
+            make.top.equalTo(110.5)
+            make.right.equalTo(-16)
+            make.height.equalTo(20)
+        }
+        
+        copyButton = {
+            let button = UIButton(type: .custom)
+            button.setTitle("复制", for: .normal)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 13)
+            button.setTitleColor(UIColor.brandMainColor, for: .normal)
+            button.addTarget(self, action: #selector(copyButtonClick), for: .touchUpInside)
+            return button
+        }()
+        centerView.addSubview(copyButton)
+        copyButton.snp.makeConstraints { make in
+            make.top.equalTo(72.5)
+            make.right.equalTo(-16)
+            make.height.equalTo(18)
+            make.width.equalTo(26)
+        }
+        
+        let subLineView = {
+            let view = UIView()
+            view.backgroundColor = UIColor.separatorColor
+            return view
+        }()
+        centerView.addSubview(subLineView)
+        subLineView.snp.makeConstraints { make in
+            make.centerY.equalTo(copyButton.snp.centerY)
+            make.right.equalTo(-50)
+            make.width.equalTo(1)
+            make.height.equalTo(6)
+        }
+    }
+
+    @objc func copyButtonClick() {
+        let textToCopy = orderNumLabel.text
+        UIPasteboard.general.string = textToCopy
+        YHHUD.flash(message: "复制成功")
+    }
+}

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

@@ -17,12 +17,15 @@ class YHServiceCenterMainViewController: YHBaseViewController {
     var titleLabel: UILabel!
     var nameBgImageView: UIImageView!
     var nameLabel: UILabel!
+    var orderButton: UIButton!
     var orderId: Int = 0
     var mobile: String = ""
+    var model: YHContactItemModel = YHContactItemModel()
     private lazy var topBkg : UIView = {
         let imagV = UIImageView()
         imagV.image = UIImage(named: "service_center_head_bkg4")
         imagV.contentMode = .scaleAspectFill
+        imagV.isUserInteractionEnabled = true
         return imagV
         
     }()
@@ -102,7 +105,7 @@ extension YHServiceCenterMainViewController {
     
     func setupUI() {
         gk_navBarAlpha = 0
-        
+        gk_navigationBar.isHidden = true
         view.backgroundColor = .white
         view.addSubview(topBkg)
         topBkg.snp.makeConstraints { make in
@@ -123,6 +126,22 @@ extension YHServiceCenterMainViewController {
             make.left.equalTo(20)
             make.height.equalTo(29)
         }
+        
+        orderButton = {
+            let button = UIButton(type: .custom)
+            button.setTitle("我的订单", for: .normal)
+            button.titleLabel?.font = UIFont.PFSC_M(ofSize: 14)
+            button.setTitleColor(UIColor(hex: 0x94a3b8), for: .normal)
+            button.addTarget(self, action: #selector(pushOrderView), for: .touchUpInside)
+            return button
+        }()
+        view.addSubview(orderButton)
+        orderButton.snp.makeConstraints { make in
+            make.right.equalTo(-20)
+            make.centerY.equalTo(titleLabel.snp.centerY)
+            make.height.equalTo(20)
+            make.width.equalTo(56)
+        }
     }
     
     override func viewDidLayoutSubviews() {
@@ -131,6 +150,12 @@ extension YHServiceCenterMainViewController {
         segmentedView.frame = CGRect(x: 4, y: k_Height_safeAreaInsetsTop() + 98, width: view.bounds.size.width - 8, height: 48)
         listContainerView.frame = CGRect(x: 0, y: k_Height_safeAreaInsetsTop() + 48 + 98, width: view.bounds.size.width, height: view.bounds.size.height - 48 - k_Height_safeAreaInsetsTop() - 98 - k_Height_TabBar)
     }
+    
+    @objc func pushOrderView() {
+        let vc = YHOrderDetailViewController()
+        vc.model = model
+        self.navigationController?.pushViewController(vc)
+    }
 }
 
 extension YHServiceCenterMainViewController: JXSegmentedViewDelegate {
@@ -171,6 +196,7 @@ extension YHServiceCenterMainViewController {
             nameBgImageView.isHidden = true
             segmentedView.isHidden = true
             listContainerView.isHidden = true
+            orderButton.isHidden = true
         } else {
             guard let model = serviceCenterMainReqVM.arrContactList.first else {
                 return
@@ -179,8 +205,10 @@ extension YHServiceCenterMainViewController {
             nameBgImageView.isHidden = false
             segmentedView.isHidden = false
             listContainerView.isHidden = false
+            orderButton.isHidden = false
             orderId = model.id
             mobile = model.mobile
+            self.model = model
             UserDefaults.standard.set(orderId, forKey: "orderIdForPreview")
             UserDefaults.standard.synchronize()
             for i in 0..<arrItemTitles.count {