elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.111.118.107:/srv/git/platform into dev

Browse Source
master
zyx 5 years ago
parent 560e13af03 cdfbe61fa2
commit 5ffc0bf9b0
10 changed files with 146 additions and 97 deletions
Show Stats Download Patch File Download Diff File

12
Application/Admin/Common/function.php
Unescape Escape View File

@ -85,7 +85,7 @@ function get_list_field($data, $grid)
/** /**
* [every_day 获取日期] * [every_day 获取日期]
* @param integer $m [description] * @param integer $m [description]
* @return [type] [array] * @return [type] [array]
*/ */
function every_day($m = 7) function every_day($m = 7)
@ -293,7 +293,6 @@ function get_config_group($group = 0)
* '字段名2'=>array(映射关系数组), * '字段名2'=>array(映射关系数组),
* ...... * ......
* ) * )
* @author 朱亚杰 <zhuyajie@topthink.net>
* @return array * @return array
* *
* 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 => '草稿'))) 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 检测结果 * @return boolean 检测结果
* @author 麦当苗儿 <zuojiazi@vip.qq.com> * @author 麦当苗儿 <zuojiazi@vip.qq.com>
*/ */
@ -522,3 +522,9 @@ function get_action_type($type, $all = false)
return $list[$type]; return $list[$type];
} }
//获取服务器类型
function getServerType($serverType)
{
return (($serverType == 1) ? '专服' : '混服');
}

4
Application/Admin/Controller/GameController.class.php
Unescape Escape View File

