几处细节调整

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberContentItem.swift

@@ -86,6 +86,8 @@ extension YHPayMemberContentItem {
         detailLabel.text = detail
         
         if oneLine {
+            copyBtn.setTitle("复制", for: .normal)
+            detailLabel.textAlignment = .right
             titleLabel.snp.makeConstraints { make in
                 make.centerY.equalToSuperview()
                 make.height.equalTo(18)
@@ -118,6 +120,8 @@ extension YHPayMemberContentItem {
                 }
             }
         } else {
+            detailLabel.textAlignment = .left
+            copyBtn.setTitle("查看", for: .normal)
             titleLabel.snp.makeConstraints { make in
                 make.centerY.equalToSuperview()
                 make.height.equalTo(18)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberContentItems.swift

@@ -50,8 +50,10 @@ private extension YHPayMemberContentItems {
 
 extension YHPayMemberContentItems {
     func updateUI( type : Int) {
+        whiteContentView.removeSubviews()
         removeSubviews()
         
+        
         addSubview(whiteContentView)
         whiteContentView.snp.makeConstraints { make in
             make.top.bottom.equalToSuperview()
@@ -71,30 +73,67 @@ extension YHPayMemberContentItems {
         var lastView : UIView = item
         
         
-        do {
-            let item = YHPayMemberContentItem()
-            whiteContentView.addSubview(item)
-            item.snp.makeConstraints { make in
-                make.top.equalTo(lastView.snp.bottom).offset(kMargin)
-                make.left.right.equalToSuperview()
+        if type == 1 || type == 2 {
+            do {
+                let item = YHPayMemberContentItem()
+                whiteContentView.addSubview(item)
+                item.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom).offset(kMargin)
+                    make.left.right.equalToSuperview()
+                }
+                item.updateUI(title: "可缴费时间段：",detail: "2023.10.1 - 2023.11.20",showBtn: false)
+                lastView = item
             }
-            item.updateUI(title: "可缴费时间段：",detail: "2023.10.1 - 2023.11.20",showBtn: false)
-            lastView = item
-        }
-        
-        
-        do {
-            let item = YHPayMemberContentItem()
-            whiteContentView.addSubview(item)
-            item.snp.makeConstraints { make in
-                make.top.equalTo(lastView.snp.bottom).offset(kMargin)
-                make.left.right.equalToSuperview()
+            
+            
+            do {
+                let item = YHPayMemberContentItem()
+                whiteContentView.addSubview(item)
+                item.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom).offset(kMargin)
+                    make.left.right.equalToSuperview()
+                }
+                item.updateUI(title: "缴费金额：",detail: "230港币（≈211.89人民币)",showBtn: false)
+                lastView = item
+            }
+            
+        } else if type == 3 {
+            
+            do {
+                let item = YHPayMemberContentItem()
+                whiteContentView.addSubview(item)
+                item.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom).offset(kMargin)
+                    make.left.right.equalToSuperview()
+                }
+                item.updateUI(title: "缴费金额：",detail: "230港币（≈211.89人民币)",showBtn: false)
+                lastView = item
+            }
+            
+            do {
+                whiteContentView.addSubview(lineView)
+                lineView.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom).offset(kMargin)
+                    make.height.equalTo(1)
+                    make.left.right.equalToSuperview()
+                }
+                lastView = lineView
+            }
+            
+            do {
+                let item = YHPayMemberContentItem()
+                whiteContentView.addSubview(item)
+                item.snp.makeConstraints { make in
+                    make.top.equalTo(lastView.snp.bottom).offset(kMargin)
+                    make.left.right.equalToSuperview()
+                }
+                item.updateUI(title: "缴费电子签证：",detail: "Visa QMEN-0021813-22.pdf",oneLine: false,showBtn: true)
+                lastView = item
             }
-            item.updateUI(title: "缴费金额：",detail: "230港币（≈211.89人民币)",showBtn: false)
-            lastView = item
         }
         
         
+        
         whiteContentView.addSubview(fakeView)
         fakeView.snp.makeConstraints { make in
             make.top.equalTo(lastView.snp.bottom).offset(kMargin)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberItemsView.swift

@@ -55,6 +55,7 @@ extension YHPayMemberItemsView {
             make.top.left.right.equalToSuperview()
             make.height.equalTo(YHPayMemberSectionItem.viewH)
         }
+        sectionItem.updateUI(type: type)
         
         
         addSubview(contentItems)
@@ -72,6 +73,10 @@ extension YHPayMemberItemsView {
             make.height.equalTo(1)
             make.bottom.equalToSuperview()
         }
-        
+        if type == 3 {
+            lineView.isHidden = true
+        } else {
+            lineView.isHidden = false
+        }
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberSectionItem.swift

@@ -76,7 +76,22 @@ private extension YHPayMemberSectionItem {
 
 
 extension YHPayMemberSectionItem {
-    func updateUI() {
+    func updateUI(type : Int) {
+        var txt = "待缴费"
+        var color : UIColor = UIColor.failColor
+        if type == 1 {
+            txt = "待缴费"
+            color = .brandMainColor
+        } else if type == 2 {
+            txt = "已过期"
+            color = .failColor
+            
+        } else if type == 3 {
+            txt = "已缴费"
+            color = .mainTextColor50
+        }
+        detailLabel.text = txt
+        detailLabel.textColor = color
         
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMembersCell.swift

@@ -143,6 +143,7 @@ private extension YHPayMembersCell {
             view.updateUI(type: index + 1)
             lastView = view
             
+            arrOtherView.append(view)
         }