细节调试

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -200,7 +200,6 @@
 		0468D43A2B579EAC00CFB916 /* YHLoginViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */; };
 		047294E82B988A19008E0B84 /* YHNewWebViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 047294E72B988A19008E0B84 /* YHNewWebViewController.swift */; };
 		04754A952B96FF3D00F8ADCA /* UITextField+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */; };
-		0477E1782BA41B1300436346 /* YHCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0477E1772BA41B1300436346 /* YHCertificateViewModel.swift */; };
 		0477E17A2BA41C7E00436346 /* YHCertificateModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0477E1792BA41C7E00436346 /* YHCertificateModel.swift */; };
 		0477E17C2BA4238400436346 /* YHMaterialListViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0477E17B2BA4238400436346 /* YHMaterialListViewController.swift */; };
 		0477E17E2BA4362A00436346 /* YHCustomNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0477E17D2BA4362A00436346 /* YHCustomNavigationBar.swift */; };
@@ -248,6 +247,7 @@
 		A592FE912BA6CC010062FACA /* YHCertificateEntryHeadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE902BA6CC010062FACA /* YHCertificateEntryHeadView.swift */; };
 		A592FE932BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */; };
 		A592FE952BA6D23C0062FACA /* YHCertificateEntryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */; };
+		A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */; };
 		A5ACE9272B4564F7002C94D2 /* YHLoginViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DB2B4564F7002C94D2 /* YHLoginViewController.swift */; };
 		A5ACE9282B4564F7002C94D2 /* YHSmsCodeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8DE2B4564F7002C94D2 /* YHSmsCodeView.swift */; };
 		A5ACE9292B4564F7002C94D2 /* YHSmsCodeInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */; };
@@ -554,7 +554,6 @@
 		0468D4392B579EAC00CFB916 /* YHLoginViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHLoginViewModel.swift; sourceTree = "<group>"; };
 		047294E72B988A19008E0B84 /* YHNewWebViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHNewWebViewController.swift; sourceTree = "<group>"; };
 		04754A942B96FF3D00F8ADCA /* UITextField+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITextField+Extension.swift"; sourceTree = "<group>"; };
-		0477E1772BA41B1300436346 /* YHCertificateViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateViewModel.swift; sourceTree = "<group>"; };
 		0477E1792BA41C7E00436346 /* YHCertificateModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateModel.swift; sourceTree = "<group>"; };
 		0477E17B2BA4238400436346 /* YHMaterialListViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHMaterialListViewController.swift; sourceTree = "<group>"; };
 		0477E17D2BA4362A00436346 /* YHCustomNavigationBar.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCustomNavigationBar.swift; sourceTree = "<group>"; };
@@ -606,6 +605,7 @@
 		A592FE902BA6CC010062FACA /* YHCertificateEntryHeadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryHeadView.swift; sourceTree = "<group>"; };
 		A592FE922BA6CFFC0062FACA /* YHCertificateEntryBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryBottomView.swift; sourceTree = "<group>"; };
 		A592FE942BA6D23C0062FACA /* YHCertificateEntryCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateEntryCell.swift; sourceTree = "<group>"; };
+		A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHCertificateViewModel.swift; 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>"; };
 		A5ACE8E02B4564F7002C94D2 /* YHSmsCodeInputView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHSmsCodeInputView.swift; sourceTree = "<group>"; };
@@ -1504,7 +1504,7 @@
 		A58A8C902BA6C40A00632765 /* VM */ = {
 			isa = PBXGroup;
 			children = (
-				0477E1772BA41B1300436346 /* YHCertificateViewModel.swift */,
+				A592FE962BA6DB340062FACA /* YHCertificateViewModel.swift */,
 			);
 			path = VM;
 			sourceTree = "<group>";
@@ -2049,6 +2049,7 @@
 				045EEEB12B9F171A0022A143 /* YHClipperView.swift in Sources */,
 				A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */,
 				04A6715C2B9FE9EA00C1FB91 /* YHUploadContentVC.swift in Sources */,
+				A592FE972BA6DB340062FACA /* YHCertificateViewModel.swift in Sources */,
 				045EEEF02B9F171A0022A143 /* YHChildPrimaryInfoVC.swift in Sources */,
 				0468D4202B49320900CFB916 /* YHVerificationCodeLoginController.swift in Sources */,
 				045EEEF62B9F171A0022A143 /* YHSpousePrimaryInfoVC.swift in Sources */,
@@ -2147,7 +2148,6 @@
 				A5ACE94F2B4564F7002C94D2 /* YhOverlayView.swift in Sources */,
 				045EEEB92B9F171A0022A143 /* YHWorkMessageSelectTableViewCell.swift in Sources */,
 				A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */,
-				0477E1782BA41B1300436346 /* YHCertificateViewModel.swift in Sources */,
 				A5ACE92E2B4564F7002C94D2 /* YHValidateCodeInputView.swift in Sources */,
 				045EEED82B9F171A0022A143 /* YHQuestionInfo.swift in Sources */,
 				A5ACE94E2B4564F7002C94D2 /* AlignedCollectionViewFlowLayout.swift in Sources */,

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/C/YHMineCertificateEntryVC.swift

@@ -50,18 +50,19 @@ class YHMineCertificateEntryVC: YHBaseViewController {
 
 extension YHMineCertificateEntryVC {
     func loadData() {
-        
-        if YHLoginManager.shared.isLogin() == false {
-            return
-        }
-        
-        let param = ["order_id":"","node":"","state":""]
-        certificateReqVM.getCertificateStatisticData(params: param) { success, error in
-            if success == true {
+        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+            let param = ["order_id":orderID,"node":"1","state":"1"]
+            certificateReqVM.getCertificateStatisticData(params: param) { success, error in
+                if success == true {
+                    self.headerView.dataModel = self.certificateReqVM.certificateEntryModel
+                } else {
+                    YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+                }
                 
-            } else {
-                YHHUD.flash(message: error?.errorMsg ?? "请求出错")
+                self.homeTableView.reloadData()
             }
+        } else {
+            printLog("error : orderID 为空")
         }
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryHeadView.swift

@@ -10,7 +10,7 @@ import UIKit
 import AttributedString
 
 class YHCertificateEntryHeadView: UIView {
-    static let viewH : CGFloat = 77.0
+    static let viewH : CGFloat = 77.0 + 17.0
     
     
     var dataModel : YHCertificateEntryModel? {
@@ -64,19 +64,19 @@ private extension YHCertificateEntryHeadView {
         }
         
         let a: ASAttributedString = .init("待上传", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let aa: ASAttributedString = .init("10", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let aa: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
         
         
         let b: ASAttributedString = .init("件，已驳回", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let bb: ASAttributedString = .init("20", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let bb: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
         
         
         let c: ASAttributedString = .init("件，审核中", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let cc: ASAttributedString = .init("30", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let cc: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
         
         
         let d: ASAttributedString = .init("件，已通过", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))
-        let dd: ASAttributedString = .init("40", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
+        let dd: ASAttributedString = .init("0", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.warnColor))
         
         
         let e: ASAttributedString = .init("件", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor.mainTextColor))