分支代码同步

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

@@ -135,16 +135,33 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                let token = YHLoginManager.shared.h5Token
-                var url = model.skip_url + "?param=" + token
-                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
-                if urlHasParam {
-                    url = model.skip_url + "&param=" + token
+                //                var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"//建明的本机IP
+                var url = ""
+                if YHLoginManager.shared.isLogin() {
+                    let token = YHLoginManager.shared.h5Token
+                    url = model.skip_url + "?param=" + token
+                    let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                    if urlHasParam {
+                        url = model.skip_url + "&param=" + token
+                    }
+                } else {
+                    url = model.skip_url
                 }
-                printLog("url: \(url)")
+                
                 let vc = YHH5WebViewVC()
                 vc.url = url
                 vc.isFullScreenFlag = false
+                
+                if model.is_share_h5_flag {
+                    if let tModel = model.addtition_param {
+                        if !tModel.ShareH5Url.isEmpty {
+                            vc.isShowRightShareItemFlag = true
+                            vc.shareH5Title = tModel.ShareH5Title
+                            vc.shareH5Describe = tModel.ShareH5Describe
+                            vc.shareUrlFromOutside = tModel.ShareH5Url
+                        }
+                    }
+                }
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 2: //跳转APP内Tab
                 goAppTab(tabBarName:model.skip_url)

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

@@ -123,16 +123,33 @@ extension YHServiceBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
         if model.skip_url.isEmpty == false {
             switch model.skip_type {
             case 1: //跳转H5
-                let token = YHLoginManager.shared.h5Token
-                var url = model.skip_url + "?param=" + token
-                let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
-                if urlHasParam {
-                    url = model.skip_url + "&param=" + token
+                //                var url = "http://192.168.23.66:10300/superAppBridge.html#/schoolEvaluation"//建明的本机IP
+                var url = ""
+                if YHLoginManager.shared.isLogin() {
+                    let token = YHLoginManager.shared.h5Token
+                    url = model.skip_url + "?param=" + token
+                    let urlHasParam = String.hasQueryParameters(urlString: model.skip_url)
+                    if urlHasParam {
+                        url = model.skip_url + "&param=" + token
+                    }
+                } else {
+                    url = model.skip_url
                 }
-                printLog("url: \(url)")
+                
                 let vc = YHH5WebViewVC()
                 vc.url = url
                 vc.isFullScreenFlag = false
+                
+                if model.is_share_h5_flag {
+                    if let tModel = model.addtition_param {
+                        if !tModel.ShareH5Url.isEmpty {
+                            vc.isShowRightShareItemFlag = true
+                            vc.shareH5Title = tModel.ShareH5Title
+                            vc.shareH5Describe = tModel.ShareH5Describe
+                            vc.shareUrlFromOutside = tModel.ShareH5Url
+                        }
+                    }
+                }
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 2: //跳转APP内Tab
                 goAppTab(tabBarName:model.skip_url)