Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

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

@@ -26,6 +26,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        view.backgroundColor = .white
         viewModel = YHHomeWebViewModel()
         //获取导航栏高度
         let navHeight = self.navigationController?.navigationBar.frame.height

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

@@ -32,7 +32,7 @@ class YHHomeBannerView: UIView {
         let view = FSPagerView()
         view.delegate = self
         view.dataSource = self
-        view.automaticSlidingInterval = 4
+        view.automaticSlidingInterval = 3
         view.register(YHHomeBannerCollectionViewCell.self, forCellWithReuseIdentifier: "cell")
         view.itemSize = CGSizeMake(YHHomeBannerView.viewH, YHHomeBannerView.viewH)//FSPagerView.automaticSize
         return view

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

@@ -82,7 +82,8 @@ extension YHServerHKLifeViewController {
     func setupUI() {
         gk_navBarAlpha = 0
         gk_navigationBar.isHidden = true
-        
+        view.backgroundColor = .white
+
         sectionView = {
             let view = YHServiceSectionView()
             view.block = {[weak self] model in

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

@@ -82,7 +82,7 @@ extension YHServiceListViewController {
     func setupUI() {
         gk_navBarAlpha = 0
         gk_navigationBar.isHidden = true
-        
+        view.backgroundColor = .white
         sectionView = {
             let view = YHServiceSectionView()
             view.block = {[weak self] model in

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

@@ -98,7 +98,7 @@ class YHServiceViewController: YHBaseViewController {
         //配置指示器
         let indicator = JXSegmentedIndicatorLineView()
         indicator.indicatorWidth = 16
-        indicator.indicatorColor = .blue
+        indicator.indicatorColor = UIColor(hex: 0x3570dc)
         segmentedView.indicators = [indicator]
         segmentedView.backgroundColor = UIColor(red: 0.95, green: 0.95, blue: 0.95, alpha: 1)
         

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

@@ -121,7 +121,7 @@ class YHServiceSectionCollectionViewCell: UICollectionViewCell {
     static let cellReuseIdentifier = "YHServiceSectionCollectionViewCell"
  
     func setSelectedStyle() {
-        contentView.backgroundColor = UIColor.brandMainColor
+        contentView.backgroundColor = UIColor(hex: 0x3570dc)
         descripeLable.textColor = UIColor.white
     }
  

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

@@ -81,7 +81,8 @@ extension YHMyLikeViewController {
     
     func setupUI() {
         gk_navBarAlpha = 1
-        
+        view.backgroundColor = .white
+
         tableFootView = {
             let view = YHServiceTableFootView()
             view.moreBlock = {[weak self] in

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

@@ -45,7 +45,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     
     let likeViewModel: YHMyLikeViewModel = YHMyLikeViewModel()
     let msgViewModel: YHMsgViewModel = YHMsgViewModel()
-       
+    
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style:.grouped)
         tableView.contentInsetAdjustmentBehavior = .never
@@ -238,12 +238,17 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 
                 var token : String = param
                 //待h5端同学提供
-                var url = "https:www.baidu.com"
+#if DEBUG
+                var url = "https://test-hkdiy-h5.galaxy-immi.com/superApp/integral"
+#elseif TESTNEV
+                var url = "https://test-hkdiy-h5.galaxy-immi.com/superApp/integral"
+#else
+                var url = "https://thkdiy-h5.galaxy-immi.com/superApp/integral"
+#endif
                 let addtionString = randomAlphanumericString(6)//随机6个字母或者数字
                 let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
                 token.insert(contentsOf: addtionString, at: indexToInsert)
                 url = url + "?param=" + token
-                YHHUD.flash(message: "还需要H5同学给URL")
                 
                 printLog(url)
                 
@@ -292,9 +297,9 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
 extension YHMyViewController {
     
     func randomAlphanumericString(_ length: Int) -> String {
-       let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-       let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)
-       return randomString
+        let letters = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        let randomString = (0..<length).map{ _ in String(letters.randomElement()!) }.reduce("", +)
+        return randomString
     }
     
     @objc func loginSuccess() {