Merge branch 'dev' into release-1.0.0

Application/Admin/Controller/GameController.class.php

@@ -302,7 +302,7 @@ class GameController extends ThinkController
             if ($_POST['beta_status'] == 1 && empty($_POST['beta_url'])) {
                 return $this->error("请在Beta按钮开启的情况填写Beta链接");
             }
-            if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
+            if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) {
                 return $this->error("请填写正确的Beta链接");
             }
             /*if($_POST['apply_status']==0&&$_POST['game_status']==1){

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

@@ -520,7 +520,7 @@
     <div class="mounting-text">
       <div class="title-one">
         第一步：下载苹果官方TestFlight
-        <img src="__IMG__/20191225/biaoshi.png" alt="">
+        <a href="https://apps.apple.com/cn/app/testflight/id899247664"><img src="__IMG__/20191225/biaoshi.png" alt=""></a>
       </div>
       <div class="one-contain">
         首次安装必须<span>打开应用</span>，并点击<span>“继续”</span>按钮后，才可进行第二步操作
@@ -724,8 +724,7 @@ var PhoneObj = {
         success: function (result) {
           if (result.code == '0000') {
             $(".phone").hide();
-            $('.mounting').show();
-            $('#beta-url').attr('href', $('[name=betaUrl]').val())
+            showMounting()
           } else {
             alert(result.msg)
           }
@@ -733,6 +732,12 @@ var PhoneObj = {
       })
     })
 
+    function showMounting()
+    {
+      $('.mounting').show();
+      $('#beta-url').attr('href', $('[name=betaUrl]').val())
+    }
+
     $("#loginBtn").on("click",function() {
       var box = $('#login-box')
       var account = box.find('[name=account]').val()
@@ -772,8 +777,7 @@ var PhoneObj = {
         success: function (result) {
           if (result.code == '0000') {
             $('.login').hide();
-            $('.mounting').show();
-            $('#beta-url').attr('href', $('[name=betaUrl]').val())
+            showMounting()
           } else {
             alert(result.msg);
           }
@@ -819,8 +823,7 @@ var PhoneObj = {
           success: function (result) {
             if (result.code == '0000') {
               $(".common").hide();
-              $('.mounting').show();
-              $('#beta-url').attr('href', $('[name=betaUrl]').val())
+              showMounting()
             } else {
               alert(result.msg)
             }