Merge branch 'dev_zyx' into dev

# Conflicts:
#	Application/Admin/Controller/TestResourceController.class.php
master
zhengchanglong 5 years ago
commit a5899444a7

@ -1,5 +1,6 @@
<?php
namespace Admin\Controller;
use mysql_xdevapi\Exception;
use User\Api\PromoteApi;
use User\Api\UserApi;
use Org\XiguSDK\Xigu;
@ -899,4 +900,54 @@ unset($_REQUEST['parent_id']);
}
}
public function shortCutMenu($p = 1) {
$page = intval($p);
$page = $page ? $page : 1; //默认显示第一页数据
$row=10;
$this->meta_title = '快捷菜单管理';
$this->m_title = '站点设置(推广员后台)';
$list = M("quick_menu","tab_")->page($page,$row)->select();
$count = M("quick_menu","tab_")->count();
$page = set_pagination($count,$row);
if($page) {$this->assign('_page', $page);}
$this->assign('list',$list);
$this->display();
}
public function shortCutMenuEdit() {
$id = I("id");
$where['id'] = $id;
$data = M("quick_menu","tab_")->where($where)->find();
$this->assign("data",$data);
$this->meta_title = '快捷菜单管理编辑';
$this->m_title = '站点设置(推广员后台)';
$this->display();
}
public function shortCutMenuSave() {
$where['id'] = I("id");
$save['icon'] = I("icon");
M('quick_menu', 'tab_')->startTrans(); //事物
try{
M('quick_menu', 'tab_')->where($where)->save($save);
}catch (Exception $e) {
M('quick_menu', 'tab_')->rollback();//回滚
}
M('quick_menu', 'tab_')->commit(); //提交事物
$this->success('保存成功',U("promote/shortCutMenu"));
}
}

