Merge commit 'dc8c04b4' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2980,7 +2980,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3181,7 +3181,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3223,7 +3223,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 0;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomeWebViewController.swift

@@ -23,9 +23,15 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     var bottomView: YHHomeWebBottomView!
     var url = ""
     var id: Int = 0
+    var vcTitle : String?
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        gk_navBarAlpha = 1.0
+        gk_navLineHidden = false
+        gk_navTitle = vcTitle
+        
         view.backgroundColor = .white
         viewModel = YHHomeWebViewModel()
         //获取导航栏高度
@@ -139,7 +145,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             bottomView.isHidden = true
             webview.frame = CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight!)
         }
-        
         getData()
     }
     
@@ -166,7 +171,11 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     
     // MARK: - WKNavigationDelegate
     func webView(_ webView: WKWebView, didFinish navigation: WKNavigation!) {
-        self.navigationItem.title = webview.title
+       
+        
+        if vcTitle == nil {
+            gk_navTitle = webview.title
+        }
     }
     
     // MARK: - WKUIDelegate

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

@@ -261,9 +261,9 @@ extension YHServiceCenterMainViewController {
                         }
                     }
                 }
-                let a: ASAttributedString = .init("您好，\(name)，您当前处于", .font(UIFont.PFSC_M(ofSize: 12)),.foreground(UIColor(hex: 0x121a26)))
-                let aa: ASAttributedString = .init(NSAttributedString(string: "身份申请"), .font(UIFont.PFSC_M(ofSize: 12)),.foreground(UIColor.brandMainColor))
-                let aaa: ASAttributedString = .init("阶段", .font(UIFont.PFSC_M(ofSize: 12)),.foreground(UIColor(hex: 0x121a26)))
+                let a: ASAttributedString = .init("您好，\(name)，您当前处于", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26)))
+                let aa: ASAttributedString = .init(NSAttributedString(string: "身份申请"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.brandMainColor))
+                let aaa: ASAttributedString = .init("阶段", .font(UIFont.PFSC_R(ofSize: 13)),.foreground(UIColor(hex: 0x121a26)))
                 self.nameLabel.attributed.text = a + aa + aaa
             }
         }

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

@@ -10,7 +10,7 @@ import UIKit
 
 //服务中心
 class YHServiceCenterSecondViewController: YHBaseViewController {
-    var orderId : Int?
+    var orderId : Int = 0
     var mobile: String?
     private let serviceCenterMainReqVM : YHServiceCenterMainViewModel = YHServiceCenterMainViewModel()
     private var unfoldFlag : Bool = true //是否展开
@@ -54,13 +54,11 @@ class YHServiceCenterSecondViewController: YHBaseViewController {
 
 extension YHServiceCenterSecondViewController {
     func loadData2() {
-        guard let orderId = orderId else { return}
         self.serviceCenterMainReqVM.getPersonInfoFillStep(params: ["orderId":orderId]) { success, error in
         }
     }
     
     func loadData() {
-        guard let orderId = orderId else { return}
         self.serviceCenterMainReqVM.getContactStatus(params: ["orderId":orderId]) { success, error in
             self.homeTableView.reloadData()
         }
@@ -198,12 +196,12 @@ extension YHServiceCenterSecondViewController : UITableViewDelegate,UITableViewD
             navigationController?.pushViewController(vc)
         } else if model.type == 4 {
             let vc = YHMyDocumentsListViewController()
-            vc.orderId = orderId ?? 0
+            vc.orderId = orderId
             vc.mobile = mobile ?? ""
             navigationController?.pushViewController(vc)
         } else if model.type == 5 {
             let vc = YHMySignatureListViewController()
-            vc.orderId = orderId ?? 0
+            vc.orderId = orderId
             navigationController?.pushViewController(vc)
         } else if model.type == 6 {
             let vc = YHMineSchemeViewController()

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

@@ -13,7 +13,7 @@ import UIKit
 
 class YHMineCertificateEntryViewController: YHBaseViewController {
     
-    var orderId : Int?
+    var orderId : Int = 0
     private let certificateReqVM : YHCertificateViewModel = YHCertificateViewModel()
     
     lazy var navBar: YHCustomNavigationBar = {
@@ -70,8 +70,8 @@ class YHMineCertificateEntryViewController: YHBaseViewController {
 
 extension YHMineCertificateEntryViewController {
     func loadData() {
-        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
-            let param = ["order_id":orderID,"node":"1","state":"1"]
+        if orderId != 0 {
+            let param = ["order_id":orderId,"node":"1","state":"1"] as [String : Any]
             certificateReqVM.getCertificateStatisticData(params: param) { success, error in
                 if success == true {
                     self.headerView.dataModel = self.certificateReqVM.certificateEntryModel
@@ -81,8 +81,6 @@ extension YHMineCertificateEntryViewController {
                 
                 self.homeTableView.reloadData()
             }
-        } else {
-            printLog("error : orderID 为空")
         }
     }
     
@@ -189,7 +187,7 @@ extension YHMineCertificateEntryViewController : UITableViewDelegate,UITableView
         printLog("点击了 tableView Cell \(indexPath.section)")
         
         guard let model = certificateReqVM.certificateEntryModel else { return }
-
+        
         let vc = YHCertificateListContainerVC()
         vc.orderId = orderId
         if indexPath.section < model.category_data.count {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeTableViewCell.swift

@@ -183,7 +183,7 @@ class YHSchemeTableViewCell: UITableViewCell {
             if title.contains("资料清单") {
                 if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
                     let vc = YHMineCertificateEntryViewController()
-                    vc.orderId = orderID as? Int
+                    vc.orderId = orderID as? Int ?? 0
                     UIViewController.current?.navigationController?.pushViewController(vc)
                 } else {
                     YHHUD.flash(message: "订单号为空")

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

@@ -270,20 +270,21 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 printLog(url)
                 
                 let vc = YHHomeWebViewController()
+                vc.vcTitle = "积分中心"
                 vc.url = url
                 self.navigationController?.pushViewController(vc)
-                
             }
         case .myTestCode://我的测评码
             printLog("我的测评码")
             let vc = YHHomeWebViewController()
+            vc.vcTitle = "我的测评码"
             vc.url = "https://test-cdn-pub.galaxy-immi.com/5000000/2377716732943678766120240418180233.png"
             self.navigationController?.pushViewController(vc)
             
         case .appointGalaxyBay://预约银河湾
             printLog("预约银河湾")
-            
             let vc = YHHomeWebViewController()
+            vc.vcTitle = "预约银河湾"
             vc.url = "https://upload.cdn.galaxy-immi.com/sell/product/images/page-1686138671996.png"
             self.navigationController?.pushViewController(vc)
         default: