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

扶持号管理推广员搜索改成下拉选项框，扶持号管理搜索异常修正，去除将text_resource的排序规则改回一般排序

Browse Source
master
zyx 5 years ago
parent 9ba9710670
commit 0d35370ade
7 changed files with 111 additions and 23 deletions
Show Stats Download Patch File Download Diff File

1
Application/Admin/Controller/PromoteController.class.php
Unescape Escape View File

@ -937,6 +937,7 @@ unset($_REQUEST['parent_id']);
$where['id'] = I("id");
$save['icon'] = I("icon");
$save['name'] = I("name");
M('quick_menu', 'tab_')->startTrans(); //事物
try{

2
Application/Admin/View/Promote/shortCutMenu.html
Unescape Escape View File

@ -27,7 +27,7 @@
<td>{$list.id}</td>
<td>{$list.name}</td>
<td>{$list.url}</td>
<td><img src="{$list.icon}" style="width: 100px"/></td>
<td><img src="{$list.icon|get_cover='path'}" style="width: 100px"/></td>
<td><a href="{:U('promote/shortCutMenuEdit',array('id'=>$list['id']))}">编辑</a></td>
</tr>
</volist>

4
Application/Admin/View/Promote/shortCutMenuEdit.html
Unescape Escape View File

@ -73,13 +73,13 @@
<tr>
<td class="l">菜单名称：</td>
<td class="r">
<input type="text" class="txt " name="user_password" value="{$data['name']}" disabled="disabled" placeholder="请输入菜单名称">
<input type="text" class="txt " name="name" value="{$data['name']}" placeholder="请输入菜单名称">
</td>
</tr>
<tr>
<td class="l">菜单跳转地址：</td>
<td class="r">
<input type="text" class="txt " name="role_name" value="{$data['url']}" disabled="disabled" placeholder="请输入菜单跳转地址">
<input type="text" class="txt " name="url" value="{$data['url']}" disabled="disabled" placeholder="请输入菜单跳转地址">
</td>
</tr>
<tr>

15
Application/Home/Controller/TestResourceController.class.php
Unescape Escape View File

@ -33,8 +33,8 @@ class TestResourceController extends BaseController
if(!empty(I('user_account'))){
$map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
}
if(!empty(I('promote_name'))){
$map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
if(!empty(I('promote_id'))){
$map['tab_test_resource.promote_id']=I('promote_id');
}
$map['user.promote_id']=session("promote_auth.pid");
@ -45,7 +45,6 @@ class TestResourceController extends BaseController
->page($page,$row)
->order('tab_test_resource.create_time DESC')
->select();
// echo M('test_resource','tab_')->_sql();die();
foreach ($data as $key => $value) {
$data[$key]['create_time'] = date('Y-m-d H:m:i',$value['create_time']);
@ -606,5 +605,15 @@ class TestResourceController extends BaseController
$this->display();
}
public function getChildPromoteList()
{
$promoteId = intval(I('post.promote_id', 0));
$promoteId = empty($promoteId) ? PID : $promoteId;
$promoteList = getAllPromoteListByType(3, false, $promoteId);
$data['status'] = 1;
$data['data'] = $promoteList;
$this->ajaxReturn($data);
}
}

2
Application/Home/View/default/TestResource/protectLogList.html
Unescape Escape View File

@ -48,7 +48,7 @@
<select id="server_id" name="server_name" class="reselect select_gallery" style="width:101px">
<option game-id="0" value="">请选择区服</option>
<volist name=":getServer_name_on($_POST['game_name'])" id="vo">
<option value="{$vo.server_name}" <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>>{$_POST['server_name']}</option>
<option value="{$vo.server_name}" <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>>{$vo.server_name}</option>
</volist>
</select>

97
Application/Home/View/default/TestResource/supportNumberList.html
Unescape Escape View File

@ -46,10 +46,13 @@
<div class="form-group normal_space fl">
<span id="server_js">
<select id="server_id" name="server_name" class="reselect select_gallery" style="width:101px">
<select id="server_id" name="server_name" class="reselect select_gallery"
style="width:101px">
<option game-id="0" value="">请选择区服</option>
<volist name=":getServer_name_on($_REQUEST['game_name'])" id="vo">
<option value="{$vo.server_name}" <if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>>{$_REQUEST['server_name']}</option>
<volist name=":getServer_name_on($_GET['game_name'])" id="vo">
<option value="{$vo.server_name}"
<if condition="$_REQUEST['server_name'] eq $vo['server_name']">selected="selected"</if>
>{$vo.server_name}</option>
</volist>
</select>
@ -64,8 +67,35 @@
<input type="text" name="user_account" id="user_account" class="txt normal_txt" style="width:110px;" placeholder="测试账号" value="{:I('user_account')}" onKeyDown="webchat_chkkeysend(event);">
</div>
<!-- <div class="form-group normal_space fl">-->
<!-- <input type="text" name="promote_name" id="promote_name" class="txt normal_txt" style="width:110px;" placeholder="推广员" value="{:I('promote_name')}" onKeyDown="webchat_chkkeysend(event);">-->
<!-- </div>-->
<if condition="$thisParentPromoteId eq 0">
<div class="form-group normal_space fl">
<input type="text" name="promote_name" id="promote_name" class="txt normal_txt" style="width:110px;" placeholder="推广员" value="{:I('promote_name')}" onKeyDown="webchat_chkkeysend(event);">
<select id="team_leader_id" name="team_leader_id" class="reselect select_gallery" style="min-width:130px;">
<option value="0">组长账号</option>
<volist name=":getAllPromoteListByType(1)" id="vo">
<option value="{$vo.id}" <if condition="$vo.id eq $_GET['team_leader_id']"> selected="selected" </if>>{$vo['account']}({$vo['real_name']})</option>
</volist>
</select>
</div>
</if>
<input id="promotesid" value="{$_GET['promote_id']}" type="hidden"/>
<div class="form-group normal_space fl">
<select id="promote_id" name="promote_id" class="reselect select_gallery" style="min-width:130px;">
<option value="0">推广员账号</option>
<notempty name="teamLeaderData">
<volist name="teamLeaderData" id="vo">
<option value="{$vo.id}">{$vo['account']}({$vo['real_name']})</option>
</volist>
</notempty>
<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}" <if condition="$vo.id eq $_GET['promote_id']"> selected="selected" </if>>{$vo['account']}({$vo['real_name']})</option>
</volist>
</if>
</select>
</div>
<div class="form-group normal_space fl">
@ -162,6 +192,7 @@
<script type="text/javascript">
$().ready(function(){
setValue('row','{:I("get.row",10)}');
$("#pagehtml a").on("click",function(event){
event.preventDefault();//使a自带的方法失效，即无法调整到href中的URL(http://www.baidu.com)
@ -170,6 +201,43 @@
$('#data_form').submit();
});
$('#team_leader_id').change(function () {
var promoteId = parseInt($(this).val());
var promoteValue = $(this).find("option:selected").text();
var html = "<option value='' selected>推广员账号</option>";
if (promoteId > 0) {
html += "<option value='" + promoteId + "'>" + promoteValue + "</option>";
$.ajax({
url: "{:U('getChildPromoteList')}",
type: "post",
data: {promote_id:promoteId},
dataType: 'json',
success: function (data) {
var promoteData = data.data;
if (promoteData.length > 0) {
for (var i in promoteData) {
html += "<option value='" + promoteData[i]['id'] + "'>" + promoteData[i]['account'] + "(" + promoteData[i]['real_name'] + ")</option>";
}
}
showPromoteSelect(html);
}
});
} else {
showPromoteSelect(html);
}
});
function showPromoteSelect(html)
{
$("#promote_id").empty();
$('#promote_id').html(html);
$("#promote_id").select2();
}
$('#sdate').datetimepicker({
lang:'ch',
format:'Y-m-d',
@ -277,7 +345,9 @@
+'/game_name/'+$('#game_id').val()
+'/server_name/'+$('#server_id').val()
+'/role_name/'+$('#role_name').val()
+'/user_account/'+$('#user_account').val()+'/promote_name/'+$('#promote_name').val();
+'/user_account/'+$('#user_account').val()
+'/promote_id/'+$('#promote_id').val()
+'/team_leader_id/'+$('#team_leader_id').val();
console.log(formsUrl);
$('#forms').attr('action',formsUrl);
@ -397,6 +467,23 @@
})
}
})
checkPromote();
function checkPromote() {
var promoteId = parseInt($('#team_leader_id').val());
var promoteValue = $('#team_leader_id').find("option:selected").text();
var promote_id = $('#promotesid').val();
if (promoteId > 0) {
var html = "<option value='" + promoteId + "' ";
if (promote_id == 1) {
html += "selected='selected'";
}
html +=" >"+ promoteValue + "</option>";
$('#promote_id').children().first().after(html);
console.log(promote_id);
}
}
</script>
</block>

9
Data/update.sql
Unescape Escape View File

@ -168,15 +168,6 @@ ADD COLUMN `user_token` char(64) CHARACTER SET utf8 COLLATE utf8_general_ci NOT
-- ----------------------------
alter table `tab_giftbag` modify COLUMN `giftbag_version` tinyint(2) COMMENT '运营平台 0双平台 1and 2ios 3超级签'
-- ----------------------------
-- 2019-10-17 zyx
-- ----------------------------
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`;
-- 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;

Write Preview
Loading…
Cancel
Save