Commit fadb63b4 authored by David黄金龙's avatar David黄金龙

Merge branch 'double11' into develop

* double11:
  2处代码优化
  添加 贤宇的 机器IP

# Conflicts:
#	galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerView.swift
#	galaxy/galaxy/Classes/Modules/InteractionH5(与H5交互)/YHH5WebViewVC.swift
parents 4e4be3fe c9d86b2d
...@@ -147,8 +147,8 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate { ...@@ -147,8 +147,8 @@ extension YHHomeBannerView: FSPagerViewDataSource, FSPagerViewDelegate {
//for test hjl 测试环境 //for test hjl 测试环境
// model.skip_url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/double11-home" // model.skip_url = "https://test-hkdiy-h5.galaxy-immi.com/superAppBridge.html#/double11-home"
//for test hjl //for test hjl 贤宇IP
// model.skip_url = "http://192.168.23.35:10300/signatureQrcode/EcqtQYs%2Bxey7t6jLbn6JkQ%3D%3D" // model.skip_url = "http://192.168.23.35:10300/signatureQrcode/EcqtQYs%2Bxey7t6jLbn6JkQ%3D%3D"
//1.增加app token //1.增加app token
var url = "" var url = ""
......
...@@ -302,7 +302,6 @@ private extension YHH5WebViewVC { ...@@ -302,7 +302,6 @@ private extension YHH5WebViewVC {
} }
url = tUrl url = tUrl
printLog("hjl: 当前加载的url是:\(url)") printLog("hjl: 当前加载的url是:\(url)")
if let url = URL(string: url) { if let url = URL(string: url) {
let request = URLRequest(url: url) let request = URLRequest(url: url)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment