From c322f6ec7ebff67996a4373ff57ff2a518e89c77 Mon Sep 17 00:00:00 2001 From: chenxiaojun <956334972@qq.com> Date: Tue, 22 Oct 2019 15:53:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=90=8E=E5=8F=B0->=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=B7=B7=E6=9C=8D=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=20=20=E6=8E=A8=E5=B9=BF=E5=91=98=E5=90=8E=E5=8F=B0->=E6=8E=A8?= =?UTF-8?q?=E5=B9=BF=E5=91=98=E6=A3=80=E7=B4=A2=E8=B0=83=E6=95=B4=20=20sys?= =?UTF-8?q?=5Fmodel->game=E7=9A=84list=5Fgrid=E5=AD=97=E6=AE=B5=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0server=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Application/Admin/Common/function.php | 12 +++++++++--- .../Admin/Controller/GameController.class.php | 4 ++++ Application/Admin/View/Game/lists.html | 11 ++++++++++- .../Home/View/default/Query/dailySummary.html | 8 +++++--- Application/Home/View/default/Query/recharge.html | 8 +++++--- Application/Home/View/default/Query/register.html | 8 +++++--- Application/Home/View/default/Query/summary.html | 8 +++++--- Data/update.sql | 5 ++++- 8 files changed, 47 insertions(+), 17 deletions(-) diff --git a/Application/Admin/Common/function.php b/Application/Admin/Common/function.php index 66dcc7489..687ec4204 100644 --- a/Application/Admin/Common/function.php +++ b/Application/Admin/Common/function.php @@ -85,7 +85,7 @@ function get_list_field($data, $grid) /** * [every_day 获取日期] - * @param integer $m [description] + * @param integer $m [description] * @return [type] [array] */ function every_day($m = 7) @@ -293,7 +293,6 @@ function get_config_group($group = 0) * '字段名2'=>array(映射关系数组), * ...... * ) - * @author 朱亚杰 * @return array * * array( @@ -301,6 +300,7 @@ function get_config_group($group = 0) * .... * ) * + * @author 朱亚杰 */ function int_to_string(&$data, $map = array('status' => array(1 => '正常', -1 => '删除', 0 => '锁定', 2 => '未审核', 3 => '草稿'))) { @@ -365,7 +365,7 @@ function get_parent_category($cid) /** * 检测验证码 - * @param integer $id 验证码ID + * @param integer $id 验证码ID * @return boolean 检测结果 * @author 麦当苗儿 */ @@ -522,3 +522,9 @@ function get_action_type($type, $all = false) return $list[$type]; } +//获取服务器类型 +function getServerType($serverType) +{ + return (($serverType == 1) ? '专服' : '混服'); +} + diff --git a/Application/Admin/Controller/GameController.class.php b/Application/Admin/Controller/GameController.class.php index b45cdcb4e..cf9a4d977 100644 --- a/Application/Admin/Controller/GameController.class.php +++ b/Application/Admin/Controller/GameController.class.php @@ -40,6 +40,10 @@ class GameController extends ThinkController $extend['sdk_version'] = $_REQUEST['sdk_version1']; unset($_REQUEST['sdk_version1']); } + if (!empty($_REQUEST['server_type'])) { + $extend['server_type'] = intval($_REQUEST['server_type']); + unset($_REQUEST['server_type']); + } if (isset($_REQUEST['recommend_status'])) { $extend['recommend_status'] = $_REQUEST['recommend_status']; unset($_REQUEST['recommend_status']); diff --git a/Application/Admin/View/Game/lists.html b/Application/Admin/View/Game/lists.html index 5234f489a..eae185a53 100644 --- a/Application/Admin/View/Game/lists.html +++ b/Application/Admin/View/Game/lists.html @@ -85,6 +85,13 @@ text-indent:0; +
+ +
diff --git a/Application/Home/View/default/Query/recharge.html b/Application/Home/View/default/Query/recharge.html index e0b8414ec..3e1c5e4dc 100644 --- a/Application/Home/View/default/Query/recharge.html +++ b/Application/Home/View/default/Query/recharge.html @@ -85,9 +85,11 @@ - - - + + + + + diff --git a/Application/Home/View/default/Query/register.html b/Application/Home/View/default/Query/register.html index d526d41ad..d422f83eb 100644 --- a/Application/Home/View/default/Query/register.html +++ b/Application/Home/View/default/Query/register.html @@ -56,9 +56,11 @@ - - - + + + + + diff --git a/Application/Home/View/default/Query/summary.html b/Application/Home/View/default/Query/summary.html index 974dd0b2e..507647703 100644 --- a/Application/Home/View/default/Query/summary.html +++ b/Application/Home/View/default/Query/summary.html @@ -84,9 +84,11 @@ - - - + + + + + diff --git a/Data/update.sql b/Data/update.sql index b1cab2369..3ef54eaad 100644 --- a/Data/update.sql +++ b/Data/update.sql @@ -157,4 +157,7 @@ CREATE TABLE `tab_protect_log_read` ( `promote_id` int(11) NOT NULL DEFAULT '0' COMMENT '推广员id', `create_time` int(11) DEFAULT '0' COMMENT '创建时间', PRIMARY KEY (`id`) -) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; \ No newline at end of file +) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; + +-- 2019-10-22 cxj +UPDATE `sys_model` SET list_grid = "id:编号\r\nsort:排序\r\ngame_name:游戏名称\r\ngame_type_name:游戏类型\r\ngame_type_id:游戏类型\r\ngame_appid:游戏appid\r\ngame_status|get_info_status:显示状态\r\npay_status|get_info_status:支付状态\r\nicon:图片id\r\napply_status:审核状态\r\ncategory:开放类型\r\nrecommend_status|get_info_status*1:推荐状态\r\nrelation_game_id:关联游戏id\r\nrelation_game_name:关联游戏名称\r\nsdk_version:运营平台\r\ndevelopers:开发商\r\ndow_num:下载\r\nonline_status:上线状态\r\ncreate_time:创建时间\r\nserver_type:混服管理\r\nid:操作:[EDIT]&id=[id]|编辑,Game/del?ids=[id]|删除" where id = 15; \ No newline at end of file