@ -40,6 +40,10 @@ class GameController extends ThinkController
$extend['sdk_version'] = $_REQUEST['sdk_version1']; $extend['sdk_version'] = $_REQUEST['sdk_version1'];
unset($_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'])) { if (isset($_REQUEST['recommend_status'])) {
$extend['recommend_status'] = $_REQUEST['recommend_status']; $extend['recommend_status'] = $_REQUEST['recommend_status'];
unset($_REQUEST['recommend_status']); unset($_REQUEST['recommend_status']);

9
Application/Admin/View/Game/lists.html
Unescape Escape View File

@ -85,6 +85,13 @@ text-indent:0;
<input type="hidden" id="sdk_version" name="sdk_version" value="{:I('sdk_version')}"> <input type="hidden" id="sdk_version" name="sdk_version" value="{:I('sdk_version')}">
</select> </select>
</div> </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"> <empty name="show_status">
<div class="input-list input-list input-list-platform"> <div class="input-list input-list input-list-platform">
<select id="recommend_status" name="recommend_status"> <select id="recommend_status" name="recommend_status">
@ -127,6 +134,7 @@ text-indent:0;
<th>游戏ID</th> <th>游戏ID</th>
<th>游戏名称</th> <th>游戏名称</th>
<th>运营平台</th> <th>运营平台</th>
<th>混服管理</th>
<th>游戏类型</th> <th>游戏类型</th>
<th>游戏Appid</th> <th>游戏Appid</th>
<th>推荐状态</th> <th>推荐状态</th>
@ -150,6 +158,7 @@ text-indent:0;
<td>{$data.id}</td> <td>{$data.id}</td>
<td>{$data.game_name}</td> <td>{$data.game_name}</td>
<td class="">{:get_systems_name($data['sdk_version'])}</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>{:get_game_type_name($data['game_type_id'])}</td>
<td>{$data.game_appid}</td> <td>{$data.game_appid}</td>

48
Application/Home/View/default/Query/dailySummary.html
Unescape Escape View File

@ -94,9 +94,11 @@
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist> </volist>
</notempty> </notempty>
<volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo"> <if condition="$_GET['team_leader_id'] gt 0">
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
</volist> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist>
</if>
</select> </select>
</div> </div>
</eq> </eq>
@ -455,20 +457,17 @@
$('#team_leader_id').change(function () { $('#team_leader_id').change(function () {
var promoteId = parseInt($(this).val()); var promoteId = parseInt($(this).val());
var promoteValue = $(this).find("option:selected").text(); var promoteValue = $(this).find("option:selected").text();
var html = "<option value='' selected>推广员账号</option>";
$.ajax({ if (promoteId > 0) {
url: "{:U('getChildPromoteList')}", html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var html = "<option value='' selected>推广员账号</option>";
if (promoteId > 0) {
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
}
if (data.status == 1) { $.ajax({
url: "{:U('getChildPromoteList')}",
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var promoteData = data.data; var promoteData = data.data;
if (promoteData.length > 0) { if (promoteData.length > 0) {
@ -476,15 +475,22 @@
html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>"; html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
} }
} }
}
$("#promote_id").empty(); showPromoteSelect(html);
$('#promote_id').html(html); }
$("#promote_id").select2(); });
} } else {
}); showPromoteSelect(html);
}
}); });
function showPromoteSelect(html)
{
$("#promote_id").empty();
$('#promote_id').html(html);
$("#promote_id").select2();
}
$('#own').on('click', function () { $('#own').on('click', function () {
var ownId = $('#own_id').val(); var ownId = $('#own_id').val();
var checkBox = $(this).children('i'); var checkBox = $(this).children('i');

48
Application/Home/View/default/Query/recharge.html
Unescape Escape View File

@ -85,9 +85,11 @@
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist> </volist>
</notempty> </notempty>
<volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo"> <if condition="$_GET['team_leader_id'] gt 0">
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
</volist> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist>
</if>
</select> </select>
</div> </div>
</eq> </eq>
@ -277,20 +279,17 @@
$('#team_leader_id').change(function () { $('#team_leader_id').change(function () {
var promoteId = parseInt($(this).val()); var promoteId = parseInt($(this).val());
var promoteValue = $(this).find("option:selected").text(); var promoteValue = $(this).find("option:selected").text();
var html = "<option value='' selected>推广员账号</option>";
$.ajax({ if (promoteId > 0) {
url: "{:U('getChildPromoteList')}", html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var html = "<option value='' selected>推广员账号</option>";
if (promoteId > 0) {
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
}
if (data.status == 1) { $.ajax({
url: "{:U('getChildPromoteList')}",
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var promoteData = data.data; var promoteData = data.data;
if (promoteData.length > 0) { if (promoteData.length > 0) {
@ -298,15 +297,22 @@
html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>"; html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
} }
} }
}
$("#promote_id").empty(); showPromoteSelect(html);
$('#promote_id').html(html); }
$("#promote_id").select2(); });
} } else {
}); showPromoteSelect(html);
}
}); });
function showPromoteSelect(html)
{
$("#promote_id").empty();
$('#promote_id').html(html);
$("#promote_id").select2();
}
$('#own').on('click',function () { $('#own').on('click',function () {
var ownId = $('#own_id').val(); var ownId = $('#own_id').val();
var checkBox = $(this).children('i'); var checkBox = $(this).children('i');

48
Application/Home/View/default/Query/register.html
Unescape Escape View File

@ -56,9 +56,11 @@
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist> </volist>
</notempty> </notempty>
<volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo"> <if condition="$_GET['team_leader_id'] gt 0">
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
</volist> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist>
</if>
</select> </select>
</div> </div>
</eq> </eq>
@ -186,20 +188,17 @@
$('#team_leader_id').change(function () { $('#team_leader_id').change(function () {
var promoteId = parseInt($(this).val()); var promoteId = parseInt($(this).val());
var promoteValue = $(this).find("option:selected").text(); var promoteValue = $(this).find("option:selected").text();
var html = "<option value='' selected>推广员账号</option>";
$.ajax({ if (promoteId > 0) {
url: "{:U('getChildPromoteList')}", html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var html = "<option value='' selected>推广员账号</option>";
if (promoteId > 0) {
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
}
if (data.status == 1) { $.ajax({
url: "{:U('getChildPromoteList')}",
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var promoteData = data.data; var promoteData = data.data;
if (promoteData.length > 0) { if (promoteData.length > 0) {
@ -207,15 +206,22 @@
html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>"; html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
} }
} }
}
$("#promote_id").empty(); showPromoteSelect(html);
$('#promote_id').html(html); }
$("#promote_id").select2(); });
} } else {
}); showPromoteSelect(html);
}
}); });
function showPromoteSelect(html)
{
$("#promote_id").empty();
$('#promote_id').html(html);
$("#promote_id").select2();
}
$('#own').on('click',function () { $('#own').on('click',function () {
var ownId = $('#own_id').val(); var ownId = $('#own_id').val();
var checkBox = $(this).children('i'); var checkBox = $(this).children('i');

56
Application/Home/View/default/Query/summary.html
Unescape Escape View File

@ -84,9 +84,11 @@
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist> </volist>
</notempty> </notempty>
<volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo"> <if condition="$_GET['team_leader_id'] gt 0">
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option> <volist name=":getAllPromoteListByType(3,false,empty(I('team_leader_id'))?PID:I('team_leader_id'))" id="vo">
</volist> <option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist>
</if>
</select> </select>
</div> </div>
</eq> </eq>
@ -240,22 +242,19 @@
setValue('row', '{:I("get.row",10)}'); setValue('row', '{:I("get.row",10)}');
$('#team_leader_id').change(function () { $('#team_leader_id').change(function () {
var promoteId = parseInt($(this).val()); var promoteId = parseInt($(this).val());
var promoteValue = $(this).find("option:selected").text(); var promoteValue = $(this).find("option:selected").text();
var html = "<option value='' selected>推广员账号</option>";
$.ajax({
url: "{:U('getChildPromoteList')}", if (promoteId > 0) {
type: "post", html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
data: {promote_id:promoteId},
dataType: 'json', $.ajax({
success: function (data) { url: "{:U('getChildPromoteList')}",
var html = "<option value='' selected>推广员账号</option>"; type: "post",
data: {promote_id:promoteId},
if (promoteId > 0) { dataType: 'json',
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>"; success: function (data) {
}
if (data.status == 1) {
var promoteData = data.data; var promoteData = data.data;
if (promoteData.length > 0) { if (promoteData.length > 0) {
@ -263,15 +262,22 @@
html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>"; html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
} }
} }
}
$("#promote_id").empty(); showPromoteSelect(html);
$('#promote_id').html(html); }
$("#promote_id").select2(); });
} } else {
}); showPromoteSelect(html);
}
}); });
function showPromoteSelect(html)
{
$("#promote_id").empty();
$('#promote_id').html(html);
$("#promote_id").select2();
}
$('#own').on('click',function () { $('#own').on('click',function () {
var ownId = $('#own_id').val(); var ownId = $('#own_id').val();
var checkBox = $(this).children('i'); var checkBox = $(this).children('i');

9
Application/Media/View/default/Public/base.html
Unescape Escape View File

@ -228,9 +228,10 @@
</div> </div>
</div> </div>
<!--浮动层--> <!--浮动层-->
<!--<div class="float_contact_position "> <div class="float_contact_position ">
<div class="float_contact "> <div class="float_contact ">
<div class="float-bg "></div> <img src="/Public/Media/images/index_about/qrcode.png" width="270">
<!-- <div class="float-bg "></div>
<ul> <ul>
<li class="show kf "> <li class="show kf ">
<a href="tencent://message/?uin={:C('PC_SET_SERVER_QQ')}&amp;menu=yes"></a> <a href="tencent://message/?uin={:C('PC_SET_SERVER_QQ')}&amp;menu=yes"></a>
@ -250,9 +251,9 @@
<li> <li>
<a href="javascript:void(0); " class="top "></a> <a href="javascript:void(0); " class="top "></a>
</li> </li>
</ul> </ul> -->
</div> </div>
</div>--> </div>
<block name="giftextend"></block> <block name="giftextend"></block>
<script> <script>

5
Data/update.sql
Unescape Escape View File

@ -158,6 +158,7 @@ CREATE TABLE `tab_protect_log_read` (
`create_time` int(11) DEFAULT '0' COMMENT '创建时间', `create_time` int(11) DEFAULT '0' COMMENT '创建时间',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)
) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC; ) ENGINE=MyISAM AUTO_INCREMENT=25 DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC;
-- 增加用户Token 验证用户 -- 增加用户Token 验证用户
ALTER TABLE `tab_user` ALTER TABLE `tab_user`
ADD COLUMN `user_token` char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '用户token 登入时下发' AFTER `token`; ADD COLUMN `user_token` char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '' COMMENT '用户token 登入时下发' AFTER `token`;
@ -175,3 +176,7 @@ MODIFY COLUMN `user_account` varchar(50) BINARY CHARACTER SET utf8 COLLATE utf8
ALTER TABLE `tab_test_resource` 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 `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;

BIN
Public/Media/images/index_about/qrcode.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 231 KiB

Write Preview
Loading…
Cancel
Save