From d3a3b8cdb76ace4434f0df1227ffb0a3014ed3e6 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Fri, 17 Jan 2020 15:44:43 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/GameController.class.php | 35 +++++++--- Application/Admin/View/Game/add.html | 41 ++++++++--- Application/Admin/View/Game/edit.html | 68 ++++++------------- .../Base/Service/GameService.class.php | 19 ++++++ .../Home/Controller/HomeController.class.php | 3 +- .../Home/View/default/Home/landingPage.html | 42 +++++++----- .../Mobile/Controller/SsgController.class.php | 4 +- Data/update.sql | 6 +- Public/Home/css/index2.css | 3 +- 9 files changed, 135 insertions(+), 86 deletions(-) create mode 100644 Application/Base/Service/GameService.class.php diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index c7fbef940..b4fe3dbb1 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -17,6 +17,7 @@ use BaiduBce\Services\Bos\CannedAcl; use BaiduBce\Services\Bos\BosOptions; use BaiduBce\Auth\SignOptions; use BaiduBce\Log\LogFactory; +use Base\Service\GameService; /** * 后台首页控制器 @@ -170,6 +171,15 @@ class GameController extends ThinkController $this->error('游戏标示不能为空！'); exit; } + $downloadWays = $_POST['download_ways'] ?? []; + if (in_array(GameService::DOWNLOAD_BETA, $downloadWays)) { + if (empty($_POST['beta_url'])) { + return $this->error("请在Beta按钮开启的情况填写Beta链接"); + } + if (!preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) { + return $this->error("请填写正确的Beta链接"); + } + } $_POST['relation_game_name'] = $_POST['game_name']; if ($_POST['sdk_version'] == 1) { unset($_POST['ios_game_address']); @@ -203,6 +213,10 @@ class GameController extends ThinkController //$_POST['material_url'] = $_POST['file_url'].$_POST['file_name']; $_POST['discount'] == '' ? $_POST['discount'] = 10 : $_POST['discount']; $_POST['short'] = $short; + + $gameService = new GameService(); + $_POST['download_ways'] = $gameService->getDownLoadWaysValue($downloadWays); + $game = D(self::model_name);//M('$this->$model_name','tab_'); $res = $game->update(); if (!$res) { @@ -299,15 +313,18 @@ class GameController extends ThinkController exit; } - if ($_POST['beta_status'] == 1 && empty($_POST['beta_url'])) { - return $this->error("请在Beta按钮开启的情况填写Beta链接"); - } - if (!empty($_POST['beta_url']) && !preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) { - return $this->error("请填写正确的Beta链接"); + $downloadWays = $_POST['download_ways'] ?? []; + if (in_array(GameService::DOWNLOAD_BETA, $downloadWays)) { + if (empty($_POST['beta_url'])) { + return $this->error("请在Beta按钮开启的情况填写Beta链接"); + } + if (!preg_match("/^((https|http|itms-beta)?:\/\/)[^\s]+/i", $_POST['beta_url'])) { + return $this->error("请填写正确的Beta链接"); + } } /*if($_POST['apply_status']==0&&$_POST['game_status']==1){ $this->error('游戏未审核不允许显示');//游戏添加完成 - }*/ + }*/ $_POST['introduction'] = str_replace(array("\r\n", "\r", "\n"), "~~", $_POST['introduction']); if (!empty($_POST['display_site'])) { @@ -321,7 +338,10 @@ class GameController extends ThinkController $_POST['discount'] == '' ? $_POST['discount'] = 10 : $_POST['discount']; $_POST['detail_content'] = $content; $_POST['pay_config'] = json_encode($_POST['pay_config']); + $gameService = new GameService(); + $_POST['download_ways'] = $gameService->getDownLoadWaysValue($downloadWays); $res = $game->update(); + $id = $res["id"]; $sibling = D("Game")->find($id); $map['relation_game_id'] = $sibling['relation_game_id']; @@ -356,9 +376,6 @@ class GameController extends ThinkController $phone['back_map'] = $sibling['back_map']; $phone['flooring_page_video'] = $sibling['flooring_page_video']; $phone['flooring_page_video_cover'] = $sibling['flooring_page_video_cover']; - $phone['supersign_status'] = $sibling['supersign_status']; - $phone['beta_url'] = $_POST['beta_url']; - $phone['beta_status'] = $_POST['beta_status']; M('Game', 'tab_')->data($phone)->where(array('id' => $another['id']))->save(); //同时修改代充游戏折扣 $set_fidel['status'] = 1; diff --git a/Application/Admin/View/Game/add.html b/Application/Admin/View/Game/add.html index 1fc3cd195..c1ac8fa69 100644 --- a/Application/Admin/View/Game/add.html +++ b/Application/Admin/View/Game/add.html @@ -408,16 +408,39 @@ - 超级签Token： - - - + 超级签Token： + + + - 超级签URL： - - - + 超级签URL： + + + + + + Beta版本链接： + + + + + + + 下载方式 + + + + + + + @@ -1284,9 +1307,11 @@ $("input[name='appstatus'][value=1]").prop("disabled",true); $("input[name='appstatus'][value=0]").prop("disabled",true); $("input[name='appstatus'][value=0]").prop("checked",true); + $('.ios-display').hide(); }else{ $("input[name='appstatus'][value=1]").removeAttr("disabled"); $("input[name='appstatus'][value=0]").removeAttr("disabled"); + $('.ios-display').show(); } }) diff --git a/Application/Admin/View/Game/edit.html b/Application/Admin/View/Game/edit.html index cd02fe912..1f5e22e75 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -446,28 +446,6 @@ - - Beta版本链接： - - - - - - - Beta版本是否开启 - - - - - - - - - 知识产权 @@ -569,6 +547,7 @@ + 超级签Token： @@ -581,32 +560,29 @@ - - 超级签状态： - - - - - - - - - - - - - + Beta版本链接： + + + - + + 下载方式 + + + + + + + + + diff --git a/Application/Base/Service/GameService.class.php b/Application/Base/Service/GameService.class.php new file mode 100644 index 000000000..6733df0e3 --- /dev/null +++ b/Application/Base/Service/GameService.class.php @@ -0,0 +1,19 @@ + intval($gameId)]; $game = M('game', 'tab_')->field($columns)->where($map)->find(); diff --git a/Application/Home/View/default/Home/landingPage.html b/Application/Home/View/default/Home/landingPage.html index bb7b43c97..51577addd 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -33,7 +33,6 @@ - @@ -104,11 +103,7 @@
{$game['relation_game_name']}
{$game['features']}
- -
免费安装
- -
免费安装
- +
免费安装
@@ -259,25 +254,31 @@