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

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

@@ -123,7 +123,6 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             make.bottom.left.right.equalToSuperview()
             make.height.equalTo(59 + k_Height_safeAreaInsetsBottom())
         }
-        getData()
         
         if id == 0 {
             if self.url.contains("?id=") {
@@ -131,6 +130,7 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
                 if list.count == 2 {
                     if let iddd = list[1].int {
                         id = iddd
+                        getData()
                         return
                     }
                 }
@@ -138,6 +138,10 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
             bottomView.isHidden = true
             webview.frame = CGRect(x: 0, y: statusHeight + navHeight!, width: self.view.frame.width, height: self.view.frame.height - statusHeight - navHeight!)
         }
+        
+        getData()
+        
+       
     }
     
     deinit {

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

@@ -50,7 +50,7 @@ class YHHomeWebBottomView: UIView {
         
         likeButton = {
             let button = YHHomeWebBottomButton()
-            button.setContent("home_web_like", "652")
+            button.setContent("home_web_like", "0")
             button.addTarget(self, action: #selector(likeBtnClick), for: .touchUpInside)
             return button
         }()
@@ -64,7 +64,7 @@ class YHHomeWebBottomView: UIView {
         
         starButton = {
             let button = YHHomeWebBottomButton()
-            button.setContent("home_web_star", "34")
+            button.setContent("home_web_star", "0")
             button.addTarget(self, action: #selector(starBtnClick), for: .touchUpInside)
             return button
         }()
@@ -78,6 +78,12 @@ class YHHomeWebBottomView: UIView {
     }
     
     @objc private func likeBtnClick() {
+        if YHLoginManager.shared.isLogin() == false {
+            if let block = likeBlock {
+                block(isLike)
+            }
+            return
+        }
         isLike = !isLike
         if let block = likeBlock {
             block(isLike)
@@ -85,6 +91,13 @@ class YHHomeWebBottomView: UIView {
     }
     
     @objc private func starBtnClick() {
+        if YHLoginManager.shared.isLogin() == false {
+            if let block = starBlock {
+                block(isStar)
+            }
+            return
+        }
+        
         isStar = !isStar
         if let block = starBlock {
             block(isStar)