Merge commit '993be4fd' into xiezhaolin

galaxy/Podfile

@@ -29,8 +29,8 @@ target 'galaxy' do
   pod 'SwifterSwift','6.0.0'
   #下拉刷新、上拉更多
   pod 'ESPullToRefresh',"2.9.3"
-  #Toast
-  pod 'Toast-Swift', '5.0.1'
+#  #Toast
+#  pod 'Toast-Swift', '5.0.1'
   #富文本 UILabel
   pod 'Nantes','0.1.2'
   #提示框
@@ -43,8 +43,8 @@ target 'galaxy' do
   pod 'SwiftyTimer','2.1.0'
   #UIColor 的扩展
 #  pod 'Hue','5.0.0'
-  #内存泄漏
-  pod 'LifetimeTracker','1.8.1'
+#  #内存泄漏
+#  pod 'LifetimeTracker','1.8.1'
   #控制台转换成中文
   pod 'ByebyeUnicode','1.1.0'
   #轮播图
@@ -53,8 +53,8 @@ target 'galaxy' do
   pod 'SmartCodable','2.2.2'
   #设备框架
   pod 'DeviceKit', '5.1.0'
-  #骨架图
-  pod 'SkeletonView','1.30.4'
+#  #骨架图
+#  pod 'SkeletonView','1.30.4'
   #导航栏、手势
   pod 'GKNavigationBarSwift','1.6.5'
   #crash统计

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

@@ -190,7 +190,14 @@ class YHSchemeTableViewCell: UITableViewCell {
                 }
                 
             } else if title.contains("文书写作") {
-                UIViewController.current?.navigationController?.pushViewController(YHMyDocumentsListViewController())
+                
+                if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+                    let vc = YHMyDocumentsListViewController()
+                    vc.orderId = orderID as? Int ?? 0
+                    UIViewController.current?.navigationController?.pushViewController(vc)
+                } else {
+                    YHHUD.flash(message: "订单号为空")
+                }
             }
         }
     }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationDetailVC.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 import SwifterSwift
-import Toast_Swift
+//import Toast_Swift
 
 class YHEducationDetailVC: YHBaseViewController {
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHEducationInfoListVC.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Toast_Swift
+//import Toast_Swift
 
 class YHEducationInfoListVC: YHBaseViewController {
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/ServiceProcess(我的信息流程)/Education&Qualification(学历专业资格填写)/C/YHQualificationDetailVC.swift

@@ -7,7 +7,7 @@
 //
 
 import UIKit
-import Toast_Swift
+//import Toast_Swift
 
 class YHQualificationDetailVC: YHBaseViewController {
     

galaxy/galaxy/Classes/Tools/Helper/YhConstant.swift

@@ -133,26 +133,8 @@ func isIphoneX() -> Bool {
 }
 
 class YhConstant {
-    // MARK: -  URL 相关
-    struct URL {
-        
-        // MARK: - 帮助与反馈
-        static let userQAUrl = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/pages/my/index"
-        
-        // MARK: - 优眠用户注销条款
-        static let userUnregisterURL = "https://www.baidu.com"
-        
-        // MARK: - 隐私政策
-        static let privacyURL = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/subpages/personal/pages/protocol/index?classify=privacy"
-        
-        // MARK: - 用户协议
-        static let userProtocalURL = YHBaseUrlManager.shared.h5URL() + "landing/index.html#/subpages/personal/pages/protocol/index?classify=agreement"
-    }
-    
     // MARK: - 登录信息
     static let KLoginedInfoKey = "KLoginedInfoKey"
-    
-    
 }
 
 extension YhConstant {

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -8,10 +8,11 @@
 
 // MARK: - 管理项目开发中需要使用到的域名地址
 class YHBaseUrlManager {
+    //单例
     static let shared = YHBaseUrlManager()
+    
     //测试环境
     static let baseUrlTest : String = "https://test-app-go-api.galaxy-immi.com/" //APP 使用域名
-    
     //正式环境
     static let baseUrlRelease : String = "https://app-go-api.galaxy-immi.com/"
     
@@ -21,12 +22,7 @@ class YHBaseUrlManager {
     //正式环境-OSS
     static let baseOSSUrlRelease : String = "http://comserver.galaxy-immi.com/"
     
-    //h5开发环境-H5
-    static let h5UrlDev : String = ""
-    //h5正式环境-H5
-    static let h5UrlRelease : String = ""
     
-    // MARK: - 当前使用的url
     func curURL() -> String {
 #if DEBUG
         return YHBaseUrlManager.baseUrlTest
@@ -44,17 +40,6 @@ class YHBaseUrlManager {
         return YHBaseUrlManager.baseOSSUrlTest
 #else
         return YHBaseUrlManager.baseOSSUrlRelease
-#endif
-    }
-    
-    // MARK: - 当前使用的url
-    func h5URL() -> String {
-#if DEBUG
-        return YHBaseUrlManager.h5UrlDev
-#elseif TESTENV
-        return YHBaseUrlManager.h5UrlDev
-#else
-        return YHBaseUrlManager.h5UrlRelease
 #endif
     }
 }