From b1844a0082e342391c62fee7ab7e989429526d95 Mon Sep 17 00:00:00 2001
From: ELF <360197197@qq.com>
Date: Thu, 26 Dec 2019 16:20:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=90=BD=E5=9C=B0?=
=?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Home/View/default/Home/landingPage.html | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html
index 5b863dbf6..71b228d51 100644
--- a/Application/Home/View/default/Home/landingPage.html
+++ b/Application/Home/View/default/Home/landingPage.html
@@ -520,7 +520,7 @@
第一步:下载苹果官方TestFlight
-

+
首次安装必须打开应用,并点击“继续”按钮后,才可进行第二步操作
@@ -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)
}
From 65ed103d3ac8cfd297de24d5a5645d2b6affaa63 Mon Sep 17 00:00:00 2001
From: yulingwei <2436953959@qq.com>
Date: Thu, 26 Dec 2019 16:49:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbeta=E9=93=BE=E6=8E=A5?=
=?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Application/Admin/Controller/GameController.class.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php
index b71f7a1dd..58e9496b7 100644
--- a/Application/Admin/Controller/GameController.class.php
+++ b/Application/Admin/Controller/GameController.class.php
@@ -301,7 +301,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){