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

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -2948,7 +2948,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3149,7 +3149,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -3191,7 +3191,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;

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

@@ -60,17 +60,23 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     }()
     
     lazy var items: [PersonalModuleItem] = {
-        
-        let version = "app版本号：" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
-        
         var arrData = [
             PersonalModuleItem(icon: "mine_item_msg", title: "我的消息".local, type:.myMessage),
             PersonalModuleItem(icon: "mine_item_scoreCenter", title: "积分中心".local, type:.scoreCenter),
             PersonalModuleItem(icon: "mine_item_code", title: "我的测评码".local, type:.myTestCode),
-            PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay),
-            PersonalModuleItem(icon: "mine_item_appoint", title: version, type:.appointGalaxyBay),
+            PersonalModuleItem(icon: "mine_item_appoint", title: "预约银河湾".local, type:.appointGalaxyBay)
         ]
         
+#if DEBUG
+        let version = "app版本号：" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
+        arrData.append(PersonalModuleItem(icon: "mine_item_appoint", title: version, type:.none))
+#elseif TESTENV
+        let version = "app版本号：" + UIDevice.appVersion() + "_" + UIDevice.appBuild()
+        arrData.append(PersonalModuleItem(icon: "mine_item_appoint", title: version, type:.none))
+#else
+#endif
+        
+        
         
         
         return arrData
@@ -225,11 +231,15 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
                 var url = "https:www.baidu.com"
                 var addtionString = randomAlphanumericString(6)//随机6个字母或者数字
                 let indexToInsert = token.index(token.startIndex, offsetBy: 6) //插入位置，这里以第六个字符后面为例
-//                token.insert(addtionString, at: indexToInsert) //for test hjl
-//                token.insert(randomAlphanumericString.c, at: <#T##String.Index#>)
-//                url = url + "?param=" + token
+                token.insert(contentsOf: addtionString, at: indexToInsert)
+                url = url + "?param=" + token
         
                 YHHUD.flash(message: "还需要H5同学给URL")
+                
+                let vc = YHHomeWebViewController()
+                vc.url = url
+                self.navigationController?.pushViewController(vc)
+                
             }
         case .myTestCode://我的测评码
             printLog("我的测评码")