1、添加图片

2、修改一处展示

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -333,6 +333,7 @@
 		A5C5B32B2B57D17600A7C5D1 /* YHDavidCell5.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32A2B57D17600A7C5D1 /* YHDavidCell5.swift */; };
 		A5C5B32D2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */; };
 		A5D001212BAA9D99001F003C /* YHChoiceButtonHoldView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */; };
+		A5D001232BAAD4B8001F003C /* YHFileListHeaerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D001222BAAD4B8001F003C /* YHFileListHeaerView.swift */; };
 		A5D6AB1B2B46A1CC001C10A5 /* YHHomeModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */; };
 		A5D6AB1D2B46AAFB001C10A5 /* YHHomePageViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */; };
 		A5E69D512BA304D400411932 /* DIN Alternate Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */; };
@@ -715,6 +716,7 @@
 		A5C5B32A2B57D17600A7C5D1 /* YHDavidCell5.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHDavidCell5.swift; sourceTree = "<group>"; };
 		A5C5B32C2B57D66000A7C5D1 /* YHBbxCollectionViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHBbxCollectionViewCell.swift; sourceTree = "<group>"; };
 		A5D001202BAA9D99001F003C /* YHChoiceButtonHoldView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHChoiceButtonHoldView.swift; sourceTree = "<group>"; };
+		A5D001222BAAD4B8001F003C /* YHFileListHeaerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListHeaerView.swift; sourceTree = "<group>"; };
 		A5D6AB1A2B46A1CC001C10A5 /* YHHomeModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeModel.swift; sourceTree = "<group>"; };
 		A5D6AB1C2B46AAFB001C10A5 /* YHHomePageViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomePageViewModel.swift; sourceTree = "<group>"; };
 		A5E69D502BA304D400411932 /* DIN Alternate Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "DIN Alternate Bold.ttf"; sourceTree = "<group>"; };
@@ -1585,6 +1587,7 @@
 			isa = PBXGroup;
 			children = (
 				A525D22F2BA83B87001A84F5 /* YHFileListBottomView.swift */,
+				A5D001222BAAD4B8001F003C /* YHFileListHeaerView.swift */,
 			);
 			path = V;
 			sourceTree = "<group>";
@@ -2288,6 +2291,7 @@
 				045EEF1A2B9F171A0022A143 /* YHAddressViewController.swift in Sources */,
 				A5C382CA2B5E1F4C00C5E65C /* YHLoginTipsView.swift in Sources */,
 				045EEEE92B9F171A0022A143 /* YHFamilyRequestViewModel.swift in Sources */,
+				A5D001232BAAD4B8001F003C /* YHFileListHeaerView.swift in Sources */,
 				044867B42BA1953B00DFAD4A /* YHCertificateFilterView.swift in Sources */,
 				A5C5B3232B57BF8F00A7C5D1 /* YHDavidCell1.swift in Sources */,
 				045EEEDF2B9F171A0022A143 /* YHCollegeSearchBar.swift in Sources */,

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

@@ -25,7 +25,18 @@ class YHInformationPerfectListVC: YHBaseViewController {
             } else {
                 var name = ""
                 if let applicant = serviceCenterMainReqVM.informationFillStepModel {
-                    name = applicant.applicantName.defaultStringIfEmpty(detaultValue: "尊敬的客户")
+                    if applicant.applicantName.isEmpty {
+                        name = "尊敬的客户"
+                    } else {
+                        name = applicant.applicantName
+                        if applicant.sex == 1 {
+                            name = name + "先生"
+                        } else if applicant.sex == 2 {
+                            name = name + "女士"
+                        } else {
+                            
+                        }
+                    }
                 }
                 headerTitleDesLable.text = "您好," + name
             }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/C/YHFileListViewController.swift

