From 72036e51e3eb2b699e3f15644225205d84a3dc07 Mon Sep 17 00:00:00 2001 From: zyx Date: Fri, 18 Oct 2019 16:28:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=97=B6=E9=97=B4=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=AD=A3=EF=BC=8C=E5=BF=AB=E6=8D=B7=E8=8F=9C?= =?UTF-8?q?=E5=8D=9510=E4=B8=AA=E9=99=90=E5=88=B6=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Home/Controller/PromoteController.class.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/Application/Home/Controller/PromoteController.class.php b/Application/Home/Controller/PromoteController.class.php index 789c7ea94..842917ebf 100644 --- a/Application/Home/Controller/PromoteController.class.php +++ b/Application/Home/Controller/PromoteController.class.php @@ -74,7 +74,8 @@ class PromoteController extends BaseController $today_start = mktime(0, 0, 0, date('m'), date('d'), date('Y')); $today_end = mktime(0, 0, 0, date('m'), date('d') + 1, date('Y')) - 1; - $today_open_server_list = M("server as sv", "tab_")->where( + $today_open_server_list = M("server as sv", "tab_") + ->where( array("sv.start_time" => array("BETWEEN", array($today_start, $today_end)), "sv.show_status" => 1)) ->join("left join tab_game gm on gm.id=sv.game_id") @@ -249,7 +250,8 @@ class PromoteController extends BaseController $map['sv.show_status'] = 1; $count_map['show_status'] = 1; - $open_server_list = M("server as sv", "tab_")->where($map) + $open_server_list = M("server as sv", "tab_") + ->where($map) ->join("left join tab_game gm on gm.id=sv.game_id") ->field('sv.*,gm.icon') ->order("sv.start_time desc") @@ -273,7 +275,7 @@ class PromoteController extends BaseController $open_server_list[$key]['pay_type'] = '安卓、iOS'; } $open_server_list[$key]['pay_type']; - $open_server_list[$key]['start_time'] = date('Y-m-s h:i', $server['start_time']); + $open_server_list[$key]['start_time'] = date('m-d H:i', $server['start_time']); } //$content = $this->fetch('Promote/home_read_data'); $this->ajaxReturn(['status' => 1, 'info' => '调用成功', 'data' => $open_server_list, '_page' => $page], "JSON"); @@ -310,6 +312,11 @@ class PromoteController extends BaseController )->delete(); $this->ajaxReturn(['status' => 1, 'info' => '移除成功'], "JSON"); } else { + $menuData = M("promote_quick_menu ", "tab_")->count(); + + if ($menuData>=10) { + $this->ajaxReturn(['status' => 1, 'info' => '快捷菜单只能有10个'], "JSON"); + } M("promote_quick_menu ", "tab_")->add( array("quick_menu_id" => $menu_id, "promote_id" => get_pid(),