管理后台->新增混服管理查询推广员后台->推广员检索调整 sys_model->game的list_grid字段添加server_type

5 years ago · 1ba358fabb
parent 3c1b1673f2 c322f6ec7e
commit 1ba358fabb
8 changed files with 49 additions and 17 deletions
--- 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 朱亚杰 <zhuyajie@topthink.net>
 * @return array
 *
 *  array(
@ -301,6 +300,7 @@ function get_config_group($group = 0)
 *      ....
 *  )
 *
+ * @author 朱亚杰 <zhuyajie@topthink.net>
 */
 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 麦当苗儿 <zuojiazi@vip.qq.com>
 */
@ -522,3 +522,9 @@ function get_action_type($type, $all = false)
    return $list[$type];
 }

+//获取服务器类型
+function getServerType($serverType)
+{
+    return (($serverType == 1) ? '专服' : '混服');
+}
+
--- 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']);
--- a/Application/Admin/View/Game/lists.html
+++ b/Application/Admin/View/Game/lists.html
@ -85,6 +85,13 @@ text-indent:0;
                    <input type="hidden" id="sdk_version" name="sdk_version" value="{:I('sdk_version')}">
                </select>  
            </div>
+            <div class="input-list input-list-platform">
+                <select id="server_type" name="server_type" >
+                    <option value="">混服管理</option>
+                    <option value="1">专服</option>
+                    <option value="2">混服</option>
+                </select>
+            </div>
            <empty name="show_status">
            <div class="input-list input-list input-list-platform">
                <select id="recommend_status" name="recommend_status">
@ -127,6 +134,7 @@ text-indent:0;
                        <th>游戏ID</th>
                        <th>游戏名称</th>
                        <th>运营平台</th>
+                        <th>混服管理</th>
                        <th>游戏类型</th>
                        <th>游戏Appid</th>
                        <th>推荐状态</th>
@ -150,7 +158,8 @@ text-indent:0;
                            <td>{$data.id}</td>
                            <td>{$data.game_name}</td>
                            <td class="">{:get_systems_name($data['sdk_version'])}</td>
-                            
+                            <td>{:getServerType($data['server_type'])}</td>
+
                            <td>{:get_game_type_name($data['game_type_id'])}</td>
                            <td>{$data.game_appid}</td>
                            <td>{:get_info_status($data['recommend_status'],1)}</td> 
--- a/Application/Home/View/default/Query/dailySummary.html
+++ b/Application/Home/View/default/Query/dailySummary.html
@ -94,9 +94,11 @@
                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                </volist>
              </notempty>
-              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
-                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-              </volist>
+              <if condition="$_GET['team_leader_id'] gt 0">
+                <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                </volist>
+              </if>
            </select>
          </div>
        </eq>
--- a/Application/Home/View/default/Query/recharge.html
+++ b/Application/Home/View/default/Query/recharge.html
@ -85,9 +85,11 @@
                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                </volist>
              </notempty>
-              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
-                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-              </volist>
+              <if condition="$_GET['team_leader_id'] gt 0">
+                <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                </volist>
+              </if>
            </select>
          </div>
        </eq>
--- a/Application/Home/View/default/Query/register.html
+++ b/Application/Home/View/default/Query/register.html
@ -56,9 +56,11 @@
                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                </volist>
              </notempty>
-              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
-                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-              </volist>
+              <if condition="$_GET['team_leader_id'] gt 0">
+                <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                </volist>
+              </if>
            </select>
          </div>
        </eq>
--- a/Application/Home/View/default/Query/summary.html
+++ b/Application/Home/View/default/Query/summary.html
@ -84,9 +84,11 @@
                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
                </volist>
              </notempty>
-              <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
-                <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
-              </volist>
+              <if condition="$_GET['team_leader_id'] gt 0">
+                <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
+                  <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
+                </volist>
+              </if>
            </select>
          </div>
        </eq>
--- a/Data/update.sql
+++ b/Data/update.sql
@ -158,6 +158,7 @@ CREATE TABLE `tab_protect_log_read` (
  `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
  PRIMARY KEY (`id`)
 ) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
+
 -- 增加用户Token 验证用户
 ALTER TABLE `tab_user`
 ADD COLUMN `user_token`  char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '用户token 登入时下发' AFTER `token`;
@ -174,4 +175,8 @@ ALTER TABLE `tab_test_resource`
 MODIFY COLUMN `user_account`  varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '用户帐号' AFTER `user_id`;
 ALTER TABLE `tab_test_resource`
 MODIFY COLUMN `role_name`  varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '角色名' AFTER `phone`,
-MODIFY COLUMN `promote_account`  varchar(30) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '所属推广员账号' AFTER `promote_id`;
+MODIFY COLUMN `promote_account`  varchar(30) BINARY CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '' COMMENT '所属推广员账号' AFTER `promote_id`;
+
+-- 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;
+