Merge commit '9209ab13' into xiezhaolin

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2980,7 +2980,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3181,7 +3181,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3223,7 +3223,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -153,17 +153,19 @@ class YHHomeWebViewController: YHBaseViewController, WKUIDelegate, WKNavigationD
     }
     
     func getData() {
-        viewModel.getWebDetail(self.id) {[weak self] success, error in
-            guard let self = self else { return }
-            if success {
-                guard let model = self.viewModel.mainModel else { return }
-                bottomView.likeCount = model.like_count
-                bottomView.starCount = model.collect_count
-                bottomView.isStar = model.is_collect
-                bottomView.isLike = model.is_like
-                
-                if operationFlag {
-                    self.block?(model)
+        if id > 0 {
+            viewModel.getWebDetail(self.id) {[weak self] success, error in
+                guard let self = self else { return }
+                if success {
+                    guard let model = self.viewModel.mainModel else { return }
+                    bottomView.likeCount = model.like_count
+                    bottomView.starCount = model.collect_count
+                    bottomView.isStar = model.is_collect
+                    bottomView.isLike = model.is_like
+                    
+                    if operationFlag {
+                        self.block?(model)
+                    }
                 }
             }
         }

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

@@ -257,7 +257,7 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 //待h5端同学提供
 #if DEBUG
                 var url = "https://test-hkdiy-h5.galaxy-immi.com/superApp/integral"
-#elseif TESTNEV
+#elseif TESTENV
                 var url = "https://test-hkdiy-h5.galaxy-immi.com/superApp/integral"
 #else
                 var url = "https://thkdiy-h5.galaxy-immi.com/superApp/integral"
@@ -267,8 +267,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 token.insert(contentsOf: addtionString, at: indexToInsert)
                 url = url + "?param=" + token
                 
-                printLog(url)
-                
                 let vc = YHHomeWebViewController()
                 vc.vcTitle = "积分中心"
                 vc.url = url