From 6e55b657a49d787c3b8350ecc9cfaee3e5a6ec31 Mon Sep 17 00:00:00 2001 From: ELF <360197197@qq.com> Date: Wed, 25 Dec 2019 14:09:15 +0800 Subject: [PATCH 1/5] =?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 --- Application/Home/Controller/HomeController.class.php | 4 +++- Application/Home/View/default/Home/landingPage.html | 7 ------- Data/update.sql | 7 ++++++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Application/Home/Controller/HomeController.class.php b/Application/Home/Controller/HomeController.class.php index b079ee597..8cfa6ccb3 100644 --- a/Application/Home/Controller/HomeController.class.php +++ b/Application/Home/Controller/HomeController.class.php @@ -181,7 +181,9 @@ class HomeController extends Controller 'flooring_page_video', 'flooring_page_video_cover', 'supersign_status', - 'ios_video_top' + 'ios_video_top', + 'stable_status', + 'stable_url', ]; $map = ['id' => 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 8030e659d..65f3a4b35 100644 --- a/Application/Home/View/default/Home/landingPage.html +++ b/Application/Home/View/default/Home/landingPage.html @@ -261,13 +261,6 @@
• 至尊下载：永不闪退、不丢数据稳定有保障
• 同一设备安装一次可在一年内无限次下载重装
- - - - - - - diff --git a/Data/update.sql b/Data/update.sql index 67f2f4060..b7f6b7c8c 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -906,4 +906,9 @@ CREATE TABLE `tab_repair_pay` ( `create_time` int(11) NOT NULL DEFAULT '0', `type` int(11) DEFAULT '0' COMMENT '0通知到账 1补单记录', PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='通知到账补单'; \ No newline at end of file +) ENGINE=InnoDB AUTO_INCREMENT=0 DEFAULT CHARSET=utf8 COMMENT='通知到账补单'; + +ALTER TABLE `tab_game` +ADD COLUMN `stable_status` tinyint(1) NOT NULL DEFAULT 0 COMMENT '稳定版状态'; +ALTER TABLE `tab_game` +ADD COLUMN `stable_url` varchar(150) NOT NULL DEFAULT '' COMMENT '稳定版链接'; \ No newline at end of file From 39f1ea9d0c3383960cf4c429b0bc060ddf6f8e43 Mon Sep 17 00:00:00 2001 From: zhanglingsheng Date: Wed, 25 Dec 2019 14:18:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B6=85=E7=BA=A7=E7=AD=BE=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1--=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/View/SuperStatistical/index.html | 6 +++--- Application/Admin/View/SuperStatistical/lists.html | 5 ++++- Application/Admin/View/SuperStatistical/superDetail.html | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Application/Admin/View/SuperStatistical/index.html b/Application/Admin/View/SuperStatistical/index.html index 6647a0d62..b0288070e 100644 --- a/Application/Admin/View/SuperStatistical/index.html +++ b/Application/Admin/View/SuperStatistical/index.html @@ -157,7 +157,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: ['admin.php?s=/SuperStatistical/lists' + params , 'no'] + content: 'admin.php?s=/SuperStatistical/lists' + params }); }); $("#role1").click(function () { @@ -167,7 +167,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: ['admin.php?s=/SuperStatistical/lists' + params , 'no'] + content: 'admin.php?s=/SuperStatistical/lists' + params }); }); $("#superDetail").click(function () { @@ -177,7 +177,7 @@ shadeClose: true, shade: 0.8, area: ['70%', '80%'], - content: ['admin.php?s=/SuperStatistical/superDetail' + params , 'no'] + content: 'admin.php?s=/SuperStatistical/superDetail' + params }); }); //搜索功能 diff --git a/Application/Admin/View/SuperStatistical/lists.html b/Application/Admin/View/SuperStatistical/lists.html index 3a06bfc8b..454a946b2 100644 --- a/Application/Admin/View/SuperStatistical/lists.html +++ b/Application/Admin/View/SuperStatistical/lists.html @@ -17,6 +17,9 @@ -
+
diff --git a/Application/Admin/View/SuperStatistical/superDetail.html b/Application/Admin/View/SuperStatistical/superDetail.html index f1d3b5177..cd1885c21 100644 --- a/Application/Admin/View/SuperStatistical/superDetail.html +++ b/Application/Admin/View/SuperStatistical/superDetail.html @@ -17,6 +17,9 @@ -
+
From 600ac3fd9ee0f96798141e1117df4bc2e83a6c79 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 25 Dec 2019 14:45:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8E=A8=E5=B9=BF?= =?UTF-8?q?=E5=91=98=E6=97=B6=E6=8E=A8=E5=B9=BF=E5=85=AC=E5=8F=B8=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/PromoteController.class.php | 4 ++- Application/Admin/View/Promote/add.html | 26 +++++++++---------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 73c1a1b0a..8f09e4e38 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -227,7 +227,9 @@ class PromoteController extends ThinkController if (preg_match('/^[a-zA-Z0-9]{6,15}$/', $account)==false) { $this->error('账号只能是6-15位字母或数字'); } - + if (empty($company_id)) { + $this->error('请选择推广公司'); + } $promoteService = new PromoteService(); $status = $promoteService->addPromote($data); if ($status) { diff --git a/Application/Admin/View/Promote/add.html b/Application/Admin/View/Promote/add.html index 4a22e69e7..d2a4326dd 100644 --- a/Application/Admin/View/Promote/add.html +++ b/Application/Admin/View/Promote/add.html @@ -38,6 +38,19 @@ 密码长度必须大于6位 + + + *所属推广公司 + + + + + 账号状态： @@ -83,19 +96,6 @@ - - 所属推广公司 - - - - - -
From 78e1fefbc77c5441daa7854c26078a382f825d40 Mon Sep 17 00:00:00 2001 From: liuweiwen <“529520975@qq.com> Date: Wed, 25 Dec 2019 14:50:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Controller/PromoteController.class.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php index 8f09e4e38..a76becf9a 100644 --- a/Application/Admin/Controller/PromoteController.class.php +++ b/Application/Admin/Controller/PromoteController.class.php @@ -280,7 +280,8 @@ class PromoteController extends ThinkController $data['account'] = I('post.account'); $map1['id'] = array('neq',$_POST['id']); $map1['account'] = $data['account']; - if ($this->accountExist($data['account'])) { + + if ($this->accountExist($data['account'], $_POST['id'])) { $this->error('该账号已存在'); } $pdata = D('Promote')->where($map1)->find(); From 2f36d3eb1c04833e066586e75ea4838d31df9bfe Mon Sep 17 00:00:00 2001 From: yulingwei <2436953959@qq.com> Date: Wed, 25 Dec 2019 15:27:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9Ebata=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E5=92=8C=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Admin/Controller/GameController.class.php | 5 +++++ Application/Admin/View/Game/edit.html | 22 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index 5638da792..0f5e8e217 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -298,6 +298,9 @@ class GameController extends ThinkController $this->error('一句话简介不能超过30个字！'); exit; } + if (!preg_match("/^((https|http|ftp|rtsp|mms)?:\/\/)[^\s]+/i", $_POST['beta_url'])) { + return $this->error("请填写正确的Bata链接"); + } /*if($_POST['apply_status']==0&&$_POST['game_status']==1){ $this->error('游戏未审核不允许显示');//游戏添加完成 }*/ @@ -349,6 +352,8 @@ class GameController extends ThinkController $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/edit.html b/Application/Admin/View/Game/edit.html index 595e67d20..f3ff9f62d 100644 --- a/Application/Admin/View/Game/edit.html +++ b/Application/Admin/View/Game/edit.html @@ -429,6 +429,28 @@ + + Bata版本链接： + + + + + + + Bata版本是否开启 + + + + + + + + +