Merge remote-tracking branch 'origin/release' into release

Application/Home/Controller/HomeController.class.php

@@ -141,6 +141,7 @@ class HomeController extends Controller
 
     public function landingPage()
     {
+        $testKey = I('test_key', '');
         $code = I('code', '');
         $gameId = I('gid', 0);
         $promoteId = I('pid', 0);
@@ -170,6 +171,16 @@ class HomeController extends Controller
         $isIOS = Request::isIOS();
         $isAndroid = Request::isAndroid();
         $isIOS13 = Request::isIOS13();
+
+        if ($testKey != '') {
+            $tempDataDir = RUNTIME_PATH . 'Data';
+            if(!is_dir($tempDataDir)) {
+                @mkdir($tempDataDir);
+            }
+            $testStr = date('Y-m-d H:i:s') . ' - ' . $testKey . ' - ' . Request::getUserAgent() . PHP_EOL;
+            file_put_contents($tempDataDir . '/langding_page.log', $testStr, FILE_APPEND);
+        }
+
         $columns = [
             'id',
             'sdk_version',

Application/Home/View/default/Home/landingPage.html

@@ -557,7 +557,7 @@ background:rgba(0,0,0,0.6); z-index: 999;display: none;"></div>
       <div class="title-one" style="width: 4.06rem;padding: 0;margin-bottom: 0;">
           <img src="__IMG__/20191225/bg.png" alt="" style="width: 100%;height: 100%;box-shadow:0px 0px 6px 0px rgba(109,121,145,0.2)">
       </div>
-      <a id="beta-url" href="#" class="mounting-btn">点击安装游戏</a>
+      <a id="beta-url" href="{$game['beta_url']}" class="mounting-btn">点击安装游戏</a>
       <!-- <div class="title-two">第二步：点击下方按钮安装游戏</div> -->
       <a href="#" class="mounting-btn lastStep">上一步</a>
     </div>
@@ -795,7 +795,7 @@ var PhoneObj = {
     {
       $(".mode").show();
       $('.mounting').show();
-      $('#beta-url').attr('href', $('[name=betaUrl]').val())
+      // $('#beta-url').attr('href', $('[name=betaUrl]').val())
     }
 
     $("#loginBtn").on("click",function() {