@@ -16,16 +16,10 @@ class YHFileListViewController: YHBaseViewController {
     var orderId : Int?
     private let certificateReqVM : YHCertificateViewModel = YHCertificateViewModel()
     
-    private lazy var topBkg : UIView = {
-        let imagV = UIImageView()
-        imagV.image = UIImage(named: "file_list_bkg")
-        imagV.contentMode = .scaleAspectFill
-        return imagV
-        
-    }()
+   
     
-    private lazy var headView : UIView = {
-        let view = UIView()
+    private lazy var headView : YHFileListHeaerView = {
+        let view = YHFileListHeaerView()
         view.backgroundColor = .clear
         return view
     }()
@@ -91,13 +85,15 @@ extension YHFileListViewController {
             make.left.right.bottom.equalToSuperview()
             make.height.equalTo(YHFileListBottomView.viewH)
         }
-        
         bottomView.block = { flag in
             if flag == 1 {
                 printLog("生成清单")
             }
         }
         
+        
+        
+        
         view.addSubview(myScrollView)
         myScrollView.snp.makeConstraints { make in
             make.top.equalToSuperview().offset(k_Height_NavigationtBarAndStatuBar)
@@ -105,12 +101,10 @@ extension YHFileListViewController {
             make.bottom.equalTo(bottomView.snp.top)
         }
         
-        myScrollView.addSubview(topBkg)
-        topBkg.snp.makeConstraints { make in
-            make.top.equalToSuperview()
-            make.left.equalToSuperview()
-            make.width.equalTo(KScreenWidth)
-            make.height.equalTo(312)
+        myScrollView.addSubview(headView)
+        headView.snp.makeConstraints { make in
+            make.top.left.right.equalToSuperview()
+            make.height.equalTo(YHFileListHeaerView.viewH)
         }
         
         myScrollView.addSubview(myContentView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/FileList(文件清单)/V/YHFileListHeaerView.swift

+//
+//  YHFileListHeaerView.swift
+//  galaxy
+//
+//  Created by davidhuangA on 2024/3/20.
+//  Copyright © 2024 https://www.galaxy-immi.com. All rights reserved.
+//
+
+import UIKit
+
+class YHFileListHeaerView: UIView {
+    static let viewH : CGFloat = 312
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        initView()
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
+    private lazy var topBkg : UIView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "file_list_bkg")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    
+    private lazy var imageV1 : UIView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "file_list_wenzi")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    
+    private lazy var imageV2 : UIView = {
+        let imagV = UIImageView()
+        imagV.image = UIImage(named: "file_list_icon")
+        imagV.contentMode = .scaleAspectFill
+        return imagV
+    }()
+    
+    
+    
+    
+}
+
+
+private extension YHFileListHeaerView {
+    func initView() {
+        addSubview(topBkg)
+        topBkg.snp.makeConstraints { make in
+            make.top.equalToSuperview()
+            make.left.equalToSuperview()
+            make.width.equalTo(KScreenWidth)
+            make.height.equalTo(YHFileListHeaerView.viewH)
+        }
+        
+        addSubview(imageV1)
+        imageV1.snp.makeConstraints { make in
+            make.top.equalTo(34)
+            make.left.equalTo(28)
+            make.width.equalTo(222)
+            make.height.equalTo(86)
+        }
+        
+        addSubview(imageV2)
+        imageV2.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(98)
+            make.left.equalTo(KScreenWidth - kMargin - 154)
+            make.width.equalTo(154)
+            make.height.equalTo(130)
+        }
+        
+        let imagVDot1 = UIImageView()
+        imagVDot1.image = UIImage(named: "file_list_dot")
+        imagVDot1.contentMode = .scaleAspectFill
+        addSubview(imagVDot1)
+        imagVDot1.snp.makeConstraints { make in
+            make.left.equalTo(28)
+            make.top.equalTo(topBkg.snp.bottom).offset(21)
+            make.width.height.equalTo(8)
+        }
+        
+        
+        let imagVBkg1 = UIImageView()
+        imagVBkg1.image = UIImage(named: "file_list_icon_bkg")
+        imagVBkg1.contentMode = .scaleAspectFill
+        addSubview(imagVBkg1)
+        imagVBkg1.snp.makeConstraints { make in
+            make.left.equalTo(imagVDot1.snp.right).offset(10)
+            make.centerY.equalTo(imagVDot1)
+            make.width.equalTo(148)
+            make.height.equalTo(23)
+        }
+        
+        
+        
+        
+        let imagVDot2 = UIImageView()
+        imagVDot2.image = UIImage(named: "file_list_dot")
+        imagVDot2.contentMode = .scaleAspectFill
+        addSubview(imagVDot2)
+        imagVDot2.snp.makeConstraints { make in
+            make.left.equalTo(28)
+            make.top.equalTo(imagVDot1.snp.bottom).offset(25)
+            make.width.height.equalTo(8)
+        }
+        
+        let imagVBkg2 = UIImageView()
+        imagVBkg2.image = UIImage(named: "file_list_icon_bkg")
+        imagVBkg2.contentMode = .scaleAspectFill
+        addSubview(imagVBkg2)
+        imagVBkg2.snp.makeConstraints { make in
+            make.left.equalTo(imagVDot2.snp.right).offset(10)
+            make.centerY.equalTo(imagVDot2)
+            make.width.equalTo(148)
+            make.height.equalTo(23)
+        }
+        
+    }
+}

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/M/YHPersonInfoFillStepModel.swift

@@ -13,4 +13,5 @@ struct YHPersonInfoFillStepModel: SmartCodable {
     var step : Int = 0
     var applicantName : String = ""
     var sweet_notify_status : Int = 0
+    var sex : Int = 0
 }

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

@@ -88,7 +88,7 @@ private extension YHCertificateEntryHeadView {
         guard let dataModel = dataModel else { return }
         var tmp = ""
         if dataModel.user_name.isEmpty {
-            tmp = "尊敬的用户"
+            tmp = "尊敬的客户"
         } else {
             tmp = dataModel.user_name
             if dataModel.sex == 1 {

galaxy/galaxy/Classes/Modules/Login(登录)/C/YHWebViewViewController.swift

@@ -14,7 +14,7 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     var webview = WKWebView()
     var progBar = UIProgressView()
 //    var url = "https://www.baidu.com"
-    var url = "https://docs.qq.com/openapi/drive/v2/files/embed/temporary?timestamp=1710294842&id=50b4f6dab5df4497aeb23e5a54933d83&clientID=2aebc2da4f0b4883bf33ef20836f2e2d"
+    var url = "https://upload-cdn.galaxy-immi.com/crm/production/1620271613711.pdf"
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -26,6 +26,8 @@ class YHWebViewViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
         
         // 创建wkwebview
         webview = WKWebView(frame: CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height))
+        
+//        webview.backgroundColor = .white//for test hjl
                 
         webview.navigationDelegate = self
         // 创建网址

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -168,6 +168,10 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
             YHHUD.flash(message: "已登录: 功能完善中...")
         }
         
+        
+        let vc = YHWebViewViewController()
+        navigationController?.pushViewController(vc, animated: true) //for test hjl
+        
         return
         
         

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_dot.imageset/Contents.json

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

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/清单列表/file_list_icon_bkg.imageset/Contents.json

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