// H5处理

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift

@@ -139,7 +139,11 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
                 if let myToken = YHLoginManager.shared.userModel?.token {
                     token = myToken
                 }
-                let url = model.skip_url + "?param=" + token
+                var url = model.skip_url + "?param=" + token
+                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                if urlHasParam {
+                    url = model.skip_url + "&param=" + token
+                }
                 printLog("url: \(url)")
                 let vc = YHHomeWebViewController()
                 vc.url = url

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceBannerView.swift

@@ -123,12 +123,17 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                let vc = YHHomeWebViewController()
                 var token = ""
                 if let myToken = YHLoginManager.shared.userModel?.token {
                     token = myToken
                 }
-                let url = model.skip_url + "?param=" + token
+                var url = model.skip_url + "?param=" + token
+                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                if urlHasParam {
+                    url = model.skip_url + "&param=" + token
+                }
+                printLog("url: \(url)")
+                let vc = YHHomeWebViewController()
                 vc.url = url
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 2: //跳转APP内Tab

galaxy/galaxy/Classes/Tools/Extention/String+Extension.swift

@@ -19,6 +19,13 @@ func isEmptyString(_ string: String?) -> Bool {
 
 extension String {
     
+    static func hasQueryParameters(urlString: String) -> Bool {
+        if let url = URL(string: urlString) {
+            return url.query != nil && !url.query!.isEmpty
+        }
+        return false
+    }
+    
     static func randomAlphaNumericStringT(_ length: Int) -> String {
         let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
         let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)