@ -32,14 +32,14 @@ class TestResourceController extends ThinkController
$map['tab_test_resource.role_name']=['like','%'.I('role_name').'%'];
}
if(!empty(I('user_account'))){
$map['tab_test_resource.user_account']=['like','%'.I('user_account').'%'];
$map['tab_test_resource.user_account']=I('user_account');
}
if(!empty(I('promote_name'))){
$map['tab_test_resource.promote_account']=['like','%'.I('promote_name').'%'];
$map['tab_test_resource.promote_account']=I('promote_name');
}
$data = M('test_resource','tab_')
->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,lock_status as check_status')
->field('tab_test_resource.id,tab_test_resource.user_id,tab_test_resource.game_name,tab_test_resource.server_name,tab_test_resource.user_account,tab_test_resource.promote_account,tab_test_resource.role_name,tab_test_resource.create_time,device_number,check_status')
->join('left join tab_user as user on tab_test_resource.user_id = user.id')
->where($map)
->page($page,$row)
@ -73,7 +73,7 @@ class TestResourceController extends ThinkController
}
$data = [
'lock_status' => 0
'check_status' => 0
];
$isFreeze = M('user','tab_')->where("id=".$supportId)->save($data);
@ -92,7 +92,7 @@ class TestResourceController extends ThinkController
}
$data = [
'lock_status' => 1
'check_status' => 1
];
$isFreeze = M('user','tab_')->where("id=".$supportId)->save($data);
@ -198,11 +198,13 @@ class TestResourceController extends ThinkController
try {
$arrUserId = array_column($data,'id');
$logId = implode(',',$arrUserId);
if ($logId) {
$logRead = M('protect_log_read','tab_')
->where("log_id IN({$logId})")
->where("log_id IN({$logId}) and promote_id = {$promote_id}")
->select();
} else {
}
else {
$logRead = [];
}
@ -351,9 +353,9 @@ class TestResourceController extends ThinkController
for ($i=0; $i < $count ; $i++) {
$i_account=I('user_account')[$i];
if (!empty($i_account)) {
$user=M('user', 'tab_')->field('promote_id,promote_account,password,phone')->where(['account'=>$i_account])->find();
// $promote = $this->get_all_promote();
if (!$user) {
$user=M('user', 'tab_')->field('promote_id,password,phone')->where(['account'=>$i_account])->find();
$promote = $this->get_all_promote();
if (!in_array($user['promote_id'], $promote)) {
M('test_resource', 'tab_')->rollback();//回滚
$this->error($i_account.'账号不存在');
}
@ -412,14 +414,14 @@ class TestResourceController extends ThinkController
$data['apply_resource']=I('apply_resource')[$i];
$data['apply_remark']=I('apply_remark')[$i];
$data['apply_name']=$user['promote_account'];
$data['apply_id']=$user['promote_id'];
$data['apply_name']=$_SESSION['onethink_home']['promote_auth']['account'];
$data['apply_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
// $data['promote_id']=session("promote_auth.pid");
// $data['promote_account']=session("promote_auth.account");
$data['promote_id']=$user['promote_id'];
$data['promote_account']=$user['promote_account'];
$data['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
$data['promote_account']=$_SESSION['onethink_home']['promote_auth']['account'];
$data['create_time']=time();
$data['apply_type']=0;
@ -531,10 +533,10 @@ class TestResourceController extends ThinkController
// $this->ajaxReturn(['status'=>0,'msg'=>'扶持申请额度不足,最大额度:'.$max_quota]);
// }
// if($support['promote_id'] !=$_SESSION['onethink_home']['promote_auth']['pid'] || empty($support) ){
// M('test_resource','tab_')->rollback();//回滚
// $this->error('申请失败');
// }
if($support['promote_id'] !=$_SESSION['onethink_home']['promote_auth']['pid'] || empty($support) ){
M('test_resource','tab_')->rollback();//回滚
$this->error('申请失败');
}
$data['game_id']=$support['game_id'];
$data['game_name']=$support['game_name'];
@ -550,13 +552,13 @@ class TestResourceController extends ThinkController
$data['apply_resource']=I('apply_resource');
$data['apply_remark']=I('apply_remark');
$data['apply_name']=$support['promote_account'];
$data['apply_id']=$support['promote_id'];
$data['apply_name']=$_SESSION['onethink_home']['promote_auth']['account'];
$data['apply_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
// $data['promote_id']=session("promote_auth.pid");
// $data['promote_account']=session("promote_auth.account");
$data['promote_id']=$support['promote_id'];
$data['promote_account']=$support['promote_account'];
$data['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
$data['promote_account']=$_SESSION['onethink_home']['promote_auth']['account'];
$data['create_time']=time();
$data['apply_type']=1;
@ -607,7 +609,7 @@ class TestResourceController extends ThinkController
unset($_REQUEST['start']);unset($_REQUEST['end']);
}
// $map['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
$map['promote_id']=$_SESSION['onethink_home']['promote_auth']['pid'];
$data=M('test_resource','tab_')->where($map)->order('id desc')->page($page,$row)->select();
$count=M('test_resource','tab_')->field('id')->where($map)->select();
$count = count($count);

@ -0,0 +1,59 @@
<extend name="Public/base"/>
<block name="body">
<script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
<div class="cf main-place top_nav_list navtab_list">
{:W('Index/navigation',array('value'=>'Site/channel'))}
<h3 class="page_title">快捷菜单管理</h3>
<p class="description_text"></p>
</div>
<div class="data_list">
<table>
<thead>
<tr>
<th>ID</th>
<th>菜单名称</th>
<th>菜单跳转地址</th>
<th>菜单图标</th>
<th>操作</th>
</tr>
</thead>
<tbody>
<notempty name="list">
<volist name="list" id="list">
<tr>
<td>{$list.id}</td>
<td>{$list.name}</td>
<td>{$list.url}</td>
<td><img src="{$list.icon}" style="width: 100px"/></td>
<td><a href="{:U('promote/shortCutMenuEdit',array('id'=>$list['id']))}">编辑</a></td>
</tr>
</volist>
<else/>
<td colspan="6" class="text-center">aOh! 暂时还没有内容!</td>
</notempty>
</tbody>
</table>
</div>
<div class="page">
{$_page|default=''}
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="Site/channel">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
</block>
<block name="script">
<script type="text/javascript">
//导航高亮
highlight_subnav('{:U('Site/channel')}');
</script>
</block>

@ -0,0 +1,184 @@
<extend name="Public/base" />
<block name="css">
<!-- <link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all"> -->
<script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
<script type="text/javascript" src="__STATIC__/provincecityarea/area1.js"></script>
<script type="text/javascript" src="__STATIC__/provincecityarea/AreaData_min.js"></script>
<script type="text/javascript" src="__STATIC__/provincecityarea/jquery-1.7.min.js"></script>
<script type="text/javascript" src="__JS__/jquery.mousewheel.js"></script>
<style>
#form .txt_area.download_url {width:400px;}
.tabcon1711 .table_radio2 .table_btn {width:215px;}
</style>
</block>
<block name="body">
<link rel="stylesheet" type="text/css" href="__CSS__/admin_table.css" media="all">
<script type="text/javascript" src="__STATIC__/layer/layer.js"></script>
<script type="text/javascript" src="__STATIC__/uploadify/jquery.uploadify.min.js"></script>
<link rel="stylesheet" href="__CSS__/select2.min.css" type="text/css" />
<style>
.select2-container--default .select2-selection--single .select2-selection__rendered {
line-height:35px;
line-height:28px;
}
.select2-container--default .select2-selection--single .select2-selection__arrow {
height:26px;
}
.select2-container--default .select2-search--dropdown .select2-search__field {
height:26px;line-height:26px;font-size:12px;
}
.select2-results__option[aria-selected] {font-size:12px;}
.tabcon1711 .select2-container--default .select2-selection--single{
font-size: 12px;
color: #555;
vertical-align: middle;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
background-color: #fff;
border: 1px solid #ccc;
-webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-moz-box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
box-shadow: inset 0 1px 1px rgba(0,0,0,0.075);
-webkit-transition: border linear .2s, box-shadow linear .2s;
-moz-transition: border linear .2s, box-shadow linear .2s;
-o-transition: border linear .2s, box-shadow linear .2s;
transition: border linear .2s, box-shadow linear .2s;height:30px;}
.tabcon1711 .select2-container--default .select2-selection--single .select2-selection__rendered {line-height: 30px;}
.tabcon1711 .select2-container--default .select2-selection--single .select2-selection__arrow {height:30px;}
.tabcon1711 .select2-container--default .select2-search--dropdown .select2-search__field {
height:26px;line-height:26px;font-size:12px;
}
.tabcon1711 .select2-results__option[aria-selected] {font-size:12px;}
</style>
<div class="cf main-place top_nav_list navtab_list">
{:W('Index/navigation',array('value'=>'Site/channel'))}
<h3 class="page_title">快捷菜单管理</h3>
<p class="description_text"></p>
</div>
<!-- 标签页导航 -->
<div class="tab-wrap">
<div class="tab-content tabcon1711">
<!-- 表单 -->
<form id="form" action="{:U('shortCutMenuSave')}" method="post" class="form-horizontal">
<!-- 基础文档模型 -->
<div id="tab1" class="tab-pane in tab1">
<table border="0" cellspacing="0" cellpadding="0">
<tbody>
<tr>
<td class="l">菜单名称:</td>
<td class="r">
<input type="text" class="txt " name="user_password" value="{$data['name']}" disabled="disabled" 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="请输入菜单跳转地址">
</td>
</tr>
<tr>
<td class="l">角色名称:</td>
<td class="r">
<div style="float:left;width:215px;padding:10px 0;">
<input type="hidden" name="id" value="{{$data['id']}}"/>
<input type="file" id="upload_picture">
<input type="hidden" name="cover_id" id="cover_id" value=""/>
<input type="hidden" name="icon" id="icon" value="{$data['icon']}"/>
<div class="upload-img-box">
<notempty name="data">
<div class="upload-pre-item">
<span class="placeholder-graphic"><img style="width:50px" src="{$data['icon']}"/></span>
</div>
</notempty>
</div>
<script type="text/javascript">
//上传图片
/* 初始化上传插件 */
$("#upload_picture").uploadify({
"height" : 30,
"swf" : "__STATIC__/uploadify/uploadify.swf",
"fileObjName" : "download",
"buttonText" : "上传图片",
"uploader" : "{:U('File/uploadPicture',array('session_id'=>session_id()))}",
"width" : 120,
'removeTimeout' : 1,
'fileTypeExts' : '*.jpg; *.jpeg; *.png; *.gif;',
"onUploadSuccess" : uploadPicture,
'onFallback' : function() {
alert('未检测到兼容版本的Flash.');
}
});
function uploadPicture(file, data){
var data = $.parseJSON(data);
var src = '';
if(data.status){
$("#cover_id").val(data.id);
src = data.url || '__ROOT__' + data.path;
$("#cover_id").parent().find('.upload-img-box').html(
'<div class="upload-pre-item"><span class="placeholder-graphic"><img style="width:50px" src="' + src + '"/></span></div>'
);
// console.log(data);
$("#icon").val(data.path);
} else {
updateAlert(data.info);
setTimeout(function(){
$('#top-alert').find('button').click();
$(that).removeClass('disabled').prop('disabled',false);
},1500);
}
}
</script>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<input type="hidden" name="id" value="{$data['id']}">
<input type="hidden" name="type" value="{$_GET['type']}">
<div class="form-item cf">
<button class="submit_btn ajax-post " id="submit" type="submit" target-form="form-horizontal" style="margin-left:210px;">
保存
</button>
<a class="submit_btn " alt="返回上一页" title="返回上一页" href="javascript:window.history.back();" >
返回
</a>
</div>
</form>
</div>
</div>
<div class="common_settings">
<span class="plus_icon"><span><img src="__IMG__/zwmimages/icon_jia.png"></span></span>
<form class="addShortcutIcon">
<input type="hidden" name="title" value="{$m_title}">
<input type="hidden" name="url" value="Giftbag/lists">
</form>
<a class="ajax-post add-butn <notempty name='commonset'>addSIsetted</notempty>" href="javascript:;" target-form="addShortcutIcon" url="{:U('Think/addShortcutIcon')}"><img src="__IMG__/zwmimages/icon_jia.png"><span><notempty name='commonset'>已添加<else />添加至常用设置</notempty></span></a>
</div>
</block>
<block name="script">
<link href="__STATIC__/datetimepicker/css/datetimepicker.css" rel="stylesheet" type="text/css">
<php>if(C('COLOR_STYLE')=='blue_color') echo '<link href="__STATIC__/datetimepicker/css/datetimepicker_blue.css" rel="stylesheet" type="text/css">';</php>
<link href="__STATIC__/datetimepicker/css/dropdown.css" rel="stylesheet" type="text/css">
<script type="text/javascript" src="__STATIC__/datetimepicker/js/bootstrap-datetimepicker.min.js"></script>
<script type="text/javascript" src="__STATIC__/datetimepicker/js/locales/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
<script type="text/javascript" src="__JS__/select2.min.js"></script>
<script type="text/javascript">
//导航高亮
// $('.side-sub-menu').eq(0).show();
highlight_subnav('{:U('Site/channel')}');
</script>
</block>
Loading…
Cancel
Save