生意星

galaxy/fastlane/Fastfile

@@ -42,9 +42,10 @@ platform :ios do
   txIM = "develop-desk-tx"
   gift = "gift_push"
   Im_618 = "develop-tx-618"
+  businessStar = 'BusinessStar'
 
   #打包正使用的分支
-  myPack_branch = Im_618
+  myPack_branch = businessStar
 
 
   # 打adhoc包 执行命令 fastlane galaxyTest

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8608,7 +8608,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -8620,7 +8620,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy.yinheReplayExt;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8638,7 +8638,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -8650,7 +8650,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy.yinheReplayExt;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8668,7 +8668,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -8680,7 +8680,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy.yinheReplayExt;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8698,7 +8698,7 @@
 				CODE_SIGN_ENTITLEMENTS = yinheReplayExt/yinheReplayExt.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = yinheReplayExt/Info.plist;
@@ -8710,7 +8710,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy.yinheReplayExt;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8787,7 +8787,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyTestEnv.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -8815,7 +8815,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8936,7 +8936,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -8964,7 +8964,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9147,7 +9147,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxyDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -9175,7 +9175,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -9198,7 +9198,7 @@
 				CODE_SIGN_ENTITLEMENTS = galaxy/galaxy.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -9226,7 +9226,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.2.7;
+				MARKETING_VERSION = 2.2.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/AppDelegate.swift

@@ -202,6 +202,10 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
                                             }
                                         }
                                     }
+                                } else if iType == 7 {
+                                    // 生意星店铺页面
+                                } else if iType == 8 {
+                                    // 生意星看店单页面
                                 } else {
                                     printLog("未处理的类型 \(iType)")
                                 }

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

@@ -93,6 +93,7 @@ private extension YHHomeKingKongBlockView {
                 let vc = YHHKEventCenterViewController()
                 self.parentViewController?.navigationController?.pushViewController(vc)
             case 6:
+                // 银河商务
                 if YHLoginManager.shared.isLogin() {
                 } else {
                     YHOneKeyLoginManager.shared.oneKeyLogin()
@@ -112,10 +113,12 @@ private extension YHHomeKingKongBlockView {
 #endif
                 if YHLoginManager.shared.isLogin() {
                     let token = YHLoginManager.shared.h5Token
-                    url = url + "?param=" + token
+                    
                     let urlHasParam = String.hasQueryParameters(urlString: url)
                     if urlHasParam {
                         url = url + "&param=" + token
+                    } else {
+                        url = url + "?param=" + token
                     }
                 }
                 
@@ -131,12 +134,49 @@ private extension YHHomeKingKongBlockView {
                 let vc = YHH5WebViewVC()
                 vc.url = tUrl
                 self.parentViewController?.navigationController?.pushViewController(vc)
+            case 7:
+                // 生意星
+                gotoBusinessStar()
             default:
                 break
             }
         }
     }
     
+    func gotoBusinessStar() {
+        if YHLoginManager.shared.isLogin() {
+        } else {
+            YHOneKeyLoginManager.shared.oneKeyLogin()
+            return
+        }
+        YHAnalytics.track("APP_Home_Page_HKbusiness")
+        var url = YHBaseUrlManager.shared.curBusinessStarUrl()
+
+        if YHLoginManager.shared.isLogin() {
+            let token = YHLoginManager.shared.h5Token
+            
+            let urlHasParam = String.hasQueryParameters(urlString: url)
+            if urlHasParam {
+                url = url + "&param=" + token
+            } else {
+                url = url + "?param=" + token
+            }
+        }
+        
+        // 2.增加导航栏高度
+        var tUrl = url
+        if !url.contains("navigationH=") {
+            tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+            if url.contains("?") {
+                tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+            }
+        }
+        
+        let vc = YHH5WebViewVC()
+        vc.url = tUrl
+        self.parentViewController?.navigationController?.pushViewController(vc)
+    }
+    
     func tapShareForGiftView() {
         // 判断是否登录成功
         if YHLoginManager.shared.isLogin() {

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -53,4 +53,19 @@ class YHBaseUrlManager {
     func curUserItemsUrl() -> String {
         return curH5URL() + "superApp/service"
     }
+    
+    // 生意星
+    func curBusinessStarUrl() -> String {
+        var url = ""
+#if DEBUG
+        url = "https://test-businessh5.galaxy-immi.com/pre-sale/business"
+#elseif TESTENV
+        url = "https://test-businessh5.galaxy-immi.com/pre-sale/business"
+#elseif UATENV
+        url = "https://businessh5.galaxy-immi.com/pre-sale/business"
+#else
+        url = "https://businessh5.galaxy-immi.com/pre-sale/business"
+#endif
+        return url
+    }
 }